检测计划导出、导入功能调整

detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java

@@ -35,6 +35,7 @@ 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;
@@ -237,8 +238,11 @@ public class PqDevController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
     @PostMapping(value = "/importCNDev")
     @ApiOperation("批量导入设备数据")
-    @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true)
+    @ApiImplicitParams({
-    public HttpResult<String> importCNDev(@RequestParam("file") MultipartFile file, String patternId, HttpServletResponse response) {
+            @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
+            @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
+    })
+    public HttpResult<String> importCNDev(@RequestParam("file") MultipartFile file,@RequestParam("patternId") String patternId, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importCNDev");
         LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
 
@@ -269,7 +273,7 @@ public class PqDevController extends BaseController {
             throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL);
         }
         if (ObjectUtil.isNotEmpty(cnDevExcelList)) {
-            pqDevService.importCNDev(cnDevExcelList, patternId);
+            pqDevService.importCNDev(cnDevExcelList, patternId, null);
         }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }

detection/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java

@@ -18,7 +18,7 @@ public interface DevValidMessage {
 
     String PATTERN_NOT_BLANK = "模式不能为空，请检查pattern参数";
 
-    String DEV_TYPE_NOT_BLANK = "设备类型不能为空，请检查devType参数";
+    String DEV_TYPE_NOT_BLANK = "设备类型不能为空";
 
     String DEV_CHNS_NOT_NULL = "设备通道系数不能为空，请检查devChns参数";
 
@@ -205,4 +205,7 @@ public interface DevValidMessage {
     String CONDITION_TYPE_FORMAT_ERROR = "判断条件类型格式错误，请检查conditionType参数";
 
     String SORT_NOT_NULL = "排序不能为空";
+    String PREINVESTMENT_PLAN_NOT_BLANK = "预投资计划不能为空";
+    String TIMECHECK_NOT_NULL = "是否做守时检测不能为空";
+    String CREATEID_NOT_BLANK = "设备序列号不能为空";
 }

detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java

@@ -19,6 +19,7 @@ import javax.validation.constraints.Pattern;
 public class CNDevExcel {
 
     @Excel(name = "预投计划*", width = 20, orderNum = "1")
+    @NotBlank(message = DevValidMessage.PREINVESTMENT_PLAN_NOT_BLANK)
     private String preinvestmentPlan;
 
     @Excel(name = "设备编号（开始编号-结束编号，编号为数字）*", width = 50, orderNum = "2")

detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java

@@ -206,8 +206,9 @@ public interface IPqDevService extends IService<PqDev> {
      *
      * @param cnDevExcelList 灿能二楼设备数据列表
      * @param patternId      模式Id
+     * @param planId         计划Id
      */
-    void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId);
+    void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId, String planId);
 
     /**
      * 根据计划id列表获取设备列表
@@ -216,4 +217,19 @@ public interface IPqDevService extends IService<PqDev> {
      * @return
      */
     List<PqDev> listByPlanIds(List<String> planIds);
+
+    /**
+     * 可视化-灿能二楼设备
+     *
+     * @param pqDevs
+     */
+    void visualizeCNDev(List<PqDev> pqDevs);
+
+    /**
+     * 逆向可视化-灿能二楼设备
+     *
+     * @param pqDevs 设备列表
+     * @param patternId 模式Id
+     */
+    void reverseVisualizeCNDev(List<PqDev> pqDevs, String patternId);
 }

detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java

@@ -452,9 +452,9 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 //                }
 //            }
             if (StrUtil.isNotBlank(pqDev.getDevType())) {
-                DevType devType = devTypeService.getById(pqDev.getDevType());
+                DevType devType = devTypeService.getByName(pqDev.getDevType());
                 if (ObjectUtil.isNotNull(devType)) {
-                    pqDev.setDevType(devType.getName());
+                    pqDev.setDevType(devType.getId());
                 }
             }
             if (StrUtil.isNotBlank(pqDev.getManufacturer())) {
@@ -673,35 +673,25 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             pqDevExcels = BeanUtil.copyToList(pqDevs, CNDevExcel.class);
         }
 
