lijianfu
/
eemcs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、修复设备在线定时任务; 

2、添加最低液位设置值；
dev_mz
25604 4 days ago
parent
77124eff14
commit
0c0cf2bdf1
4 changed files with 28 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java
  2. 3
      mh-quartz/src/main/java/com/mh/quartz/task/CreateAlarmTask.java
  3. 9
      mh-system/src/main/java/com/mh/system/mapper/device/DeviceLedgerMapper.java
  4. 29
      mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java

4
mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java
Unescape View File

@ -115,6 +115,10 @@ public class HotWaterControlVO {
private int emergencyStopStatus; private int emergencyStopStatus;
private String emergencyStopStatusId; private String emergencyStopStatusId;
// 最低设置值 44
private int minSet;
private String minSetId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date curTime; private Date curTime;

3
mh-quartz/src/main/java/com/mh/quartz/task/CreateAlarmTask.java
Unescape View File

@ -56,6 +56,9 @@ public class CreateAlarmTask {
String[] alarmTaskArray = alarmTask.split(","); String[] alarmTaskArray = alarmTask.split(",");
// 遍历 // 遍历
for (String id : alarmTaskArray) { for (String id : alarmTaskArray) {
if (null == id || id.isEmpty()) {
continue;
}
sendMsgByTopic.sendDelayedAlarm(id, 1); sendMsgByTopic.sendDelayedAlarm(id, 1);
} }
} }

9
mh-system/src/main/java/com/mh/system/mapper/device/DeviceLedgerMapper.java
Unescape View File

@ -3,10 +3,8 @@ package com.mh.system.mapper.device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mh.common.core.domain.entity.DeviceLedger; import com.mh.common.core.domain.entity.DeviceLedger;
import com.mh.common.core.domain.entity.DeviceState; import com.mh.common.core.domain.entity.DeviceState;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.mapping.StatementType;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
@ -26,7 +24,8 @@ public interface DeviceLedgerMapper extends BaseMapper<DeviceLedger> {
@Update("update device_ledger set status = #{status}, update_time = current_timestamp where id = #{id}") @Update("update device_ledger set status = #{status}, update_time = current_timestamp where id = #{id}")
void updateOnlineOrOfflineStatus(@Param("id") String deviceLedgerId, @Param("status") int integer); 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); void createOrUpdateDeviceState(@Param("curDate") String curDate);
} }

29
mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java
Unescape View File

@ -698,11 +698,11 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag
vo.setSwitchStatusId(item.getCpmId()); vo.setSwitchStatusId(item.getCpmId());
break; break;
case "3": case "3":
vo.setFrequencySet(item.getCurValue()); vo.setFrequencySet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setFrequencySetId(item.getCpmId()); vo.setFrequencySetId(item.getCpmId());
break; break;
case "4": case "4":
vo.setFrequency(item.getCurValue()); vo.setFrequency(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setFrequencyId(item.getCpmId()); vo.setFrequencyId(item.getCpmId());
break; break;
case "5": case "5":
@ -722,44 +722,44 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag
vo.setCloseSwitchId(item.getCpmId()); vo.setCloseSwitchId(item.getCpmId());
break; break;
case "10": case "10":
vo.setWaterLevelSet(item.getCurValue()); vo.setWaterLevelSet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setWaterLevelSetId(item.getCpmId()); vo.setWaterLevelSetId(item.getCpmId());
break; break;
case "11": case "11":
vo.setWaterLevel(item.getCurValue()); vo.setWaterLevel(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setCurTime(item.getCurTime()); vo.setCurTime(item.getCurTime());
vo.setWaterLevelId(item.getCpmId()); vo.setWaterLevelId(item.getCpmId());
break; break;
case "12": case "12":
vo.setTemp(item.getCurValue()); vo.setTemp(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setTempId(item.getCpmId()); vo.setTempId(item.getCpmId());
break; break;
case "13": case "13":
vo.setPressure(item.getCurValue()); vo.setPressure(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setPressureId(item.getCpmId()); vo.setPressureId(item.getCpmId());
break; break;
case "14": case "14":
vo.setTempSet(item.getCurValue()); vo.setTempSet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setTempSetId(item.getCpmId()); vo.setTempSetId(item.getCpmId());
break; break;
case "15": case "15":
vo.setPressureSet(item.getCurValue()); vo.setPressureSet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setPressureSetId(item.getCpmId()); vo.setPressureSetId(item.getCpmId());
break; break;
case "34": case "34":
vo.setDelayTimeSet(item.getCurValue()); vo.setDelayTimeSet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setDelayTimeSetId(item.getCpmId()); vo.setDelayTimeSetId(item.getCpmId());
break; break;
case "35": case "35":
vo.setDiffValueSet(item.getCurValue()); vo.setDiffValueSet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setDiffValueSetId(item.getCpmId()); vo.setDiffValueSetId(item.getCpmId());
break; break;
case "36": case "36":
vo.setCounterSet(item.getCurValue()); vo.setCounterSet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setCounterSetId(item.getCpmId()); vo.setCounterSetId(item.getCpmId());
break; break;
case "37": case "37":
vo.setSwitchTimeSet(item.getCurValue()); vo.setSwitchTimeSet(BigDecimal.valueOf(item.getCurValue().intValue()));
vo.setSwitchTimeSetId(item.getCpmId()); vo.setSwitchTimeSetId(item.getCpmId());
break; break;
case "38": case "38":
@ -770,6 +770,11 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag
vo.setEmergencyStopStatus(item.getCurValue().intValue()); vo.setEmergencyStopStatus(item.getCurValue().intValue());
vo.setEmergencyStopStatusId(item.getCpmId()); vo.setEmergencyStopStatusId(item.getCpmId());
break; break;
case "44":
// 最低设置值
vo.setMinSet(item.getCurValue().intValue());
vo.setMinSetId(item.getCpmId());
break;
default: default:
// 处理未识别的paramType或忽略 // 处理未识别的paramType或忽略
break; break;

Write Preview
Loading…
Cancel
Save