修改模块名称

2024-11-08 09:04:17 +08:00
parent f0e82c458c
commit b1e881798b
15 changed files with 8 additions and 3 deletions
--- a/device/src/main/java/com/njcn/gather/machine/device/controller/PqDevController.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/controller/PqDevController.java
@@ -0,0 +1,148 @@
+package com.njcn.gather.machine.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.util.StrUtil;
+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;
+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.machine.device.pojo.param.PqDevParam;
+import com.njcn.gather.machine.device.pojo.po.PqDev;
+import com.njcn.gather.machine.device.pojo.vo.PqDevExcel;
+import com.njcn.gather.machine.device.service.IPqDevService;
+import com.njcn.gather.machine.pojo.enums.MachineResponseEnum;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.utils.HttpResultUtil;
+import com.njcn.web.utils.PoiUtil;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * @author caozehui
+ * @date 2024/11/06
+ */
+@Slf4j
+@Api(tags = "被检设备")
+@RestController
+@RequestMapping("/pqDev")
+@RequiredArgsConstructor
+public class PqDevController extends BaseController {
+
+    private final IPqDevService pqDevService;
+
+    @OperateInfo
+    @PostMapping("/list")
+    @ApiOperation("分页查询被检设备")
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    public HttpResult<Page<PqDev>> list(@RequestBody @Validated PqDevParam.PqDevQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("list");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        Page<PqDev> result = pqDevService.listPqDevs(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(operateType = OperateType.ADD)
+    @PostMapping("/add")
+    @ApiOperation("新增被检设备")
+    @ApiImplicitParam(name = "pqDevParam", value = "被检设备", required = true)
+    public HttpResult<Object> add(@RequestBody @Validated PqDevParam pqDevParam) {
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, pqDevParam);
+        boolean result = pqDevService.addPqDev(pqDevParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    @OperateInfo(operateType = OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改被检设备")
+    @ApiImplicitParam(name = "updateParam", value = "被检设备", required = true)
+    public HttpResult<Object> update(@RequestBody @Validated PqDevParam.PqDevUpdateParam updateParam) {
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);
+        boolean result = pqDevService.updatePqDev(updateParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    @OperateInfo(operateType = OperateType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation("删除被检设备")
+    @ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
+    public HttpResult<Object> delete(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
+        boolean result = pqDevService.deletePqDev(ids);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/downloadTemplate")
+    @ApiOperation("下载被检设备导入文件模板")
+    public void downloadTemplate() {
+        pqDevService.downloadTemplate();
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping(value = "/import")
+    @ApiOperation("批量导入被检设备数据")
+    @ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
+    public HttpResult<String> importPqDevData(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
+        String methodDescribe = getMethodDescribe("importPqDevData");
+        ImportParams params = new ImportParams();
+        params.setHeadRows(1);
+        params.setNeedVerify(true);
+        params.setStartSheetIndex(0);
+        params.setSheetNum(1);
+        try {
+            ExcelImportResult<PqDevExcel> excelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), PqDevExcel.class, params);
+            //如果存在非法数据，将不合格的数据导出
+            if (excelImportResult.isVerifyFail()) {
+                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
+                PoiUtil.exportFileByWorkbook(excelImportResult.getFailWorkbook(), "非法被检设备数据.xlsx", response);
+                throw new BusinessException(MachineResponseEnum.IMPORT_DATA_FAIL);
+            } else {
+                //批量录入数据
+                List<PqDevExcel> sgEventExcels = excelImportResult.getList();
+                pqDevService.importPqDevData(sgEventExcels);
+            }
+        } catch (Exception e) {
+            throw new BusinessException(MachineResponseEnum.IMPORT_DATA_FAIL);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/export")
+    @ApiOperation("导出被检设备数据")
+    @ApiImplicitParam(name = "queryParam", value = "查询参数",required = true)
+    public void export(@RequestBody @Validated PqDevParam.PqDevQueryParam queryParam) {
+        pqDevService.exportPqDevData(queryParam);
+    }
+}
--- a/device/src/main/java/com/njcn/gather/machine/device/mapper/PqDevMapper.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/mapper/PqDevMapper.java
@@ -0,0 +1,13 @@
+package com.njcn.gather.machine.device.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.machine.device.pojo.po.PqDev;
+
+/**
+ * @author caozehui
+ * @date 2024-11-06
+ */
+public interface PqDevMapper extends MPJBaseMapper<PqDev> {
+
+}
+
--- a/device/src/main/java/com/njcn/gather/machine/device/mapper/mapping/PqDevMapper.xml
+++ b/device/src/main/java/com/njcn/gather/machine/device/mapper/mapping/PqDevMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.gather.machine.device.mapper.PqDevMapper">
+
+
+</mapper>
+
--- a/device/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java
@@ -0,0 +1,157 @@
+package com.njcn.gather.machine.device.pojo.param;
+
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.gather.machine.pojo.constant.MachineValidMessage;
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author caozehui
+ * @date 2024/11/06
+ */
+@Data
+public class PqDevParam {
+
+    @ApiModelProperty(value = "名称", required = true)
+    @NotBlank(message = MachineValidMessage.NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = MachineValidMessage.NAME_FORMAT_ERROR)
+    private String name;
+
+    @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）", required = true)
+    @NotBlank(message = MachineValidMessage.PATTERN_NOT_BLANK)
+    private String pattern;
+
+    @ApiModelProperty(value = "设备类型，字典表", required = true)
+    @NotBlank(message = MachineValidMessage.DEV_TYPE_NOT_BLANK)
+    private String devType;
+
+    @ApiModelProperty(value = "设备通道数", required = true)
+    @NotNull(message = MachineValidMessage.DEV_CHNS_NOT_NULL)
+    private Integer devChns;
+
+    @ApiModelProperty(value = "额定电压（V）", required = true)
+    @NotNull(message = MachineValidMessage.DEV_VOLT_NOT_NULL)
+    private Float devVolt;
+
+    @ApiModelProperty(value = "额定电流（A）", required = true)
+    @NotNull(message = MachineValidMessage.DEV_CURR_NOT_NULL)
+    private Float devCurr;
+
+    @ApiModelProperty(value = "生产厂家，字典表", required = true)
+    @NotBlank(message = MachineValidMessage.MANUFACTURER_NOT_BLANK)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "生产日期", required = true)
+    @NotBlank(message = MachineValidMessage.CREATEDATETIME_NOT_NULL)
+    @DateTimeStrValid(format = "yyyy-MM-dd", message = MachineValidMessage.CREATEDATETIME_FORMAT_ERROR)
+    private String createDate;
+
+    @ApiModelProperty(value = "出厂编号", required = true)
+    @NotBlank(message = MachineValidMessage.FACTORYNO_NOT_BLANK)
+    private String createId;
+
+    @ApiModelProperty(value = "固件版本", required = true)
+    @NotBlank(message = MachineValidMessage.FIRMWARE_NOT_BLANK)
+    private String hardwareVersion;
+
+    @ApiModelProperty(value = "软件版本", required = true)
+    @NotBlank(message = MachineValidMessage.SOFTWARE_NOT_BLANK)
+    private String softwareVersion;
+
+    @ApiModelProperty(value = "通讯协议", required = true)
+    @NotBlank(message = MachineValidMessage.PROTOCOL_NOT_BLANK)
+    private String protocol;
+
+    @ApiModelProperty(value = "IP地址", required = true)
+    @NotBlank(message = MachineValidMessage.IP_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.IP_REGEX, message = MachineValidMessage.IP_FORMAT_ERROR)
+    private String ip;
+
+    @ApiModelProperty(value = "端口号", required = true)
+    @NotNull(message = MachineValidMessage.PORT_NOT_NULL)
+    private Integer port;
+
+    @ApiModelProperty(value = "装置是否为加密版本", required = true)
+    @NotNull(message = MachineValidMessage.ENCRYPTION_NOT_NULL)
+    private Integer encryption;
+
+    @ApiModelProperty("装置识别码（3ds加密）")
+    private String series;
+
+    @ApiModelProperty("装置秘钥（3ds加密）")
+    private String devKey;
+
+    @ApiModelProperty("样品编号")
+    private String sampleId;
+
+    @ApiModelProperty(value = "送样日期")
+    @DateTimeStrValid(message = MachineValidMessage.ARRIVE_DATE_TIME_FORMAT_ERROR)
+    private String arrivedDate;
+
+    @ApiModelProperty("所属地市名称")
+    private String cityName;
+
+    @ApiModelProperty("所属供电公司名称")
+    private String gdName;
+
+    @ApiModelProperty("所属电站名称")
+    private String subName;
+
+    @ApiModelProperty("检测状态")
+    private Integer checkState;
+
+    @ApiModelProperty("检测结果（1:合格/0:不合格）")
+    private Integer checkResult;
+
+    @ApiModelProperty("报告状态（1：生成/0:未生成）")
+    private Integer reportState;
+
+    @ApiModelProperty("归档状态（1：归档/0:未归档）")
+    private Integer documentState;
+
+    @ApiModelProperty("报告路径")
+    private String reportPath;
+
+    @ApiModelProperty("设备关键信息二维码")
+    private String qrCode;
+
+    @ApiModelProperty(value = "复检次数,默认为0", required = true)
+    @NotNull(message = MachineValidMessage.RECHECK_NUM_NOT_NULL)
+    private Integer reCheckNum;
+
+
+    /**
+     * 更新操作实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class PqDevUpdateParam extends PqDevParam {
+
+        @ApiModelProperty("id")
+        @NotBlank(message = MachineValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = MachineValidMessage.ID_FORMAT_ERROR)
+        private String id;
+
+    }
+
+    /**
+     * 分页查询实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class PqDevQueryParam extends BaseParam {
+        @ApiModelProperty("名称")
+        @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = MachineValidMessage.NAME_FORMAT_ERROR)
+        private String name;
+
+        @ApiModelProperty("设备类型")
+        private String devType;
+    }
+}
--- a/device/src/main/java/com/njcn/gather/machine/device/pojo/po/PqDev.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/pojo/po/PqDev.java
@@ -0,0 +1,195 @@
+package com.njcn.gather.machine.device.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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.db.mybatisplus.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author caozehui
+ * @date 2024/11/06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pq_dev")
+public class PqDev extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = -45763424394344208L;
+
+    /**
+     * 主键装置序号ID
+     */
+    private String id;
+
+    /**
+     * 设备名称
+     */
+    private String name;
+
+    /**
+     * 设备模式，字典表（数字、模拟、比对）
+     */
+    private String pattern;
+
+    /**
+     * 设备类型，字典表
+     */
+    private String devType;
+
+    /**
+     * 设备通道数
+     */
+    private Integer devChns;
+
+    /**
+     * 额定电压（V）
+     */
+    private Float devVolt;
+
+    /**
+     * 额定电流（A）
+     */
+    private Float devCurr;
+
+    /**
+     * 生产厂家，字典表
+     */
+    private String manufacturer;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "CreateDate")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    @JsonSerialize(using = LocalDateSerializer.class)
+    private LocalDate createDate;
+
+    /**
+     * 出厂编号
+     */
+    @TableField(value = "CreateId")
+    private String createId;
+
+    /**
+     * 固件版本
+     */
+    private String hardwareVersion;
+
+    /**
+     * 软件版本
+     */
+    private String softwareVersion;
+
+    /**
+     * 通讯协议，字典表(MMS、PODIF)
+     */
+    private String protocol;
+
+    /**
+     * IP地址
+     */
+    private String ip;
+
+    /**
+     * 端口号
+     */
+    private Integer port;
+
+    /**
+     * 装置是否为加密版本
+     */
+    @TableField("IsEncryption")
+    private Integer encryption;
+
+    /**
+     * 装置识别码（3ds加密）
+     */
+    private String series;
+
+    /**
+     * 装置秘钥（3ds加密）
+     */
+    private String devKey;
+
+    /**
+     * 样品编号
+     */
+    @TableField("SampleID")
+    private String sampleId;
+
+    /**
+     * 送样日期
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @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;
+
+    /**
+     * 检测结果（1:合格/0:不合格）
+     */
+    private Integer checkResult;
+
+    /**
+     * 报告状态（1：生成/0:未生成）
+     */
+    private Integer reportState;
+
+    /**
+     * 归档状态（1：归档/0:未归档）
+     */
+    private Integer documentState;
+
+    /**
+     * 报告路径
+     */
+    private String reportPath;
+
+    /**
+     * 设备关键信息二维码
+     */
+    private String qrCode;
+
+    /**
+     * 复检次数,默认为0
+     */
+    @TableField(value = "ReCheck_Num")
+    private Integer reCheckNum;
+
+    /**
+     * 状态：0-删除 1-正常
+     */
+    private Integer state;
+}
+
--- a/device/src/main/java/com/njcn/gather/machine/device/pojo/vo/PqDevExcel.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/pojo/vo/PqDevExcel.java
@@ -0,0 +1,129 @@
+package com.njcn.gather.machine.device.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.gather.machine.pojo.constant.MachineValidMessage;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author caozehui
+ * @data 2024/11/7
+ */
+@Data
+public class PqDevExcel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "名称", width = 20)
+    @NotBlank(message = MachineValidMessage.NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = MachineValidMessage.NAME_FORMAT_ERROR)
+    private String name;
+
+    @Excel(name = "设备模式", width = 20)
+    @NotBlank(message = MachineValidMessage.PATTERN_NOT_BLANK)
+    private String pattern;
+
+    @Excel(name = "设备类型", width = 20)
+    @NotBlank(message = MachineValidMessage.DEV_TYPE_NOT_BLANK)
+    private String devType;
+
+    @Excel(name = "设备通道数", width = 20)
+    @NotNull(message = MachineValidMessage.DEV_CHNS_NOT_NULL)
+    private Integer devChns;
+
+    @Excel(name = "额定电压（V）", width = 15)
+    @NotNull(message = MachineValidMessage.DEV_VOLT_NOT_NULL)
+    private Float devVolt;
+
+    @Excel(name = "额定电流（A）", width = 15)
+    @NotNull(message = MachineValidMessage.DEV_CURR_NOT_NULL)
+    private Float devCurr;
+
+    @Excel(name = "生产厂家", width = 20)
+    @NotBlank(message = MachineValidMessage.MANUFACTURER_NOT_BLANK)
+    private String manufacturer;
+
+    @Excel(name = "生产日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd")
+    @NotNull(message = MachineValidMessage.CREATEDATETIME_NOT_NULL)
+    //@DateTimeStrValid(format = "yyyy-MM-dd", message = MachineValidMessage.CREATEDATETIME_FORMAT_ERROR)
+    private LocalDate createDate;
+
+    @Excel(name = "出厂编号", width = 40)
+    @NotBlank(message = MachineValidMessage.FACTORYNO_NOT_BLANK)
+    private String createId;
+
+    @Excel(name = "固件版本", width = 15)
+    @NotBlank(message = MachineValidMessage.FIRMWARE_NOT_BLANK)
+    private String hardwareVersion;
+
+    @Excel(name = "软件版本", width = 15)
+    @NotBlank(message = MachineValidMessage.SOFTWARE_NOT_BLANK)
+    private String softwareVersion;
+
+    @Excel(name = "通讯协议", width = 15)
+    @NotBlank(message = MachineValidMessage.PROTOCOL_NOT_BLANK)
+    private String protocol;
+
+    @Excel(name = "IP地址", width = 20)
+    @NotBlank(message = MachineValidMessage.IP_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.IP_REGEX, message = MachineValidMessage.IP_FORMAT_ERROR)
+    private String ip;
+
+    @Excel(name = "端口号")
+    @NotNull(message = MachineValidMessage.PORT_NOT_NULL)
+    private Integer port;
+
+    @Excel(name = "是否为加密版本（1：是/0：否）", width = 20)
+    @NotNull(message = MachineValidMessage.ENCRYPTION_NOT_NULL)
+    private Integer encryption;
+
+    @Excel(name = "识别码（未加密）", width = 30)
+    private String series;
+
+    @Excel(name = "秘钥（未加密）", width = 30)
+    private String devKey;
+
+    @Excel(name = "样品编号", width = 40)
+    private String sampleId;
+
+    @Excel(name = "送样日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd")
+    //@DateTimeStrValid(format = "yyyy-MM-dd", message = MachineValidMessage.ARRIVEDATETIME_FORMAT_ERROR)
+    private LocalDate arrivedDate;
+
+    @Excel(name = "所属地市名称", width = 20)
+    private String cityName;
+
+    @Excel(name = "所属供电公司名称", width = 20)
+    private String gdName;
+
+    @Excel(name = "所属电站名称", width = 20)
+    private String subName;
+
+    @Excel(name = "检测状态", width = 15)
+    private Integer checkState;
+
+    @Excel(name = "检测结果（1:合格/0:不合格）", width = 15)
+    private Integer checkResult;
+
+    @Excel(name = "报告状态（1：生成/0:未生成）", width = 15)
+    private Integer reportState;
+
+    @Excel(name = "归档状态（1：归档/0:未归档）", width = 15)
+    private Integer documentState;
+
+    @Excel(name = "报告路径", width = 20)
+    private String reportPath;
+
+    @Excel(name = "关键信息二维码", width = 20)
+    private String qrCode;
+
+    @Excel(name = "复检次数", width = 15)
+    @NotNull(message = MachineValidMessage.RECHECK_NUM_NOT_NULL)
+    private Integer reCheckNum;
+}
--- a/device/src/main/java/com/njcn/gather/machine/device/service/IPqDevService.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/service/IPqDevService.java
@@ -0,0 +1,69 @@
+package com.njcn.gather.machine.device.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.gather.machine.device.pojo.param.PqDevParam;
+import com.njcn.gather.machine.device.pojo.po.PqDev;
+import com.njcn.gather.machine.device.pojo.vo.PqDevExcel;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @date 2024/11/06
+ */
+public interface IPqDevService extends IService<PqDev> {
+
+    /**
+     * 分页查询被检设备列表
+     *
+     * @param queryParam 查询参数
+     * @return 分页数据，包含被检设备列表
+     */
+    Page<PqDev> listPqDevs(PqDevParam.PqDevQueryParam queryParam);
+
+    /**
+     * 新增被检设备信息
+     *
+     * @param pqDevParam 被检设备信息
+     * @return 新增成功返回true，否则返回false
+     */
+    boolean addPqDev(PqDevParam pqDevParam);
+
+    /**
+     * 修改被检设备信息
+     *
+     * @param updateParam 被检设备信息
+     * @return 修改成功返回true，否则返回false
+     */
+    boolean updatePqDev(PqDevParam.PqDevUpdateParam updateParam);
+
+    /**
+     * 删除被检设备信息
+     *
+     * @param ids 被检设备id列表
+     * @return 删除成功返回true，否则返回false
+     */
+    boolean deletePqDev(List<String> ids);
+
+    /**
+     * 下载模板文件
+     */
+    void downloadTemplate();
+
+    /**
+     * 批量导入被检设备信息
+     *
+     * @param sgEventExcels
+     */
+    void importPqDevData(List<PqDevExcel> sgEventExcels);
+
+    /**
+     * 导出被检设备信息
+     *
+     * @param queryParam 查询参数
+     */
+    void exportPqDevData(PqDevParam.PqDevQueryParam queryParam);
+
+
+}
--- a/device/src/main/java/com/njcn/gather/machine/device/service/impl/PqDevServiceImpl.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/service/impl/PqDevServiceImpl.java
@@ -0,0 +1,133 @@
+package com.njcn.gather.machine.device.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.db.mybatisplus.constant.DbConstant;
+import com.njcn.gather.machine.device.mapper.PqDevMapper;
+import com.njcn.gather.machine.device.pojo.param.PqDevParam;
+import com.njcn.gather.machine.device.pojo.po.PqDev;
+import com.njcn.gather.machine.device.pojo.vo.PqDevExcel;
+import com.njcn.gather.machine.device.service.IPqDevService;
+import com.njcn.gather.machine.device.util.DeviceUtil;
+import com.njcn.web.factory.PageFactory;
+import com.njcn.web.utils.ExcelUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author caozehui
+ * @date 2024/11/06
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements IPqDevService {
+
+    @Override
+    public Page<PqDev> listPqDevs(PqDevParam.PqDevQueryParam queryParam) {
+        QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotNull(queryParam)) {
+            queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName())
+                    .eq(StrUtil.isNotBlank(queryParam.getDevType()), "pq_dev.dev_type", queryParam.getDevType())
+                    .between(ObjectUtil.isAllNotEmpty(queryParam.getSearchBeginTime(), queryParam.getSearchEndTime()), "pq_dev.CreateDate", queryParam.getSearchBeginTime(), queryParam.getSearchEndTime());
+            //排序
+            if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
+                queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
+            } else {
+                //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
+                queryWrapper.orderBy(true, true, "pq_dev.Create_Time");
+            }
+        }
+        queryWrapper.eq("pq_dev.state", DataStateEnum.ENABLE.getCode());
+        return this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
+    }
+
+    @Override
+    public boolean addPqDev(PqDevParam pqDevParam) {
+        PqDev pqDev = new PqDev();
+        BeanUtil.copyProperties(pqDevParam, pqDev);
+        if (Objects.nonNull(pqDev.getSeries())) {
+            pqDev.setSeries(DeviceUtil.encodeString(1, pqDev.getSeries()));
+        }
+        if (Objects.nonNull(pqDev.getDevKey())) {
+            pqDev.setDevKey(DeviceUtil.encodeString(1, pqDev.getDevKey()));
+        }
+        //todo 比对式设备处理
+        pqDev.setState(DataStateEnum.ENABLE.getCode());
+        return this.save(pqDev);
+    }
+
+    @Override
+    public boolean updatePqDev(PqDevParam.PqDevUpdateParam updateParam) {
+        PqDev pqDev = new PqDev();
+        BeanUtil.copyProperties(updateParam, pqDev);
+        if (Objects.nonNull(pqDev.getSeries())) {
+            pqDev.setSeries(DeviceUtil.encodeString(1, pqDev.getSeries()));
+        }
+        if (Objects.nonNull(pqDev.getDevKey())) {
+            pqDev.setDevKey(DeviceUtil.encodeString(1, pqDev.getDevKey()));
+        }
+        //todo 比对式设备处理
+        return this.updateById(pqDev);
+    }
+
+    @Override
+    public boolean deletePqDev(List<String> ids) {
+        return this.lambdaUpdate()
+                .set(PqDev::getState, DataStateEnum.DELETED.getCode())
+                .in(PqDev::getId, ids)
+                .update();
+    }
+
+    @Override
+    public void downloadTemplate() {
+        ExcelUtil.exportExcel("被检设备模板.xls", "被检设备", PqDevExcel.class, new ArrayList<>());
+    }
+
+    @Override
+    public void importPqDevData(List<PqDevExcel> pqDevExcelList) {
+        List<PqDev> pqDevList = BeanUtil.copyToList(pqDevExcelList, PqDev.class);
+        pqDevList.forEach(pqDev -> {
+            if (Objects.nonNull(pqDev.getSeries())) {
+                pqDev.setSeries(DeviceUtil.encodeString(1, pqDev.getSeries()));
+            }
+            if (Objects.nonNull(pqDev.getDevKey())) {
+                pqDev.setDevKey(DeviceUtil.encodeString(1, pqDev.getDevKey()));
+            }
+            pqDev.setState(DataStateEnum.ENABLE.getCode());
+        });
+        this.saveBatch(pqDevList);
+    }
+
+    @Override
+    public void exportPqDevData(PqDevParam.PqDevQueryParam queryParam) {
+        QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotNull(queryParam)) {
+            queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName())
+                    .eq(StrUtil.isNotBlank(queryParam.getDevType()), "pq_dev.dev_type", queryParam.getDevType())
+                    .between(ObjectUtil.isAllNotEmpty(queryParam.getSearchBeginTime(), queryParam.getSearchEndTime()), "pq_dev.CreateDate", queryParam.getSearchBeginTime(), queryParam.getSearchEndTime());
+            //排序
+            if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
+                queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
+            } else {
+                //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
+                queryWrapper.orderBy(true, true, "pq_dev.Create_Time");
+            }
+        }
+        queryWrapper.eq("pq_dev.state", DataStateEnum.ENABLE.getCode());
+        List<PqDev> pqDevs = this.list(queryWrapper);
+        List<PqDevExcel> pqDevExcels = BeanUtil.copyToList(pqDevs, PqDevExcel.class);
+        ExcelUtil.exportExcel("被检设备导出数据.xlsx", "被检设备", PqDevExcel.class, pqDevExcels);
+    }
+}
--- a/device/src/main/java/com/njcn/gather/machine/device/util/DeviceUtil.java
+++ b/device/src/main/java/com/njcn/gather/machine/device/util/DeviceUtil.java
@@ -0,0 +1,62 @@
+package com.njcn.gather.machine.device.util;
+
+import com.njcn.common.utils.sm.ThreeDesUtil;
+import org.apache.commons.codec.binary.Base64;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/1/6
+ */
+public class DeviceUtil {
+
+
+    /**
+     * cd 系统配置的解密方式
+     * content 需要解密的内容
+     * 解密对应内容
+     *
+     * @author cdf
+     * @date 2021/10/12
+     */
+    public static String decoderString(Integer cd, String content) {
+        String seriesTmp = null;
+        if (cd == 0) {
+            seriesTmp = Base64.decodeBase64(content).toString();
+        } else if (cd == 1) {
+            seriesTmp = ThreeDesUtil.decryptThreeDes(content);
+        } else if (cd == 2) {
+            //SM4加密密码
+//            String secretkey = Sm4Utils.globalSecretKey;
+//            Sm4Utils sm4 = new Sm4Utils(secretkey);
+//            seriesTmp = sm4.decryptData_ECB(content);
+        }
+        return seriesTmp;
+    }
+
+    /**
+     * cd 系统配置的加密方式
+     * content 需要加密的内容
+     * 加密对应内容
+     *
+     * @author cdf
+     * @date 2021/10/12
+     */
+    public static String encodeString(Integer cd, String content) {
+        String key = null;
+        if (cd == 0) {
+            key = Base64.encodeBase64String(content.getBytes());
+        } else if (cd == 1) {
+            key = ThreeDesUtil.encryptThreeDes(content);
+        } else if (cd == 2) {
+            //SM4加密密码
+//            String secretkey = Sm4Utils.globalSecretKey;
+//            Sm4Utils sm4 = new Sm4Utils(secretkey);
+//            key = sm4.encryptData_ECB(content);
+        }
+        return key;
+    }
+
+}
+
--- a/device/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java
+++ b/device/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java
@@ -0,0 +1,52 @@
+package com.njcn.gather.machine.pojo.constant;
+
+/**
+ * @author caozehui
+ * @date 2024/11/06
+ */
+public interface MachineValidMessage {
+
+    String ID_NOT_BLANK = "id不能为空，请检查id参数";
+
+    String ID_FORMAT_ERROR = "id格式错误，请检查id参数";
+
+    String NAME_NOT_BLANK = "名称不能为空，请检查name参数";
+
+    String NAME_FORMAT_ERROR = "名称格式错误，请检查name参数";
+
+    String PATTERN_NOT_BLANK = "设备模式不能为空，请检查pattern参数";
+
+    String DEV_TYPE_NOT_BLANK = "设备类型不能为空，请检查devType参数";
+
+    String DEV_CHNS_NOT_NULL = "设备通道系数不能为空，请检查devChns参数";
+
+    String DEV_VOLT_NOT_NULL = "额定电压不能为空，请检查devVolt参数";
+
+    String DEV_CURR_NOT_NULL = "额定电流不能为空，请检查devCurr参数";
+
+    String MANUFACTURER_NOT_BLANK = "生产厂家不能为空，请检查manufacturer参数";
+
+    String CREATEDATETIME_NOT_NULL = "生产日期不能为空，请检查producedDate参数";
+
+    String CREATEDATETIME_FORMAT_ERROR = "生产日期格式错误，请检查createDateTime参数";
+
+    String FACTORYNO_NOT_BLANK = "出厂编号不能为空，请检查factoryNo参数";
+
+    String FIRMWARE_NOT_BLANK = "固件版本不能为空，请检查firmware参数";
+
+    String SOFTWARE_NOT_BLANK = "软件版本不能为空，请检查software参数";
+
+    String PROTOCOL_NOT_BLANK = "通讯协议不能为空，请检查protocol参数";
+
+    String IP_NOT_BLANK = "IP地址不能为空，请检查ip参数";
+
+    String IP_FORMAT_ERROR = "IP地址格式错误，请检查ip参数";
+
+    String PORT_NOT_NULL = "端口号不能为空，请检查port参数";
+
+    String ENCRYPTION_NOT_NULL = "是否为加密版本不能为空，请检查encryption参数";
+
+    String RECHECK_NUM_NOT_NULL = "复检次数不能为空，请检查reCheckNum参数";
+
+    String ARRIVE_DATE_TIME_FORMAT_ERROR = "送样日期格式错误，请检查arrivedDateTime参数";
+}
--- a/device/src/main/java/com/njcn/gather/machine/pojo/enums/MachineResponseEnum.java
+++ b/device/src/main/java/com/njcn/gather/machine/pojo/enums/MachineResponseEnum.java
@@ -0,0 +1,19 @@
+package com.njcn.gather.machine.pojo.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum MachineResponseEnum {
+    //NAME_REPEAT("A001001", "名称重复"),
+
+    IMPORT_DATA_FAIL("A001002", "导入数据失败");
+
+    private final String code;
+
+    private final String message;
+
+    MachineResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}