From 0c0cf2bdf1291657f432cbb13b1351cd85ef50d5 Mon Sep 17 00:00:00 2001 From: 25604 Date: Fri, 22 Aug 2025 16:12:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1;=202?= =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E6=9C=80=E4=BD=8E=E6=B6=B2=E4=BD=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=80=BC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/vo/HotWaterControlVO.java | 4 +++ .../com/mh/quartz/task/CreateAlarmTask.java | 3 ++ .../mapper/device/DeviceLedgerMapper.java | 9 +++--- .../CollectionParamsManageServiceImpl.java | 29 +++++++++++-------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java b/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java index 37ee3c9..e39c05e 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java @@ -115,6 +115,10 @@ public class HotWaterControlVO { private int emergencyStopStatus; private String emergencyStopStatusId; + // 最低设置值 44 + private int minSet; + private String minSetId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date curTime; diff --git a/mh-quartz/src/main/java/com/mh/quartz/task/CreateAlarmTask.java b/mh-quartz/src/main/java/com/mh/quartz/task/CreateAlarmTask.java index 68d5883..4e52851 100644 --- a/mh-quartz/src/main/java/com/mh/quartz/task/CreateAlarmTask.java +++ b/mh-quartz/src/main/java/com/mh/quartz/task/CreateAlarmTask.java @@ -56,6 +56,9 @@ public class CreateAlarmTask { String[] alarmTaskArray = alarmTask.split(","); // 遍历 for (String id : alarmTaskArray) { + if (null == id || id.isEmpty()) { + continue; + } sendMsgByTopic.sendDelayedAlarm(id, 1); } } diff --git a/mh-system/src/main/java/com/mh/system/mapper/device/DeviceLedgerMapper.java b/mh-system/src/main/java/com/mh/system/mapper/device/DeviceLedgerMapper.java index 0db7f5e..cf4284b 100644 --- a/mh-system/src/main/java/com/mh/system/mapper/device/DeviceLedgerMapper.java +++ b/mh-system/src/main/java/com/mh/system/mapper/device/DeviceLedgerMapper.java @@ -3,10 +3,8 @@ package com.mh.system.mapper.device; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mh.common.core.domain.entity.DeviceLedger; import com.mh.common.core.domain.entity.DeviceState; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; +import org.apache.ibatis.mapping.StatementType; import java.util.List; @@ -26,7 +24,8 @@ public interface DeviceLedgerMapper extends BaseMapper { @Update("update device_ledger set status = #{status}, update_time = current_timestamp where id = #{id}") void updateOnlineOrOfflineStatus(@Param("id") String deviceLedgerId, @Param("status") int integer); - @Select("SELECT pro_device_state(#{curDate})") + @Update("select pro_device_state(#{curDate})") + @Options(statementType = StatementType.CALLABLE) void createOrUpdateDeviceState(@Param("curDate") String curDate); } diff --git a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java index 69612b9..5dd7443 100644 --- a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java @@ -698,11 +698,11 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag vo.setSwitchStatusId(item.getCpmId()); break; case "3": - vo.setFrequencySet(item.getCurValue()); + vo.setFrequencySet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setFrequencySetId(item.getCpmId()); break; case "4": - vo.setFrequency(item.getCurValue()); + vo.setFrequency(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setFrequencyId(item.getCpmId()); break; case "5": @@ -722,44 +722,44 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag vo.setCloseSwitchId(item.getCpmId()); break; case "10": - vo.setWaterLevelSet(item.getCurValue()); + vo.setWaterLevelSet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setWaterLevelSetId(item.getCpmId()); break; case "11": - vo.setWaterLevel(item.getCurValue()); + vo.setWaterLevel(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setCurTime(item.getCurTime()); vo.setWaterLevelId(item.getCpmId()); break; case "12": - vo.setTemp(item.getCurValue()); + vo.setTemp(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setTempId(item.getCpmId()); break; case "13": - vo.setPressure(item.getCurValue()); + vo.setPressure(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setPressureId(item.getCpmId()); break; case "14": - vo.setTempSet(item.getCurValue()); + vo.setTempSet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setTempSetId(item.getCpmId()); break; case "15": - vo.setPressureSet(item.getCurValue()); + vo.setPressureSet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setPressureSetId(item.getCpmId()); break; case "34": - vo.setDelayTimeSet(item.getCurValue()); + vo.setDelayTimeSet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setDelayTimeSetId(item.getCpmId()); break; case "35": - vo.setDiffValueSet(item.getCurValue()); + vo.setDiffValueSet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setDiffValueSetId(item.getCpmId()); break; case "36": - vo.setCounterSet(item.getCurValue()); + vo.setCounterSet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setCounterSetId(item.getCpmId()); break; case "37": - vo.setSwitchTimeSet(item.getCurValue()); + vo.setSwitchTimeSet(BigDecimal.valueOf(item.getCurValue().intValue())); vo.setSwitchTimeSetId(item.getCpmId()); break; case "38": @@ -770,6 +770,11 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag vo.setEmergencyStopStatus(item.getCurValue().intValue()); vo.setEmergencyStopStatusId(item.getCpmId()); break; + case "44": + // 最低设置值 + vo.setMinSet(item.getCurValue().intValue()); + vo.setMinSetId(item.getCpmId()); + break; default: // 处理未识别的paramType或忽略 break;