1.过程监督-谐波普测管理代码调整

2.过程监督-干扰用户管理代码调整
3.过程监督-电能质量问题管理代码调整
4.过程监督-终端监测管理代码调整

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java

@@ -36,6 +36,9 @@ public class LoadTypeUserSearchParam {
     @ApiModelProperty("是否上传实测报告(0:否 1:是)")
     private Integer aIsFileUpload;
 
+    @ApiModelProperty("是否审核(0:否 1:是)")
+    private Integer checkType=0;
+
     @ApiModelProperty("页码")
     @NotNull(message = "页码不可为空")
     @Range(min = 1,message = "页码必须大于0")

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -19,20 +21,25 @@ import java.util.List;
 public class RGeneralSurveyPlanAddParm {
 
     @ApiModelProperty(value="单位ID")
+    @NotBlank(message = "单位不可为空")
     private String orgNo;
 
     @ApiModelProperty(value="普测计划编号")
+    @NotBlank(message = "普测计划编号不可为空")
     private String planNo;
 
     @ApiModelProperty(value="普测计划名称")
+    @NotBlank(message = "普测计划名称不可为空")
     private String planName;
 
     @ApiModelProperty(value="计划开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @NotNull(message = "计划开始时间不可为空")
     private Date planStartTime;
 
     @ApiModelProperty(value="计划结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @NotNull(message = "计划结束时间不可为空")
     private Date planEndTime;
 
     @ApiModelProperty(value="计划负责人")

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java

@@ -128,6 +128,8 @@ public class RGeneralSurveyPlanPO {
     @TableField(value = "upload_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
+
+
     @TableField(value = "create_person")
     private  String createPerson;
 

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java

@@ -77,6 +77,10 @@ public class RLoadTypeUserManage implements Serializable {
      * 入网报告路径
      */
     private String iFilePath;
+    /**
+     * 入网报告文件名称
+     */
+    private String iFilePathName;
     /**
      * 入网报告上传时间
      */
@@ -117,6 +121,10 @@ public class RLoadTypeUserManage implements Serializable {
      * 实测报告路径
      */
     private String aFilePath;
+    /**
+     * 实测报告文件名称
+     */
+    private String aFilePathName;
     /**
      * 实测报告上传时间
      */

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RSurveyCyclePO.java

@@ -1,6 +1,7 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -18,7 +19,8 @@ import java.time.LocalDate;
 @Data
 @TableName(value = "r_survey_cycle")
 public class RSurveyCyclePO {
-    @TableField(value = "id")
+
+    @TableId(value = "id")
     private String id;
 
     @TableField(value = "start_year")

pqs-process/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java

@@ -231,7 +231,6 @@ public class ElectricityQualityIssuesController extends BaseController {
     @ApiImplicitParam(name = "powerQualityProblemNo", value = "历史审核记录查询参数", required = true)
     public HttpResult<List<RStatElectricQualityProblemLogVO>> queryCheckTrack(@RequestParam("powerQualityProblemNo") String powerQualityProblemNo){
         String methodDescribe = getMethodDescribe("checkPowerQuality");
-
         List<RStatElectricQualityProblemLogVO>  rStatElectricQualityProblemLogVOS  = issuesService.queryCheckTrack (powerQualityProblemNo);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatElectricQualityProblemLogVOS, methodDescribe);
     }

pqs-process/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java

@@ -98,7 +98,6 @@ public class LoadTypeUserManageController extends BaseController {
     @ApiImplicitParam(name = "loadTypeUserCheckParam", value = "入网评估报告审核参数", required = true)
     public HttpResult<Boolean> checkLoadTypeUserI(@Validated @RequestBody LoadTypeUserCheckParam loadTypeUserCheckParam){
         String methodDescribe = getMethodDescribe("checkLoadTypeUserI");
-
         Boolean flag  = loadTypeUserManageService.checkLoadTypeUserI (loadTypeUserCheckParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
@@ -121,7 +120,6 @@ public class LoadTypeUserManageController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
     @PostMapping("/uploadLoadTypeUserI")
     @ApiOperation("上传干扰源用户入网报告（未建档干扰源用户管理）")
-//    @ApiImplicitParam(name = "loadTypeUserIUploadParam", value = "实体参数", required = true)
     public HttpResult<Boolean> uploadLoadTypeUserI(@Validated LoadTypeUserIUploadParam loadTypeUserIUploadParam){
         String methodDescribe = getMethodDescribe("uploadLoadTypeUserI");
         boolean res = loadTypeUserManageService.uploadLoadTypeUserI(loadTypeUserIUploadParam);
@@ -201,7 +199,6 @@ public class LoadTypeUserManageController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
     @PostMapping("/uploadLoadTypeUserA")
     @ApiOperation("上传干扰源用户实测报告（干扰源用户常态化管理）")
-//    @ApiImplicitParam(name = "loadTypeUserAUploadParam", value = "实体参数", required = true)
     public HttpResult<Boolean> uploadLoadTypeUserA(@Validated LoadTypeUserAUploadParam loadTypeUserAUploadParam){
         String methodDescribe = getMethodDescribe("uploadLoadTypeUserA");
         boolean res = loadTypeUserManageService.uploadLoadTypeUserA(loadTypeUserAUploadParam);

pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java

@@ -2,11 +2,13 @@ package com.njcn.process.controller;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.minioss.bo.MinIoUploadResDTO;
@@ -15,23 +17,21 @@ import com.njcn.process.pojo.param.*;
 import com.njcn.process.pojo.po.RGeneralSurveyPlanPO;
 import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
 import com.njcn.process.pojo.vo.*;
-import com.njcn.process.service.RGeneralSurveyPlanDetailService;
 import com.njcn.process.service.RGeneralSurveyPlanPOService;
 import com.njcn.process.service.impl.RSurveyPlanConfigService;
 import com.njcn.web.controller.BaseController;
 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.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -54,10 +54,9 @@ public class RGeneralSurveyPlanController extends BaseController {
 
     private final RGeneralSurveyPlanPOService rGeneralSurveyPlanPOService;
 
-    private final
+
-    RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService;
+    private final RSurveyPlanConfigService rSurveyPlanConfigService;
-    private final
+
-    RSurveyPlanConfigService rSurveyPlanConfigService;
     /**
      * @Description: 新增/修改普测计划
      * @Param: [rGeneralSurveyPlanAddParm]
@@ -69,9 +68,8 @@ public class RGeneralSurveyPlanController extends BaseController {
     @PostMapping("/addPlan")
     @ApiOperation("新增/修改普测计划")
     @ApiImplicitParam(name = "rGeneralSurveyPlanAddParm", value = "新增普测计划参数", required = true)
-    public HttpResult<Boolean> addPlan(@RequestBody RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm){
+    public HttpResult<Boolean> addPlan(@RequestBody @Validated RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm) {
         String methodDescribe = getMethodDescribe("addPlan");
-
         Boolean addFlag = rGeneralSurveyPlanPOService.addPlan(rGeneralSurveyPlanAddParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe);
     }
@@ -82,26 +80,16 @@ public class RGeneralSurveyPlanController extends BaseController {
     @ApiImplicitParam(name = "cycleNum", value = "普测周期", required = true)
     public HttpResult<RSurveyCycleVO> addPlanCycle(@RequestParam("cycleNum") Integer cycleNum) {
         String methodDescribe = getMethodDescribe("addPlanCycle");
-
         RSurveyCycleVO rSurveyCycleVO = rGeneralSurveyPlanPOService.addPlanCycle(cycleNum);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rSurveyCycleVO, methodDescribe);
     }
 
-    @ResponseBody
-    @ApiOperation("excel批量导入电站信息")
-    @PostMapping(value = "importSubStatation")
-    public HttpResult<String> importSubStatation(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
-        String methodDescribe = getMethodDescribe("importSubStatation");
-        rGeneralSurveyPlanPOService.importSubStatation(file, response);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/initDetpStataionTree")
     @ApiOperation("初始化部门")
     @ApiImplicitParam(name = "orgId", value = "部门号", required = true)
     public HttpResult<List<DeptSubstationVO>> initDetpStataionTree(@RequestParam("orgId") String orgId) {
         String methodDescribe = getMethodDescribe("initDetpStataionTree");
-
         List<DeptSubstationVO> list = rGeneralSurveyPlanPOService.initDetpStataionTree(orgId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
@@ -146,7 +134,6 @@ public class RGeneralSurveyPlanController extends BaseController {
     @ApiImplicitParam(name = "statetionNum", value = "电站数量", required = true)
     public HttpResult<RGeneralSurveyPlanAddParm> querySubStatation(@RequestParam("statetionNum") Integer statetionNum) {
         String methodDescribe = getMethodDescribe("querySubStatation");
-
         RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = rGeneralSurveyPlanPOService.querySubStatation(statetionNum);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanAddParm, methodDescribe);
     }
@@ -157,7 +144,6 @@ public class RGeneralSurveyPlanController extends BaseController {
     @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true)
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) {
         String methodDescribe = getMethodDescribe("queryPlan");
-
         IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query(rGeneralSurveyPlanQueryParm, Stream.of("0", "1", "2", "3").collect(Collectors.toList()), "1");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
@@ -168,8 +154,17 @@ public class RGeneralSurveyPlanController extends BaseController {
     @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true)
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) {
         String methodDescribe = getMethodDescribe("queryPlanAudit");
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query(rGeneralSurveyPlanQueryParm, Stream.of("1").collect(Collectors.toList()), "2");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
+    }
 
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()),"2");
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryPlanResult")
+    @ApiOperation("查询普测计划-结果页面")
+    @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true)
+    public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) {
+        String methodDescribe = getMethodDescribe("queryPlanResult");
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query(rGeneralSurveyPlanQueryParm, Stream.of("3", "4").collect(Collectors.toList()), "3");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 
@@ -179,22 +174,10 @@ public class RGeneralSurveyPlanController extends BaseController {
     @ApiImplicitParam(name = "rGeneralSurveyPlanChcekParm", value = "普测计划审核参数", required = true)
     public HttpResult<Boolean> checkPlanAudit(@Validated @RequestBody RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm) {
         String methodDescribe = getMethodDescribe("checkPlanAudit");
-
         Boolean flag = rGeneralSurveyPlanPOService.checkPlanAudit(rGeneralSurveyPlanChcekParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/queryPlanResult")
-    @ApiOperation("查询普测计划-结果页面")
-    @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true)
-    public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
-        String methodDescribe = getMethodDescribe("queryPlanResult");
-
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ()),"3");
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
-    }
-
 //    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
 //    @PostMapping("/queryPlandetail")
 //    @ApiOperation("根据planNO查询普测计划详情")
@@ -207,11 +190,9 @@ public class RGeneralSurveyPlanController extends BaseController {
 //    }
 
 
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
     @PostMapping("/surveyResultUpload")
     @ApiOperation("上传普测结果报告")
-//    @ApiImplicitParam(name = "surveyResultUploadParam", value = "实体参数", required = true)
     public HttpResult<Boolean> surveyResultUpload(@Validated SurveyResultUploadParam surveyResultUploadParam) {
         String methodDescribe = getMethodDescribe("surveyResultUpload");
         boolean res = rGeneralSurveyPlanPOService.surveyResultUpload(surveyResultUploadParam);
@@ -229,7 +210,6 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<List<MinIoUploadResDTO>> surveyResultDownload(@RequestParam("planNo") String planNo) {
         String methodDescribe = getMethodDescribe("surveyResultDownload");
         List<MinIoUploadResDTO> downloadUrls = rGeneralSurveyPlanPOService.surveyResultDownload(planNo);
-
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, downloadUrls, methodDescribe);
 
     }
@@ -241,7 +221,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<String> exportSurveyPlan(HttpServletResponse response, @RequestBody List<String> planIdList) {
         String methodDescribe = getMethodDescribe("exportSurveyPlan");
         String fileName = "普测计划信息.xls";
-        List<SurveyPlanExcel> baseExcelList = null;
+        List<SurveyPlanExcel> baseExcelList;
         try {
             baseExcelList = rGeneralSurveyPlanPOService.exportSurveyPlan(planIdList);
         } catch (Exception e) {
@@ -260,9 +240,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     @ApiImplicitParam(name = "questionQueryParm", value = "普测计划信息问题件查询参数", required = true)
     public HttpResult<List<RGeneralSurveyPlanDetailOnQuestionVO>> querySurveyPlanOnQuestion(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) {
         String methodDescribe = getMethodDescribe("querySurveyPlanOnQuestion");
-
         List<RGeneralSurveyPlanDetailOnQuestionVO> list = rGeneralSurveyPlanPOService.querySurveyPlanOnQuestion(questionQueryParm);
-
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
 
     }
@@ -273,13 +251,30 @@ public class RGeneralSurveyPlanController extends BaseController {
     @ApiImplicitParam(name = "questionQueryParm", value = "普测计划名称查询参数", required = true)
     public HttpResult<List<RGeneralSurveyPlanPO>> querySurveyPlanName(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) {
         String methodDescribe = getMethodDescribe("querySurveyPlanName");
-
         List<RGeneralSurveyPlanPO> list = rGeneralSurveyPlanPOService.querySurveyPlanName(questionQueryParm);
-
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
 
     }
 
+    @ResponseBody
+    @ApiOperation("普测计划状态更改为待审核")
+    @PostMapping(value = "planStatus")
+    public HttpResult<Boolean> planStatus(@RequestBody List<String> planNo) {
+        String methodDescribe = getMethodDescribe("planStatus");
+        int count = rGeneralSurveyPlanPOService.count(new LambdaUpdateWrapper<RGeneralSurveyPlanPO>()
+                .in(RGeneralSurveyPlanPO::getPlanNo, planNo)
+                .ne(RGeneralSurveyPlanPO::getStatus, Arrays.asList(0, 2))
+        );
+        if (count > 0) {
+            throw new BusinessException("请检查普测计划状态是否正确！");
+        }
+        Boolean update = rGeneralSurveyPlanPOService.update(new LambdaUpdateWrapper<RGeneralSurveyPlanPO>()
+                .in(RGeneralSurveyPlanPO::getPlanNo, planNo)
+                .set(RGeneralSurveyPlanPO::getStatus, 1)
+        );
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
+
+    }
 
 
 }

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java

@@ -9,6 +9,8 @@ import com.njcn.process.pojo.po.RLoadTypeUserManage;
 import com.njcn.process.pojo.vo.RLoadTypeUserManageVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 干扰源用户管理Mapper
  *
@@ -24,7 +26,10 @@ public interface LoadTypeUserManageMapper extends BaseMapper<RLoadTypeUserManage
      * @param loadTypeUserSearchParam 入参
      * @return 结果
      */
-    Page<RLoadTypeUserManageVO> getLoadTypeUserPage(IPage<RLoadTypeUserManageVO> page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam);
+    Page<RLoadTypeUserManageVO> getLoadTypeUserPage(IPage<RLoadTypeUserManageVO> page,
+                                                    @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam,
+                                                    @Param("ids") List<String> ids
+                                                    );
 
     /**
      * 干扰源用户分页查询
@@ -32,5 +37,7 @@ public interface LoadTypeUserManageMapper extends BaseMapper<RLoadTypeUserManage
      * @param loadTypeUserSearchParam 入参
      * @return 结果
      */
-    Page<RLoadTypeUserManageVO> getLoadTypeRelationPage(IPage<RLoadTypeUserManageVO> page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam);
+    Page<RLoadTypeUserManageVO> getLoadTypeRelationPage(IPage<RLoadTypeUserManageVO> page,
+                                                        @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam
+                                                        );
 }

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml

@@ -2,27 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.process.mapper.LoadTypeUserManageMapper">
 
-    <select id="getLoadTypeUserPage" resultType="RLoadTypeUserManageVO">
+    <select id="getLoadTypeUserPage" resultType="com.njcn.process.pojo.vo.RLoadTypeUserManageVO">
         SELECT
             *
         FROM
             r_load_type_user_manage r
-        where 1=1
+        <where>
-        <if test="loadTypeUserSearchParam.orgNo != null and loadTypeUserSearchParam.orgNo != ''">
+            <if test="ids != null and ids.size > 0">
-            and r.org_no = #{loadTypeUserSearchParam.orgNo}
+                AND r.org_no IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
             </if>
-        <if test="loadTypeUserSearchParam.loadType != null and loadTypeUserSearchParam.loadType != ''">
+            <if test="param.checkType != null and param.checkType == 1">
-            and r.load_type = #{loadTypeUserSearchParam.loadType}
+                    and r.i_check_person is null and r.i_check_person !=""
             </if>
-        <if test="loadTypeUserSearchParam.userName != null and loadTypeUserSearchParam.userName != ''">
+            <if test="param.loadType != null and param.loadType != ''">
-            and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%')
+                and r.load_type = #{param.loadType}
             </if>
-        <if test="loadTypeUserSearchParam.fileUploadflag != null and loadTypeUserSearchParam.fileUploadflag != ''">
+            <if test="param.userName != null and param.userName != ''">
-            and r.i_is_file_upload = #{loadTypeUserSearchParam.fileUploadflag}
+                and r.user_name like CONCAT('%', #{param.userName}, '%')
             </if>
+            <if test="param.fileUploadflag != null and param.fileUploadflag != ''">
+                and r.i_is_file_upload = #{param.fileUploadflag}
+            </if>
+        </where>
+        order by record_time desc
     </select>
 
-    <select id="getLoadTypeRelationPage" resultType="RLoadTypeUserManageVO">
+    <select id="getLoadTypeRelationPage" resultType="com.njcn.process.pojo.vo.RLoadTypeUserManageVO">
         SELECT
         *
         FROM
@@ -31,21 +39,22 @@
         AND ISNULL( relation_user_id )= 0
         AND LENGTH(
         trim( relation_user_id ))> 0
-        <if test="loadTypeUserSearchParam.orgNo != null and loadTypeUserSearchParam.orgNo != ''">
+        <if test="param.orgNo != null and param.orgNo != ''">
-            and r.org_no = #{loadTypeUserSearchParam.orgNo}
+            and r.org_no = #{param.orgNo}
         </if>
-        <if test="loadTypeUserSearchParam.loadType != null and loadTypeUserSearchParam.loadType != ''">
+        <if test="param.loadType != null and param.loadType != ''">
-            and r.load_type = #{loadTypeUserSearchParam.loadType}
+            and r.load_type = #{param.loadType}
         </if>
-        <if test="loadTypeUserSearchParam.userName != null and loadTypeUserSearchParam.userName != ''">
+        <if test="param.userName != null and param.userName != ''">
-            and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%')
+            and r.user_name like CONCAT('%', #{param.userName}, '%')
         </if>
-        <if test="loadTypeUserSearchParam.relationUserName != null and loadTypeUserSearchParam.relationUserName != ''">
+        <if test="param.relationUserName != null and param.relationUserName != ''">
-            and r.relation_user_name like CONCAT('%', #{loadTypeUserSearchParam.relationUserName}, '%')
+            and r.relation_user_name like CONCAT('%', #{param.relationUserName}, '%')
         </if>
-        <if test="loadTypeUserSearchParam.aIsFileUpload != null and loadTypeUserSearchParam.aIsFileUpload != ''">
+        <if test="param.aIsFileUpload != null and param.aIsFileUpload != ''">
-            and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload}
+            and r.a_is_file_upload = #{param.aIsFileUpload}
         </if>
+            order by record_time desc
     </select>
 
 </mapper>

pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java

@@ -6,13 +6,10 @@ import com.njcn.minioss.bo.MinIoUploadResDTO;
 import com.njcn.process.pojo.param.*;
 import com.njcn.process.pojo.po.RGeneralSurveyPlanPO;
 import com.njcn.process.pojo.vo.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * 
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/11  11:24【需求编号】
@@ -30,6 +27,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      * @Date: 2022/11/14
      */
     Boolean addPlan(RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm);
+
     /**
      * @Description: query
      * @Param: [rGeneralSurveyPlanQueryParm]
@@ -38,6 +36,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      * @Date: 2022/11/15
      */
     IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List<String> statusList, String type);
+
     /**
      * @Description: surveyResultUpload
      * @Param: [surveyResultUploadParam]
@@ -46,6 +45,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      * @Date: 2022/11/18
      */
     boolean surveyResultUpload(SurveyResultUploadParam surveyResultUploadParam);
+
     /**
      * @Description: surveyResultDownload
      * @Param: [planNo]
@@ -54,6 +54,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      * @Date: 2022/11/18
      */
     List<MinIoUploadResDTO> surveyResultDownload(String planNo);
+
     /**
      * @Description: exportSurveyPlan
      * @Param: []
@@ -62,6 +63,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      * @Date: 2022/11/21
      */
     List<SurveyPlanExcel> exportSurveyPlan(List<String> planIdList);
+
     /**
      * @Description: querySurveyPlanOnQuestion
      * @Param: [questionQueryParm]
@@ -70,6 +72,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      * @Date: 2022/11/30
      */
     List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm);
+
     /**
      * @Description: 更具questionQueryParm查计划名称
      * @Param: [questionQueryParm]
@@ -78,6 +81,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      * @Date: 2022/12/1
      */
     List<RGeneralSurveyPlanPO> querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm);
+
     /**
      * @Description: checkPlanAudit
      * @Param: [rGeneralSurveyPlanChcekParm]
@@ -87,11 +91,10 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
      */
     Boolean checkPlanAudit(RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm);
 
-    void importSubStatation(MultipartFile file, HttpServletResponse response);
-
     RGeneralSurveyPlanAddParm querySubStatation(Integer statetionNum);
 
     List<DeptSubstationVO> initDetpStataionTree(String orgid);
+
     /**
      * @Description: 设置普测周期
      * @Param: [cycleNum]

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.config.GeneralInfo;
+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.oss.constant.OssPath;
 import com.njcn.device.pms.api.DistributionMonitorClient;
 import com.njcn.oss.utils.FileStorageUtil;
@@ -21,19 +24,21 @@ import com.njcn.system.enums.DicDataEnum;
 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.user.pojo.po.Dept;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
+import com.njcn.web.utils.RequestUtil;
+import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.jdbc.Null;
 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 java.util.Date;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -49,16 +54,9 @@ import java.util.stream.Collectors;
 public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService {
 
     private final LoadTypeUserManageMapper loadTypeUserManageMapper;
-
     private final DicDataFeignClient dicDataFeignClient;
-
-    private final DistributionMonitorClient distributionMonitorClient;
-
     private final DeptFeignClient deptFeignClient;
 
-    @Resource
-    private GeneralInfo generalInfo;
-
     private final FileStorageUtil fileStorageUtil;
 
 
@@ -72,21 +70,23 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     @Override
     public Page<RLoadTypeUserManageVO> getLoadTypeUserList(LoadTypeUserSearchParam loadTypeUserSearchParam) {
         Page<RLoadTypeUserManageVO> page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize());
-        Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam);
+        List<String> ids=deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( );
-
+        Integer checkType = loadTypeUserSearchParam.getCheckType();
-        //部门处理：根据部门code取名称
+        //0表示不是审核信息 1标识审核信息
-        List<RLoadTypeUserManageVO> list = loadTypeUserPage.getRecords();
+        List<String> data = deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( );
+        if(checkType==1){
+            ids=data.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList());
+        }
+        //干扰源用户信息录入
+        Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam,ids);
         List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
         Map<String, PvTerminalTreeVO> pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO));
-        List<RLoadTypeUserManageVO> resultList = list.stream().map(item -> {
+        //部门处理：根据部门code取名称
-            RLoadTypeUserManageVO rLoadTypeUserManageVO = new RLoadTypeUserManageVO();
+        loadTypeUserPage.getRecords().stream().forEach(item -> {
-            BeanUtils.copyProperties(item, rLoadTypeUserManageVO);
+            item.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位名称
-            rLoadTypeUserManageVO.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位名称
+        });
-            return rLoadTypeUserManageVO;
-        }).collect(Collectors.toList());
-
         //返回新的数据组
-        return loadTypeUserPage.setRecords(resultList);
+        return loadTypeUserPage;
     }
 
     /**
@@ -127,6 +127,10 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
         //塞入建档时间
         Date date = DateUtil.parse(loadTypeUserParam.getRecordTime(), "yyyy-MM-dd HH:mm:ss");
         rLoadTypeUserManage.setRecordTime(date);
+        //获取部门信息
+        Dept data = deptFeignClient.getDeptById (loadTypeUserParam.getOrgNo()).getData();
+        rLoadTypeUserManage.setICheckPerson(data.getPid());
+        rLoadTypeUserManage.setACheckPerson(data.getPid());
         loadTypeUserManageMapper.insert(rLoadTypeUserManage);
         return true;
     }
@@ -140,25 +144,34 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public boolean uploadLoadTypeUserI(LoadTypeUserIUploadParam loadTypeUserIUploadParam) {
-
+        //todo 修改用户信息，当用户信息为待审核状态。该信息不可修改
+        Boolean aBoolean = checkStatus(loadTypeUserIUploadParam.getId(), 0);
         RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
         BeanUtils.copyProperties(loadTypeUserIUploadParam, rLoadTypeUserManage);
         MultipartFile multipartFile = loadTypeUserIUploadParam.getFile();
         //文件上传到Minio服务器，存入文件名
         if (Objects.nonNull(multipartFile)) {
             rLoadTypeUserManage.setIFilePath(fileStorageUtil.uploadMultipart(multipartFile,OssPath.LOAD_TYPE_USER));
+            rLoadTypeUserManage.setIFilePathName(multipartFile.getOriginalFilename());
             rLoadTypeUserManage.setIUploadTime(new Date());
         }
 
         //提交：待审核/保存：新建
-        DictData dictData;
+        String dictData;
         if (Objects.equals(Param.LOAD_TYPE_USER_SUBMIT, loadTypeUserIUploadParam.getStatus())) {
-            dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData();
+            dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData().getId();
+            rLoadTypeUserManage.setICheckPerson("");
+            rLoadTypeUserManage.setICheckComment("");
         } else {
-            dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData();
+            //是否是未通过，未通过则不修改状态
+            if(aBoolean){
+                dictData=null;
+            }else{
+                dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData().getId();
             }
-        rLoadTypeUserManage.setIStatus(dictData.getId());
+        }
-        rLoadTypeUserManage.setIIsFileUpload(1);
+        rLoadTypeUserManage.setIStatus(dictData);
+        rLoadTypeUserManage.setIIsFileUpload(rLoadTypeUserManage.getIFilePath()!=null?1:0);
         loadTypeUserManageMapper.updateById(rLoadTypeUserManage);
 
         return true;
@@ -209,7 +222,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
 
 
     /**
-     * 上传干扰源用户入网报告
+     * 上传干扰源用户实测报告
      *
      * @param loadTypeUserAUploadParam
      * @return
@@ -217,13 +230,15 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public boolean uploadLoadTypeUserA(LoadTypeUserAUploadParam loadTypeUserAUploadParam) {
-
+        //todo 修改用户信息，当用户信息为待审核状态。该信息不可修改
+        Boolean aBoolean = checkStatus(loadTypeUserAUploadParam.getId(), 1);
         RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
         BeanUtils.copyProperties(loadTypeUserAUploadParam, rLoadTypeUserManage);
         MultipartFile multipartFile = loadTypeUserAUploadParam.getFile();
         //文件上传到文件服务器，存入文件名
         if (Objects.nonNull(multipartFile)) {
             rLoadTypeUserManage.setAFilePath(fileStorageUtil.uploadMultipart(multipartFile,OssPath.LOAD_TYPE_USER));
+            rLoadTypeUserManage.setAFilePathName(multipartFile.getOriginalFilename());
             rLoadTypeUserManage.setAUploadTime(new Date());
         }
 
@@ -231,12 +246,19 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
         DictData dictData;
         if (Objects.equals(Param.LOAD_TYPE_USER_SUBMIT, loadTypeUserAUploadParam.getStatus())) {
             dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData();
+        } else {
+            //是否是未通过，未通过则不修改状态
+            if(aBoolean){
+                dictData=null;
             }else{
                 dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData();
             }
+        }
+        if(!aBoolean){
             rLoadTypeUserManage.setAStatus(dictData.getId());
+        }
+        rLoadTypeUserManage.setAIsFileUpload(rLoadTypeUserManage.getAFilePath()!=null?1:0);
         loadTypeUserManageMapper.updateById(rLoadTypeUserManage);
-
         return true;
     }
 
@@ -357,8 +379,8 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
         updateWrapper.set("i_check_comment", loadTypeUserCheckParam.getCheckComment());
         updateWrapper.set("i_check_person", loadTypeUserCheckParam.getCheckPerson());
 
-        DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAIL.getCode()).getData();
+        DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAILED.getCode()).getData();
-        DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData();
+        DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.FINISH.getCode()).getData();
 
         updateWrapper.set("i_status", Objects.equals("1", loadTypeUserCheckParam.getCheckResult()) ? finish.getId() : fail.getId());
         int i = loadTypeUserManageMapper.update(null, updateWrapper);
@@ -383,12 +405,57 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
         updateWrapper.set("a_check_comment", loadTypeUserCheckParam.getCheckComment());
         updateWrapper.set("a_check_person", loadTypeUserCheckParam.getCheckPerson());
 
-        DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAIL.getCode()).getData();
+        DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAILED.getCode()).getData();
-        DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData();
+        DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.FINISH.getCode()).getData();
 
         updateWrapper.set("a_status", Objects.equals("1", loadTypeUserCheckParam.getCheckResult()) ? finish.getId() : fail.getId());
         int i = loadTypeUserManageMapper.update(null, updateWrapper);
         result = i == 1;
         return result;
     }
+
+    /**
+     * @Description: 干扰源用户报告状态，待审核无法修改信息
+     * @param id
+     * @param type
+     * @Author: wr
+     * @Date: 2024/1/30 10:44
+     */
+    private Boolean checkStatus(String id,Integer type){
+        Boolean fly=false;
+        RLoadTypeUserManage rLoadTypeUserManage = loadTypeUserManageMapper.selectById(id);
+        if(type==0){
+            //入网评估
+            DictData audit = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData();
+            DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.FINISH.getCode()).getData();
+            String iStatus = rLoadTypeUserManage.getIStatus();
+            if(audit.getId().equals(iStatus)||finish.getId().equals(iStatus)){
+                throw new BusinessException(CommonResponseEnum.FAIL, "只有新建和未通过状态下，可修改信息");
+            }
+            DictData failed = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAILED.getCode()).getData();
+            if(failed.getId().equals(iStatus)){
+                fly=true;
+            }
+        }
+
+        if(type==1){
+            //实测评估
+            DictData audit = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDITT.getCode()).getData();
+            DictData success = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData();
+            String aStatus = rLoadTypeUserManage.getAStatus();
+            if(audit.getId().equals(aStatus)||success.getId().equals(aStatus)){
+                throw new BusinessException(CommonResponseEnum.FAIL, "只有新建和未通过状态下，可修改信息");
+            }
+            DictData failed = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAIL.getCode()).getData();
+            if(failed.getId().equals(aStatus)){
+                fly=true;
+            }
+        }
+        return fly;
+
+    }
+
+
+
+
 }

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java

@@ -130,7 +130,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
             throw new BusinessException(ProcessResponseEnum.TERMINAL_ID_REPEAT);
         }
         PmsTerminalDetection detection = BeanUtil.copyProperties(param, PmsTerminalDetection.class);
-        detection.setOriginalName(detection.getId() + "-原始数据报告.docx");
+        detection.setOriginalName(StrUtil.isNotBlank(param.getOriginalReport())?detection.getId() + "-原始数据报告.docx":"");
         detection.setOrgNo(data.getCode());
         detection.setOrgName(data.getName());
 

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java

@@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.api.StatationStatClient;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
 import com.njcn.device.pms.pojo.po.StatationStat;
 import com.njcn.minioss.bo.MinIoUploadResDTO;
 import com.njcn.oss.constant.OssPath;
@@ -29,7 +31,6 @@ import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
 import com.njcn.process.pojo.vo.*;
 import com.njcn.process.service.RGeneralSurveyPlanDetailService;
 import com.njcn.process.service.RGeneralSurveyPlanPOService;
-import com.njcn.process.service.StatationStatService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
@@ -37,16 +38,15 @@ import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.web.utils.RequestUtil;
+import lombok.RequiredArgsConstructor;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -63,33 +63,18 @@ import java.util.stream.Stream;
  * @version V1.0.0
  */
 @Service
+@RequiredArgsConstructor
 public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurveyPlanPOMapper, RGeneralSurveyPlanPO> implements RGeneralSurveyPlanPOService {
 
-    @Autowired
+    private final RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService;
-    private RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService;
+    private final RGeneralSurveyPlanPOMapper rGeneralSurveyPlanPOMapper;
-
+    private final RGeneralSurveyPlanDetailMapper rGeneralSurveyPlanDetailMapper;
-    @Resource
+    private final DeptFeignClient deptFeignClient;
-    private RGeneralSurveyPlanPOMapper rGeneralSurveyPlanPOMapper;
+    private final FileStorageUtil fileStorageUtil;
-
+    private final StatationStatClient statationStatClient;
-    @Resource
+    private final DicDataFeignClient dicDataFeignClient;
-    private RGeneralSurveyPlanDetailMapper rGeneralSurveyPlanDetailMapper;
+    private final RSurveyCycleMapper rSurveyCycleMapper;
-
+    private final RSurveyPlanConfigService rSurveyPlanConfigService;
-    @Autowired
-    private DeptFeignClient deptFeignClient;
-
-    @Resource
-    private FileStorageUtil fileStorageUtil;
-
-    @Autowired
-    private StatationStatService statationStatService;
-    @Autowired
-    private DicDataFeignClient dicDataFeignClient;
-
-    @Autowired
-    private RSurveyCycleMapper rSurveyCycleMapper;
-
-    @Autowired
-    private RSurveyPlanConfigService rSurveyPlanConfigService;
 
 
     /**
@@ -106,8 +91,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
 
         RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO();
         BeanUtils.copyProperties(rGeneralSurveyPlanAddParm, rGeneralSurveyPlanPO);
-        /*todo 后期与工作流绑定*/
+
-        rGeneralSurveyPlanPO.setStatus (1);
         /**查出周期id**/
         QueryWrapper<RSurveyCyclePO> rSurveyCyclePOQueryWrapper = new QueryWrapper();
         rSurveyCyclePOQueryWrapper.le("start_year", rGeneralSurveyPlanPO.getPlanEndTime());
@@ -119,30 +103,43 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         Dept data = deptFeignClient.getDeptById(deptIndex).getData();
         rGeneralSurveyPlanPO.setCheckPerson(data.getPid());
         rGeneralSurveyPlanPO.setCreatePerson(RequestUtil.getUserIndex());
-         boolean b = this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO);
+        int count = this.count(new LambdaQueryWrapper<RGeneralSurveyPlanPO>()
+                .eq(RGeneralSurveyPlanPO::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo())
+        );
+        boolean b;
+        if (count > 0) {
+            b = this.updateByMultiId(rGeneralSurveyPlanPO);
+        } else {
+            /*todo 后期与工作流绑定*/
+            rGeneralSurveyPlanPO.setStatus(0);
+            b = this.save(rGeneralSurveyPlanPO);
+        }
 
         QueryWrapper<RGeneralSurveyPlanDetail> queryWrapper = new QueryWrapper();
         queryWrapper.lambda().eq(RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo());
         rGeneralSurveyPlanDetailService.remove(queryWrapper);
         List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetailList = new ArrayList<>();
-        rGeneralSurveyPlanAddParm.getSubIds ( ).forEach (temp -> {
+
-            StatationStat byId = statationStatService.getById (temp);
+        PmsStatationStatInfoParam param =new PmsStatationStatInfoParam();
+        param.setPowerIds(rGeneralSurveyPlanAddParm.getSubIds());
+        List<StatationStat> stationList = statationStatClient.getPowerInfo(param).getData();
+        for (StatationStat stat : stationList) {
             RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail();
             rGeneralSurveyPlanDetail.setPlanNo(rGeneralSurveyPlanAddParm.getPlanNo());
-            rGeneralSurveyPlanDetail.setOrgNo (byId.getOrgId ( ));
+            rGeneralSurveyPlanDetail.setOrgNo(stat.getOrgId());
-            rGeneralSurveyPlanDetail.setOrgName (byId.getOrgName ( ));
+            rGeneralSurveyPlanDetail.setOrgName(stat.getOrgName());
-            rGeneralSurveyPlanDetail.setSubId (byId.getPowerId ( ));
+            rGeneralSurveyPlanDetail.setSubId(stat.getPowerId());
-            rGeneralSurveyPlanDetail.setSubName (byId.getPowerName ( ));
+            rGeneralSurveyPlanDetail.setSubName(stat.getPowerName());
             /*目前时间与计划开始时间，结束时间一致*/
             rGeneralSurveyPlanDetail.setGeneralSurveyStartTime(rGeneralSurveyPlanAddParm.getPlanStartTime());
             rGeneralSurveyPlanDetail.setGeneralSurveyTime(rGeneralSurveyPlanAddParm.getPlanStartTime());
             rGeneralSurveyPlanDetail.setGeneralSurveyEndTime(rGeneralSurveyPlanAddParm.getPlanEndTime());
             rGeneralSurveyPlanDetail.setPlanNo(rGeneralSurveyPlanAddParm.getPlanNo());
             rGeneralSurveyPlanDetail.setGeneralSurveyLeader(rGeneralSurveyPlanAddParm.getLeader());
+            rGeneralSurveyPlanDetail.setVoltageLevel(stat.getVoltageLevel());
             rGeneralSurveyPlanDetailList.add(rGeneralSurveyPlanDetail);
-        });
+        }
         boolean b1 = rGeneralSurveyPlanDetailService.saveOrUpdateBatchByMultiId(rGeneralSurveyPlanDetailList, 500);
-
         return b && b1;
     }
 
@@ -365,6 +362,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         }
         return result;
     }
+
     /**
      * @param questionQueryParm
      * @Description: querySurveyPlanOnQuestion
@@ -375,10 +373,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
      */
     @Override
     public List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm) {
-        List<RGeneralSurveyPlanDetailOnQuestionVO> rGeneralSurveyPlanDetailOnQuestionVOS = new ArrayList<> ( );
+        return rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion(questionQueryParm);
-        rGeneralSurveyPlanDetailOnQuestionVOS = rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion (questionQueryParm);
-
-        return rGeneralSurveyPlanDetailOnQuestionVOS;
     }
 
     /**
@@ -425,71 +420,11 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         return result;
     }
 
-    @Override
-    public void importSubStatation(MultipartFile file, HttpServletResponse response) {
-        ImportParams params = new ImportParams ( );
-        params.setHeadRows (1);
-        params.setTitleRows (0);
-        //params.setNeedVerify(true);
-        //第一个sheet为台账信息
-        params.setStartSheetIndex (0);
-        params.setSheetNum (1);
-        try {
-            ExcelImportResult<StatationStatExcel> terminalBaseList = ExcelImportUtil.importExcelMore (file.getInputStream ( ), StatationStatExcel.class, params);
-            //如果存在非法数据，将不合格的数据导出
-
-            /*规则1:StatationStat的orgName要在原系统存在2:电压等级不对*/
-            List<PvTerminalTreeVO> data = deptFeignClient.allDeptList ( ).getData ( );
-            Map<String, PvTerminalTreeVO> pvTerminalTreeVOMap = data.stream ( ).collect (Collectors.toMap (PvTerminalTreeVO::getName, pvTerminalTreeVO -> pvTerminalTreeVO));
-            //获取电压等级的字典
-            List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.DEV_VOLTAGE.getCode ( )).getData ( );
-            //将电压信息转成map，key：id  value：name
-            Map<String, DictData> voltageLevelMap = voltageLevelList.stream ( ).collect (Collectors.toMap (DictData::getName, voltageLevel -> voltageLevel));
-            List<StatationStatExcel> trueCollect = new ArrayList<> ( );
-            List<StatationStatExcel> falseCollect = new ArrayList<> ( );
-            for (int i = 0; i < terminalBaseList.getList ( ).size ( ); i++) {
-                StatationStatExcel statationStatExcel = terminalBaseList.getList ( ).get (i);
-                if (pvTerminalTreeVOMap.containsKey (statationStatExcel.getOrgName ( ))) {
-                    statationStatExcel.setOrgId (pvTerminalTreeVOMap.get (statationStatExcel.getOrgName ( )).getId ( ));
-                } else {
-                    statationStatExcel.setExceptionMessage ("系统中不存在此电站的部门");
-                    falseCollect.add (statationStatExcel);
-                    continue;
-                }
-                if (voltageLevelMap.containsKey (statationStatExcel.getVoltageLevel ( ))) {
-                    statationStatExcel.setVoltageLevel (voltageLevelMap.get (statationStatExcel.getVoltageLevel ( )).getId ( ));
-                } else {
-                    statationStatExcel.setExceptionMessage ("系统中不存在此电站的电压等级");
-                    falseCollect.add (statationStatExcel);
-                    continue;
-                }
-                trueCollect.add (statationStatExcel);
-
-            }
-            if (!CollectionUtils.isEmpty (trueCollect)) {
-                List<StatationStat> collect = trueCollect.stream ( ).map (temp -> {
-                    StatationStat statationStat = new StatationStat ( );
-                    BeanUtils.copyProperties (temp, statationStat);
-                    return statationStat;
-                }).collect (Collectors.toList ( ));
-                statationStatService.saveOrUpdateBatch (collect, 500);
-            }
-            if (!CollectionUtils.isEmpty (falseCollect)) {
-                ExportParams exportExcel = new ExportParams ("批量导入模板（请严格按照模板标准填入数据）", "非法电站信息");
-                Workbook workbook = ExcelExportUtil.exportExcel (exportExcel, StatationStatExcel.class, falseCollect);
-                PoiUtil.exportFileByWorkbook (workbook, "非法台账信息.xlsx", response);
-
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace ( );
-        }
-    }
 
     @Override
     public RGeneralSurveyPlanAddParm querySubStatation(Integer statetionNum) {
         /*查询所有电站并过滤已经参加当期普测电站*/
-        List<StatationStat> list = statationStatService.list ( );
+        List<StatationStat> list = statationStatClient.getPowerInfo(new PmsStatationStatInfoParam()).getData();
 
         /**查出当前周期id**/
         QueryWrapper<RSurveyCyclePO> rSurveyCyclePOQueryWrapper = new QueryWrapper();
@@ -560,7 +495,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
     public List<DeptSubstationVO> initDetpStataionTree(String orgdid) {
 
         /*查询所有电站并过滤已经参加当期普测电站*/
-        List<StatationStat> list = statationStatService.list ( );
+        List<StatationStat> list = statationStatClient.getPowerInfo(new PmsStatationStatInfoParam()).getData();
 
         /**查出当前周期id**/
         QueryWrapper<RSurveyCyclePO> rSurveyCyclePOQueryWrapper = new QueryWrapper();
@@ -606,7 +541,6 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
 
 
         List<String> finalSubIds = subIds;
-
         List<PvTerminalTreeVO> data = deptFeignClient.allDeptList().getData();
         List<DeptSubstationVO> deptSubstationVOList = data.stream().map(temp -> {
             DeptSubstationVO deptSubstationVO = new DeptSubstationVO();
@@ -615,7 +549,9 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
             deptSubstationVO.setFlag(true);
             QueryWrapper<StatationStat> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", temp.getCode());
-            List<StatationStat> list1 = statationStatService.list (queryWrapper);
+            PmsStatationStatInfoParam param =new PmsStatationStatInfoParam();
+            param.setOrgIds(Arrays.asList(temp.getCode()));
+            List<StatationStat> list1 = statationStatClient.getPowerInfo(param).getData();
             List<DeptSubstationVO> children = deptSubstationVO.getChildren();
             List<DeptSubstationVO> collect = list1.stream().map(statationStat -> {
                 DeptSubstationVO deptSubstationVO1 = new DeptSubstationVO();