导出检测计划

2024-12-16 10:21:01 +08:00
parent 878a2e68af
commit 5fde9586fc
24 changed files with 650 additions and 514 deletions
--- a/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java
+++ b/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java
@@ -13,24 +13,24 @@ 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.device.pojo.vo.PqDevExcel;
 import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.pojo.enums.DevResponseEnum;
+import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.plan.pojo.param.AdPlanParam;
 import com.njcn.gather.plan.pojo.vo.AdPlanExcel;
 import com.njcn.gather.plan.pojo.vo.AdPlanVO;
 import com.njcn.gather.plan.service.IAdPlanService;
-import com.njcn.gather.device.pojo.enums.DevResponseEnum;
-import com.njcn.gather.device.pojo.enums.PatternEnum;
+import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.ExcelUtil;
 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.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -53,6 +53,7 @@ public class AdPlanController extends BaseController {

    private final IAdPlanService adPlanService;
    private final IPqDevService pqDevService;
+    private final IDictDataService dictDataService;

    @OperateInfo
    @PostMapping("/list")
@@ -122,61 +123,50 @@ public class AdPlanController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
+    @PostMapping("/downloadTemplate")
+    @ApiOperation("下载监测计划导入文件模板")
+    public void downloadTemplate() {
+        adPlanService.downloadTemplate();
+    }
+
    @OperateInfo(operateType = OperateType.DOWNLOAD)
    @PostMapping("/export")
    @ApiOperation("导出检测计划")
    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
    public void export(@RequestBody @Validated AdPlanParam.QueryParam queryParam) {
-        String methodDescribe = getMethodDescribe("download");
+        String methodDescribe = getMethodDescribe("export");
        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
-        List<AdPlanExcel> data = adPlanService.getExportData(queryParam);
-        ExcelUtil.exportExcel("检测计划导出数据.xlsx", AdPlanExcel.class, data);
+        List<AdPlanExcel.ExportData> data = adPlanService.getExportData(queryParam);
+        ExcelUtil.exportExcel("检测计划导出数据.xlsx", AdPlanExcel.ExportData.class, data);
    }

    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
    @PostMapping(value = "/import")
    @ApiOperation("批量导入检测计划数据")
-    @ApiImplicitParam(name = "file", value = "检测计划数据文件", required = true)
-    public HttpResult<Object> importData(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "检测计划数据文件", required = true),
+            @ApiImplicitParam(name = "pattern", value = "模式Id", required = true)
+    })
+    public HttpResult<Object> importData(@RequestParam("file") MultipartFile file, @RequestParam("pattern") String pattern, HttpServletResponse response) {
        String methodDescribe = getMethodDescribe("importData");
-        LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
+        LogUtil.njcnDebug(log, "{}，上传文件为：{}, 模式Id为：{}", methodDescribe, file.getOriginalFilename(), pattern);
+
+        ImportParams params = new ImportParams();
+        params.setHeadRows(2);
+        params.setNeedVerify(true);
+        params.setStartSheetIndex(0);
+        params.setSheetNum(1);

        try {
-            Workbook workBook = ExcelUtil.getWorkBook(file);
-            int numberOfSheets = workBook.getNumberOfSheets();
-            if (numberOfSheets == 2) {
-                ImportParams params = new ImportParams();
-                params.setHeadRows(1);
-                params.setNeedVerify(true);
-                params.setSheetNum(1);
-
-                params.setStartSheetIndex(0);
-                ExcelImportResult<AdPlanExcel> adPlanExcelResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AdPlanExcel.class, params);
-                if (adPlanExcelResult.isVerifyFail()) {
-                    // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
-                    PoiUtil.exportFileByWorkbook(adPlanExcelResult.getFailWorkbook(), "非法检测计划数据.xlsx", response);
-                } else {
-                    List<AdPlanExcel> adPlanExcelList = adPlanExcelResult.getList();
-                    if (ObjectUtil.isNotEmpty(adPlanExcelList)) {
-                        params.setStartSheetIndex(1);
-                        String pattern = adPlanExcelList.get(0).getPattern();
-                        if (PatternEnum.CONTRAST.getValue().equals(pattern)) {
-                            ExcelImportResult<PqDevExcel.ContrastImportData> pqDevExcelResult = ExcelImportUtil.importExcelMore(file.getInputStream(), PqDevExcel.ContrastImportData.class, params);
-                            if (pqDevExcelResult.isVerifyFail()) {
-                                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
-                                PoiUtil.exportFileByWorkbook(pqDevExcelResult.getFailWorkbook(), "非法检测计划数据.xlsx", response);
-                            } else {
-                                adPlanService.importData(adPlanExcelList);
-                                pqDevService.importContrastData(pqDevExcelResult.getList());
-                            }
-                        } else {
-                            ExcelImportResult<PqDevExcel.SimulateOrDigitalImportData> pqDevExcelResult = ExcelImportUtil.importExcelMore(file.getInputStream(), PqDevExcel.SimulateOrDigitalImportData.class, params);
-                            if (pqDevExcelResult.isVerifyFail()) {
-                                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
-                                PoiUtil.exportFileByWorkbook(pqDevExcelResult.getFailWorkbook(), "非法检测计划数据.xlsx", response);
-                            }
-                        }
-                    }
+            ExcelImportResult<AdPlanExcel.ImportData> adPlanExcelResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AdPlanExcel.ImportData.class, params);
+            if (adPlanExcelResult.isVerifyFail()) {
+                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
+                PoiUtil.exportFileByWorkbook(adPlanExcelResult.getFailWorkbook(), "非法检测计划数据.xlsx", response);
+            } else {
+                List<AdPlanExcel.ImportData> adPlanExcelList = adPlanExcelResult.getList();
+                if (ObjectUtil.isNotEmpty(adPlanExcelList)) {
+                    adPlanService.importData(pattern,adPlanExcelList);
                }
            }
        } catch (Exception e) {
--- a/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java
+++ b/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java
@@ -2,11 +2,17 @@ package com.njcn.gather.plan.pojo.vo;

 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import com.njcn.gather.device.device.pojo.vo.PqDevExcel;
+import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Range;

 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.time.LocalDate;
 import java.util.List;

 /**
@@ -15,40 +21,152 @@ import java.util.List;
 */
@Data
 public class AdPlanExcel {
-    @Excel(name = "名称", width = 40, needMerge = true)
+    @Excel(name = "名称", width = 40, needMerge = true, orderNum = "0")
+    @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
    private String name;

-    @Excel(name = "模式", width = 20, needMerge = true)
-    @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-    private String pattern;
+    @Excel(name = "检测源", width = 40, needMerge = true, orderNum = "2")
+    @NotBlank(message = DevValidMessage.SOURC_NOT_BLANK)
+    private String source;

-    @Excel(name = "父计划id", width = 25, needMerge = true)
-    private String fatherPlanId;
-
-    @Excel(name = "数据源", width = 20, needMerge = true)
+    @Excel(name = "数据源", width = 20, needMerge = true, orderNum = "4")
+    @NotBlank(message = DevValidMessage.DATASOURCE_NOT_BLANK)
    private String datasourceId;

-    @Excel(name = "脚本", width = 50, needMerge = true)
+    @Excel(name = "脚本", width = 50, needMerge = true, orderNum = "5")
+    @NotBlank(message = DevValidMessage.SCRIPT_NOT_BLANK)
    private String scriptId;

-    @Excel(name = "误差体系", width = 30, needMerge = true)
+    @Excel(name = "误差体系", width = 30, needMerge = true, orderNum = "6")
+    @NotBlank(message = DevValidMessage.ERRORSYS_NOT_BLANK)
    private String errorSysId;

-    @Excel(name = "是否做守时检测", width = 15, replace = {"否_0", "是_1"}, needMerge = true)
-    private Integer timeCheck;

-    @Excel(name = "检测状态", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true)
-    private Integer testState;
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class ExportData extends AdPlanExcel {
+        @Excel(name = "模式", width = 20, needMerge = true, orderNum = "1")
+        @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
+        private String pattern;

-    @Excel(name = "报告生成状态", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true)
-    private Integer reportState;
+        @Excel(name = "父计划id", width = 25, needMerge = true, orderNum = "3")
+        private String fatherPlanId;

-    @Excel(name = "检测结果", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true)
-    private Integer result;
+        @Excel(name = "是否做守时检测（否\\是）", width = 15, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "7")
+        private Integer timeCheck;

-    @Excel(name = "数据表后缀", width = 20, needMerge = true)
-    private Integer code;
+        @Excel(name = "检测状态（未检\\检测中\\检测完成）", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "8")
+        private Integer testState;

-    @ExcelCollection(name = "绑定的设备")
-    private List<PqDevExcel.PlanBindDevice> devices;
+        @Excel(name = "报告生成状态（未生成\\部分生成\\全部生成）", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "9")
+        private Integer reportState;
+
+        @Excel(name = "检测结果（不符合\\符合\\未检）", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "10")
+        private Integer result;
+
+        @Excel(name = "数据表后缀", width = 20, needMerge = true, orderNum = "11")
+        private Integer code;
+
+        @ExcelCollection(name = "绑定的设备", orderNum = "12")
+        private List<AdPlanExcel.BoundExportData> devices;
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class ImportData extends AdPlanExcel {
+        @Excel(name = "是否做守时检测（否\\是）", width = 15, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "7")
+        @NotNull(message = DevValidMessage.TIMECHECK_NOT_BLANK)
+        private String timeCheck;
+
+        @ExcelCollection(name = "绑定的设备", orderNum = "13")
+        private List<AdPlanExcel.BoundImportData> devices;
+    }
+
+    @Data
+    public static class BoundData {
+        @Excel(name = "名称", width = 20)
+        @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
+        private String name;
+
+        @Excel(name = "设备类型", width = 20, orderNum = "2")
+        @NotBlank(message = DevValidMessage.DEV_TYPE_NOT_BLANK)
+        private String devType;
+
+        @Excel(name = "设备通道数", width = 20, orderNum = "3")
+        @NotNull(message = DevValidMessage.DEV_CHNS_NOT_NULL)
+        private Integer devChns;
+
+        @Excel(name = "额定电压（V）", width = 15, orderNum = "4")
+        @NotNull(message = DevValidMessage.DEV_VOLT_NOT_NULL)
+        private Float devVolt;
+
+        @Excel(name = "额定电流（A）", width = 15, orderNum = "5")
+        @NotNull(message = DevValidMessage.DEV_CURR_NOT_NULL)
+        private Float devCurr;
+
+        @Excel(name = "设备厂家", width = 20, orderNum = "6")
+        @NotBlank(message = DevValidMessage.MANUFACTURER_NOT_BLANK)
+        private String manufacturer;
+
+        @Excel(name = "设备序列号", width = 40, orderNum = "8")
+        @NotBlank(message = DevValidMessage.FACTORYNO_NOT_BLANK)
+        private String createId;
+
+        @Excel(name = "固件版本", width = 15, orderNum = "9")
+        @NotBlank(message = DevValidMessage.FIRMWARE_NOT_BLANK)
+        private String hardwareVersion;
+
+        @Excel(name = "软件版本", width = 15, orderNum = "10")
+        @NotBlank(message = DevValidMessage.SOFTWARE_NOT_BLANK)
+        private String softwareVersion;
+
+        @Excel(name = "通讯协议", width = 15, orderNum = "11")
+        @NotBlank(message = DevValidMessage.PROTOCOL_NOT_BLANK)
+        private String protocol;
+
+        @Excel(name = "IP地址", width = 20, orderNum = "12")
+        @NotBlank(message = DevValidMessage.IP_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.IP_REGEX, message = DevValidMessage.IP_FORMAT_ERROR)
+        private String ip;
+
+        @Excel(name = "端口号", orderNum = "13")
+        @NotNull(message = DevValidMessage.PORT_NOT_NULL)
+        @Range(min = 1, max = 65535, message = DevValidMessage.PORT_RANGE_ERROR)
+        private Integer port;
+
+        @Excel(name = "是否为加密版本（否\\是）", width = 20, replace = {"否_0", "是_1"}, orderNum = "14")
+        @NotNull(message = DevValidMessage.ENCRYPTION_NOT_NULL)
+        private Integer encryptionFlag;
+
+        @Excel(name = "识别码（当为加密版本时必填）", width = 30, orderNum = "15")
+        private String series;
+
+        @Excel(name = "秘钥（当为加密版本时必填）", width = 30, orderNum = "16")
+        private String devKey;
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class BoundExportData extends BoundData {
+        @Excel(name = "出厂日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "7")
+        @NotNull(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
+        private LocalDate createDate;
+
+        @Excel(name = "是否支持系数校准（否\\是）", width = 20, replace = {"否_0", "是_1"}, orderNum = "17", needMerge = true)
+        private Integer factorFlag;
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class BoundImportData extends BoundData {
+        @Excel(name = "出厂日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "7", needMerge = true)
+        @NotNull(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
+        @DateTimeStrValid(message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR)
+        private String createDate;
+
+        @Excel(name = "是否支持系数校准（否\\是）", width = 20, replace = {"否_0", "是_1"}, orderNum = "17", needMerge = true)
+        @NotBlank(message = DevValidMessage.FACTOR_FLAG_NOT_BLANK)
+        private String factorFlag;
+    }
 }
--- a/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
+++ b/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
@@ -57,12 +57,9 @@ public interface IAdPlanService extends IService<AdPlan> {
    List<Map<String, Object>> listByPattern(String pattern);

    /**
-     * 获取检测计划导出时所需的SheetList  （包含与之关联的设备信息）
-     *
-     * @param queryParam 查询参数
-     * @return SheetList
+     * 下载检测计划模板
     */
-    //List<Map<String, Object>> getAdPlanEexportSheetList(AdPlanParam.QueryParam queryParam);
+    void downloadTemplate();

    /**
     * 获取检测计划导出数据
@@ -70,15 +67,14 @@ public interface IAdPlanService extends IService<AdPlan> {
     * @param queryParam 查询参数
     * @return 检测计划导出数据
     */
-    List<AdPlanExcel> getExportData(AdPlanParam.QueryParam queryParam);
+    List<AdPlanExcel.ExportData> getExportData(AdPlanParam.QueryParam queryParam);

    /**
     * 导入检测计划
-     *
+     * @param patternId 模式Id
     * @param adPlanExcelList 检测计划Excel列表
     * @return 导入成功则返回true，否则返回false
     */
-    void importData(List<AdPlanExcel> adPlanExcelList);
-
+    void importData(String patternId, List<AdPlanExcel.ImportData> adPlanExcelList);

 }
--- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
@@ -17,6 +17,7 @@ import com.njcn.gather.device.err.service.IPqErrSysService;
 import com.njcn.gather.device.pojo.enums.*;
 import com.njcn.gather.device.script.service.IPqScriptService;
 import com.njcn.gather.device.source.pojo.po.PqSource;
+import com.njcn.gather.device.source.service.IPqSourceService;
 import com.njcn.gather.plan.mapper.AdPlanMapper;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.param.AdPlanParam;
@@ -27,10 +28,12 @@ import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.plan.service.IAdPlanSourceService;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 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 org.springframework.transaction.annotation.Transactional;

 import java.util.*;
 import java.util.stream.Collectors;
@@ -49,6 +52,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
    private final IAdPlanSourceService adPlanSourceService;
    private final IPqDevService pqDevService;
    private final IDictDataService dictDataService;
+    private final IPqSourceService pqSourceService;

    @Override
    public Page<AdPlanVO> listAdPlan(AdPlanParam.QueryParam queryParam) {
@@ -84,17 +88,18 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme

        String planId = UUID.randomUUID().toString().replaceAll("-", "");
        adPlan.setId(planId);
+        adPlan.setDatasourceId(String.join(StrUtil.COMMA, param.getDatasourceIds()));
+
        adPlan.setState(DataStateEnum.ENABLE.getCode());
        // 默认为顶级检测计划
        adPlan.setFatherPlanId(CommonEnum.FATHER_ID.getValue());
-        adPlan.setDatasourceId(String.join(StrUtil.COMMA, param.getDatasourceIds()));
        adPlan.setTestState(CheckStateEnum.UNCHECKED.getValue());
        adPlan.setReportState(PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue());
        adPlan.setResult(CheckResultEnum.UNCHECKED.getValue());
        // todo code 生成
        // 日期生成 MMdd
        //String dateStr = DateFormatUtils.format(new Date(), "MMdd");
-        adPlan.setCode(this.count() + 1);
+        adPlan.setCode(this.generateCode());

        // 新增检测计划、检测源关联
        adPlanSourceService.addAdPlanSource(planId, param.getSourceIds());
@@ -175,61 +180,100 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
        return result;
    }

-//    @Override
-//    public List<Map<String, Object>> getAdPlanEexportSheetList(AdPlanParam.QueryParam queryParam) {
-//        List<AdPlan> adPlans = this.list(this.getQueryWrapper(queryParam));
-//
-//        List<AdPlanExcel> adPlanExcelList = this.getAdPlanExcelList(adPlans);
-//        Map<String, Object> sheetMap1 = new HashMap<>();
-//        ExportParams exportParams = new ExportParams();
-//        exportParams.setSheetName("检测计划");
-//        sheetMap1.put("title", exportParams);
-//        sheetMap1.put("entity", AdPlanExcel.class);
-//        sheetMap1.put("data", adPlanExcelList);
-//
-//        List<Map<String, Object>> sheetList = new ArrayList<>();
-//        sheetList.add(sheetMap1);
-//        DictData dictData = dictDataService.getDictDataById(queryParam.getPattern());
-//        if (ObjectUtil.isNotNull(dictData)) {
-//            if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
-//                sheetList.add(pqDevService.getExportSheetMap(adPlans.stream().map(AdPlan::getId).collect(Collectors.toList()), PqDevExcel.ContrastExportData.class));
-//            } else {
-//                sheetList.add(pqDevService.getExportSheetMap(adPlans.stream().map(AdPlan::getId).collect(Collectors.toList()), PqDevExcel.SimulateOrDigitalExportData.class));
-//            }
-//        }
-//
-//        return sheetList;
-//    }
+    @Override
+    public void downloadTemplate() {
+        ExcelUtil.exportExcel("检测计划模板.xlsx", AdPlanExcel.ImportData.class, Collections.emptyList());
+    }

    @Override
-    public List<AdPlanExcel> getExportData(AdPlanParam.QueryParam queryParam) {
+    public List<AdPlanExcel.ExportData> getExportData(AdPlanParam.QueryParam queryParam) {
        List<AdPlan> planList = this.list(this.getQueryWrapper(queryParam));
        this.visualize(planList);
-        List<AdPlanExcel> planExcelList = BeanUtil.copyToList(planList, AdPlanExcel.class);
+        List<AdPlanExcel.ExportData> planExcelList = BeanUtil.copyToList(planList, AdPlanExcel.ExportData.class);
        for (int i = 0; i < planList.size(); i++) {
+            List<PqSource> pqSources = adPlanSourceService.listPqSourceByPlanId(planList.get(i).getId());
+            planExcelList.get(i).setSource(pqSources.stream().map(PqSource::getName).collect(Collectors.joining(StrUtil.COMMA)));
+
            PqDevParam.QueryParam queryParam1 = new PqDevParam.QueryParam();
            queryParam1.setPlanId(planList.get(i).getId());
-//            planExcelList.get(i).setDevices(BeanUtil.copyToList(pqDevService.listByPlanId(queryParam1), PqDevExcel.ExportData.class));
+            List<PqDev> pqDevs = pqDevService.listByPlanId(queryParam1);
+            pqDevService.visualize(pqDevs);
+            planExcelList.get(i).setDevices(BeanUtil.copyToList(pqDevs, AdPlanExcel.BoundExportData.class));
        }
        return planExcelList;
    }

    @Override
-    public void importData(List<AdPlanExcel> adPlanExcelList) {
+    @Transactional(rollbackFor = Exception.class)
+    public void importData(String patternId, List<AdPlanExcel.ImportData> adPlanExcelList) {
        List<AdPlan> adPlans = BeanUtil.copyToList(adPlanExcelList, AdPlan.class);
+        List<PqDev> devList = new ArrayList<>();
+
+        String patternCode = dictDataService.getDictDataById(patternId).getCode();
+        for (int i = 0; i < adPlans.size(); i++) {
+
+            AdPlanExcel.ImportData adPlanExcel = adPlanExcelList.get(i);
+            String planId = UUID.randomUUID().toString().replaceAll("-", "");
+            adPlans.get(i).setId(planId);
+            adPlans.get(i).setPattern(patternId);
+
+            String source = adPlanExcel.getSource();
+            String[] sourceNames = source.split(StrUtil.COMMA);
+            // 若非比对模式，检测源、数据源有2个以上时，不导入
+            if (!PatternEnum.CONTRAST.getValue().equals(patternCode) && sourceNames.length > 1) {
+                throw new BusinessException(DevResponseEnum.IMPORT_SOURCE_ERROR);
+            }
+
+            String datasource = adPlanExcel.getDatasourceId();
+            String[] datasourceIds = datasource.split(StrUtil.COMMA);
+            // 若非比对模式，数据源有2个以上时，不导入
+            if (!PatternEnum.CONTRAST.getValue().equals(patternCode) && datasourceIds.length > 1) {
+                throw new BusinessException(DevResponseEnum.IMPORT_DATASOURCE_ERROR);
+            }
+
+            List<String> sourceIds = pqSourceService.listPqSourceIdByName(sourceNames);
+            adPlanSourceService.addAdPlanSource(planId, sourceIds);
+
+            List<PqDev> pqDevs = adPlanExcel.getDevices().stream()
+                    .map(planExcel -> {
+                        PqDev dev = new PqDev();
+                        BeanUtil.copyProperties(planExcel, dev);
+                        dev.setPlanId(planId);
+                        dev.setPattern(patternId);
+                        return dev;
+                    }).collect(Collectors.toList());
+            devList.addAll(pqDevs);
+        }
        // 逆向可视化
        this.reverseVisualize(adPlans);
        this.saveBatch(adPlans);
-        //todo 脚本、误差体系处理
+
+        pqDevService.reverseVisualize(devList);
+        pqDevService.saveBatch(devList);
+    }
+
+    /**
+     * 获取查询条件wrapper
+     *
+     * @param queryParam 查询条件
+     * @return
+     */
+    private Wrapper getQueryWrapper(AdPlanParam.QueryParam queryParam) {
+        QueryWrapper<AdPlan> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotNull(queryParam)) {
+            queryWrapper.eq(StrUtil.isNotBlank(queryParam.getPattern()), "ad_plan.pattern", queryParam.getPattern()).eq(StrUtil.isNotBlank(queryParam.getName()), "ad_plan.name", queryParam.getName()).eq(ObjectUtil.isNotNull(queryParam.getTestState()), "ad_plan.Test_State", queryParam.getTestState()).eq(ObjectUtil.isNotNull(queryParam.getReportState()), "ad_plan.Report_State", queryParam.getReportState()).eq(ObjectUtil.isNotNull(queryParam.getResult()), "ad_plan.result", queryParam.getResult());
+        }
+        queryWrapper.eq("ad_plan.state", DataStateEnum.ENABLE.getCode()).orderBy(true, true, "Create_Time");
+        return queryWrapper;
    }

    /**
     * 可视化
     *
-     * @param adPlans 检测计划列表
+     * @param planList 检测计划列表
     */
-    private void visualize(List<AdPlan> adPlans) {
-        adPlans.forEach(adPlan -> {
+    private void visualize(List<AdPlan> planList) {
+        planList.forEach(adPlan -> {
            if (StrUtil.isNotBlank(adPlan.getPattern())) {
                adPlan.setPattern(dictDataService.getDictDataById(adPlan.getPattern()).getName());
            }
@@ -255,43 +299,34 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
    /**
     * 逆向可视化
     *
-     * @param adPlans 检测计划列表
+     * @param planList 检测计划列表
     */
-    private void reverseVisualize(List<AdPlan> adPlans) {
-        adPlans.forEach(adPlan -> {
-            if (StrUtil.isNotBlank(adPlan.getPattern())) {
-                adPlan.setPattern(dictDataService.getDictDataByName(adPlan.getPattern()).getId());
-            }
-//            if (DevConst.FATHER_ID.equals(adPlan.getFatherPlanId())) {
-//                adPlan.setFatherPlanId(CommonEnum.FATHER_ID.getValue());
-//            } else {
-//                adPlan.setFatherPlanId(this.getById(adPlan.getFatherPlanId()).getId());
-//            }
-            if (StrUtil.isNotBlank(adPlan.getDatasourceId())) {
-                String[] datasourceIds = adPlan.getDatasourceId().split(StrUtil.COMMA);
-                adPlan.setDatasourceId(Arrays.stream(datasourceIds).map(id -> DataSourceEnum.getValueByMsg(id)).collect(Collectors.joining(StrUtil.COMMA)));
-            }
-//            if (StrUtil.isNotBlank(adPlan.getScriptId())) {
-//                adPlan.setScriptId(pqScriptService.getPqScriptById(adPlan.getScriptId()).getName());
-//            }
-//            if (StrUtil.isNotBlank(adPlan.getErrorSysId())) {
-//                adPlan.setErrorSysId(pqErrSysService.getPqErrSysById(adPlan.getErrorSysId()).getName());
-//            }
+    private void reverseVisualize(List<AdPlan> planList) {
+        planList.forEach(adPlan -> {
+            String[] datasourceIds = adPlan.getDatasourceId().split(StrUtil.COMMA);
+            adPlan.setDatasourceId(Arrays.stream(datasourceIds).map(id -> DataSourceEnum.getValueByMsg(id)).collect(Collectors.joining(StrUtil.COMMA)));
+
+            adPlan.setScriptId(pqScriptService.getPqScriptByName(adPlan.getScriptId()).getId());
+
+            adPlan.setErrorSysId(pqErrSysService.getPqErrSysByName(adPlan.getErrorSysId()).getId());
+            adPlan.setCode(this.generateCode());
+
+            adPlan.setState(DataStateEnum.ENABLE.getCode());
+            // 默认为顶级检测计划
+            adPlan.setFatherPlanId(CommonEnum.FATHER_ID.getValue());
+            adPlan.setTestState(CheckStateEnum.UNCHECKED.getValue());
+            adPlan.setReportState(PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue());
+            adPlan.setResult(CheckResultEnum.UNCHECKED.getValue());
        });
    }

    /**
-     * 获取查询条件wrapper
+     * 生成code
     *
-     * @param queryParam 查询条件
     * @return
     */
-    private Wrapper getQueryWrapper(AdPlanParam.QueryParam queryParam) {
-        QueryWrapper<AdPlan> queryWrapper = new QueryWrapper<>();
-        if (ObjectUtil.isNotNull(queryParam)) {
-            queryWrapper.eq(StrUtil.isNotBlank(queryParam.getPattern()), "ad_plan.pattern", queryParam.getPattern()).eq(StrUtil.isNotBlank(queryParam.getName()), "ad_plan.name", queryParam.getName()).eq(ObjectUtil.isNotNull(queryParam.getTestState()), "ad_plan.Test_State", queryParam.getTestState()).eq(ObjectUtil.isNotNull(queryParam.getReportState()), "ad_plan.Report_State", queryParam.getReportState()).eq(ObjectUtil.isNotNull(queryParam.getResult()), "ad_plan.result", queryParam.getResult());
-        }
-        queryWrapper.eq("ad_plan.state", DataStateEnum.ENABLE.getCode()).orderBy(true, true, "Create_Time");
-        return queryWrapper;
+    private Integer generateCode() {
+        return this.count() + 1;
    }
+
 }