新增云前置相关功能

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<Boolean> AuditDevModel(@RequestBody @Validated CsDevModelAuditParm csDevModelAuditParm ){
         String methodDescribe = getMethodDescribe("AuditDevModel");

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<List<CsLinePO>> updateCldLine(@RequestBody CsLineParam param) {
         String methodDescribe = getMethodDescribe("updateCldLine");
         csLinePOService.updateCldLine(param);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -907,7 +907,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             //修改监测点运行状态
             List<String> devIdList = devList.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
             List<CsLinePO> lineList = csLinePOService.getLinesByDevList(devIdList);
-            csLinePOService.updateCldLineStatus(lineList,0);
+            csLinePOService.updateCldLineStatus(lineList,2);
         }
     }
 

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<CsLinePOMapper, CsLinePO> i
     private final CsDevModelService csDevModelService;
     private final ICsDataSetService csDataSetService;
     private final DicDataFeignClient dicDataFeignClient;
+    private final OverlimitMapper overlimitMapper;
 
     @Override
     public List<CsLinePO> getLineByDev(List<String> list) {
@@ -108,6 +112,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> 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<CsLinePOMapper, CsLinePO> 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<CsLinePOMapper, CsLinePO> 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