From 46370fc12a83cacc90caa85e3e343f0171014373 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 11 Sep 2025 08:34:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B9=A1=E9=95=87=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/exportapi/api/HomeApi.java | 13 +++++++++++-- .../modules/heating/entity/Heatsource.java | 2 ++ .../heating/mapper/HeatanalysisMapper.java | 2 ++ .../heating/mapper/xml/HeatanalysisMapper.xml | 19 +++++++++++++++++++ .../heating/mapper/xml/HeatsourceMapper.xml | 4 ++++ .../heating/mapper/xml/SimconfigMapper.xml | 3 +++ .../heating/service/HeatanalysisService.java | 2 ++ .../service/impl/HeatanalysisServiceImpl.java | 5 +++++ .../jeecg/modules/system/entity/SysUser.java | 4 ++++ .../src/main/resources/application-prod.yml | 2 +- 10 files changed, 53 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java index 84a592d..bcb34a0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java @@ -71,7 +71,7 @@ public class HomeApi { //郊县数量（郊县公司数量） LambdaQueryChainWrapper qw3 = thermalcompanyService.lambdaQuery(); - qw3.eq(Thermalcompany::getRegionType,"郊县"); + qw3.eq(Thermalcompany::getRegionType,"乡镇"); qw3.eq(Thermalcompany::getDelFlag,"0"); qw3.orderByAsc(Thermalcompany::getId); List thermalcompanyList = qw3.list(); @@ -79,7 +79,7 @@ public class HomeApi { //郊县锅炉房数量 LambdaQueryChainWrapper qw4 = heatsourceService.lambdaQuery(); - qw4.eq(Heatsource::getRegionType,"郊县"); + qw4.eq(Heatsource::getRegionType,"乡镇"); qw4.eq(Heatsource::getDelFlag,"0"); qw4.orderByAsc(Heatsource::getId); List heatsourceJXList = qw4.list(); @@ -142,4 +142,13 @@ public class HomeApi { return Result.ok(result); } + + @RequestMapping(value = "/getStaticNowList", method = RequestMethod.POST) + public Result getStaticNowList(@RequestBody HomeApiEntity dto) { + Map result = new HashMap<>(); + List list = heatanalysisService.getStaticNowList(dto); + result.put("data",list); + return Result.ok(result); + } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java index af3ad42..850cc04 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java @@ -147,5 +147,7 @@ public class Heatsource implements Serializable { /**地区类型*/ @Excel(name = "地区类型", width = 15) private java.lang.String regionType; + @TableField(exist = false) + private String sourceId; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java index 086f07c..8b8e58c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java @@ -29,4 +29,6 @@ public interface HeatanalysisMapper extends BaseMapper { List getStaticList(@Param("params") HomeApiEntity dto); Page yunweiPage(Page page, @Param("params") Heatanalysis heatanalysis); + + List getStaticNowList(@Param("params") HomeApiEntity dto); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml index 78deeed..6661878 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml @@ -552,6 +552,25 @@ where t1.view002= #{params.sourceId} and t1.view004 is null ORDER BY t1.view002,t1.datatime + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SimconfigMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SimconfigMapper.xml index b8628c4..ed58a29 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SimconfigMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SimconfigMapper.xml @@ -24,6 +24,9 @@ AND a.region_type = #{regionType} + + AND id in ( ${sourceId}) + ORDER BY a.id diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java index 8d79c04..a651dc4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java @@ -30,4 +30,6 @@ public interface HeatanalysisService extends JeecgService { List getStaticList(HomeApiEntity dto); IPage yunweiPage(Page page,Heatanalysis heatanalysis); + + List getStaticNowList(HomeApiEntity dto); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java index eedcf52..b5e76ab 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java @@ -102,4 +102,9 @@ public class HeatanalysisServiceImpl extends JeecgServiceImpl getStaticNowList(HomeApiEntity dto) { + return baseMapper.getStaticNowList(dto); + } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java index 52d03d9..73bfe20 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -206,6 +206,10 @@ public class SysUser implements Serializable { */ private String bpmStatus; + + @Dict(dictTable ="bl_heatsource",dicText = "source_name",dicCode = "id") + private String sourceId; + /** * 是否已经绑定第三方 */ diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index bcdcedd..82a4dcf 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8050 undertow: decode-url: true # 启用URL解码 worker-threads: 16