Browse Source

1、主机列表参数过滤条件添加

dev
mh 3 weeks ago
parent
commit
bfb802a739
  1. 1
      user-service/src/main/java/com/mh/user/service/chillers/impl/ChillersServiceImpl.java
  2. 4
      user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java

1
user-service/src/main/java/com/mh/user/service/chillers/impl/ChillersServiceImpl.java

@ -316,6 +316,7 @@ public class ChillersServiceImpl implements ChillersService {
if (proId != null && !proId.equalsIgnoreCase("")) { if (proId != null && !proId.equalsIgnoreCase("")) {
deviceQueryWrapper.eq("project_id", proId); deviceQueryWrapper.eq("project_id", proId);
} }
deviceQueryWrapper.eq("device_type", 0);
List<DevicesManageEntity> devicesManageEntityList = devicesManageMapper.selectList(deviceQueryWrapper.orderByAsc("id")); List<DevicesManageEntity> devicesManageEntityList = devicesManageMapper.selectList(deviceQueryWrapper.orderByAsc("id"));
if (devicesManageEntityList != null && !devicesManageEntityList.isEmpty()) { if (devicesManageEntityList != null && !devicesManageEntityList.isEmpty()) {
HostListVO hostListVO = new HostListVO(); HostListVO hostListVO = new HostListVO();

4
user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java

@ -46,7 +46,7 @@ public class AnalysisReceiveOrder485 {
//解析冷量表 //解析冷量表
public void analysisCloudOrder485(final String dataStr1, final DeviceCodeParamEntity deviceCodeParam) { public void analysisCloudOrder485(final String dataStr1, final DeviceCodeParamEntity deviceCodeParam) {
// threadPoolService.execute(() -> { threadPoolService.execute(() -> {
// 去掉空格 // 去掉空格
String dataStr = dataStr1.replace(" ", "").toUpperCase(); String dataStr = dataStr1.replace(" ", "").toUpperCase();
// 检验报文 // 检验报文
@ -124,7 +124,7 @@ public class AnalysisReceiveOrder485 {
} else { } else {
log.info("冷量计校验失败===>" + dataStr); log.info("冷量计校验失败===>" + dataStr);
} }
// }); });
} }
public String analysisCloudQueue(QueueParam queueParam) { public String analysisCloudQueue(QueueParam queueParam) {

Loading…
Cancel
Save