方案数据修改后第二版提交

2024-06-21 16:34:50 +08:00
parent bee3171860
commit 79341bb790
13 changed files with 441 additions and 115 deletions
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
@@ -22,6 +22,7 @@ import com.njcn.csdevice.service.IMqttUserService;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
+import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
@@ -161,6 +162,12 @@ public class EquipmentDeliveryController extends BaseController {
    public HttpResult<Page<CsEquipmentDeliveryVO>> list(@RequestBody CsEquipmentDeliveryQueryParm param){
        String methodDescribe = getMethodDescribe("list");
        Page<CsEquipmentDeliveryVO> page = csEquipmentDeliveryService.list(param);
+        //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
+        for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
+            if("8b45cf6b7f5266e777d07c166ad5fa77".equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
+                csEquipmentDeliveryVO.setStatus(5);
+            }
+        }
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
    }

--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java
@@ -1,6 +1,5 @@
 package com.njcn.csdevice.controller.scheme;

-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -10,11 +9,11 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.csdevice.param.WlRecordPageParam;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
-import com.njcn.csdevice.pojo.po.WlRecord;
-import com.njcn.csdevice.pojo.vo.RecordPageVo;
 import com.njcn.csdevice.pojo.vo.RecordTreeVo;
 import com.njcn.csdevice.pojo.vo.RecordVo;
 import com.njcn.csdevice.service.IWlRecordService;
+import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
+import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -24,7 +23,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
-import java.util.Map;

 /**
 * <p>
@@ -45,7 +43,7 @@ public class WlRecordController extends BaseController {
    private final IWlRecordService wlRecordService;

    /**
-     * 两层树方案+测试项*
+     * 两层树方案+测试项
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
    @GetMapping("/schemeTree")
@@ -58,25 +56,25 @@ public class WlRecordController extends BaseController {
    }

    /**
-     * 根据测试项ID查询测试项信息*
+     * 根据测试项ID查询测试项信息
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
    @GetMapping("/getTestRecordById")
    @ApiOperation("根据测试项ID查询测试项信息")
    @ApiImplicitParam(name = "testRecordId", value = "测试项ID", required = true)
-    public HttpResult<RecordVo> getTestRecordById(@RequestParam @Validated String testRecordId) {
+    public HttpResult<RecordVo.RecordItemVo> getTestRecordById(@RequestParam @Validated String testRecordId) {
        String methodDescribe = getMethodDescribe("getTestRecordById");
        LogUtil.njcnDebug(log, "{}，测试项id为：{}", methodDescribe, testRecordId);
-        RecordVo result = wlRecordService.getTestRecordById(testRecordId);
+        RecordVo.RecordItemVo result = wlRecordService.getTestRecordById(testRecordId);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
    }

    /**
-     * 新增方案或新增测试项*
+     * 新增测试项
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
    @PostMapping("/addRecord")
-    @ApiOperation("新增方案或新增测试项")
+    @ApiOperation("新增测试项")
    @ApiImplicitParam(name = "records", value = "测试项集合", required = true)
    public HttpResult<Boolean> addRecord(@RequestBody @Validated WlRecordParam.AddRecord records) {
        String methodDescribe = getMethodDescribe("addRecord");
@@ -86,7 +84,7 @@ public class WlRecordController extends BaseController {
    }

    /**
-     * 修改测试项*
+     * 修改测试项
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
    @PostMapping("/updateTestRecord")
@@ -100,15 +98,29 @@ public class WlRecordController extends BaseController {
    }

    /**
-     * 查询测试项下绑定的设备列表*
+     * 新增或修改方案
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/updateSchemeRecord")
+    @ApiOperation("新增或修改方案")
+    @ApiImplicitParam(name = "record", value = "方案对象", required = true)
+    public HttpResult<Boolean> updateSchemeRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
+        String methodDescribe = getMethodDescribe("updateSchemeRecord");
+        LogUtil.njcnDebug(log, "{}，新增或修改方案对象为：{}", methodDescribe, record);
+        wlRecordService.updateSchemeRecord(record);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 设备列表
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
    @PostMapping("/queryPage")
-    @ApiOperation("查询测试项下绑定的设备列表")
-    public HttpResult<Page<RecordPageVo>> queryPage(@Validated @RequestBody WlRecordPageParam wlRecordPageParam) {
+    @ApiOperation("设备列表")
+    public HttpResult<Object> queryPage(@Validated @RequestBody WlRecordPageParam wlRecordPageParam) {
        String methodDescribe = getMethodDescribe("queryPage");
        LogUtil.njcnDebug(log, "{}", methodDescribe);
-        Page<RecordPageVo> result = wlRecordService.queryPage(wlRecordPageParam);
+        Object result = wlRecordService.queryPage(wlRecordPageParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
    }

@@ -127,24 +139,12 @@ public class WlRecordController extends BaseController {
    }

    /**
-     * 修改方案名称
-     */
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @PostMapping("/updateSchemeRecordName")
-    @ApiOperation("修改方案名称")
-    public HttpResult<List<Map>> updateSchemeRecordName(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
-        String methodDescribe = getMethodDescribe("updateSchemeRecordName");
-        wlRecordService.updateSchemeRecordName(record);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-    /**
-     * 删除测试项中的设备基础数据*
+     * 删除测试项中的设备基础数据
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
    @DeleteMapping("/deleteDataRecord")
    @ApiOperation("删除测试项中的设备基础数据")
-    public HttpResult<WlRecord> deleteDataRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
+    public HttpResult<Boolean> deleteDataRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
        String methodDescribe = getMethodDescribe("deleteDataRecord");
        LogUtil.njcnDebug(log, "{}，测试项及基础数据ID为：{}", methodDescribe, record);
        wlRecordService.deleteDataRecord(record);
@@ -152,27 +152,28 @@ public class WlRecordController extends BaseController {
    }

    /**
-     * 添加测试项中的设备基础数据*
+     * 添加测试项中的设备基础数据
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
    @PostMapping("/saveDataRecord")
    @ApiOperation("添加测试项中的设备基础数据")
-    public HttpResult<WlRecord> saveDataRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
+    public HttpResult<Boolean> saveDataRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
        String methodDescribe = getMethodDescribe("saveDataRecord");
-        LogUtil.njcnDebug(log, "{}，测试项及基础数据ID为：{}", methodDescribe, record);
+        LogUtil.njcnDebug(log, "{}，测试项及基础数据对象为：{}", methodDescribe, record);
        wlRecordService.saveDataRecord(record);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
    }

    /**
-     * 方案下拉框*
+     * 查询测试项时间段实时数据
     */
    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
-    @GetMapping("/schemeRecordDown")
-    @ApiOperation("方案下拉框")
-    public HttpResult<List<Map>> schemeRecordDown() {
-        String methodDescribe = getMethodDescribe("schemeRecordDown");
-        List<Map> result = wlRecordService.schemeRecordDown();
+    @PostMapping("/queryCommonStatisticalByTest")
+    @ApiOperation("查询测试项时间段实时数据")
+    public HttpResult<List<ThdDataVO>> queryCommonStatisticalByTest(@RequestBody @Validated CommonStatisticalQueryParam commonStatisticalQueryParam) {
+        String methodDescribe = getMethodDescribe("queryCommonStatisticalByTest");
+        LogUtil.njcnDebug(log, "{}，查询对象为：{}", methodDescribe, commonStatisticalQueryParam);
+        List<ThdDataVO> result = wlRecordService.queryCommonStatisticalByTest(commonStatisticalQueryParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
    }