1.监测点表新增两个字段

2.无线bug提交

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataSetController.java

@@ -16,10 +16,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -76,5 +73,15 @@ public class CsDataSetController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getDataSetBySetIds")
+    @ApiOperation("根据测点获取数据集")
+    @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true)
+    public HttpResult<List<CsDataSet>> getDataSetBySetIds(@RequestBody List<String> lineIds){
+        String methodDescribe = getMethodDescribe("getDataSetBySetIds");
+        List<CsDataSet> list = csDataSetService.getDataSetBySetIds(lineIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }
 

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

@@ -30,7 +30,7 @@ import java.util.Objects;
 @RequiredArgsConstructor
 @Slf4j
 @Api(tags = "通用台账查询")
-public class CommTerminalController extends BaseController {
+public class CsCommTerminalController extends BaseController {
 
     private final PqsDeviceUnitMapper pqsDeviceUnitMapper;