diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index 91a612c..25e8a2e 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -158,7 +158,7 @@ public class CsLinePOServiceImpl extends ServiceImpl i po.setClDid(param.getLineNo()); //监测位置 //DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.GRID_SIDE.getCode()).getData(); - po.setPosition(param.getPosition()); + po.setPosition(param.getPosition().isEmpty()?null:param.getPosition()); this.save(po); //2.新增台账树信息 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java index 6314f3f..4e9d390 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java @@ -93,7 +93,7 @@ class DeviceMessageServiceImpl implements DeviceMessageService { throw new BusinessException("监测点为空"); } for (CsLinePO item : lineList) { - if (Objects.isNull(item.getPosition())){ + if (Objects.isNull(item.getPosition()) || item.getPosition().isEmpty()){ map.put(item.getClDid(),item.getLineId()); } else { DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData();