bug修改

pqs-auth/src/main/java/com/njcn/auth/config/WebSecurityConfig.java

@@ -37,7 +37,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         http
                 .authorizeRequests()
-                .antMatchers("/oauth/getPublicKey","/oauth/logout","/auth/getImgCode","/judgeToken/guangZhou","/judgeToken/heBei","/oauth/autoLogin").permitAll()
+                .antMatchers("/oauth/getPublicKey","/oauth/logout","/auth/getImgCode","/judgeToken/guangZhou","/judgeToken/heBei","/oauth/autoLogin","/judgeToken/productionManagementCheck").permitAll()
                 // @link https://gitee.com/xiaoym/knife4j/issues/I1Q5X6 (接口文档knife4j需要放行的规则)
                 .antMatchers("/webjars/**","/doc.html","/swagger-resources/**","/v2/api-docs").permitAll()
                 .anyRequest().authenticated()

pqs-auth/src/main/java/com/njcn/auth/controller/JudgeThirdToken.java

@@ -76,6 +76,93 @@ public class JudgeThirdToken extends BaseController {
         }
     }
 
+    /**
+     * 生产管理系统token校验
+     * @param token
+     * @return
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/productionManagementCheck")
+    @ApiOperation("生产管理系统token校验")
+    @ApiImplicitParam(name = "token", required = true)
+    public HttpResult<Object> productionManagementCheck (String token) {
+        RestTemplate restTemplate = new RestTemplate();
+        String methodDescribe = getMethodDescribe("productionManagementCheck");
+        LogUtil.njcnDebug(log, "{}，token：{}", methodDescribe, token);
+
+        // 请求地址
+        String url = "http://10.120.192.72:80/head-auth-service/oauth/check_token";
+
+        // 请求头设置,x-www-form-urlencoded格式的数据
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+        //提交参数设置
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("token", token);
+
+        // 组装请求体
+        HttpEntity<MultiValueMap<String, String>> request =
+                new HttpEntity<>(map, headers);
+
+        /**
+         * 成功
+         * {
+         *     "sub": "40a21660947c44a6a40030109214f313",
+         *     "ver": "JWT1.0",
+         *     "user_name": "web",
+         *     "pri": [
+         *         "MASTER_ADMIN",
+         *         "znxs",
+         *         "root",
+         *         "ADMIN"
+         *     ],
+         *     "last_login": 1744875032,
+         *     "scope": [
+         *         "all"
+         *     ],
+         *     "iss": "nrec",
+         *     "active": true,
+         *     "exp": 1744961431,
+         *     "jti": "32add77a-43f0-4d67-82a2-8376fed6fc3d",
+         *     "client_id": "frontend"
+         * }
+         *
+         * 失败
+         *
+         * {
+         *     "msg": "Cannot convert access token to JSON",
+         *     "path": "/auth-service/oauth/check_token",
+         *     "code": "2500",
+         *     "succ": false,
+         *     "error": "Internal Server Error",
+         *     "timestamp": 1744879150627
+         * }
+         */
+
+        // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+        try {
+            String result = restTemplate.postForObject(url, request, String.class);
+            JSONObject resultJson = new JSONObject(result);
+            if (resultJson.containsKey("code")) {
+                //失败
+                return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+            } else {
+                return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            }
+        }catch (Exception e){
+            log.info(e.toString());
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+
+
+
+    }
+
+
+
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @PostMapping("/heBei")

pqs-common/common-poi/src/main/java/com/njcn/poi/excel/ExcelUtil.java

@@ -400,41 +400,44 @@ public class ExcelUtil {
      * @param pullDowns
      */
     private static void setTopLevel(Workbook workbook, List<PullDown> pullDowns) {
-        int num = 0;
-        for (PullDown pullDown : pullDowns) {
-            if (!pullDown.getIsText()) {
-                int sum = pullDown.getStrings().stream().mapToInt(String::length).sum();
-                if (sum == 0) {
-                    continue;
-                }
-                if (sum > 255) {
-                    // 创建隐藏sheet
-                    String hiddenSheetName = "hiddenSheetA";
-                    if (num == 0) {
-                        workbook.createSheet(hiddenSheetName);
-                    }
-                    //false展示隐藏sheet ,true不展示隐藏sheet
-                    workbook.setSheetHidden(workbook.getSheetIndex(workbook.getSheet(hiddenSheetName)), true);
-                    Sheet sheet = workbook.getSheet(hiddenSheetName);
-                    if (num == 0) {
-                        //sheet.getLastRowNum无法区分 有一行和没有 所以这里先建一行
-                        sheet.createRow(0);
-                    }
-                    Row row; //创建数据行
-                    sheet.setColumnWidth(num, 4000); //设置每列的列宽
-                    for (int j = 0; j < pullDown.getStrings().size(); j++) {
-                        if (sheet.getLastRowNum() < j) {
-                            row = sheet.createRow(j); //创建数据行
-                        } else {
-                            row = sheet.getRow(j);
-                        }
-                        //设置对应单元格的值
-                        row.createCell(num).setCellValue(pullDown.getStrings().get(j));
-                    }
-                    num++;
-                }
-            }
-        }
+       if(CollUtil.isNotEmpty(pullDowns)){
+           int num = 0;
+           for (PullDown pullDown : pullDowns) {
+               if (!pullDown.getIsText()) {
+                   int sum = pullDown.getStrings().stream().mapToInt(String::length).sum();
+                   if (sum == 0) {
+                       continue;
+                   }
+                   if (sum > 255) {
+                       // 创建隐藏sheet
+                       String hiddenSheetName = "hiddenSheetA";
+                       if (num == 0) {
+                           workbook.createSheet(hiddenSheetName);
+                       }
+                       //false展示隐藏sheet ,true不展示隐藏sheet
+                       workbook.setSheetHidden(workbook.getSheetIndex(workbook.getSheet(hiddenSheetName)), true);
+                       Sheet sheet = workbook.getSheet(hiddenSheetName);
+                       if (num == 0) {
+                           //sheet.getLastRowNum无法区分 有一行和没有 所以这里先建一行
+                           sheet.createRow(0);
+                       }
+                       Row row; //创建数据行
+                       sheet.setColumnWidth(num, 4000); //设置每列的列宽
+                       for (int j = 0; j < pullDown.getStrings().size(); j++) {
+                           if (sheet.getLastRowNum() < j) {
+                               row = sheet.createRow(j); //创建数据行
+                           } else {
+                               row = sheet.getRow(j);
+                           }
+                           //设置对应单元格的值
+                           row.createCell(num).setCellValue(pullDown.getStrings().get(j));
+                       }
+                       num++;
+                   }
+               }
+           }
+       }
+
     }
 
     /**

pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java

@@ -78,7 +78,9 @@ public class Knife4jSwaggerConfig {
                 "com.njcn.cloud.controller",
                 "com.njcn.zlevent.controller",
                 "com.njcn.prepare",
-                "com.njcn.supervision.controller"
+                "com.njcn.supervision.controller",
+                "com.njcn.algorithm",
+                "com.njcn.dataProcess"
                 )
                 .collect(Collectors.toList());
         List<GrantType> grantTypes = new ArrayList<>();

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java

@@ -24,6 +24,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -148,10 +150,8 @@ public class DataQualityStatServiceImpl implements DataQualityStatService {
             vo.setOrgName(deptDTOMap.get(vo.getOrgNo()).getName());
             if(vo.getMeasurementCount()!=0&&vo.getMeasurementCount()!=null){
                 vo.setEffectiveAccessRate(
-                        Double.parseDouble(
-                                df.format((vo.getEffectiveAccessMeasurementCount() * 1.0)
-                                        / (vo.getMeasurementCount() * 1.0))
-                        ) * 100);
+                       BigDecimal.valueOf((vo.getEffectiveAccessMeasurementCount() * 1.0/ (vo.getMeasurementCount() * 1.0))*100).setScale(2, RoundingMode.HALF_UP).doubleValue()
+                       );
             }else{
                 vo.setEffectiveAccessRate(0.0);
             }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java

@@ -1838,11 +1838,11 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
 
     private String dealVoltageLevel(String voltage) {
         float scale = Float.parseFloat(voltage.substring(0, voltage.indexOf("kV")));
-        if (scale < 500) {
+        //if (scale < 500) {
             return "交流" + voltage;
-        } else {
-            return "直流" + voltage;
-        }
+        //} else {
+           // return "直流" + voltage;
+        //}
 
     }
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -1802,7 +1802,7 @@
         line.Name name,
         pq_line_detail.Num lineNo,
         s1.Name voltageLevel,
-        pq_line_detail.PT_Phase_Type ptType,
+        pq_line_detail.PT_Type ptType,
         pq_line_detail.Run_Flag status
         FROM
         pq_line_detail

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/NodeMapper.xml

@@ -17,8 +17,8 @@
         pq_device_process.process_no processNo,
         pq_device.Dev_Key devKey
         FROM
-        pq_node
-        LEFT JOIN pq_device ON pq_node.Id = pq_device.Node_Id
+        pq_device
+        LEFT JOIN pq_node ON pq_node.Id = pq_device.Node_Id
         LEFT JOIN pq_line on pq_device.id = pq_line.id
         LEFT JOIN pq_device_process on pq_device_process.id = pq_device.id
         LEFT JOIN sys_dict_data s1 ON pq_device.Dev_Type = s1.id

pqs-gateway/src/main/resources/bootstrap.yml

@@ -215,7 +215,8 @@ whitelist:
     - /pqs-auth/oauth/getPublicKey
     - /pqs-auth/judgeToken/heBei
     - /pqs-auth/judgeToken/guangZhou
-
+    - /pqs-auth/judgeToken/productionManagementCheck
+    -
     - /webjars/**
     - /doc.html
     - /swagger-resources/**

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/FailedAttemptJob.java

@@ -0,0 +1,79 @@
+package com.njcn.harmonic.service.upload.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.advance.pojo.dto.waveAnalysis.AnalyWave;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.harmonic.api.UploadGwDataFeignClient;
+import com.njcn.harmonic.pojo.param.UploadParam;
+import com.njcn.harmonic.pojo.po.upload.RUploadDataLog;
+import com.njcn.harmonic.service.upload.IPointStatisticalDataService;
+import com.njcn.harmonic.service.upload.IRUploadDataLogService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2025-04-21
+ * @Description: 主网测点失败尝试
+ */
+@Component
+@EnableScheduling
+@RequiredArgsConstructor
+public class FailedAttemptJob {
+
+    private static final Logger logger = LoggerFactory.getLogger(FailedAttemptJob.class);
+
+    private final IRUploadDataLogService irUploadDataLogService;
+
+    private final IPointStatisticalDataService iPointStatisticalDataService;
+
+
+    // 每天早上 8 点执行
+    @Scheduled(cron = "0 05 8 * * ?")
+    public void executeAtEight() {
+        commFunction();
+    }
+
+    // 每天早上 9 点执行
+    @Scheduled(cron = "0 10 8 * * ?")
+    public void executeAtNine() {
+        commFunction();
+    }
+
+    // 每天早上 10 点执行
+    @Scheduled(cron = "0 15 8 * * ?")
+    public void executeAtTen() {
+        commFunction();
+    }
+
+
+
+    private void commFunction(){
+        System.out.println("早上定时任务执行(主网测点失败尝试)：" + LocalDateTime.now());
+        LambdaQueryWrapper<RUploadDataLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(RUploadDataLog::getStatisticDate, LocalDate.now().minusDays(1)).eq(RUploadDataLog::getBigType,0).eq(RUploadDataLog::getSmallType,1);
+        RUploadDataLog rUploadDataLog = irUploadDataLogService.getOne(lambdaQueryWrapper);
+        if(Objects.nonNull(rUploadDataLog)){
+            if(rUploadDataLog.getResult().equals(0)){
+                //失败了需要重试
+                UploadParam param = new UploadParam();
+                param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+                iPointStatisticalDataService.uploadPointStatisticalData(param);
+            }
+        }
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadDataLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.upload.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,7 +28,7 @@ public class RUploadDataLogServiceImpl extends MppServiceImpl<RUploadDataLogMapp
     @Override
     public Page<RUploadDataLog> getList(BaseParam baseParam) {
         LambdaQueryWrapper<RUploadDataLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.between(RUploadDataLog::getCreateTime,baseParam.getSearchBeginTime(),baseParam.getSearchEndTime())
+        lambdaQueryWrapper.between(RUploadDataLog::getStatisticDate, DateUtil.beginOfDay(DateUtil.parse(baseParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime())))
                 .orderByDesc(RUploadDataLog::getStatisticDate);
         if(StrUtil.isNotBlank(baseParam.getSearchValue())){
             lambdaQueryWrapper.eq(RUploadDataLog::getSmallType,Integer.parseInt(baseParam.getSearchValue()));

pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml

@@ -1,11 +0,0 @@
-<?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.harmonic.mapper.upload.PmsTemProcessApprovalMapper">
-
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    obj_id, temp_user_dossier_id, approval_join_user_id, approval_join_user_name, approval_advise, 
-    create_time, update_time, legacy_problem, rectification_status, rectification_time, 
-    rectification_user_id, rectification_user_name, rectification_measure
-  </sql>
-</mapper>

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java

@@ -25,7 +25,9 @@ public enum SupervisionResponseEnum {
     NO_USER_REPORT_UPDATE("A00550","常态化干扰源用户管理信息更新失败，不存在该条信息"),
     NO_DEPT_POWER("A00550","不能操作非自己部门创建的任务"),
     IMPORT_DEV_ERROR("A00550","导入终端检测失败"),
+    IMPORT_PLAN_ERROR("A00550","导入技术监督计划失败"),
     IMPORT_DEV_DATA_ERROR("A00550","终端数据为空"),
+    IMPORT_PLAN_DATA_ERROR("A00550","技术监督计划数据为空"),
     DELETE_TO_BE_SUBMITTED("A00550","流程删除失败，只有待提交信息可删除!"),
     EXISTENCE_OR_NOT("A00550","信息查询为空,请检查信息是否存在!"),
     NAME_EXISTS("A00550","名称重复"),

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionPlanExcel.java

@@ -0,0 +1,87 @@
+package com.njcn.supervision.pojo.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/27 11:21
+ */
+@Data
+public class SupervisionPlanExcel {
+
+    /**
+     * 负责单位ID
+     */
+    @Excel(name = "*计划负责单位", width = 30)
+    private String deptId;
+
+    /**
+     * 计划名称
+     */
+    @Excel(name = "*计划名称", width = 30)
+    private String planName;
+
+    /**
+     * 监督类型
+     */
+    @Excel(name = "*监督类型", width = 30)
+    private String supvType;
+
+    /**
+     * 监督对象名称
+     */
+    @Excel(name = "*监督对象名称", width = 30)
+    private String supvObjectName;
+
+    /**
+     * 计划开始时间
+     */
+    @Excel(name = "*计划开始时间(yyyy/MM/dd)", width = 30,exportFormat = "yyyy/MM/dd")
+    private Date planStartTime;
+
+    /**
+     * 计划结束时间
+     */
+    @Excel(name = "*计划结束时间(yyyy/MM/dd)", width = 30,exportFormat = "yyyy/MM/dd")
+    private Date planEndTime;
+
+    /**
+     * 0 关联系统内变电站；1 用户手动输入变电站
+     */
+    @Excel(name = "*是否系统电站", width = 30, replace = {"是_0", "否_1",})
+    private String customSubstationFlag ;
+
+    /**
+     * 变电站台账ID或者用户手动输入的变电站名称
+     */
+    @Excel(name = "*关联电站一", width = 30)
+    private String substation;
+
+    /**
+     * 变电站台账ID或者用户手动输入的变电站名称
+     */
+    @Excel(name = "关联电站二", width = 30)
+    private String substation2;
+
+    /**
+     * 变电站台账ID或者用户手动输入的变电站名称
+     */
+    @Excel(name = "关联电站三", width = 30)
+    private String substation3;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class ExcelMsg extends SupervisionPlanExcel implements Serializable {
+
+        @Excel(name = "错误信息描述", width = 30)
+        private String msg;
+
+    }
+
+}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java

@@ -15,13 +15,17 @@ import com.njcn.supervision.service.survey.ISurveyPlanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import com.njcn.web.controller.BaseController;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -108,5 +112,25 @@ public class SurveyPlanController extends BaseController {
         Boolean b = surveyPlanService.deleteSurveyPlan(supervisionId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping(value = "/downloadPlanTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    @ApiOperation("下载技术监督计划模板")
+    public void downloadPlanTemplate() {
+        surveyPlanService.downloadPlanTemplate();
+    }
+
+
+    @PostMapping(value = "/importPlanData")
+    @ApiOperation("批量导入技术监督计划")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    public HttpResult<String> importPlanData(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
+        String methodDescribe = getMethodDescribe("importPlanData");
+        surveyPlanService.importPlanData(file, response);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+
 }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java

@@ -357,33 +357,6 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         List<PullDown> pullDowns = new ArrayList<>();
 
         PullDown pullDown;
-        pullDown = new PullDown();
-        pullDown.setFirstCol(0);
-        pullDown.setLastCol(0);
-        pullDown.setIsText(true);
-        pullDowns.add(pullDown);
-
-        pullDown = new PullDown();
-        pullDown.setFirstCol(10);
-        pullDown.setLastCol(10);
-        pullDown.setIsText(true);
-        pullDowns.add(pullDown);
-
-
-        pullDown = new PullDown();
-        pullDown.setFirstCol(11);
-        pullDown.setLastCol(11);
-        pullDown.setIsText(true);
-        pullDowns.add(pullDown);
-
-
-        pullDown = new PullDown();
-        pullDown.setFirstCol(20);
-        pullDown.setLastCol(20);
-        pullDown.setIsText(true);
-        pullDowns.add(pullDown);
-
-
         pullDown = new PullDown();
         pullDown.setFirstCol(1);
         pullDown.setLastCol(1);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyPlanService.java

@@ -6,7 +6,9 @@ import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.survey.SurveyPlanParam;
 import com.njcn.supervision.pojo.po.survey.SurveyPlan;
 import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -30,4 +32,8 @@ public interface ISurveyPlanService extends IBpmService<SurveyPlan> {
     SurveyPlanVO getVOById(String id);
 
     Boolean deleteSurveyPlan(List<String> supervisionId);
+
+    void downloadPlanTemplate();
+
+    void importPlanData(MultipartFile file, HttpServletResponse response);
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java

@@ -1,11 +1,17 @@
 package com.njcn.supervision.service.survey.impl;
 
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -20,13 +26,24 @@ import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.enums.common.DealStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
+import com.njcn.device.biz.pojo.dto.SubGetBase;
+import com.njcn.device.biz.pojo.param.SubstationParam;
+import com.njcn.device.pms.pojo.excel.PowerGenerationUserExcel;
+import com.njcn.device.pms.utils.PubUtil;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
+import com.njcn.poi.excel.ExcelUtil;
+import com.njcn.poi.excel.PullDown;
+import com.njcn.poi.util.PoiUtil;
 import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.enums.SupervisionKeyEnum;
 import com.njcn.supervision.enums.SupervisionResponseEnum;
 import com.njcn.supervision.mapper.survey.SurveyPlanMapper;
+import com.njcn.supervision.pojo.dto.SupervisionDevMainReportExcel;
+import com.njcn.supervision.pojo.dto.SupervisionPlanExcel;
 import com.njcn.supervision.pojo.param.survey.SurveyPlanParam;
+import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.survey.SurveyPlan;
 import com.njcn.supervision.pojo.po.survey.SurveyTest;
 import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO;
@@ -35,18 +52,24 @@ import com.njcn.supervision.service.survey.ISurveyPlanService;
 import com.njcn.supervision.service.survey.ISurveyTestService;
 import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -62,19 +85,16 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
 
     @Resource
     private BpmProcessFeignClient bpmProcessFeignClient;
-
     @Resource
     private DeptFeignClient deptFeignClient;
-
     @Resource
     private LineFeignClient lineFeignClient;
-
     @Resource
     private ISurveyTestService surveyTestService;
-
     @Resource
     private DicDataFeignClient dicDataFeignClient;
-
+    @Resource
+    private CommTerminalGeneralClient commterminalGeneralClient;
 
     @Override
     public Page<SurveyPlanVO> surveyPlanPage(SurveyPlanParam.SurveyPlanQueryParam surveyPlanQueryParam) {
@@ -125,12 +145,16 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
                         String[] subIds = substation.split(StrPool.COMMA);
 
                         for (String subId : subIds) {
-                            String name = lineFeignClient.getSubstationInfo(subId).getData().getName();
-                            subName = subName.concat(StrPool.COMMA).concat(name);
+                            PollutionSubstationDTO data = lineFeignClient.getSubstationInfo(subId).getData();
+                            if (ObjectUtil.isNotNull(data)) {
+                                String name = data.getName();
+                                subName = subName.concat(StrPool.COMMA).concat(name);
+                            }
+                        }
+                        if(StrUtil.isNotBlank(subName)){
+                            subName = subName.substring(1);
                         }
-                        subName = subName.substring(1);
                     }
-
                     record.setSubstation(subName);
                 } else {
                     record.setSubstationName(record.getSubstation());
@@ -348,4 +372,185 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
         return this.update(new LambdaUpdateWrapper<SurveyPlan>().set(SurveyPlan::getState, DataStateEnum.DELETED.getCode())
                 .in(SurveyPlan::getId, supervisionId));
     }
+
+    @Override
+    public void downloadPlanTemplate() {
+        ExportParams exportParams = new ExportParams("技术监督计划模板数据模板（带*字段均是必填,请严格按照模板标准填入数据）", "技术监督计划信息");
+        //所属供电公司
+        List<DeptDTO> depts = deptFeignClient.getDepSonDetailByDeptId(RequestUtil.getDeptIndex()).getData();
+        List<DictData> supType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPV_TYPE.getCode()).getData();
+        SubstationParam substationParam = new SubstationParam();
+        substationParam.setOrgIds(depts.stream().map(DeptDTO::getId).distinct().collect(Collectors.toList()));
+        List<SubGetBase> data = commterminalGeneralClient.tagOrIdGetSub(substationParam).getData();
+
+        List<PullDown> pullDowns = new ArrayList<>();
+
+        PullDown pullDown;
+        pullDown = new PullDown();
+        pullDown.setFirstCol(0);
+        pullDown.setLastCol(0);
+        pullDown.setStrings(depts.stream().map(DeptDTO::getName).distinct().collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
+        pullDown = new PullDown();
+        pullDown.setFirstCol(2);
+        pullDown.setLastCol(2);
+        pullDown.setStrings(supType.stream().map(DictData::getName).distinct().collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
+        pullDown = new PullDown();
+        pullDown.setFirstCol(6);
+        pullDown.setLastCol(6);
+        pullDown.setStrings(Stream.of("是", "否").collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
+        pullDown = new PullDown();
+        pullDown.setFirstCol(7);
+        pullDown.setLastCol(7);
+        pullDown.setStrings(data.stream().map(SubGetBase::getName).distinct().collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
+        pullDown = new PullDown();
+        pullDown.setFirstCol(8);
+        pullDown.setLastCol(8);
+        pullDown.setStrings(data.stream().map(SubGetBase::getName).distinct().collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
+        pullDown = new PullDown();
+        pullDown.setFirstCol(9);
+        pullDown.setLastCol(9);
+        pullDown.setStrings(data.stream().map(SubGetBase::getName).distinct().collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+        ExcelUtil.exportExcelPullDown(exportParams, "技术监督计划模板.xlsx", pullDowns, SupervisionPlanExcel.class, new ArrayList<>());
+    }
+
+    @Override
+    public void importPlanData(MultipartFile file, HttpServletResponse response) {
+        List<SupervisionPlanExcel.ExcelMsg> planMsgList = new ArrayList<>();
+        ImportParams params = new ImportParams();
+        //表头
+        params.setHeadRows(1);
+        //标题
+        params.setTitleRows(1);
+        params.setNeedVerify(true);
+        params.setStartSheetIndex(0);
+        params.setSheetNum(1);
+        List<SupervisionPlanExcel> planExcels;
+        try {
+            planExcels = ExcelImportUtil.importExcel(file.getInputStream(), SupervisionPlanExcel.class, params);
+            //如果存在非法数据，将不合格的数据导出
+            if (CollUtil.isEmpty(planExcels)) {
+                throw new BusinessException(SupervisionResponseEnum.IMPORT_PLAN_DATA_ERROR);
+            }
+            //各地市
+            List<DeptDTO> deptS = deptFeignClient.getDepSonDetailByDeptId(RequestUtil.getDeptIndex()).getData();
+            List<DictData> supType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPV_TYPE.getCode()).getData();
+
+            SubstationParam substationParam = new SubstationParam();
+            substationParam.setOrgIds(deptS.stream().map(DeptDTO::getId).distinct().collect(Collectors.toList()));
+            List<SubGetBase> data = commterminalGeneralClient.tagOrIdGetSub(substationParam).getData();
+            List<SurveyPlan> info = new ArrayList<>();
+            SurveyPlan po;
+            if (CollectionUtil.isNotEmpty(planExcels)) {
+                for (SupervisionPlanExcel planExcel : planExcels) {
+                    po = new SurveyPlan();
+                    StringBuilder msg = new StringBuilder();
+                    if (StrUtil.isEmpty(planExcel.getDeptId())) {
+                        msg.append("计划负责单位不能为空!");
+                    } else {
+                        List<String> DeptIds = deptS.stream().filter(x -> x.getName().equals(planExcel.getDeptId())).map(DeptDTO::getId).collect(Collectors.toList());
+                        if (CollUtil.isEmpty(DeptIds)) {
+                            msg.append("计划负责单位不存在!");
+                        } else {
+                            po.setDeptId(DeptIds.get(0));
+                        }
+                    }
+                    if (StrUtil.isEmpty(planExcel.getPlanName())) {
+                        msg.append("计划名称不能为空!");
+                    } else {
+                        po.setPlanName(planExcel.getPlanName());
+                    }
+
+                    if (StrUtil.isEmpty(planExcel.getSupvType())) {
+                        msg.append("监督类型不能为空!");
+                    } else {
+                        String dicById = PubUtil.getDicById(planExcel.getSupvType(), supType);
+                        if (StrUtil.isEmpty(dicById)) {
+                            msg.append("监督类型不存在!");
+                        } else {
+                            po.setSupvType(dicById);
+                        }
+                    }
+                    if (StrUtil.isEmpty(planExcel.getSupvObjectName())) {
+                        msg.append("监督对象名称不能为空!");
+                    } else {
+                        po.setSupvObjectName(planExcel.getSupvObjectName());
+                    }
+                    try {
+                        Date startTime = planExcel.getPlanStartTime();
+                        Date endTime = planExcel.getPlanEndTime();
+                        po.setPlanStartTime(startTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+                        po.setPlanEndTime(endTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+                    } catch (Exception e) {
+                        msg.append("计划时间格式有误!");
+                    }
+
+                    if (StrUtil.isEmpty(planExcel.getCustomSubstationFlag())) {
+                        msg.append("是否系统电站不能为空!");
+                    } else {
+                        po.setCustomSubstationFlag(Integer.valueOf(planExcel.getCustomSubstationFlag()));
+                    }
+                    List<String> list = Arrays.asList(planExcel.getSubstation(), planExcel.getSubstation2(), planExcel.getSubstation3())
+                            .stream().filter(Objects::nonNull).distinct().collect(Collectors.toList());
+                    if (CollUtil.isEmpty(list)) {
+                        msg.append("关联电站不能为空!");
+                    } else {
+                        if ("0".equals(planExcel.getCustomSubstationFlag())) {
+                            List<String> subIds = data.stream().filter(x -> list.contains(x.getName())).map(SubGetBase::getId).collect(Collectors.toList());
+                            if (CollUtil.isEmpty(subIds)) {
+                                msg.append("关联电站不存在!");
+                            } else {
+                                po.setSubstation(String.join(",", subIds));
+                            }
+                        } else {
+                            po.setSubstation(planExcel.getSubstation());
+                        }
+                    }
+                    String string = msg.toString();
+                    if (StrUtil.isNotBlank(string)) {
+                        SupervisionPlanExcel.ExcelMsg excelMsg = new SupervisionPlanExcel.ExcelMsg();
+                        BeanUtils.copyProperties(planExcel, excelMsg);
+                        excelMsg.setMsg(string);
+                        planMsgList.add(excelMsg);
+                        continue;
+                    }
+                    po.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+                    po.setState(DataStateEnum.ENABLE.getCode());
+                    info.add(po);
+                }
+            }
+            if (CollUtil.isNotEmpty(info)) {
+                for (SurveyPlan surveyPlan : info) {
+                    this.saveOrUpdate(surveyPlan);
+                    SurveyPlan plan = this.baseMapper.selectById(surveyPlan.getId());
+                    Map<String, Object> processInstanceVariables = new HashMap<>(16);
+                    BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+                    bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_PLAN.getKey());
+                    bpmProcessInstanceCreateReqDTO.setBusinessKey(plan.getId());
+                    bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>(16));
+                    bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+                    String processInstanceId = bpmProcessFeignClient.createProcessInstance(plan.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+                    // 将工作流的编号，更新到流程单中
+                    plan.setProcessInstanceId(processInstanceId);
+                    this.baseMapper.updateById(plan);
+                }
+            }
+            //判断有没有错误信息
+            if (CollectionUtil.isNotEmpty(planMsgList)) {
+                ExcelUtil.exportExcel("失败列表.xlsx", SupervisionPlanExcel.ExcelMsg.class, planMsgList);
+            }
+        } catch (Exception e) {
+            throw new BusinessException(SupervisionResponseEnum.IMPORT_PLAN_ERROR);
+        }
+    }
 }

pqs-supervision/supervision-boot/src/main/resources/bootstrap.yml

@@ -35,6 +35,10 @@ spring:
             refresh: true
   main:
     allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
 #项目日志的配置
 logging:
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml

pqs-system/system-boot/pom.xml

@@ -91,7 +91,6 @@
             <artifactId>cs-device-api</artifactId>
             <version>1.0.0</version>
         </dependency>
-
     </dependencies>
 
     <build>