diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java index 7d71942..bbe6536 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java @@ -140,6 +140,11 @@ public class CsLineParam extends BaseEntity { */ private String monitorUser; + /** + * 监测位置 + */ + private String position; + } \ No newline at end of file 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 142c890..06ace49 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 @@ -29,7 +29,6 @@ import com.njcn.csharmonic.pojo.po.PqSensitiveUser; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.system.api.DicDataFeignClient; -import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.constant.UserType; @@ -160,8 +159,8 @@ public class CsLinePOServiceImpl extends ServiceImpl i po.setClDid(list.get(0).getClDev()); } //监测位置 - DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.GRID_SIDE.getCode()).getData(); - po.setPosition(data.getId()); + //DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.GRID_SIDE.getCode()).getData(); + po.setPosition(param.getPosition()); this.save(po); //2.新增台账树信息 @@ -209,6 +208,7 @@ public class CsLinePOServiceImpl extends ServiceImpl i .set(CsLinePO::getMonitorObj,param.getMonitorObj()) .set(CsLinePO::getMonitorObj,param.getMonitorObj()) .set(CsLinePO::getGovern,param.getGovern()) + .set(CsLinePO::getPosition,param.getPosition()) .set(CsLinePO::getMonitorUser,param.getMonitorUser()); this.update(lambdaUpdateWrapper);