diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java index 95468b0..c7dab08 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java @@ -54,7 +54,7 @@ public class DevModelController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/AuditDevModel") - @ApiOperation("更新/删除出厂设备") + @ApiOperation("更新/删除设备模板参数") @ApiImplicitParam(name = "csDevModelAuditParm", value = "更新/删除设备模板参数", required = true) public HttpResult AuditDevModel(@RequestBody @Validated CsDevModelAuditParm csDevModelAuditParm ){ String methodDescribe = getMethodDescribe("AuditDevModel"); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java index f356c8d..1e06fd8 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java @@ -41,9 +41,7 @@ import java.util.List; public class CslineController extends BaseController { private final CsLinePOService csLinePOService; - private final OverlimitMapper overlimitMapper; - private final CsLinePOMapper csLinePOMapper; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryLineById") @@ -170,7 +168,7 @@ public class CslineController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/updateCldLine") @ApiOperation("修改云前置监测点") - @ApiImplicitParam(name = "id", value = "id", required = true) + @ApiImplicitParam(name = "param", value = "param", required = true) public HttpResult> updateCldLine(@RequestBody CsLineParam param) { String methodDescribe = getMethodDescribe("updateCldLine"); csLinePOService.updateCldLine(param); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index c7f68a7..1f7b06d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -907,7 +907,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl devIdList = devList.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList()); List lineList = csLinePOService.getLinesByDevList(devIdList); - csLinePOService.updateCldLineStatus(lineList,0); + csLinePOService.updateCldLineStatus(lineList,2); } } 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 961b2f0..4501ca5 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.mapper.CsLinePOMapper; +import com.njcn.csdevice.mapper.OverlimitMapper; import com.njcn.csdevice.pojo.param.CsLineParam; import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.po.CsDevModelPO; @@ -16,6 +17,8 @@ import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.service.CsDevModelService; import com.njcn.csdevice.service.CsLinePOService; import com.njcn.csdevice.service.ICsDataSetService; +import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.DictData; @@ -47,6 +50,7 @@ public class CsLinePOServiceImpl extends ServiceImpl i private final CsDevModelService csDevModelService; private final ICsDataSetService csDataSetService; private final DicDataFeignClient dicDataFeignClient; + private final OverlimitMapper overlimitMapper; @Override public List getLineByDev(List list) { @@ -108,6 +112,7 @@ public class CsLinePOServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public void addCldLine(CsLineParam param) { + String lineId = param.getDevMac().replace(":","") + param.getLineNo(); CsLinePO po = new CsLinePO(); //1.新增监测点信息 BeanUtils.copyProperties(param,po); @@ -132,7 +137,7 @@ public class CsLinePOServiceImpl extends ServiceImpl i //2.新增台账树信息 CsLedger csLedger = new CsLedger(); - csLedger.setId(param.getDevMac().replace(":","") + param.getLineNo()); + csLedger.setId(lineId); csLedger.setPid(param.getDevId()); csLedger.setPids("0," + param.getEngineeringId() + "," + param.getProjectId() + "," + param.getDevId()); csLedger.setName(param.getName()); @@ -140,6 +145,12 @@ public class CsLinePOServiceImpl extends ServiceImpl i csLedger.setState(1); csLedger.setSort(0); csLedgerMapper.insert(csLedger); + + //3.新增监测点限值 + Overlimit overlimit = COverlimitUtil.globalAssemble(param.getVolGrade().floatValue(),10f,10f,10f,0,1); + overlimit.setId(lineId); + overlimitMapper.deleteById(lineId); + overlimitMapper.insert(overlimit); } @Override