From 5ad23519b1970c55bac71edbbe151ca6ad72810a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 27 Nov 2024 09:32:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A4=E5=86=85=E6=B8=A9=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/heating/job/HeatingReportJob.java | 64 +++++++++---------- .../temperature/entity/Temperature.java | 2 + .../mapper/xml/TemperatureMapper.xml | 5 +- .../src/main/resources/application-dev.yml | 4 +- 4 files changed, 39 insertions(+), 36 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingReportJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingReportJob.java index fcc3fbd..963062c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingReportJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingReportJob.java @@ -56,8 +56,8 @@ public class HeatingReportJob implements Job { String SDate = sdf.format(new Date()); String tableName = "heatanalysis_"+SDate.substring(2, 4)+SDate.substring(5, 7); List list = new ArrayList<>(); -// list.add("22423010001");//磐石市白云物业管理有限责任公司 磐石白云物业供热站 白云锅炉房 -// list.add("12423011000");//磐石市北亚供热有限公司 磐石北亚供热站 北亚锅炉房 + list.add("22423010001");//磐石市白云物业管理有限责任公司 磐石白云物业供热站 白云锅炉房 + list.add("12423011000");//磐石市北亚供热有限公司 磐石北亚供热站 北亚锅炉房 // list.add("");//磐石市颐和供热有限责任公司 磐石颐和供热站 三兴嘉园锅炉房 list.add("22423030004");//磐石市鼎丰供热有限责任公司 磐石鼎丰供热站 汇城国樾府小区(香格里拉 list.add("22423013000");//磐石市冬晨供热有限公司 磐石冬晨供热站 冬晨锅炉房 @@ -65,13 +65,13 @@ public class HeatingReportJob implements Job { list.add("22423001001");//磐石市红大供热有限公司 磐石红大供热站 红大锅炉房 list.add("22423002001");//磐石市宏城供热有限公司 磐石宏城供热站 宏城锅炉房 list.add("22423003002");//磐石市隆昌物业管理有限公司 磐石隆昌物业供热站 隆昌1处锅炉房 -// list.add("22423003005");//磐石市琉森供热管理有限公司 磐石琉森供热站 隆昌二处锅炉房 + list.add("22423003005");//磐石市琉森供热管理有限公司 磐石琉森供热站 隆昌二处锅炉房 list.add("32423012001");//磐石市牟力供热有限公司 磐石牟力供热站 牟力锅炉房 -// list.add("22423004000");//磐石市三兴供热有限公司 磐石三兴供热站 三兴锅炉房 + list.add("22423004000");//磐石市三兴供热有限公司 磐石三兴供热站 三兴锅炉房 list.add("12423005000");//磐石市升旺供热有限公司 磐石升旺供热站 升旺锅炉房 -// list.add("22423008001");//磐石市万达物业管理有限公司 磐石万达供热站 万达锅炉房 -// list.add("22423006000");//磐石市馨达供热有限公司 磐石馨达供热站 馨达锅炉房 -// list.add("22423009000");//磐石市忠信供热有限公司 磐石忠信供热站 忠信锅炉房 + list.add("22423008001");//磐石市万达物业管理有限公司 磐石万达供热站 万达锅炉房 + list.add("22423006000");//磐石市馨达供热有限公司 磐石馨达供热站 馨达锅炉房 + list.add("22423009000");//磐石市忠信供热有限公司 磐石忠信供热站 忠信锅炉房 list.add("22423020000");//磐石市恒升供热有限公司 磐石恒升供热站 恒升锅炉房 // list.add("");//磐石市柏悦供热有限公司 磐石柏悦供热站 for(String sim:list){ @@ -81,16 +81,16 @@ public class HeatingReportJob implements Job { Heatanalysis heatanalysis2 = heatanalysisService.getHeatOne(heatanalysis); String CompanyName = ""; String HeatName = ""; - if("1111111111".equals(sim)){ -// if("22423010001".equals(sim)){ -// CompanyName = "磐石市白云物业管理有限责任公司"; -// HeatName = "磐石白云物业供热站"; -// }else if("12423011000".equals(sim)){ -// CompanyName = "磐石市北亚供热有限公司"; -// HeatName = "磐石北亚供热站"; -// }else if("12423007000".equals(sim)){ -// CompanyName = "磐石市颐和供热有限责任公司"; -// HeatName = "磐石颐和供热站"; +// if("1111111111".equals(sim)){ + if("22423010001".equals(sim)){ + CompanyName = "磐石市白云物业管理有限责任公司"; + HeatName = "磐石白云物业供热站"; + }else if("12423011000".equals(sim)){ + CompanyName = "磐石市北亚供热有限公司"; + HeatName = "磐石北亚供热站"; + }else if("12423007000".equals(sim)){ + CompanyName = "磐石市颐和供热有限责任公司"; + HeatName = "磐石颐和供热站"; }else if("22423030004".equals(sim)){ CompanyName = "磐石市鼎丰供热有限责任公司"; HeatName = "磐石鼎丰供热站"; @@ -109,27 +109,27 @@ public class HeatingReportJob implements Job { }else if("22423003002".equals(sim)){ CompanyName = "磐石市隆昌物业管理有限公司"; HeatName = "磐石隆昌物业供热站"; -// }else if("22423003005".equals(sim)){ -// CompanyName = "磐石市琉森供热管理有限公司"; -// HeatName = "磐石琉森供热站"; + }else if("22423003005".equals(sim)){ + CompanyName = "磐石市琉森供热管理有限公司"; + HeatName = "磐石琉森供热站"; }else if("32423012001".equals(sim)){ CompanyName = "磐石市牟力供热有限公司"; HeatName = "磐石牟力供热站"; -// }else if("22423004000".equals(sim)){ -// CompanyName = "磐石市三兴供热有限公司"; -// HeatName = "磐石三兴供热站"; + }else if("22423004000".equals(sim)){ + CompanyName = "磐石市三兴供热有限公司"; + HeatName = "磐石三兴供热站"; }else if("12423005000".equals(sim)){ CompanyName = "磐石市升旺供热有限公司"; HeatName = "磐石升旺供热站"; -// }else if("22423008001".equals(sim)){ -// CompanyName = "磐石市万达物业管理有限公司"; -// HeatName = "磐石万达供热站"; -// }else if("22423006000".equals(sim)){ -// CompanyName = "磐石市馨达供热有限公司"; -// HeatName = "磐石馨达供热站"; -// }else if("22423009000".equals(sim)){ -// CompanyName = "磐石市忠信供热有限公司"; -// HeatName = "磐石忠信供热站"; + }else if("22423008001".equals(sim)){ + CompanyName = "磐石市万达物业管理有限公司"; + HeatName = "磐石万达供热站"; + }else if("22423006000".equals(sim)){ + CompanyName = "磐石市馨达供热有限公司"; + HeatName = "磐石馨达供热站"; + }else if("22423009000".equals(sim)){ + CompanyName = "磐石市忠信供热有限公司"; + HeatName = "磐石忠信供热站"; }else if("22423020000".equals(sim)){ CompanyName = "磐石市恒升供热有限公司"; HeatName = "磐石恒升供热站"; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/entity/Temperature.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/entity/Temperature.java index 0136338..5eae7b4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/entity/Temperature.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/entity/Temperature.java @@ -32,6 +32,8 @@ public class Temperature extends JeecgEntity { private String reportTime; // @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") // private Date createTime; + @TableField(exist = false) + private String reportHour; @TableField(exist = false) private String SDate;//开始时间 @TableField(exist = false) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml index 18d154f..c0f0454 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml @@ -30,7 +30,8 @@ diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 8d0c9d1..2520047 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -167,9 +167,9 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 multi-datasource1: - url: jdbc:mysql://1.92.152.160:40521/heatsupply?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://localhost:3306/heatsupply?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: BLXC@123. + password: root driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: