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

1、监视界面now_data表相关逻辑修改；

dev
3067418132@qq.com 5 hours ago
parent
abf18e0619
commit
127c9650b6
8 changed files with 225 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 130
      user-service/src/main/java/com/mh/user/controller/NowDataController.java
  2. 2
      user-service/src/main/java/com/mh/user/entity/NowDataEntity.java
  3. 41
      user-service/src/main/java/com/mh/user/job/S7PlcCollectionJob.java
  4. 79
      user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java
  5. 4
      user-service/src/main/java/com/mh/user/model/MultiControlModel.java
  6. 49
      user-service/src/main/java/com/mh/user/service/impl/CollectionParamsManageServiceImpl.java
  7. 5
      user-service/src/main/java/com/mh/user/service/impl/NowDataServiceImpl.java
  8. 2
      user-service/src/main/resources/application.yml

130
user-service/src/main/java/com/mh/user/controller/NowDataController.java
Unescape View File

@ -122,6 +122,43 @@ public class NowDataController {
}
}
// 多路控制设备名称常量
private static final String[] MULTI_CONTROL_PUMP_NAMES = {
"1号供水泵", "2号供水泵", "1号抽水泵", "2号抽水泵", "补水电磁阀"
};
private static final String[] WATER_SUPPLY_PUMP_NAMES = {
"1号供水泵", "2号供水泵", "补水电磁阀"
};
/**
* 创建设备记录并保存
*/
private void createAndSaveDeviceRecord(String pumpId, String pumpName, String buildingId,
String buildingName, String curDate) {
NowDataEntity nowData = new NowDataEntity();
nowData.setPumpId(pumpId);
nowData.setPumpName(pumpName);
nowData.setBuildingId(buildingId);
nowData.setBuildingName(buildingName);
nowData.setRunState("0");
nowData.setIsFault("0");
nowData.setCurDate(curDate);
nowDataService.saveNowData(nowData); //当前状态表
nowDataService.saveHistoryData(nowData); //历史状态表
}
/**
* 批量创建设备记录
*/
private void batchCreateDeviceRecords(List<DeviceModel> deviceList, String[] pumpNames,
String buildingId, String buildingName, String curDate) {
for (DeviceModel device : deviceList) {
for (String pumpName : pumpNames) {
createAndSaveDeviceRecord(device.getDeviceAddr(), pumpName, buildingId, buildingName, curDate);
}
}
}
@SysLogger(title = "实时监控", optDesc = "实时查看每楼栋多路控制运行情况")
@PostMapping("/queryMultiNow")
public HttpResult queryMultiNowData(@RequestParam(value = "buildingId") String buildingId) {
@ -131,85 +168,48 @@ public class NowDataController {
String maxWaterTemp = nowDataService.selectMaxTemp(buildingId);
String buildingName = buildingService.queryBuildingName(buildingId);//获取楼栋名称
// SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// Date date = new Date();
// String curDate = sdf1.format(date);
// curDate = curDate.substring(0, 13) + ":00:00";
String curDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:00:00"));
NowPublicDataEntity nowPublicData = new NowPublicDataEntity();
nowPublicData.setBuildingId(buildingId);
nowPublicData.setBuildingName(buildingName);
if (avgWaterTemp != null) {
nowPublicData.setBackWaterTemp(avgWaterTemp);
} else {
nowPublicData.setBackWaterTemp("0");
}
if (maxWaterTemp != null) {
nowPublicData.setUseWaterTemp(maxWaterTemp);
} else {
nowPublicData.setUseWaterTemp("0");
}
nowPublicData.setBackWaterTemp(avgWaterTemp != null ? avgWaterTemp : "0");
nowPublicData.setUseWaterTemp(maxWaterTemp != null ? maxWaterTemp : "0");
nowPublicDataService.saveNowHistoryPublicData(nowPublicData);
//监视表生成初始记录
List<NowDataEntity> list = nowDataService.queryNowData(buildingId);
if (list.isEmpty()) {//实时表生成记录
if (list.isEmpty()) {
// 多路控制设备
List<DeviceModel> deviceList = deviceInstallService.selectDevices(buildingId, "多路控制");
if (!deviceList.isEmpty()) {
for (DeviceModel list2 : deviceList) {
NowDataEntity nowData = new NowDataEntity();
nowData.setPumpId(list2.getDeviceAddr());
nowData.setPumpName("1号供水泵");
nowData.setBuildingId(buildingId);
nowData.setBuildingName(buildingName);
nowData.setRunState("0");
nowData.setIsFault("0");
nowData.setCurDate(curDate);
nowDataService.saveNowData(nowData); //当前状态表
nowDataService.saveHistoryData(nowData); //历史状态表
batchCreateDeviceRecords(deviceList, MULTI_CONTROL_PUMP_NAMES, buildingId, buildingName, curDate);
nowData.setPumpId(list2.getDeviceAddr());
nowData.setPumpName("2号供水泵");
nowData.setBuildingId(buildingId);
nowData.setBuildingName(buildingName);
nowData.setRunState("0");
nowData.setIsFault("0");
nowData.setCurDate(curDate);
nowDataService.saveNowData(nowData); //当前状态表
nowDataService.saveHistoryData(nowData); //历史状态表
// 供水泵设备
deviceList = deviceInstallService.selectDevices(buildingId, "供水泵");
batchCreateDeviceRecords(deviceList, WATER_SUPPLY_PUMP_NAMES, buildingId, buildingName, curDate);
nowData.setPumpId(list2.getDeviceAddr());
nowData.setPumpName("1号抽水泵");
nowData.setBuildingId(buildingId);
nowData.setBuildingName(buildingName);
nowData.setRunState("0");
nowData.setIsFault("0");
nowData.setCurDate(curDate);
nowDataService.saveNowData(nowData); //当前状态表
nowDataService.saveHistoryData(nowData); //历史状态表
// 补水电磁阀
deviceList = deviceInstallService.selectDevices(buildingId, "补水电磁阀");
for (DeviceModel device : deviceList) {
createAndSaveDeviceRecord(device.getDeviceAddr(), "补水电磁阀", buildingId, buildingName, curDate);
}
nowData.setPumpId(list2.getDeviceAddr());
nowData.setPumpName("2号抽水泵");
nowData.setBuildingId(buildingId);
nowData.setBuildingName(buildingName);
nowData.setRunState("0");
nowData.setIsFault("0");
nowData.setCurDate(curDate);
nowDataService.saveNowData(nowData); //当前状态表
nowDataService.saveHistoryData(nowData); //历史状态表
// 单箱电磁阀
deviceList = deviceInstallService.selectDevices(buildingId, "单箱电磁阀");
for (DeviceModel device : deviceList) {
createAndSaveDeviceRecord(device.getDeviceAddr(), "单箱电磁阀", buildingId, buildingName, curDate);
}
nowData.setPumpId(list2.getDeviceAddr());
nowData.setPumpName("补水电磁阀");
nowData.setBuildingId(buildingId);
nowData.setBuildingName(buildingName);
nowData.setRunState("0");
nowData.setIsFault("0");
nowData.setCurDate(curDate);
nowDataService.saveNowData(nowData); //当前状态表
nowDataService.saveHistoryData(nowData); //历史状态表
// 多箱电磁阀
deviceList = deviceInstallService.selectDevices(buildingId, "多箱电磁阀");
for (DeviceModel device : deviceList) {
createAndSaveDeviceRecord(device.getDeviceAddr(), "多箱电磁阀", buildingId, buildingName, curDate);
}
// 多箱电动阀
deviceList = deviceInstallService.selectDevices(buildingId, "多箱电动阀");
for (DeviceModel device : deviceList) {
createAndSaveDeviceRecord(device.getDeviceAddr(), "多箱电动阀", buildingId, buildingName, curDate);
}
}
List<MultiControlModel> resultList = nowDataService.queryMultiControlNowData(buildingId);
@ -227,7 +227,7 @@ public class NowDataController {
NowDataEntity nowDataEntity = nowDataService.queryNowDataByPump(buildingId, pumpId);
return HttpResult.ok(nowDataEntity);
} catch (Exception e) {
e.printStackTrace();
log.error("按热泵查询当前监控状态出错!", e);
return HttpResult.error("按热泵查询当前监控状态出错!");
}

2
user-service/src/main/java/com/mh/user/entity/NowDataEntity.java
Unescape View File

@ -47,4 +47,6 @@ public class NowDataEntity {
private String backControlMode; // 回水运行模式
private String backWaterTemp; // 回水温度
}

41
user-service/src/main/java/com/mh/user/job/S7PlcCollectionJob.java
Unescape View File

@ -15,6 +15,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -235,6 +236,7 @@ public class S7PlcCollectionJob {
if (deviceInstallEntity != null) {
// 更新设备安装表中的now_date字段，根据param.getParamTypeId()的值进行判断 // 在对now_date进行更新
// 查询当前点位是否是运行状态、压力、液位、液位设置、回水温度、故障状态
log.error("进入nowData设置==>{}", param.toString());
switch(param.getParamTypeId()) {
case 2: // 运行状态
nowDataMapper.updateRunState(deviceInstallEntity.getBuildingId(),
@ -254,46 +256,51 @@ public class S7PlcCollectionJob {
}
break;
case 5: // 压力
if (param.getOtherName().contains("供水压力")) {
nowDataMapper.updatePressure(deviceInstallEntity.getBuildingId(),
deviceInstallEntity.getDeviceAddr(),
curValue.toString(), deviceInstallEntity.getDeviceName());
null,
curValue.setScale(1, RoundingMode.HALF_UP).toString(), null);
}
break;
case 31: // 液位
if (param.getOtherName().contains("单箱") && deviceInstallEntity.getIsSingleBox() == 1) {
// 更新单箱液位
nowDataMapper.updateBoxLevel(deviceInstallEntity.getBuildingId(),
deviceInstallEntity.getDeviceAddr(),
curValue.toString(),
deviceInstallEntity.getDeviceName(), 1);
null,
curValue.setScale(1, RoundingMode.HALF_UP).toString(),
null, 1);
} else {
// 获取多箱的液位
nowDataMapper.updateBoxLevel(deviceInstallEntity.getBuildingId(),
null,
curValue.toString(),
curValue.setScale(1, RoundingMode.HALF_UP).toString(),
null, 0);
}
break;
case 39: // 液位设置
if (param.getOtherName().contains("单箱") && deviceInstallEntity.getIsSingleBox() == 1) {
case 26: // 液位设置
if (param.getOtherName().contains("单箱液位") && param.getOtherName().contains("上限") && deviceInstallEntity.getIsSingleBox() == 1) {
// 更新单箱液位
nowDataMapper.updateBoxLevelSet(deviceInstallEntity.getBuildingId(),
deviceInstallEntity.getDeviceAddr(),
curValue.toString(),
deviceInstallEntity.getDeviceName(), 1);
} else {
null,
curValue.setScale(1, RoundingMode.HALF_UP).toString(),
null, 1);
} if (param.getOtherName().contains("多箱液位") && param.getOtherName().contains("上限") && deviceInstallEntity.getIsSingleBox() == 0) {
// 获取多箱的液位
nowDataMapper.updateBoxLevelSet(deviceInstallEntity.getBuildingId(),
null,
curValue.toString(),
curValue.setScale(1, RoundingMode.HALF_UP).toString(),
null, 0);
}
break;
case 32: // 压力设置
nowDataMapper.updatePressureSet(deviceInstallEntity.getBuildingId(),
deviceInstallEntity.getDeviceAddr(),
curValue.toString(), deviceInstallEntity.getDeviceName());
null,
curValue.setScale(1, RoundingMode.HALF_UP).toString(), null);
break;
case 12: // 回水温度
nowDataMapper.updateBackWaterTemp(deviceInstallEntity.getBuildingId(),
null,
curValue.setScale(1, RoundingMode.HALF_UP).toString(), null);
break;
case 3: // 故障状态
nowDataMapper.updatePressureSet(deviceInstallEntity.getBuildingId(),
@ -302,8 +309,8 @@ public class S7PlcCollectionJob {
break;
case 41: // 回水阀控制模式：0单箱，1多箱
nowDataMapper.updateBackControlModel(deviceInstallEntity.getBuildingId(),
deviceInstallEntity.getDeviceAddr(),
String.valueOf(curValue.intValue()), deviceInstallEntity.getDeviceName());
null,
String.valueOf(curValue.intValue()), null);
break;
}
// 根据deviceInstall查询对应的deviceInstall表数据

79
user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java
Unescape View File

@ -76,6 +76,7 @@ public interface NowDataMapper {
@Result(property ="pressure",column ="pressure"),
@Result(property ="pressureSet",column ="pressure_set"),
@Result(property ="backControlMode",column ="back_control_mode"),
@Result(property ="backWaterTemp",column ="back_water_temp"),
})
@Select("select * from now_data where building_id=#{buildingId} order by cast(pump_id as int) ")
List<NowDataEntity> queryNowData(@Param("buildingId") String buildingId);
@ -624,10 +625,28 @@ public interface NowDataMapper {
"</script>")
void updateMultiNowData(NowDataEntity nowDataEntity);
@Update("update now_data set pressure=#{value} where building_id=#{buildingId} and pump_id=#{deviceAddr} and pump_name=#{deviceName}")
@Update("<script>" +
"update now_data set pressure=#{value} where building_id=#{buildingId} " +
"<if test='deviceAddr!=null and deviceAddr != \"\"'>" +
" and pump_id=#{deviceAddr} " +
"</if>" +
"<if test='deviceName!=null and deviceName!=\"\"'>" +
"and pump_name=#{deviceName}" +
"</if>" +
"</script>"
)
void updatePressure(String buildingId, String deviceAddr, String value, String deviceName);
@Update("update now_data set pressure_set=#{value} where building_id=#{buildingId} and pump_id=#{deviceAddr} and pump_name=#{deviceName}")
@Update("<script>" +
"update now_data set pressure_set=#{value} where building_id=#{buildingId} " +
"<if test='deviceAddr!=null and deviceAddr != \"\"'>" +
" and pump_id=#{deviceAddr} " +
"</if>" +
"<if test='deviceName!=null and deviceName!=\"\"'>" +
"and pump_name=#{deviceName}" +
"</if>" +
"</script>"
)
void updatePressureSet(String buildingId, String deviceAddr, String value, String deviceName);
@Update("<script>" +
@ -676,18 +695,66 @@ public interface NowDataMapper {
)
void updateBoxLevelSet(String buildingId, String deviceAddr, String value, String deviceName, int isSingleBox);
@Update("update now_data set level_set=#{value} where building_id=#{buildingId} and pump_id=#{deviceAddr} and pump_name=#{deviceName}")
@Update("<script>" +
"update now_data set level_set=#{value} where building_id=#{buildingId} " +
"<if test='deviceAddr!=null and deviceAddr != \"\"'>" +
" and pump_id=#{deviceAddr} " +
"</if>" +
"<if test='deviceName!=null and deviceName!=\"\"'>" +
"and pump_name=#{deviceName}" +
"</if>" +
"</script>"
)
void updateSingleBoxLevelSet(String buildingId, String deviceAddr, String value, String deviceName);
@Update("update now_data set up_water_state=#{value} where building_id=#{buildingId} and pump_id=#{deviceAddr} and pump_name=#{deviceName}")
@Update("<script>" +
"update now_data set up_water_state=#{value} where building_id=#{buildingId} " +
"<if test='deviceAddr!=null and deviceAddr != \"\"'>" +
" and pump_id=#{deviceAddr} " +
"</if>" +
"<if test='deviceName!=null and deviceName!=\"\"'>" +
"and pump_name=#{deviceName}" +
"</if>" +
"</script>"
)
void updateUpWaterState(String buildingId, String deviceAddr, String value, String deviceName);
@Update("update now_data set use_water_state=#{value} where building_id=#{buildingId} and pump_id=#{deviceAddr} and pump_name=#{deviceName}")
@Update("<script>" +
"update now_data set use_water_state=#{value} where building_id=#{buildingId} " +
"<if test='deviceAddr!=null and deviceAddr != \"\"'>" +
" and pump_id=#{deviceAddr} " +
"</if>" +
"<if test='deviceName!=null and deviceName!=\"\"'>" +
"and pump_name=#{deviceName}" +
"</if>" +
"</script>"
)
void updateUseWaterState(String buildingId, String deviceAddr, String value, String deviceName);
@Update("update now_data set back_water_state=#{value} where building_id=#{buildingId} ")
void updateBackWaterState(Long buildingId, String value);
@Update("update now_data set back_control_model=#{value} where building_id=#{buildingId} and pump_id=#{deviceAddr} and pump_name=#{deviceName}")
@Update("<script>" +
"update now_data set back_control_model=#{value} where building_id=#{buildingId} " +
"<if test='deviceAddr!=null and deviceAddr != \"\"'>" +
" and pump_id=#{deviceAddr} " +
"</if>" +
"<if test='deviceName!=null and deviceName!=\"\"'>" +
"and pump_name=#{deviceName}" +
"</if>" +
"</script>"
)
void updateBackControlModel(String buildingId, String deviceAddr, String value, String deviceName);
@Update("<script>" +
"update now_data set back_water_temp=#{value} where building_id=#{buildingId} " +
"<if test='deviceAddr!=null and deviceAddr != \"\"'>" +
" and pump_id=#{deviceAddr} " +
"</if>" +
"<if test='deviceName!=null and deviceName!=\"\"'>" +
"and pump_name=#{deviceName}" +
"</if>" +
"</script>"
)
void updateBackWaterTemp(String buildingId, String deviceAddr, String value, String deviceName);
}

4
user-service/src/main/java/com/mh/user/model/MultiControlModel.java
Unescape View File

@ -51,6 +51,10 @@ public class MultiControlModel {
private String isFault; //是否故障
private String pumpRunState; //运行状态
private String pressure; //压力
private String pressureSet; //压力设置
private String backWaterTemp; //回水温度
@Override
public String toString() {
return new StringJoiner(", ", MultiControlModel.class.getSimpleName() + "[", "]")

49
user-service/src/main/java/com/mh/user/service/impl/CollectionParamsManageServiceImpl.java
Unescape View File

@ -474,6 +474,22 @@ public class CollectionParamsManageServiceImpl implements CollectionParamsManage
circuitPumpVo.setOneHourMinTimeOpenSetOneStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetOne(), circuitPumpVo.getOneMinTimeOpenSetOne()));
circuitPumpVo.setOneHourMinTimeCloseSetOneStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetOne(), circuitPumpVo.getOneMinTimeCloseSetOne()));
}
if (circuitPumpVo.getOneHourTimeOpenSetTwoId() != null
&& circuitPumpVo.getOneHourTimeCloseSetTwoId() != null
&& circuitPumpVo.getOneMinTimeOpenSetTwoId() != null
&& circuitPumpVo.getOneMinTimeCloseSetTwoId() != null) {
// 获取时分开写入oneHourMinTimeOpenSetTwoStr，oneHourMinTimeCloseSetTwoStr
circuitPumpVo.setOneHourMinTimeOpenSetTwoStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetTwo(), circuitPumpVo.getOneMinTimeOpenSetTwo()));
circuitPumpVo.setOneHourMinTimeCloseSetTwoStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetTwo(), circuitPumpVo.getOneMinTimeCloseSetTwo()));
}
if (circuitPumpVo.getOneHourTimeOpenSetThreeId() != null
&& circuitPumpVo.getOneHourTimeCloseSetThreeId() != null
&& circuitPumpVo.getOneMinTimeOpenSetThreeId() != null
&& circuitPumpVo.getOneMinTimeCloseSetThreeId() != null) {
// 获取时分开写入oneHourMinTimeOpenSetThreeStr，oneHourMinTimeCloseSetThreeStr
circuitPumpVo.setOneHourMinTimeOpenSetThreeStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetThree(), circuitPumpVo.getOneMinTimeOpenSetThree()));
circuitPumpVo.setOneHourMinTimeCloseSetThreeStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetThree(), circuitPumpVo.getOneMinTimeCloseSetThree()));
}
return circuitPumpVo;
}
@ -561,6 +577,22 @@ public class CollectionParamsManageServiceImpl implements CollectionParamsManage
circuitPumpVo.setOneHourMinTimeOpenSetOneStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetOne(), circuitPumpVo.getOneMinTimeOpenSetOne()));
circuitPumpVo.setOneHourMinTimeCloseSetOneStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetOne(), circuitPumpVo.getOneMinTimeCloseSetOne()));
}
if (circuitPumpVo.getOneHourTimeOpenSetTwoId() != null
&& circuitPumpVo.getOneHourTimeCloseSetTwoId() != null
&& circuitPumpVo.getOneMinTimeOpenSetTwoId() != null
&& circuitPumpVo.getOneMinTimeCloseSetTwoId() != null) {
// 获取时分开写入oneHourMinTimeOpenSetTwoStr，oneHourMinTimeCloseSetTwoStr
circuitPumpVo.setOneHourMinTimeOpenSetTwoStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetTwo(), circuitPumpVo.getOneMinTimeOpenSetTwo()));
circuitPumpVo.setOneHourMinTimeCloseSetTwoStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetTwo(), circuitPumpVo.getOneMinTimeCloseSetTwo()));
}
if (circuitPumpVo.getOneHourTimeOpenSetThreeId() != null
&& circuitPumpVo.getOneHourTimeCloseSetThreeId() != null
&& circuitPumpVo.getOneMinTimeOpenSetThreeId() != null
&& circuitPumpVo.getOneMinTimeCloseSetThreeId() != null) {
// 获取时分开写入oneHourMinTimeOpenSetThreeStr，oneHourMinTimeCloseSetThreeStr
circuitPumpVo.setOneHourMinTimeOpenSetThreeStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetThree(), circuitPumpVo.getOneMinTimeOpenSetThree()));
circuitPumpVo.setOneHourMinTimeCloseSetThreeStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetThree(), circuitPumpVo.getOneMinTimeCloseSetThree()));
}
return circuitPumpVo;
}
@ -633,6 +665,22 @@ public class CollectionParamsManageServiceImpl implements CollectionParamsManage
circuitPumpVo.setOneHourMinTimeOpenSetOneStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetOne(), circuitPumpVo.getOneMinTimeOpenSetOne()));
circuitPumpVo.setOneHourMinTimeCloseSetOneStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetOne(), circuitPumpVo.getOneMinTimeCloseSetOne()));
}
if (circuitPumpVo.getOneHourTimeOpenSetTwoId() != null
&& circuitPumpVo.getOneHourTimeCloseSetTwoId() != null
&& circuitPumpVo.getOneMinTimeOpenSetTwoId() != null
&& circuitPumpVo.getOneMinTimeCloseSetTwoId() != null) {
// 获取时分开写入oneHourMinTimeOpenSetTwoStr，oneHourMinTimeCloseSetTwoStr
circuitPumpVo.setOneHourMinTimeOpenSetTwoStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetTwo(), circuitPumpVo.getOneMinTimeOpenSetTwo()));
circuitPumpVo.setOneHourMinTimeCloseSetTwoStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetTwo(), circuitPumpVo.getOneMinTimeCloseSetTwo()));
}
if (circuitPumpVo.getOneHourTimeOpenSetThreeId() != null
&& circuitPumpVo.getOneHourTimeCloseSetThreeId() != null
&& circuitPumpVo.getOneMinTimeOpenSetThreeId() != null
&& circuitPumpVo.getOneMinTimeCloseSetThreeId() != null) {
// 获取时分开写入oneHourMinTimeOpenSetThreeStr，oneHourMinTimeCloseSetThreeStr
circuitPumpVo.setOneHourMinTimeOpenSetThreeStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeOpenSetThree(), circuitPumpVo.getOneMinTimeOpenSetThree()));
circuitPumpVo.setOneHourMinTimeCloseSetThreeStr(String.format("%02d:%02d", circuitPumpVo.getOneHourTimeCloseSetThree(), circuitPumpVo.getOneMinTimeCloseSetThree()));
}
return circuitPumpVo;
}
@ -1482,6 +1530,7 @@ public class CollectionParamsManageServiceImpl implements CollectionParamsManage
break;
case "5":
case "6":
case "12":
case "31":
// 实时值
deviceCalibrationVo.setRealTimeValue(item.getCurValue());

5
user-service/src/main/java/com/mh/user/service/impl/NowDataServiceImpl.java
Unescape View File

@ -156,6 +156,11 @@ public class NowDataServiceImpl implements NowDataService {
} else {
multiControlModel1.setLevelSet("--");
}
// 压力
multiControlModel1.setPressure(nowDataEntity.getPressure());
multiControlModel1.setPressureSet(nowDataEntity.getPressureSet());
// 回水温度
multiControlModel1.setBackWaterTemp(nowDataEntity.getBackWaterTemp());
result.add(multiControlModel1);
});
// result再根据热泵名称的数字进行排序

2
user-service/src/main/resources/application.yml
Unescape View File

@ -1,6 +1,6 @@
spring:
profiles:
active: dev
active: prod
mvc:
pathmatch:
matching-strategy: ant_path_matcher

Write Preview
Loading…
Cancel
Save