From f436d1690b130caacfeb99226701ca12bd6ce325 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 7 Mar 2024 13:35:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A0=B9=E6=8D=AE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=B0=B4=E4=BD=8D=E6=88=96=E8=80=85=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9B2=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8F=92=E5=85=A5=E6=AD=BB=E9=94=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mh/user/constants/Constant.java | 1 + user-service/src/main/java/com/mh/user/job/DealDataJob.java | 6 ++++-- .../java/com/mh/user/serialport/SerialPortSendReceive2.java | 3 ++- .../java/com/mh/user/service/impl/SysLogServiceImpl.java | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/constants/Constant.java b/user-service/src/main/java/com/mh/user/constants/Constant.java index 0362988..c50aaaf 100644 --- a/user-service/src/main/java/com/mh/user/constants/Constant.java +++ b/user-service/src/main/java/com/mh/user/constants/Constant.java @@ -10,6 +10,7 @@ package com.mh.user.constants; public class Constant { public static final CharSequence CUSTOM_NAME_HUAXIA = "华厦"; + public static final CharSequence CUSTOM_NAME_GUANGSHANG = "广商"; public static boolean CONTROL_WEB_FLAG = false; public static boolean SEND_STATUS = false; // 指令发送状态 public static volatile boolean FLAG = false; diff --git a/user-service/src/main/java/com/mh/user/job/DealDataJob.java b/user-service/src/main/java/com/mh/user/job/DealDataJob.java index 561f819..f4bab96 100644 --- a/user-service/src/main/java/com/mh/user/job/DealDataJob.java +++ b/user-service/src/main/java/com/mh/user/job/DealDataJob.java @@ -47,7 +47,8 @@ public class DealDataJob { Date date = new Date(); String curDate = sdf1.format(date); String name = dealDataService.customName(); - if (name != null && name.contains("华夏学院")) { + if (name != null + && (name.contains(Constant.CUSTOM_NAME_HUAXIA) || name.contains(Constant.CUSTOM_NAME_GUANGSHANG))) { dealDataService.proEnergy2(curDate); } else { dealDataService.proEnergy(curDate); //yyyy-MM-dd HH:00:00 @@ -141,7 +142,8 @@ public class DealDataJob { Date date = new Date(); String curDate = sdf1.format(date); String name = dealDataService.customName(); - if (name != null && name.contains("华夏学院")) { + if (name != null + && (name.contains(Constant.CUSTOM_NAME_HUAXIA) || name.contains(Constant.CUSTOM_NAME_GUANGSHANG))) { dealDataService.proEnergySum2(curDate); } else { dealDataService.proEnergySum(curDate); diff --git a/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive2.java b/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive2.java index 6850425..2e35246 100644 --- a/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive2.java +++ b/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive2.java @@ -233,7 +233,8 @@ public class SerialPortSendReceive2 { log.info("进入水位开关，地址==>{}", registerAddr); SysParamEntity sysParamEntity = sysParamService.selectSysParam(); if (null != sysParamEntity && !StringUtils.isBlank(sysParamEntity.getCustomName())) { - if (sysParamEntity.getCustomName().contains(Constant.CUSTOM_NAME_HUAXIA)) { + if (sysParamEntity.getCustomName().contains(Constant.CUSTOM_NAME_HUAXIA) + || sysParamEntity.getCustomName().contains(Constant.CUSTOM_NAME_GUANGSHANG)) { analysisReceiveOrder485.analysisRelayOrder485(dataStr,registerAddr,brand,buildingId, buildingName); //华厦 } else { analysisReceiveOrder485.analysisPumpStateOrder(dataStr, registerAddr, brand, buildingId, buildingName); //创新,热泵状态与水位共用一个8路设备 diff --git a/user-service/src/main/java/com/mh/user/service/impl/SysLogServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/SysLogServiceImpl.java index 31cd2c4..c17a92a 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/SysLogServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/SysLogServiceImpl.java @@ -20,7 +20,7 @@ public class SysLogServiceImpl implements SysLogService { private SysLogMapper sysLogMapper; @Override - public int save(SysLog record) { + public synchronized int save(SysLog record) { if(record.getId() == null || record.getId() == 0) { return sysLogMapper.insertSelective(record); }