fix (farm): 配置文件,大屏

- 分离wanmao与吉水微信账号配置
- 大屏bug修复

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpitController.java

@@ -126,9 +126,7 @@ public class DigitalCockpitController {
     @Parameter(name = "year", description = "查询条件: 年份", required = true)
     public CommonResult<List<CropStatisticsRespVO>> getCropStatisticsInfo(@RequestParam("baseId") String baseId,
                                                                           @RequestParam("year") String year) {
-        // TODO: 2025/9/24  待实现
+        List<CropStatisticsRespVO> res = productionPlanService.getCultivatingAreaInfo(baseId, year);
-        List<CropStatisticsRespVO> res = new ArrayList<>();
-        res.add(new CropStatisticsRespVO("香菜",1000,1200));
         return success(res);
     }
 
@@ -138,9 +136,7 @@ public class DigitalCockpitController {
     @Parameter(name = "year", description = "查询条件: 年份", required = true)
     public CommonResult<List<YieldStatisticsRespVO>> getYieldStatisticsInfo(@RequestParam("baseId") String baseId,
                                                                             @RequestParam("year") String year) {
-        // TODO: 2025/9/24  待实现
+        List<YieldStatisticsRespVO> res = productionPlanService.getCultivatingYieldInfo(baseId, year);
-        List<YieldStatisticsRespVO> res = new ArrayList<>();
-        res.add(new YieldStatisticsRespVO("香菜",10000,16000));
         return success(res);
     }
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*;
 import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanPage2ReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.CropStatisticsRespVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO;
 import cn.iocoder.yudao.module.farm.enums.CommonConstants;
 import org.apache.ibatis.annotations.Mapper;
@@ -83,4 +84,6 @@ public interface ProductionPlanMapper extends BaseMapperX<ProductionPlanDO> {
     List<YieldComparisonChartRespVO> getYieldComparisonChart(YieldComparisonChartReqVO req);
 
     PlantingPlanCompletionRespVO getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req);
+
+    List<CropStatisticsRespVO> getCultivatingAreaInfo(@Param("baseId") String baseId, @Param("year") String year);
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.farm.service.productionplan;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*;
+import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.CropStatisticsRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.YieldStatisticsRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanSaveReqVO;
@@ -215,6 +217,10 @@ public interface ProductionPlanService {
      */
     CultivatingInfo getCultivatingInfo(String baseId, String tenantId);
 
+    List<CropStatisticsRespVO> getCultivatingAreaInfo(String baseId, String year);
+
+    List<YieldStatisticsRespVO> getCultivatingYieldInfo(String baseId, String year);
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java

@@ -5,6 +5,8 @@ import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*;
+import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.CropStatisticsRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.YieldStatisticsRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanSaveReqVO;
@@ -12,6 +14,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
 import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper;
 import cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary.SpeciesLibraryMapper;
+import cn.iocoder.yudao.module.farm.service.specieslibrary.SpeciesLibraryService;
 import cn.iocoder.yudao.module.farm.utils.DateUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.ObjectUtils;
@@ -53,6 +56,8 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
     @Resource
     private SpeciesLibraryMapper speciesLibraryMapper;
     @Resource
+    private SpeciesLibraryService speciesLibraryService;
+    @Resource
     private BaseInfoMapper baseInfoMapper;
 
     @Override
@@ -415,5 +420,19 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
         return new CultivatingInfo(cultivatingSpeciesCount,cultivatingPlotCount);
     }
 
+    @Override
+    public List<CropStatisticsRespVO> getCultivatingAreaInfo(String baseId, String year) {
+        Map<String, String> map = speciesLibraryService.getSpeciesName();
+        List<CropStatisticsRespVO> list = productionPlanMapper.getCultivatingAreaInfo(baseId, year);
+        for (CropStatisticsRespVO c : list) {
+            c.setSpeciesName(map.getOrDefault(c.getSpeciesName(),""));
+        }
+        return list ;
+    }
 
+    @Override
+    public List<YieldStatisticsRespVO> getCultivatingYieldInfo(String baseId, String year) {
+
+        return null;
+    }
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java

@@ -96,4 +96,6 @@ public interface SpeciesLibraryService {
 
     List<SpeciesLibraryDO> getSpeciesLibraryList();
 
+    Map<String, String> getSpeciesName();
+
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.*;
+import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO;
@@ -791,4 +792,14 @@ public class SpeciesLibraryServiceImpl implements SpeciesLibraryService {
         return result;
     }
 
+    public Map<String,String> getSpeciesName() {
+        LambdaQueryWrapper<SpeciesLibraryDO> x = new LambdaQueryWrapper<>();
+        x.eq(SpeciesLibraryDO::getTenantId, getLoginUser().getTenantId());
+
+        List<SpeciesLibraryDO> speciesLibraryDOList = speciesLibraryMapper.selectList(x);
+
+        Map<String, String> nameMap = speciesLibraryDOList.stream().collect((Collectors.toMap(SpeciesLibraryDO::getId, SpeciesLibraryDO::getCultivarName)));
+        return nameMap;
+    }
+
 }

yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml

@@ -90,4 +90,25 @@
 
     </select>
 
+    <select id="getCultivatingAreaInfo"
+            resultType="cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.CropStatisticsRespVO">
+
+        SELECT
+            plant_species_code AS speciesName,
+            SUM(predicted_area) AS cropArea,
+            SUM(total_area) AS totalArea
+        FROM farm_production_plan
+        <where>
+            deleted = 0
+            <if test="baseId != null and baseId != ''">
+                AND base_id = #{baseId}
+            </if>
+            <if test="year != null and year != ''">
+                AND YEAR(production_start_date) = #{year}
+            </if>
+        </where>
+        GROUP BY plant_species_code
+
+    </select>
+
 </mapper>

yudao-server/src/main/resources/application.yaml

@@ -344,8 +344,8 @@ spring:
         keep-alive: 60s # 空闲线程存活时间
 # 万懋wms系统
 wms:
-  hosts: 47.111.15.9:8074/prod-api
+  hosts: ${wms.hosts}
-  url_1: getTenantByMobile
+  url_1: ${wms.url_1}
 
 # 万懋设备管理
 device-manager:

yudao-server/src/main/resources/db.properties

@@ -1,4 +1,7 @@
-# local
+#########################
+###########wanmao###########
+#########################
+
 mysql.url=jdbc:mysql://223.83.129.121:3360/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
 mysql.username=farming-platform
 mysql.password=wCM7fBMhFP3zNdJ3
@@ -8,14 +11,35 @@ redis.port=65532
 redis.database=5
 redis.password=luxifa970219
 
-wm.wx.mp.app-id=wxde87f69bb4a2cf5c
+wm.wx.mp.app-id=wx508d9a9ab84f67d0
-wm.wx.mp.secret=a5e114df50a86c2578af255adba1c3e7
+wm.wx.mp.secret=88b5a8deca40c8f86d064717d82d8485
-wm.wx.miniapp.app-id=wxde87f69bb4a2cf5c
+wm.wx.miniapp.app-id=wx508d9a9ab84f67d0
-wm.wx.miniapp.secret=a5e114df50a86c2578af255adba1c3e7
+wm.wx.miniapp.secret=88b5a8deca40c8f86d064717d82d8485
+
+# ????
+wms.hosts=https://wms.simple.gltec.cn/prod-ai 
+# ????
+#wms.hosts=47.111.15.9:8074/prod-api
+wms.url_1=getTenantByMobile
 
 
 
-# jishui
+
+
+
+
+
+
+
+
+
+
+
+
+#########################
+###########??###########
+#########################
+
 #mysql.url=jdbc:mysql://rm-bp10c7f0fou5efc95fo.mysql.rds.aliyuncs.com:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
 #mysql.username=root
 #mysql.password=Jsnm2025
@@ -29,3 +53,6 @@ wm.wx.miniapp.secret=a5e114df50a86c2578af255adba1c3e7
 #wm.wx.mp.secret=a5e114df50a86c2578af255adba1c3e7
 #wm.wx.miniapp.app-id=wxde87f69bb4a2cf5c
 #wm.wx.miniapp.secret=a5e114df50a86c2578af255adba1c3e7
+#
+#wms.hosts=https://wms.jslstec.cn/prod-api
+#wms.url_1=getTenantByMobile