1.无线bug修改

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CommTerminalController.java

@@ -0,0 +1,65 @@
+package com.njcn.csdevice.controller.ledger;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.mapper.PqsDeviceUnitMapper;
+import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+
+/**
+ * @author wr
+ * @description
+ * @date 2023/4/26 10:00
+ */
+@RestController
+@RequestMapping("/commTerminal")
+@RequiredArgsConstructor
+@Slf4j
+@Api(tags = "通用台账查询")
+public class CommTerminalController extends BaseController {
+
+    private final PqsDeviceUnitMapper pqsDeviceUnitMapper;
+
+
+
+    /**
+     * 通过监测点获取监测点数据单位
+     * @author cdf
+     * @date 2023/9/21
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/lineUnitDetail")
+    @ApiOperation("根据监测点id获取数据单位")
+    @ApiImplicitParam(name = "lineId", value = "实体", required = true)
+    public HttpResult<PqsDeviceUnit> lineUnitDetail(@RequestParam("lineId") String lineId) {
+        String methodDescribe = getMethodDescribe("lineUnitDetail");
+
+        PqsDeviceUnit pqsDeviceUnit = pqsDeviceUnitMapper.selectById(lineId);
+        if(Objects.isNull(pqsDeviceUnit)){
+            pqsDeviceUnit = new PqsDeviceUnit();
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqsDeviceUnit, methodDescribe);
+    }
+
+
+
+
+
+
+
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java

@@ -5,15 +5,19 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.mapper.OverlimitMapper;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.service.CsLinePOService;
+import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.device.biz.utils.COverlimitUtil;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -36,6 +40,8 @@ public class CslineController extends BaseController {
 
     private final CsLinePOService csLinePOService;
 
+    private final OverlimitMapper overlimitMapper;
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryLineById")
     @ApiOperation("监测点查询通过id获取")
@@ -70,9 +76,16 @@ public class CslineController extends BaseController {
     @PostMapping("/addList")
     @ApiOperation("批量新增监测点")
     @ApiImplicitParam(name = "list", value = "监测点数据集", required = true)
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult<String> addLineList(@RequestBody List<CsLinePO> list){
         String methodDescribe = getMethodDescribe("addLineList");
         csLinePOService.saveBatch(list);
+        for(CsLinePO csLinePO: list){
+           Overlimit overlimit = COverlimitUtil.globalAssemble(csLinePO.getVolGrade().floatValue(),10f,10f,10f,0,1);
+           overlimit.setId(csLinePO.getLineId());
+           overlimitMapper.deleteById(csLinePO.getLineId());
+           overlimitMapper.insert(overlimit);
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }