被检设备根据设备类型调整

2025-02-10 13:34:25 +08:00
parent 776141bea7
commit 2def1546a9
13 changed files with 90 additions and 127 deletions
--- a/detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java
+++ b/detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java
@@ -3,6 +3,7 @@ package com.njcn.gather.device.controller;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -14,6 +15,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
+import com.njcn.gather.device.pojo.enums.DevResponseEnum;
+import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.pojo.vo.CNDevExcel;
@@ -21,10 +24,10 @@ import com.njcn.gather.device.pojo.vo.PqDevExcel;
 import com.njcn.gather.device.pojo.vo.PqDevVO;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.pojo.enums.DevResponseEnum;
-import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
+import com.njcn.gather.type.entity.DevType;
+import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.ExcelUtil;
 import com.njcn.web.utils.FileUtil;
@@ -60,6 +63,7 @@ public class PqDevController extends BaseController {

    private final IPqDevService pqDevService;
    private final IDictDataService dictDataService;
+    private final IDevTypeService devTypeService;


    @OperateInfo
@@ -80,10 +84,10 @@ public class PqDevController extends BaseController {
    @PostMapping("/list")
    @ApiOperation("分页查询被检设备")
    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
-    public HttpResult<Page<PqDev>> list(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
+    public HttpResult<Page<PqDevVO>> list(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
        String methodDescribe = getMethodDescribe("list");
        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
-        Page<PqDev> result = pqDevService.listPqDevs(queryParam);
+        Page<PqDevVO> result = pqDevService.listPqDevs(queryParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
    }

@@ -283,12 +287,22 @@ public class PqDevController extends BaseController {

    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/listByPlanId")
-    @ApiOperation("根据查询参数查询出所有已绑定的设备")
+    @ApiOperation("查询出所有已绑定的设备")
    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
-    public HttpResult<List<PqDev>> listByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
+    public HttpResult<List<PqDevVO>> listByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
        String methodDescribe = getMethodDescribe("listByPlanId");
        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
-        List<PqDev> result = pqDevService.listByPlanId(param);
+        List<PqDev> pqDevList = pqDevService.listByPlanId(param);
+
+        List<PqDevVO> result = BeanUtil.copyToList(pqDevList, PqDevVO.class);
+        result.forEach(pqDevVO -> {
+            DevType devType = devTypeService.getById(pqDevVO.getDevType());
+            if (ObjectUtil.isNotNull(devType)) {
+                pqDevVO.setDevChns(devType.getDevChns());
+                pqDevVO.setDevVolt(devType.getDevVolt());
+                pqDevVO.setDevCurr(devType.getDevCurr());
+            }
+        });
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
    }

--- a/detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java
+++ b/detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java
@@ -36,19 +36,6 @@ public class PqDevParam {
    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_TYPE_FORMAT_ERROR)
    private String devType;

-    @ApiModelProperty(value = "设备通道数", required = true)
-    @NotNull(message = DevValidMessage.DEV_CHNS_NOT_NULL)
-    @Min(value = 1, message = DevValidMessage.DEV_CHNS_RANGE_ERROR)
-    private Integer devChns;
-
-    @ApiModelProperty(value = "额定电压（V）", required = true)
-    @NotNull(message = DevValidMessage.DEV_VOLT_NOT_NULL)
-    private Float devVolt;
-
-    @ApiModelProperty(value = "额定电流（A）", required = true)
-    @NotNull(message = DevValidMessage.DEV_CURR_NOT_NULL)
-    private Float devCurr;
-
    @ApiModelProperty(value = "设备厂家，字典表", required = true)
    //@NotBlank(message = DevValidMessage.MANUFACTURER_NOT_BLANK)
    //@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.MANUFACTURER_FORMAT_ERROR)
--- a/detection/src/main/java/com/njcn/gather/device/pojo/po/PqDev.java
+++ b/detection/src/main/java/com/njcn/gather/device/pojo/po/PqDev.java
@@ -47,21 +47,6 @@ public class PqDev extends BaseEntity implements Serializable {
     */
    private String devType;

-    /**
-     * 设备通道数
-     */
-    private Integer devChns;
-
-    /**
-     * 额定电压（V）
-     */
-    private Double devVolt;
-
-    /**
-     * 额定电流（A）
-     */
-    private Double devCurr;
-
    /**
     * 设备厂家，字典表
     */
@@ -207,8 +192,6 @@ public class PqDev extends BaseEntity implements Serializable {
     */
    private Integer factorCheckResult;

-    private String icdId;
-
    @TableField("Check_Time")
    private LocalDateTime checkTime;

--- a/detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java
+++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import lombok.Data;

@@ -17,75 +18,13 @@ import java.util.List;
 * @data 2024-12-13
 */
@Data
-public class PqDevVO {
-
-    private String id;
-
-    private String name;
-
-    private String pattern;
-
-    private String devType;
+public class PqDevVO extends PqDev {

    private Integer devChns;

-    private Float devVolt;
+    private Double devVolt;

-    private Float devCurr;
-
-    private String manufacturer;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    @JsonSerialize(using = LocalDateSerializer.class)
-    private LocalDate createDate;
-
-    private String createId;
-
-    private String hardwareVersion;
-
-    private String softwareVersion;
-
-    private String protocol;
-
-    private String ip;
-
-    private Integer port;
-
-    private Integer encryptionFlag;
-
-    private String series;
-
-    private String devKey;
-
-    private String sampleId;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    @JsonSerialize(using = LocalDateSerializer.class)
-    private LocalDate arrivedDate;
-
-    private String cityName;
-
-    private String gdName;
-
-    private String subName;
-
-    private Integer checkState;
-
-    private Integer checkResult;
-
-    private Integer reportState;
-
-//    private Integer documentState;
-
-    private String reportPath;
-
-    private String qrCode;
-
-    private Integer reCheckNum;
+    private Double devCurr;

    private List<PqMonitor> monitorList;
-
-    private LocalDateTime checkTime;
 }
--- a/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java
+++ b/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java
@@ -26,7 +26,7 @@ public interface IPqDevService extends IService<PqDev> {
     * @param queryParam 查询参数
     * @return 分页数据，包含被检设备列表
     */
-    Page<PqDev> listPqDevs(PqDevParam.QueryParam queryParam);
+    Page<PqDevVO> listPqDevs(PqDevParam.QueryParam queryParam);

    /**
     * 新增被检设备信息
@@ -168,21 +168,22 @@ public interface IPqDevService extends IService<PqDev> {

    /**
     * 设备归档操作
+     *
     * @param id 设备id
     * @return 归档成功返回true，否则返回false
     */
    boolean documented(List<String> id);


-
    /**
     * 正式监测完成，修改中断状态
+     *
     * @param ids
     * @param valueType
     * @param code
     * @return
     */
-    boolean updateResult(List<String> ids,List<String> valueType ,String code);
+    boolean updateResult(List<String> ids, List<String> valueType, String code);

    void updatePqDevReportState(String devId, int i);

@@ -204,7 +205,7 @@ public interface IPqDevService extends IService<PqDev> {
     * 导入灿能二楼设备数据
     *
     * @param cnDevExcelList 灿能二楼设备数据列表
-     * @param patternId        模式Id
+     * @param patternId      模式Id
     */
    void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId);
 }
--- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
@@ -68,9 +68,9 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements


    @Override
-    public Page<PqDev> listPqDevs(PqDevParam.QueryParam queryParam) {
-        Page<PqDev> page = this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), this.getQueryWrapper(queryParam));
-        page.getRecords().forEach(p -> {
+    public Page<PqDevVO> listPqDevs(PqDevParam.QueryParam queryParam) {
+        Page<PqDev> page1 = this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), this.getQueryWrapper(queryParam));
+        page1.getRecords().forEach(p -> {
            if (ObjectUtil.isNotNull(p.getSeries())) {
                p.setSeries(DeviceUtil.decoderString(1, p.getSeries()));
            }
@@ -78,7 +78,20 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                p.setDevKey(DeviceUtil.decoderString(1, p.getDevKey()));
            }
        });
-        return page;
+
+        Page<PqDevVO> page2 = new Page<>();
+        BeanUtil.copyProperties(page1, page2);
+        List<PqDevVO> voList = BeanUtil.copyToList(page1.getRecords(), PqDevVO.class);
+        page2.setRecords(voList);
+        page2.getRecords().forEach(p -> {
+            DevType devType = devTypeService.getById(p.getDevType());
+            if (ObjectUtil.isNotNull(devType)) {
+                p.setDevChns(devType.getDevChns());
+                p.setDevVolt(devType.getDevVolt());
+                p.setDevCurr(devType.getDevCurr());
+            }
+        });
+        return page2;
    }

    @Override
@@ -305,12 +318,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
                .orderByAsc(PqDev::getCreateTime)
                .list();
-//        List<Map<String, Object>> result = pqDevList.stream().map(pqDev -> {
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("id", pqDev.getId());
-//            map.put("name", pqDev.getName());
-//            return map;
-//        }).collect(Collectors.toList());
+
        return pqDevList;
    }

@@ -373,6 +381,14 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
        PqDev pqDev = this.getById(id);
        PqDevVO pqDevVO = new PqDevVO();
        BeanUtil.copyProperties(pqDev, pqDevVO);
+
+        DevType devType = devTypeService.getById(pqDev.getDevType());
+        if (ObjectUtil.isNotNull(devType)) {
+            pqDevVO.setDevChns(devType.getDevChns());
+            pqDevVO.setDevVolt(devType.getDevVolt());
+            pqDevVO.setDevCurr(devType.getDevCurr());
+        }
+
        List<PqMonitor> monitorList = pqMonitorService.listPqMonitorByDevId(id);
        if (ObjectUtil.isNotEmpty(monitorList)) {
            pqDevVO.setMonitorList(monitorList);
@@ -895,10 +911,10 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
            pqDev.setPreinvestmentPlan(dictDataService.getDictDataByName(pqDev.getPreinvestmentPlan()).getId());
            DevType devType = devTypeService.getByName(pqDev.getDevType());
            pqDev.setDevType(devType.getId());
-            pqDev.setIcdId(devType.getIcd());
-            pqDev.setDevVolt(devType.getDevVolt());
-            pqDev.setDevCurr(devType.getDevCurr());
-            pqDev.setDevChns(devType.getDevChns());
+//            pqDev.setIcdId(devType.getIcd());
+//            pqDev.setDevVolt(devType.getDevVolt());
+//            pqDev.setDevCurr(devType.getDevCurr());
+//            pqDev.setDevChns(devType.getDevChns());
            pqDev.setProtocol(dictDataService.getDictDataByName(pqDev.getProtocol()).getId());
        });
    }