From 4af34297e26391e34883ccdfcbb2163af9c7f690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Fri, 10 Oct 2025 11:11:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6,=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 分离wanmao与吉水微信账号配置 - 大屏bug修复 --- .../DigitalCockpitController.java | 8 +--- .../productionplan/ProductionPlanMapper.java | 3 ++ .../productionplan/ProductionPlanService.java | 6 +++ .../ProductionPlanServiceImpl.java | 19 +++++++++ .../specieslibrary/SpeciesLibraryService.java | 2 + .../SpeciesLibraryServiceImpl.java | 11 ++++++ .../productionplan/ProductionPlanMapper.xml | 21 ++++++++++ .../src/main/resources/application.yaml | 4 +- yudao-server/src/main/resources/db.properties | 39 ++++++++++++++++--- 9 files changed, 99 insertions(+), 14 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpitController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpitController.java index 76ae6c16..993219f3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpitController.java +++ b/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> getCropStatisticsInfo(@RequestParam("baseId") String baseId, @RequestParam("year") String year) { - // TODO: 2025/9/24 待实现 - List res = new ArrayList<>(); - res.add(new CropStatisticsRespVO("香菜",1000,1200)); + List res = productionPlanService.getCultivatingAreaInfo(baseId, year); return success(res); } @@ -138,9 +136,7 @@ public class DigitalCockpitController { @Parameter(name = "year", description = "查询条件: 年份", required = true) public CommonResult> getYieldStatisticsInfo(@RequestParam("baseId") String baseId, @RequestParam("year") String year) { - // TODO: 2025/9/24 待实现 - List res = new ArrayList<>(); - res.add(new YieldStatisticsRespVO("香菜",10000,16000)); + List res = productionPlanService.getCultivatingYieldInfo(baseId, year); return success(res); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java index 0db908f1..b63a0da6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java +++ b/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 { List getYieldComparisonChart(YieldComparisonChartReqVO req); PlantingPlanCompletionRespVO getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req); + + List getCultivatingAreaInfo(@Param("baseId") String baseId, @Param("year") String year); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java index 70e4e614..fd7173da 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java +++ b/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 getCultivatingAreaInfo(String baseId, String year); + + List getCultivatingYieldInfo(String baseId, String year); + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java index 19a127e9..2a3a29c2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java +++ b/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 getCultivatingAreaInfo(String baseId, String year) { + Map map = speciesLibraryService.getSpeciesName(); + List list = productionPlanMapper.getCultivatingAreaInfo(baseId, year); + for (CropStatisticsRespVO c : list) { + c.setSpeciesName(map.getOrDefault(c.getSpeciesName(),"")); + } + return list ; + } + @Override + public List getCultivatingYieldInfo(String baseId, String year) { + + return null; + } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java index a6aae93b..c38c0dda 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java @@ -96,4 +96,6 @@ public interface SpeciesLibraryService { List getSpeciesLibraryList(); + Map getSpeciesName(); + } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java index 8c5a7f1e..cb281dfc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java +++ b/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 getSpeciesName() { + LambdaQueryWrapper x = new LambdaQueryWrapper<>(); + x.eq(SpeciesLibraryDO::getTenantId, getLoginUser().getTenantId()); + + List speciesLibraryDOList = speciesLibraryMapper.selectList(x); + + Map nameMap = speciesLibraryDOList.stream().collect((Collectors.toMap(SpeciesLibraryDO::getId, SpeciesLibraryDO::getCultivarName))); + return nameMap; + } + } \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml index 2cca05aa..633706c7 100644 --- a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml @@ -90,4 +90,25 @@ + + \ No newline at end of file diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 8c78e550..0f160808 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/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 - url_1: getTenantByMobile + hosts: ${wms.hosts} + url_1: ${wms.url_1} # 万懋设备管理 device-manager: diff --git a/yudao-server/src/main/resources/db.properties b/yudao-server/src/main/resources/db.properties index 9e90c355..d9fe7849 100644 --- a/yudao-server/src/main/resources/db.properties +++ b/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.secret=a5e114df50a86c2578af255adba1c3e7 -wm.wx.miniapp.app-id=wxde87f69bb4a2cf5c -wm.wx.miniapp.secret=a5e114df50a86c2578af255adba1c3e7 +wm.wx.mp.app-id=wx508d9a9ab84f67d0 +wm.wx.mp.secret=88b5a8deca40c8f86d064717d82d8485 +wm.wx.miniapp.app-id=wx508d9a9ab84f67d0 +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 \ No newline at end of file