From c3aab4658b01a3619b4d33a7ce4ec1b9302a7bc6 Mon Sep 17 00:00:00 2001 From: v-lijf43 <3067418132@qq.com> Date: Sat, 27 Jun 2026 16:02:37 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E7=99=BE=E8=AF=97?= =?UTF-8?q?=E5=BE=97=E5=86=B7=E9=87=8F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 4 +- .../test/java/com/mh/MHApplicationTest.java | 2 +- .../dealdata/impl/DataProcessServiceImpl.java | 2 +- .../mh/quartz/task/GetOtherSysDataJob.java | 40 +++++++++++++++++-- .../mapper/device/DataProcessMapper.java | 2 +- .../overview/impl/HomeServiceImpl.java | 8 ++-- .../overview/impl/ProOverviewServiceImpl.java | 5 ++- 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/mh-admin/src/main/resources/application-dev.yml b/mh-admin/src/main/resources/application-dev.yml index 234cc2f..a93b3bc 100644 --- a/mh-admin/src/main/resources/application-dev.yml +++ b/mh-admin/src/main/resources/application-dev.yml @@ -98,10 +98,10 @@ spring: # 主库数据源 master: #添加allowMultiQueries=true 在批量更新时才不会出错 - url: jdbc:postgresql://127.0.0.1:5432/bl_eems + url: jdbc:postgresql://192.168.1.107:5232/bl_eems # url: jdbc:postgresql://106.55.173.225:5505/eemcs username: postgres - password: 123456 + password: mhtech@803 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/mh-admin/src/test/java/com/mh/MHApplicationTest.java b/mh-admin/src/test/java/com/mh/MHApplicationTest.java index 9e539c4..df2f1e8 100644 --- a/mh-admin/src/test/java/com/mh/MHApplicationTest.java +++ b/mh-admin/src/test/java/com/mh/MHApplicationTest.java @@ -75,7 +75,7 @@ public class MHApplicationTest { @Test public void getBSDData() { - getOtherSysDataJob.getBSDData("",""); +// getOtherSysDataJob.getBSDData1("",""); } @Test diff --git a/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java b/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java index 9ff4ad9..a898556 100644 --- a/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java +++ b/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java @@ -255,7 +255,7 @@ public class DataProcessServiceImpl implements DataProcessService { Date date = DateUtils.stringToDate(formattedTime, "yyyy-MM-dd HH:mm:ss"); collectionParamsManage.setCurTime(date); entities.add(collectionParamsManage); - break; +// break; } } } catch (Exception e) { diff --git a/mh-quartz/src/main/java/com/mh/quartz/task/GetOtherSysDataJob.java b/mh-quartz/src/main/java/com/mh/quartz/task/GetOtherSysDataJob.java index 5143c8b..b095bf2 100644 --- a/mh-quartz/src/main/java/com/mh/quartz/task/GetOtherSysDataJob.java +++ b/mh-quartz/src/main/java/com/mh/quartz/task/GetOtherSysDataJob.java @@ -104,7 +104,27 @@ public class GetOtherSysDataJob { params.put("systemType", "0"); params.put("paramType", "16"); List collectionParamsManages = collectionParamsManageService.selectListByParams(params); - + + HashMap params1 = new HashMap<>(); + params1.put("systemType", "0"); + params1.put("paramType", "17"); + List collectionParamsManages1 = collectionParamsManageService.selectListByParams(params1); + + HashMap params2 = new HashMap<>(); + params2.put("systemType", "0"); + params2.put("paramType", "12"); + List collectionParamsManages2 = collectionParamsManageService.selectListByParams(params2); + + HashMap params3 = new HashMap<>(); + params3.put("systemType", "0"); + params3.put("paramType", "31"); + List collectionParamsManages3 = collectionParamsManageService.selectListByParams(params3); + + // 全部合并成collectionParamsManages + collectionParamsManages.addAll(collectionParamsManages1); + collectionParamsManages.addAll(collectionParamsManages2); + collectionParamsManages.addAll(collectionParamsManages3); + // 分离grade=40(累计读数)和grade=140(实时功率)的点位 List cumulativeMtCodes = new ArrayList<>(); // grade=40 List powerMtCodes = new ArrayList<>(); // grade=140 @@ -207,7 +227,7 @@ public class GetOtherSysDataJob { AdvantechReceiver advantechReceiver = new AdvantechReceiver(); advantechReceiver.setTs(DateUtils.dateToString(new Date(), Constants.DATE_FORMAT)); advantechReceiver.setD(allAdvantechDatas); - + String message = JSONObject.toJSONString(advantechReceiver); log.info("发送BSD数据到消息队列，数据点数: {}", allAdvantechDatas.size()); sendMsgByTopic.sendToDeviceMQ(message); @@ -336,7 +356,13 @@ public class GetOtherSysDataJob { AdvantechDatas datas = new AdvantechDatas<>(); String tag = mtCodeToOtherNameMap.getOrDefault(mtCode, mtCode); datas.setTag(tag); - datas.setValue(value); + // 判断如果是冷吨的单位，都要乘以3.517 + if (mtCode.contains("TON")) { + value = value.multiply(new BigDecimal("3.517")); + datas.setValue(value); + } else { + datas.setValue(value); + } datas.setQuality(BigDecimal.valueOf(0)); dataList.add(datas); } catch (NumberFormatException e) { @@ -385,7 +411,13 @@ public class GetOtherSysDataJob { AdvantechDatas datas = new AdvantechDatas<>(); String tag = mtCodeToOtherNameMap.getOrDefault(mtCode, mtCode); datas.setTag(tag); - datas.setValue(value); + // 判断如果是冷吨的单位，都要乘以3.517 + if (mtCode.contains("TON")) { + value = value.multiply(new BigDecimal("3.517")); + datas.setValue(value); + } else { + datas.setValue(value); + } datas.setQuality(BigDecimal.valueOf(0)); dataList.add(datas); } catch (NumberFormatException e) { diff --git a/mh-system/src/main/java/com/mh/system/mapper/device/DataProcessMapper.java b/mh-system/src/main/java/com/mh/system/mapper/device/DataProcessMapper.java index 6c03a7a..2d65c07 100644 --- a/mh-system/src/main/java/com/mh/system/mapper/device/DataProcessMapper.java +++ b/mh-system/src/main/java/com/mh/system/mapper/device/DataProcessMapper.java @@ -90,7 +90,7 @@ public interface DataProcessMapper { " #{item.ratio}," + " #{item.registerAddr} " + "WHERE NOT EXISTS (" + - " SELECT 1 FROM ${tableName} WHERE device_num = #{item.deviceNum} AND cur_time = #{item.curTime} " + + " SELECT 1 FROM ${tableName} WHERE device_num = #{item.deviceNum} AND device_type = #{item.deviceType} AND cur_time = #{item.curTime} " + ")" + "" + "") diff --git a/mh-system/src/main/java/com/mh/system/service/overview/impl/HomeServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/overview/impl/HomeServiceImpl.java index 612678f..93ba26c 100644 --- a/mh-system/src/main/java/com/mh/system/service/overview/impl/HomeServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/overview/impl/HomeServiceImpl.java @@ -47,13 +47,13 @@ public class HomeServiceImpl implements HomeService { // ==================== 冷量表 mt_num 常量 ==================== /** 总冷量计读数（累计） */ - private static final String MT_COLD_READING = "39001700"; + private static final String MT_COLD_READING = "SystemRealLoadTONTatol"; /** 总冷量计供水温度 */ - private static final String MT_COLD_SUPPLY_TEMP = "39001620"; + private static final String MT_COLD_SUPPLY_TEMP = "ChWSupplyTemp"; /** 总冷量计回水温度 */ - private static final String MT_COLD_RETURN_TEMP = "39001660"; + private static final String MT_COLD_RETURN_TEMP = "ChWReturnTemp"; /** 系统总冷量计瞬时冷量 */ - private static final String MT_SYS_COLD_INSTANT = "39001580"; + private static final String MT_SYS_COLD_INSTANT = "SystemRealLoadKW"; /** 冷量表 mt_num 前缀 */ private static final String MT_COLD_PREFIX = "3900"; diff --git a/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java index ec04916..85617e1 100644 --- a/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java @@ -117,7 +117,7 @@ public class ProOverviewServiceImpl implements IProOverviewService { if (!today) { continue; } - if (name.contains("系统")) { + if (name.contains("机房")) { // 系统 sysEle = sysEle.add(value); } else if (name.contains("主机")) { @@ -132,6 +132,9 @@ public class ProOverviewServiceImpl implements IProOverviewService { } else if (name.contains("冷却塔")) { // 冷却塔 towerEle = towerEle.add(value); + } else if (name.contains("冷量")) { + // 冷却塔 + cap = cap.add(value); } } Map resultMap = new HashMap<>();