-        ExcelUtil.exportExcelPullDown(new ExportParams(), "被检设备导出数据.xlsx", this.getCNDevPullDownList(), CNDevExcel.class, ObjectUtil.isEmpty(pqDevExcels) ? new ArrayList<>() : pqDevExcels);
+        ExcelUtil.exportExcelPullDown(new ExportParams(), "被检设备导出数据.xlsx", 1, this.getCNDevPullDownList(), CNDevExcel.class, ObjectUtil.isEmpty(pqDevExcels) ? new ArrayList<>() : pqDevExcels);
     }
 
     @Override
     public void downloadCNDevTemplate() {
-        ExcelUtil.exportExcelPullDown(new ExportParams(), "被检设备模板.xlsx", this.getCNDevPullDownList(), CNDevExcel.class, new ArrayList<>());
+        ExcelUtil.exportExcelPullDown(new ExportParams(), "被检设备模板.xlsx", 1, this.getCNDevPullDownList(), CNDevExcel.class, new ArrayList<>());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId) {
+    public void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId,String planId) {
         List<PqDev> oldDevList = BeanUtil.copyToList(cnDevExcelList, PqDev.class);
         //逆向可视化
-        this.reverseVisualizeCNDev(oldDevList);
+        this.reverseVisualizeCNDev(oldDevList, patternId);
 
         List<PqDev> newDevList = new ArrayList<>();
         PqDevParam param = new PqDevParam.UpdateParam();
         oldDevList.forEach(pqDev -> {
-
+            pqDev.setPlanId(planId);
-            pqDev.setCreateDate(LocalDateTime.now().toLocalDate());
-            pqDev.setCreateId(pqDev.getName());
-            pqDev.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue());
-            pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
-            pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue());
-            pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue());
-            pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
-            pqDev.setPattern(patternId);
-            pqDev.setState(DataStateEnum.ENABLE.getCode());
-
             if (pqDev.getEncryptionFlag() == 1) {
                 if (StrUtil.isNotBlank(pqDev.getSeries()) && StrUtil.isNotBlank(pqDev.getDevKey())) {
                     pqDev.setSeries(EncryptionUtil.encodeString(1, pqDev.getSeries()));
@@ -728,6 +718,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                         BeanUtil.copyProperties(pqDev, dev);
                         dev.setName(String.valueOf(i));
                         dev.setCreateId(String.valueOf(i));
+                        dev.setPlanId(planId);
 
                         param.setName(dev.getName());
                         param.setCreateId(dev.getName());
@@ -765,6 +756,35 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         return this.lambdaQuery().in(PqDev::getPlanId, planIds).eq(PqDev::getState, DataStateEnum.ENABLE.getCode()).list();
     }
 
+    public void visualizeCNDev(List<PqDev> pqDevs) {
+        pqDevs.forEach(pqDev -> {
+            pqDev.setPreinvestmentPlan(dictDataService.getDictDataById(pqDev.getPreinvestmentPlan()).getName());
+            pqDev.setDevType(devTypeService.getById(pqDev.getDevType()).getName());
+            pqDev.setProtocol(dictDataService.getDictDataById(pqDev.getProtocol()).getName());
+        });
+    }
+
+    public void reverseVisualizeCNDev(List<PqDev> pqDevs, String patternId) {
+        pqDevs.forEach(pqDev -> {
+            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.setPattern(patternId);
+            pqDev.setProtocol(dictDataService.getDictDataByName(pqDev.getProtocol()).getId());
+            pqDev.setCreateDate(LocalDateTime.now().toLocalDate());
+            pqDev.setCreateId(pqDev.getName());
+            pqDev.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue());
+            pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
+            pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue());
+            pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue());
+            pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
+            pqDev.setState(DataStateEnum.ENABLE.getCode());
+        });
+    }
 
     /**
      * 获取检测状态饼状图数据
@@ -900,35 +920,4 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 
         return pullDowns;
     }
-
-    /**
-     * 可视化-灿能二楼设备
-     *
-     * @param pqDevs
-     */
-    private void visualizeCNDev(List<PqDev> pqDevs) {
-        pqDevs.forEach(pqDev -> {
-            pqDev.setPreinvestmentPlan(dictDataService.getDictDataById(pqDev.getPreinvestmentPlan()).getName());
-            pqDev.setDevType(devTypeService.getById(pqDev.getDevType()).getName());
-            pqDev.setProtocol(dictDataService.getDictDataById(pqDev.getProtocol()).getName());
-        });
-    }
-
-    /**
-     * 逆向可视化-灿能二楼设备
-     *
-     * @param pqDevs
-     */
-    public void reverseVisualizeCNDev(List<PqDev> pqDevs) {
-        pqDevs.forEach(pqDev -> {
-            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.setProtocol(dictDataService.getDictDataByName(pqDev.getProtocol()).getId());
-        });
-    }
 }

detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java

@@ -116,7 +116,6 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
     public List<Map<String, Object>> listAllPqErrSys() {
         List<PqErrSys> pqErrSysList = this.lambdaQuery().eq(PqErrSys::getState, DataStateEnum.ENABLE.getCode()).list();
         List<Map<String, Object>> result = pqErrSysList.stream().map(pqErrSys -> {

detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java

@@ -14,12 +14,14 @@ 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.vo.CNDevExcel;
 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.web.controller.BaseController;
 import com.njcn.web.utils.ExcelUtil;
+import com.njcn.web.utils.FileUtil;
 import com.njcn.web.utils.HttpResultUtil;
 import com.njcn.web.utils.PoiUtil;
 import io.swagger.annotations.Api;
@@ -28,6 +30,7 @@ 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;
@@ -118,58 +121,119 @@ 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() {
+     * @param queryParam
-        adPlanService.downloadTemplate();
+     */
-    }
-
     @OperateInfo(operateType = OperateType.DOWNLOAD)
-    @PostMapping("/export")
+    @PostMapping("/exportCNPlan")
-    @ApiOperation("导出检测计划")
+    @ApiOperation("二楼导出检测计划")
     @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
-    public void export(@RequestBody @Validated AdPlanParam.QueryParam queryParam) {
+    public void exportCNPlan(@RequestBody @Validated AdPlanParam.QueryParam queryParam) {
         String methodDescribe = getMethodDescribe("export");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
-        List<AdPlanExcel.ExportData> data = adPlanService.getExportData(queryParam);
+
-        ExcelUtil.exportExcel("检测计划导出数据.xlsx", AdPlanExcel.ExportData.class, data);
+        adPlanService.exportCNPlan(queryParam);
     }
 
+    /**
+     * 二楼检测计划导出模板
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
+    @PostMapping("/downloadCNPlanTemplate")
+    @ApiOperation("下载二楼检测计划导出模板")
+    public void downloadCNPlanTemplate() {
+        adPlanService.downloadCNPlanTemplate();
+    }
+
+    /**
+     * 二楼检测计划导入
+     */
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
-    @PostMapping(value = "/import")
+    @PostMapping(value = "/importCNPlan")
-    @ApiOperation("批量导入检测计划数据")
+    @ApiOperation("二楼导入检测计划数据")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "检测计划数据文件", required = true),
             @ApiImplicitParam(name = "pattern", value = "模式Id", required = true)
     })
-    public HttpResult<Object> importData(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, HttpServletResponse response) {
+    public HttpResult<String> importCNPlan(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, HttpServletResponse response) {
-        String methodDescribe = getMethodDescribe("importData");
+        String methodDescribe = getMethodDescribe("importCNPlan");
-        LogUtil.njcnDebug(log, "{}，上传文件为：{}, 模式Id为：{}", methodDescribe, file.getOriginalFilename(), patternId);
+        LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
+
+        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
+        if (!fileType) {
+            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
+        }
 
         ImportParams params = new ImportParams();
-        params.setHeadRows(2);
-        params.setNeedVerify(true);
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
+        params.setHeadRows(2);
+        params.setNeedVerify(true);
 
+        List<AdPlanExcel> planExcelList;
         try {
-            ExcelImportResult<AdPlanExcel.ImportData> adPlanExcelResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AdPlanExcel.ImportData.class, params);
+            ExcelImportResult<AdPlanExcel> excelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AdPlanExcel.class, params);
-            if (adPlanExcelResult.isVerifyFail()) {
+            if (excelImportResult.isVerifyFail()) {
                 // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
-                PoiUtil.exportFileByWorkbook(adPlanExcelResult.getFailWorkbook(), "非法检测计划数据.xlsx", response);
+                Workbook failWorkbook = excelImportResult.getFailWorkbook();
+                PoiUtil.exportFileByWorkbook(failWorkbook, "非法检测计划数据.xlsx", response);
+//                throw new BusinessException(DevResponseEnum.IMPORT_DATA_FORMAT_FAIL);
+                return null;
             } else {
-                List<AdPlanExcel.ImportData> adPlanExcelList = adPlanExcelResult.getList();
+                planExcelList = excelImportResult.getList();
-                if (ObjectUtil.isNotEmpty(adPlanExcelList)) {
-                    adPlanService.importData(patternId, adPlanExcelList);
-                }
             }
         } catch (Exception e) {
-            throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL, e.getMessage());
+            throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL);
+        }
+        if (ObjectUtil.isNotEmpty(planExcelList)) {
+            adPlanService.importCNPlan(planExcelList, patternId);
         }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+//
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
+//    @PostMapping(value = "/import")
+//    @ApiOperation("批量导入检测计划数据")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "file", value = "检测计划数据文件", required = true),
+//            @ApiImplicitParam(name = "pattern", value = "模式Id", required = true)
+//    })
+//    public HttpResult<String> importData(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, HttpServletResponse response) {
+//        String methodDescribe = getMethodDescribe("importData");
+//        LogUtil.njcnDebug(log, "{}，上传文件为：{}, 模式Id为：{}", methodDescribe, file.getOriginalFilename(), patternId);
+//
+//        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
+//        if (!fileType) {
+//            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
+//        }
+//        ImportParams params = new ImportParams();
+//        params.setHeadRows(2);
+//        params.setNeedVerify(true);
+//        params.setStartSheetIndex(0);
+//        params.setSheetNum(1);
+//
+//        List<AdPlanExcel.ImportData> adPlanExcelList = null;
+//        try {
+//            ExcelImportResult<AdPlanExcel.ImportData> adPlanExcelResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AdPlanExcel.ImportData.class, params);
+//            if (adPlanExcelResult.isVerifyFail()) {
+//                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
+//                PoiUtil.exportFileByWorkbook(adPlanExcelResult.getFailWorkbook(), "非法检测计划数据.xlsx", response);
+//                return null;
+//            } else {
+//                adPlanExcelList = adPlanExcelResult.getList();
+//            }
+//        } catch (Exception e) {
+//            throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL, e.getMessage());
+//        }
+//        if (ObjectUtil.isNotEmpty(adPlanExcelList)) {
+//            adPlanService.importData(patternId, adPlanExcelList);
+//        }
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+//    }
+
 //    @OperateInfo
 //    @GetMapping("/getPieData")
 //    @ApiOperation("获取饼状图数据")

detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.device.pojo.vo.CNDevExcel;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -21,164 +22,42 @@ import java.util.List;
  */
 @Data
 public class AdPlanExcel {
-    @Excel(name = "名称", width = 40, needMerge = true, orderNum = "0")
+    @Excel(name = "名称*", width = 40, needMerge = true, orderNum = "0")
     @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
     private String name;
 
-    @Excel(name = "检测源", width = 40, needMerge = true, orderNum = "1")
+    @Excel(name = "检测源*", width = 40, needMerge = true, orderNum = "1")
     @NotBlank(message = DevValidMessage.SOURC_NOT_BLANK)
     private String source;
 
-    @Excel(name = "数据源", width = 20, needMerge = true, orderNum = "2")
+    @Excel(name = "数据源*", width = 20, needMerge = true, orderNum = "2")
     @NotBlank(message = DevValidMessage.DATASOURCE_NOT_BLANK)
     private String datasourceId;
 
-    @Excel(name = "脚本", width = 50, needMerge = true, orderNum = "3")
+    @Excel(name = "脚本*", width = 50, needMerge = true, orderNum = "3")
     @NotBlank(message = DevValidMessage.SCRIPT_NOT_BLANK)
     private String scriptId;
 
-    @Excel(name = "误差体系", width = 30, needMerge = true, orderNum = "4")
+    @Excel(name = "误差体系*", width = 30, needMerge = true, orderNum = "4")
     @NotBlank(message = DevValidMessage.ERRORSYS_NOT_BLANK)
     private String errorSysId;
 
+    @Excel(name = "是否做守时检测*", width = 15, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "5")
+    @NotNull(message = DevValidMessage.TIMECHECK_NOT_NULL)
+    private Integer timeCheck;
 
-    @Data
+    @Excel(name = "检测状态*", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "6")
-    @EqualsAndHashCode(callSuper = true)
+    @NotNull(message = DevValidMessage.TEST_STATE_NOT_NULL)
-    public static class ExportData extends AdPlanExcel {
+    private Integer testState;
-//        @Excel(name = "模式", width = 20, needMerge = true, orderNum = "1")
-//        @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-//        private String pattern;
 
-//        @Excel(name = "父计划id", width = 25, needMerge = true, orderNum = "3")
+    @Excel(name = "报告生成状态*", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "7")
-//        private String fatherPlanId;
+    @NotNull(message = DevValidMessage.REPORT_STATE_NOT_NULL)
+    private Integer reportState;
 
-        @Excel(name = "是否做守时检测（否\\是）", width = 15, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "5")
+    @Excel(name = "检测结果*", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "8")
-        private Integer timeCheck;
+    @NotNull(message = DevValidMessage.CHECK_RESULT_STATE_NOT_NULL)
+    private Integer result;
 
-        @Excel(name = "检测状态（未检\\检测中\\检测完成）", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "6")
+    @ExcelCollection(name = "绑定的设备", orderNum = "9")
-        private Integer testState;
+    private List<CNDevExcel> devices;
-
-        @Excel(name = "报告生成状态（未生成\\部分生成\\全部生成）", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "7")
-        private Integer reportState;
-
-        @Excel(name = "检测结果（不符合\\符合\\未检）", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "8")
-        private Integer result;
-
-//        @Excel(name = "数据表后缀", width = 20, needMerge = true, orderNum = "11")
-//        private Integer code;
-
-        @ExcelCollection(name = "绑定的设备", orderNum = "9")
-        private List<BoundExportData> devices;
-    }
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ImportData extends AdPlanExcel {
-        @Excel(name = "是否做守时检测（否\\是）", width = 15, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "5")
-        @NotBlank(message = DevValidMessage.TIMECHECK_NOT_BLANK)
-        private String timeCheck;
-
-        @Excel(name = "检测状态（未检\\检测中\\检测完成）", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "6")
-        @NotBlank(message = DevValidMessage.TEST_STATE_NOT_NULL)
-        private String testState;
-
-        @Excel(name = "报告生成状态（未生成\\部分生成\\全部生成）", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "7")
-        @NotBlank(message = DevValidMessage.REPORT_STATE_NOT_NULL)
-        private String reportState;
-
-        @Excel(name = "检测结果（不符合\\符合\\未检）", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "8")
-        @NotBlank(message = DevValidMessage.CHECK_RESULT_STATE_NOT_NULL)
-        private String result;
-
-        @ExcelCollection(name = "绑定的设备", orderNum = "9")
-        private List<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;
-    }
 }

detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java

@@ -57,26 +57,23 @@ public interface IAdPlanService extends IService<AdPlan> {
     List<Map<String, Object>> listByPattern(String pattern);
 
     /**
-     * 下载检测计划模板
+     * 二楼下载检测计划模板
      */
-    void downloadTemplate();
+    void downloadCNPlanTemplate();
 
     /**
-     * 获取检测计划导出数据
+     * 二楼导出检测计划数据
      *
      * @param queryParam 查询参数
-     * @return 检测计划导出数据
      */
-    List<AdPlanExcel.ExportData> getExportData(AdPlanParam.QueryParam queryParam);
+    void exportCNPlan(AdPlanParam.QueryParam queryParam);
 
     /**
-     * 导入检测计划
+     * 二楼导入检测计划
-     * @param patternId 模式Id
+     * @param planExcelList
-     * @param adPlanExcelList 检测计划Excel列表
+     * @param patternId
-     * @return 导入成功则返回true，否则返回false
      */
-    void importData(String patternId, List<AdPlanExcel.ImportData> adPlanExcelList);
+    void importCNPlan(List<AdPlanExcel> planExcelList, String patternId);
-
 
     /**
      * 可视化

detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.gather.plan.service.impl;
 
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.CharsetUtil;
@@ -13,9 +14,11 @@ 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.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.poi.PullDown;
 import com.njcn.gather.device.pojo.enums.*;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.vo.CNDevExcel;
 import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.err.service.IPqErrSysService;
 import com.njcn.gather.plan.mapper.AdPlanMapper;
@@ -36,9 +39,14 @@ import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.storage.service.TableGenService;
 import com.njcn.gather.system.config.pojo.po.SysTestConfig;
 import com.njcn.gather.system.config.service.ISysTestConfigService;
+import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
+import com.njcn.gather.system.dictionary.pojo.po.DictType;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.gather.system.dictionary.service.IDictTreeService;
+import com.njcn.gather.system.dictionary.service.IDictTypeService;
+import com.njcn.gather.type.pojo.po.DevType;
+import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.ExcelUtil;
 import com.njcn.web.utils.HttpServletUtil;
@@ -47,9 +55,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xddf.usermodel.PresetColor;
-import org.apache.poi.xddf.usermodel.XDDFColor;
-import org.apache.poi.xddf.usermodel.XDDFSolidFillProperties;
 import org.apache.poi.xddf.usermodel.chart.*;
 import org.apache.poi.xssf.usermodel.*;
 import org.openxmlformats.schemas.drawingml.x2006.chart.CTBarSer;
@@ -83,6 +88,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
     private final IDictTreeService dictTreeService;
     private final TableGenService tableGenService;
     private final ISysTestConfigService sysTestConfigService;
+    private final IDevTypeService devTypeService;
+    private final IDictTypeService dictTypeService;
 
     @Override
     public Page<AdPlanVO> listAdPlan(AdPlanParam.QueryParam queryParam) {
@@ -221,15 +228,15 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
     }
 
     @Override
-    public void downloadTemplate() {
+    public void downloadCNPlanTemplate() {
-        ExcelUtil.exportExcel("检测计划模板.xlsx", AdPlanExcel.ImportData.class, Collections.emptyList());
+        ExcelUtil.exportExcelPullDown(new ExportParams(), "检测计划模板.xlsx", 2, this.getPullDownList(), AdPlanExcel.class, Collections.emptyList());
     }
 
     @Override
-    public List<AdPlanExcel.ExportData> getExportData(AdPlanParam.QueryParam queryParam) {
+    public void exportCNPlan(AdPlanParam.QueryParam queryParam) {
         List<AdPlan> planList = this.list(this.getQueryWrapper(queryParam));
         this.visualize(planList);
-        List<AdPlanExcel.ExportData> planExcelList = BeanUtil.copyToList(planList, AdPlanExcel.ExportData.class);
+        List<AdPlanExcel> planExcelList = BeanUtil.copyToList(planList, AdPlanExcel.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)));
@@ -237,25 +244,34 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             PqDevParam.QueryParam queryParam1 = new PqDevParam.QueryParam();
             queryParam1.setPlanId(planList.get(i).getId());
             List<PqDev> pqDevs = pqDevService.listByPlanId(queryParam1);
-            pqDevService.visualize(pqDevs);
+            pqDevService.visualizeCNDev(pqDevs);
-            planExcelList.get(i).setDevices(BeanUtil.copyToList(pqDevs, AdPlanExcel.BoundExportData.class));
+            List<CNDevExcel> deviceExportData = BeanUtil.copyToList(pqDevs, CNDevExcel.class);
+            planExcelList.get(i).setDevices(deviceExportData);
         }
-        return planExcelList;
+        ExcelUtil.exportExcelPullDown(new ExportParams(), "检测计划导出数据.xlsx", 2, this.getPullDownList(), AdPlanExcel.class, planExcelList);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void importData(String patternId, List<AdPlanExcel.ImportData> adPlanExcelList) {
+    public void importCNPlan(List<AdPlanExcel> planExcelList, String patternId) {
-        List<AdPlan> adPlans = BeanUtil.copyToList(adPlanExcelList, AdPlan.class);
+        List<AdPlan> adPlans = BeanUtil.copyToList(planExcelList, AdPlan.class);
-        List<PqDev> devList = new ArrayList<>();
 
         String patternCode = dictDataService.getDictDataById(patternId).getCode();
         for (int i = 0; i < adPlans.size(); i++) {
+            AdPlanExcel adPlanExcel = planExcelList.get(i);
+            AdPlanParam adPlanParam = new AdPlanParam();
+            adPlanParam.setName(adPlanExcel.getName());
+            adPlanParam.setPattern(patternId);
+            checkRepeat(adPlanParam, false);
 
-            AdPlanExcel.ImportData adPlanExcel = adPlanExcelList.get(i);
             String planId = UUID.randomUUID().toString().replaceAll("-", "");
             adPlans.get(i).setId(planId);
             adPlans.get(i).setPattern(patternId);
+            Integer code = this.generateCode();
+            adPlans.get(i).setCode(code);
+
+            tableGenService.deleteTable(Arrays.asList(code.toString()));
+            tableGenService.genAdNonHarmonicTable(code.toString());
 
             String source = adPlanExcel.getSource();
             String[] sourceNames = source.split(StrUtil.COMMA);
@@ -274,22 +290,12 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             List<String> sourceIds = pqSourceService.listPqSourceIdByName(sourceNames);
             adPlanSourceService.addAdPlanSource(planId, sourceIds);
 
-            List<PqDev> pqDevs = adPlanExcel.getDevices().stream()
+            List<CNDevExcel> cnDevExcelList = adPlanExcel.getDevices();
-                    .map(planExcel -> {
+            pqDevService.importCNDev(cnDevExcelList, patternId, planId);
-                        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);
-
-        pqDevService.reverseVisualize(devList);
-        pqDevService.saveBatch(devList);
     }
 
     /**
@@ -696,4 +702,106 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             log.error(">>> 导出数据异常：{}", e.getMessage());
         }
     }
+
+    private List<PullDown> getPullDownList() {
+        List<PullDown> pullDowns = new ArrayList<>();
+
+        PullDown pullDown = null;
+        // 检测脚本
+        List<Map<String, Object>> maps1 = pqScriptService.listAllPqScript(null);
+        List<String> scriptNameList = maps1.stream().map(m -> (String) m.get("name")).collect(Collectors.toList());
+        pullDown = new PullDown();
+        pullDown.setFirstCol(3);
+        pullDown.setLastCol(3);
+        pullDown.setStrings(scriptNameList);
+        pullDowns.add(pullDown);
+        // 误差体系
+        List<Map<String, Object>> maps2 = pqErrSysService.listAllPqErrSys();
+        List<String> errSysNameList = maps2.stream().map(m -> (String) m.get("name")).collect(Collectors.toList());
+        pullDown = new PullDown();
+        pullDown.setFirstCol(4);
+        pullDown.setLastCol(4);
+        pullDown.setStrings(errSysNameList);
+        pullDowns.add(pullDown);
+
+        // 是否做守时检测
+        pullDown = new PullDown();
+        pullDown.setFirstCol(5);
+        pullDown.setLastCol(5);
+        pullDown.setStrings(Arrays.asList("是", "否"));
+        pullDowns.add(pullDown);
+
+        // 检测状态
+        pullDown = new PullDown();
+        pullDown.setFirstCol(6);
+        pullDown.setLastCol(6);
+        pullDown.setStrings(Arrays.asList(CheckStateEnum.UNCHECKED.getMsg(), CheckStateEnum.CHECKING.getMsg(), CheckStateEnum.CHECKED.getMsg()));
+        pullDowns.add(pullDown);
+
+        // 报告生成状态
+        pullDown = new PullDown();
+        pullDown.setFirstCol(7);
+        pullDown.setLastCol(7);
+        pullDown.setStrings(Arrays.asList(PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getMsg(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getMsg(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getMsg()));
+        pullDowns.add(pullDown);
+
+        //检测结果
+        pullDown = new PullDown();
+        pullDown.setFirstCol(8);
+        pullDown.setLastCol(8);
+        pullDown.setStrings(Arrays.asList(CheckResultEnum.UNCHECKED.getMsg(), CheckResultEnum.ACCORD.getMsg(), CheckResultEnum.UNCHECKED.getMsg()));
+        pullDowns.add(pullDown);
+
+        // 预投计划
+        List<DictData> dictDataList = null;
+        pullDown = new PullDown();
+
+        DictType dictType = dictTypeService.getByCode("Preinvestment_Plan");
+        if (ObjectUtil.isNotNull(dictType)) {
+            dictDataList = dictDataService.getDictDataByTypeId(dictType.getId());
+
+            pullDown = new PullDown();
+            pullDown.setFirstCol(9);
+            pullDown.setLastCol(9);
+            pullDown.setStrings(dictDataList.stream().map(DictData::getName).collect(Collectors.toList()));
+            pullDowns.add(pullDown);
+        }
+
+        // 设备类型
+        pullDown = new PullDown();
+        pullDown.setFirstCol(11);
+        pullDown.setLastCol(11);
+        pullDown.setStrings(devTypeService.listAll().stream().map(DevType::getName).collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
+        // 通讯协议
+        dictType = dictTypeService.getByCode("Protocol");
+        if (ObjectUtil.isNotNull(dictType)) {
+            dictDataList = dictDataService.getDictDataByTypeId(dictType.getId());
+
+            pullDown = new PullDown();
+            pullDown.setFirstCol(12);
+            pullDown.setLastCol(12);
+            pullDown.setStrings(dictDataList.stream().map(DictData::getName).collect(Collectors.toList()));
+            pullDowns.add(pullDown);
+        }
+
+        // 是否为加密版本
+        pullDown = new PullDown();
+        pullDown.setFirstCol(13);
+        pullDown.setLastCol(13);
+        pullDown.setStrings(Arrays.asList("是", "否"));
+        pullDowns.add(pullDown);
+
+
+        // 是否支持系数校准
+        pullDown = new PullDown();
+        pullDown.setFirstCol(16);
+        pullDown.setLastCol(16);
+        pullDown.setStrings(Arrays.asList("是", "否"));
+        pullDowns.add(pullDown);
+
+
+        return pullDowns;
+    }
 }

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java

@@ -98,7 +98,7 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
 
     @Override
     public List<Map<String, Object>> listAllPqScript(String patternId) {
-        List<PqScript> pqScriptList = this.lambdaQuery().eq(PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list();
+        List<PqScript> pqScriptList = this.lambdaQuery().eq(StrUtil.isNotBlank(patternId), PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list();
         List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
             Map<String, Object> map = new HashMap<>();
             map.put("id", pqScript.getId());

system/src/main/java/com/njcn/gather/system/log/controller/SysLogController.java

@@ -49,7 +49,7 @@ public class SysLogController extends BaseController {
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DOWNLOAD)
     @PostMapping("/export")
-    @ApiOperation("导出csv文件")
+    @ApiOperation("日志导出为csv文件")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public void export(@RequestBody @Validated SysLogParam.QueryParam param) {
         String methodDescribe = getMethodDescribe("export");

system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java

@@ -61,7 +61,10 @@ public class SysLogAuditServiceImpl extends ServiceImpl<SysLogAuditMapper, SysLo
         String[] keys = {"operateType", "ip", "result", "remark", "level", "warn", "createBy", "createTime"};
         QueryWrapper<SysLogAudit> queryWrapper = new QueryWrapper<>();
         if (ObjectUtil.isNotNull(param)) {
-            queryWrapper.eq(StrUtil.isNotBlank(param.getOperateType()), "sys_log_audit.Operate_Type", param.getOperateType()).eq(StrUtil.isNotBlank(param.getCreateBy()), "sys_log_audit.Create_By", param.getCreateBy()).between(StrUtil.isAllNotBlank(param.getSearchBeginTime(), param.getSearchEndTime()), "sys_log_audit.Create_Time", param.getSearchBeginTime(), param.getSearchEndTime());
+            queryWrapper
+                    .eq(StrUtil.isNotBlank(param.getOperateType()), "sys_log_audit.Operate_Type", param.getOperateType())
+                    .eq(StrUtil.isNotBlank(param.getCreateBy()), "sys_log_audit.Create_By", param.getCreateBy())
+                    .between(StrUtil.isAllNotBlank(param.getSearchBeginTime(), param.getSearchEndTime()), "sys_log_audit.Create_Time", param.getSearchBeginTime(), param.getSearchEndTime());
         }
         queryWrapper.orderByDesc("sys_log_audit.Create_Time");
         List<SysLogAudit> list = this.list(queryWrapper);
@@ -73,8 +76,7 @@ public class SysLogAuditServiceImpl extends ServiceImpl<SysLogAuditMapper, SysLo
             map.put("remark", item.getRemark());
             map.put("level", LogLevelEnum.getEnum(item.getLevel()).getMsg());
             map.put("warn", item.getWarn() == 0 ? "未告警" : "告警");
-            SysUser user = sysUserService.getById(item.getCreateBy());
+            map.put("createBy", item.getCreateBy());
-            map.put("createBy", ObjectUtil.isNull(user) ? "" : user.getName());
             //将 createTime 转换为 yyyy-MM-dd HH:mm:ss 格式
             map.put("createTime", item.getCreateTime() == null ? "" : item.getCreateTime().toString().replace("T", " "));
             return map;