From 3148a844445cb3e963f82355f5da6cbd88ccd8e5 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 5 Feb 2024 14:08:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=BF=87=E7=A8=8B=E7=9B=91=E7=9D=A3-?= =?UTF-8?q?=E8=B0=90=E6=B3=A2=E6=99=AE=E6=B5=8B=E7=AE=A1=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4=202.=E8=BF=87=E7=A8=8B=E7=9B=91?= =?UTF-8?q?=E7=9D=A3-=E5=B9=B2=E6=89=B0=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=203.=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E7=9B=91=E7=9D=A3-=E7=94=B5=E8=83=BD=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=204.=E8=BF=87=E7=A8=8B=E7=9B=91=E7=9D=A3-?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E7=9B=91=E6=B5=8B=E7=AE=A1=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/LoadTypeUserSearchParam.java | 3 + .../pojo/param/RGeneralSurveyPlanAddParm.java | 7 + .../process/pojo/po/RGeneralSurveyPlanPO.java | 2 + .../process/pojo/po/RLoadTypeUserManage.java | 8 + .../njcn/process/pojo/po/RSurveyCyclePO.java | 4 +- .../ElectricityQualityIssuesController.java | 1 - .../LoadTypeUserManageController.java | 3 - .../RGeneralSurveyPlanController.java | 165 +++-- .../mapper/LoadTypeUserManageMapper.java | 11 +- .../RGeneralSurveyPlanDetailMapper.java | 4 +- .../mapping/LoadTypeUserManageMapper.xml | 59 +- .../service/RGeneralSurveyPlanPOService.java | 153 +++-- .../impl/LoadTypeUserManageServiceImpl.java | 143 ++-- .../impl/PmsTerminalDetectionServiceImpl.java | 2 +- .../impl/RGeneralSurveyPlanPOServiceImpl.java | 640 ++++++++---------- 15 files changed, 620 insertions(+), 585 deletions(-) diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java index 16d6fb952..00774b249 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java +++ b/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") diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java index 59c6c4ff6..d1445f2e1 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java +++ b/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="计划负责人") diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java index e45562175..ee961fa0c 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java +++ b/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; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java index 75ce5aefc..8f6176fb7 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java +++ b/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; /** * 实测报告上传时间 */ diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RSurveyCyclePO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RSurveyCyclePO.java index 60315f4ed..073b07b88 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RSurveyCyclePO.java +++ b/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") diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java index 3240f8ebf..95226a9df 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java +++ b/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> queryCheckTrack(@RequestParam("powerQualityProblemNo") String powerQualityProblemNo){ String methodDescribe = getMethodDescribe("checkPowerQuality"); - List rStatElectricQualityProblemLogVOS = issuesService.queryCheckTrack (powerQualityProblemNo); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatElectricQualityProblemLogVOS, methodDescribe); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java index 1670eec50..60b8448ca 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java +++ b/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 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 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 uploadLoadTypeUserA(@Validated LoadTypeUserAUploadParam loadTypeUserAUploadParam){ String methodDescribe = getMethodDescribe("uploadLoadTypeUserA"); boolean res = loadTypeUserManageService.uploadLoadTypeUserA(loadTypeUserAUploadParam); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java index 7969385fa..102692c14 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java +++ b/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; @@ -52,26 +52,24 @@ import java.util.stream.Stream; @AllArgsConstructor public class RGeneralSurveyPlanController extends BaseController { - private final RGeneralSurveyPlanPOService rGeneralSurveyPlanPOService; + private final RGeneralSurveyPlanPOService rGeneralSurveyPlanPOService; - private final - RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService; - private final - RSurveyPlanConfigService rSurveyPlanConfigService; - /** - * @Description: 新增/修改普测计划 - * @Param: [rGeneralSurveyPlanAddParm] - * @return: com.njcn.common.pojo.response.HttpResult - * @Author: clam - * @Date: 2022/11/22 - */ + + private final RSurveyPlanConfigService rSurveyPlanConfigService; + + /** + * @Description: 新增/修改普测计划 + * @Param: [rGeneralSurveyPlanAddParm] + * @return: com.njcn.common.pojo.response.HttpResult + * @Author: clam + * @Date: 2022/11/22 + */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/addPlan") @ApiOperation("新增/修改普测计划") @ApiImplicitParam(name = "rGeneralSurveyPlanAddParm", value = "新增普测计划参数", required = true) - public HttpResult addPlan(@RequestBody RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm){ + public HttpResult addPlan(@RequestBody @Validated RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm) { String methodDescribe = getMethodDescribe("addPlan"); - Boolean addFlag = rGeneralSurveyPlanPOService.addPlan(rGeneralSurveyPlanAddParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe); } @@ -80,29 +78,19 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/addPlanCycle") @ApiOperation("设置普测周期") @ApiImplicitParam(name = "cycleNum", value = "普测周期", required = true) - public HttpResult addPlanCycle(@RequestParam("cycleNum") Integer cycleNum ){ + public HttpResult 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 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> initDetpStataionTree(@RequestParam("orgId") String orgId ){ + public HttpResult> initDetpStataionTree(@RequestParam("orgId") String orgId) { String methodDescribe = getMethodDescribe("initDetpStataionTree"); - - List list = rGeneralSurveyPlanPOService.initDetpStataionTree ( orgId); + List list = rGeneralSurveyPlanPOService.initDetpStataionTree(orgId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } @@ -110,32 +98,32 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/addPlanConfig") @ApiOperation("增加普测计划参数") @ApiImplicitParam(name = "rSurveyPlanConfigVOList", value = "", required = true) - public HttpResult addPlanConfig(@Validated @RequestBody List rSurveyPlanConfigVOList){ + public HttpResult addPlanConfig(@Validated @RequestBody List rSurveyPlanConfigVOList) { String methodDescribe = getMethodDescribe("querySubStatation"); - double sum = rSurveyPlanConfigVOList.stream ( ).mapToDouble (RSurveyPlanConfigVO::getProportion).sum ( ); - if(sum>1){ + double sum = rSurveyPlanConfigVOList.stream().mapToDouble(RSurveyPlanConfigVO::getProportion).sum(); + if (sum > 1) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.MATH_ERROR, false, methodDescribe); } - List collect = rSurveyPlanConfigVOList.stream ( ).map (temp -> { - RSurveyPlanConfigPO rs = new RSurveyPlanConfigPO ( ); - BeanUtils.copyProperties (temp, rs); + List collect = rSurveyPlanConfigVOList.stream().map(temp -> { + RSurveyPlanConfigPO rs = new RSurveyPlanConfigPO(); + BeanUtils.copyProperties(temp, rs); return rs; - }).collect (Collectors.toList ( )); - boolean b = rSurveyPlanConfigService.saveOrUpdateBatchByMultiId (collect, 500); + }).collect(Collectors.toList()); + boolean b = rSurveyPlanConfigService.saveOrUpdateBatchByMultiId(collect, 500); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPlanConfig") @ApiOperation("查询普测计划参数") - public HttpResult> queryPlanConfig(){ + public HttpResult> queryPlanConfig() { String methodDescribe = getMethodDescribe("queryPlanConfig"); - List list = rSurveyPlanConfigService.list ( ); - List collect = list.stream ( ).map (temp -> { - RSurveyPlanConfigVO rs = new RSurveyPlanConfigVO ( ); - BeanUtils.copyProperties (temp, rs); + List list = rSurveyPlanConfigService.list(); + List collect = list.stream().map(temp -> { + RSurveyPlanConfigVO rs = new RSurveyPlanConfigVO(); + BeanUtils.copyProperties(temp, rs); return rs; - }).collect (Collectors.toList ( )); + }).collect(Collectors.toList()); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, collect, methodDescribe); } @@ -144,10 +132,9 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/querySubStatation") @ApiOperation("电站勾选接口") @ApiImplicitParam(name = "statetionNum", value = "电站数量", required = true) - public HttpResult querySubStatation(@RequestParam("statetionNum") Integer statetionNum ){ + public HttpResult querySubStatation(@RequestParam("statetionNum") Integer statetionNum) { String methodDescribe = getMethodDescribe("querySubStatation"); - - RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = rGeneralSurveyPlanPOService.querySubStatation (statetionNum); + RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = rGeneralSurveyPlanPOService.querySubStatation(statetionNum); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanAddParm, methodDescribe); } @@ -155,10 +142,9 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/queryPlan") @ApiOperation("查询普测计划-新建页面") @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true) - public HttpResult> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ + public HttpResult> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) { String methodDescribe = getMethodDescribe("queryPlan"); - - IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ()),"1"); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query(rGeneralSurveyPlanQueryParm, Stream.of("0", "1", "2", "3").collect(Collectors.toList()), "1"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } @@ -166,10 +152,19 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/queryPlanAudit") @ApiOperation("查询普测计划-审核页面") @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true) - public HttpResult> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ + public HttpResult> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) { String methodDescribe = getMethodDescribe("queryPlanAudit"); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query(rGeneralSurveyPlanQueryParm, Stream.of("1").collect(Collectors.toList()), "2"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); + } - IPage 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> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) { + String methodDescribe = getMethodDescribe("queryPlanResult"); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query(rGeneralSurveyPlanQueryParm, Stream.of("3", "4").collect(Collectors.toList()), "3"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } @@ -177,24 +172,12 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/checkPlanAudit") @ApiOperation("普测计划-审核") @ApiImplicitParam(name = "rGeneralSurveyPlanChcekParm", value = "普测计划审核参数", required = true) - public HttpResult checkPlanAudit(@Validated @RequestBody RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm){ + public HttpResult checkPlanAudit(@Validated @RequestBody RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm) { String methodDescribe = getMethodDescribe("checkPlanAudit"); - - Boolean flag = rGeneralSurveyPlanPOService.checkPlanAudit (rGeneralSurveyPlanChcekParm); + 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> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ - String methodDescribe = getMethodDescribe("queryPlanResult"); - - IPage 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,29 +190,26 @@ public class RGeneralSurveyPlanController extends BaseController { // } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPLOAD) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) @PostMapping("/surveyResultUpload") @ApiOperation("上传普测结果报告") -// @ApiImplicitParam(name = "surveyResultUploadParam", value = "实体参数", required = true) - public HttpResult surveyResultUpload( @Validated SurveyResultUploadParam surveyResultUploadParam){ + public HttpResult surveyResultUpload(@Validated SurveyResultUploadParam surveyResultUploadParam) { String methodDescribe = getMethodDescribe("surveyResultUpload"); boolean res = rGeneralSurveyPlanPOService.surveyResultUpload(surveyResultUploadParam); - if(res){ + if (res) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - }else { + } else { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.DOWNLOAD) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD) @PostMapping("/surveyResultDownload") @ApiOperation("下载普测结果报告") @ApiImplicitParam(name = "planNo", value = "计划号", required = true) - public HttpResult> surveyResultDownload(@RequestParam("planNo") String planNo ){ + public HttpResult> surveyResultDownload(@RequestParam("planNo") String planNo) { String methodDescribe = getMethodDescribe("surveyResultDownload"); List downloadUrls = rGeneralSurveyPlanPOService.surveyResultDownload(planNo); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, downloadUrls, methodDescribe); } @@ -238,10 +218,10 @@ public class RGeneralSurveyPlanController extends BaseController { @ApiOperation("导出普测计划信息") @PostMapping(value = "exportSurveyPlan") @ApiImplicitParam(name = "planIdList", value = "普测计划详情查询参数", required = true) - public HttpResult exportSurveyPlan(HttpServletResponse response,@RequestBody List planIdList) { + public HttpResult exportSurveyPlan(HttpServletResponse response, @RequestBody List planIdList) { String methodDescribe = getMethodDescribe("exportSurveyPlan"); String fileName = "普测计划信息.xls"; - List baseExcelList = null; + List baseExcelList; try { baseExcelList = rGeneralSurveyPlanPOService.exportSurveyPlan(planIdList); } catch (Exception e) { @@ -258,11 +238,9 @@ public class RGeneralSurveyPlanController extends BaseController { @ApiOperation("普测计划信息问题件新增查询") @PostMapping(value = "querySurveyPlanOnQuestion") @ApiImplicitParam(name = "questionQueryParm", value = "普测计划信息问题件查询参数", required = true) - public HttpResult> querySurveyPlanOnQuestion(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) { + public HttpResult> querySurveyPlanOnQuestion(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) { String methodDescribe = getMethodDescribe("querySurveyPlanOnQuestion"); - - List list= rGeneralSurveyPlanPOService.querySurveyPlanOnQuestion(questionQueryParm); - + List list = rGeneralSurveyPlanPOService.querySurveyPlanOnQuestion(questionQueryParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } @@ -271,15 +249,32 @@ public class RGeneralSurveyPlanController extends BaseController { @ApiOperation("普测计划名称查询") @PostMapping(value = "querySurveyPlanName") @ApiImplicitParam(name = "questionQueryParm", value = "普测计划名称查询参数", required = true) - public HttpResult> querySurveyPlanName(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) { + public HttpResult> querySurveyPlanName(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) { String methodDescribe = getMethodDescribe("querySurveyPlanName"); - - List list= rGeneralSurveyPlanPOService.querySurveyPlanName(questionQueryParm); - + List list = rGeneralSurveyPlanPOService.querySurveyPlanName(questionQueryParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @ResponseBody + @ApiOperation("普测计划状态更改为待审核") + @PostMapping(value = "planStatus") + public HttpResult planStatus(@RequestBody List planNo) { + String methodDescribe = getMethodDescribe("planStatus"); + int count = rGeneralSurveyPlanPOService.count(new LambdaUpdateWrapper() + .in(RGeneralSurveyPlanPO::getPlanNo, planNo) + .ne(RGeneralSurveyPlanPO::getStatus, Arrays.asList(0, 2)) + ); + if (count > 0) { + throw new BusinessException("请检查普测计划状态是否正确！"); + } + Boolean update = rGeneralSurveyPlanPOService.update(new LambdaUpdateWrapper() + .in(RGeneralSurveyPlanPO::getPlanNo, planNo) + .set(RGeneralSurveyPlanPO::getStatus, 1) + ); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe); + + } } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java index dc1f53c25..badaf99cc 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java +++ b/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 getLoadTypeUserPage(IPage page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam); + Page getLoadTypeUserPage(IPage page, + @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam, + @Param("ids") List ids + ); /** * 干扰源用户分页查询 @@ -32,5 +37,7 @@ public interface LoadTypeUserManageMapper extends BaseMapper getLoadTypeRelationPage(IPage page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam); + Page getLoadTypeRelationPage(IPage page, + @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam + ); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java index c64d03593..6d5e9a0c4 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/11 11:28【需求编号】 @@ -38,4 +38,4 @@ public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper"}) List querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm); - } \ No newline at end of file +} \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml index ca588738d..32c715396 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml @@ -2,27 +2,35 @@ - SELECT * FROM r_load_type_user_manage r - where 1=1 - - and r.org_no = #{loadTypeUserSearchParam.orgNo} - - - and r.load_type = #{loadTypeUserSearchParam.loadType} - - - and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%') - - - and r.i_is_file_upload = #{loadTypeUserSearchParam.fileUploadflag} - + + + AND r.org_no IN + + #{item} + + + + and r.i_check_person is null and r.i_check_person !="" + + + and r.load_type = #{param.loadType} + + + and r.user_name like CONCAT('%', #{param.userName}, '%') + + + and r.i_is_file_upload = #{param.fileUploadflag} + + + order by record_time desc - SELECT * FROM @@ -31,21 +39,22 @@ AND ISNULL( relation_user_id )= 0 AND LENGTH( trim( relation_user_id ))> 0 - - and r.org_no = #{loadTypeUserSearchParam.orgNo} + + and r.org_no = #{param.orgNo} - - and r.load_type = #{loadTypeUserSearchParam.loadType} + + and r.load_type = #{param.loadType} - - and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%') + + and r.user_name like CONCAT('%', #{param.userName}, '%') - - and r.relation_user_name like CONCAT('%', #{loadTypeUserSearchParam.relationUserName}, '%') + + and r.relation_user_name like CONCAT('%', #{param.relationUserName}, '%') - - and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload} + + and r.a_is_file_upload = #{param.aIsFileUpload} + order by record_time desc diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java index df33a17b9..3c83268d3 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java +++ b/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【需求编号】 @@ -20,84 +17,90 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface RGeneralSurveyPlanPOService extends IMppService{ +public interface RGeneralSurveyPlanPOService extends IMppService { - /** - * @Description: addPlan - * @Param: [rGeneralSurveyPlanAddParm] - * @return: java.lang.Boolean - * @Author: clam - * @Date: 2022/11/14 - */ - Boolean addPlan(RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm); - /** - * @Description: query - * @Param: [rGeneralSurveyPlanQueryParm] - * @return: java.util.List - * @Author: clam - * @Date: 2022/11/15 - */ - IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List statusList,String type); - /** - * @Description: surveyResultUpload - * @Param: [surveyResultUploadParam] - * @return: boolean - * @Author: clam - * @Date: 2022/11/18 - */ + /** + * @Description: addPlan + * @Param: [rGeneralSurveyPlanAddParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2022/11/14 + */ + Boolean addPlan(RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm); + + /** + * @Description: query + * @Param: [rGeneralSurveyPlanQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/15 + */ + IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List statusList, String type); + + /** + * @Description: surveyResultUpload + * @Param: [surveyResultUploadParam] + * @return: boolean + * @Author: clam + * @Date: 2022/11/18 + */ boolean surveyResultUpload(SurveyResultUploadParam surveyResultUploadParam); - /** - * @Description: surveyResultDownload - * @Param: [planNo] - * @return: java.util.List - * @Author: clam - * @Date: 2022/11/18 - */ - List surveyResultDownload(String planNo); - /** - * @Description: exportSurveyPlan - * @Param: [] - * @return: java.util.List - * @Author: clam - * @Date: 2022/11/21 - */ - List exportSurveyPlan(List planIdList); - /** - * @Description: querySurveyPlanOnQuestion - * @Param: [questionQueryParm] - * @return: java.util.List - * @Author: clam - * @Date: 2022/11/30 - */ - List querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm); - /** - * @Description: 更具questionQueryParm查计划名称 - * @Param: [questionQueryParm] - * @return: java.util.List - * @Author: clam - * @Date: 2022/12/1 - */ - List querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm); - /** - * @Description: checkPlanAudit - * @Param: [rGeneralSurveyPlanChcekParm] - * @return: java.lang.Boolean - * @Author: clam - * @Date: 2023/2/22 - */ - Boolean checkPlanAudit(RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm); - void importSubStatation(MultipartFile file, HttpServletResponse response); + /** + * @Description: surveyResultDownload + * @Param: [planNo] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/18 + */ + List surveyResultDownload(String planNo); + + /** + * @Description: exportSurveyPlan + * @Param: [] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/21 + */ + List exportSurveyPlan(List planIdList); + + /** + * @Description: querySurveyPlanOnQuestion + * @Param: [questionQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/30 + */ + List querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm); + + /** + * @Description: 更具questionQueryParm查计划名称 + * @Param: [questionQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/12/1 + */ + List querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm); + + /** + * @Description: checkPlanAudit + * @Param: [rGeneralSurveyPlanChcekParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2023/2/22 + */ + Boolean checkPlanAudit(RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm); RGeneralSurveyPlanAddParm querySubStatation(Integer statetionNum); List initDetpStataionTree(String orgid); - /** - * @Description: 设置普测周期 - * @Param: [cycleNum] - * @return: java.lang.Boolean - * @Author: clam - * @Date: 2023/3/15 - */ + + /** + * @Description: 设置普测周期 + * @Param: [cycleNum] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2023/3/15 + */ RSurveyCycleVO addPlanCycle(Integer cycleNum); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java index c1c1451f3..d231ca979 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java +++ b/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.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; 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 getLoadTypeUserList(LoadTypeUserSearchParam loadTypeUserSearchParam) { Page page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize()); - Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam); - - //部门处理：根据部门code取名称 - List list = loadTypeUserPage.getRecords(); + List ids=deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( ); + Integer checkType = loadTypeUserSearchParam.getCheckType(); + //0表示不是审核信息 1标识审核信息 + List data = deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( ); + if(checkType==1){ + ids=data.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList()); + } + //干扰源用户信息录入 + Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam,ids); List dept = deptFeignClient.allDeptList().getData(); Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO)); - List resultList = list.stream().map(item -> { - RLoadTypeUserManageVO rLoadTypeUserManageVO = new RLoadTypeUserManageVO(); - BeanUtils.copyProperties(item, rLoadTypeUserManageVO); - rLoadTypeUserManageVO.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位名称 - return rLoadTypeUserManageVO; - }).collect(Collectors.toList()); - + //部门处理：根据部门code取名称 + loadTypeUserPage.getRecords().stream().forEach(item -> { + item.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位名称 + }); //返回新的数据组 - 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()); } @@ -232,11 +247,18 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService if (Objects.equals(Param.LOAD_TYPE_USER_SUBMIT, loadTypeUserAUploadParam.getStatus())) { dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData(); } else { - dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData(); + //是否是未通过，未通过则不修改状态 + if(aBoolean){ + dictData=null; + }else{ + dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData(); + } } - rLoadTypeUserManage.setAStatus(dictData.getId()); + 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 finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData(); + DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAILED.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 finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData(); + DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAILED.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; + + } + + + + } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java index de9ec3e4c..a077311f8 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java @@ -130,7 +130,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl implements RGeneralSurveyPlanPOService { - @Autowired - private RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService; - - @Resource - private RGeneralSurveyPlanPOMapper rGeneralSurveyPlanPOMapper; - - @Resource - private RGeneralSurveyPlanDetailMapper rGeneralSurveyPlanDetailMapper; - - @Autowired - private DeptFeignClient deptFeignClient; - - @Resource - private FileStorageUtil fileStorageUtil; - - @Autowired - private StatationStatService statationStatService; - @Autowired - private DicDataFeignClient dicDataFeignClient; - - @Autowired - private RSurveyCycleMapper rSurveyCycleMapper; - - @Autowired - private RSurveyPlanConfigService rSurveyPlanConfigService; + private final RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService; + private final RGeneralSurveyPlanPOMapper rGeneralSurveyPlanPOMapper; + private final RGeneralSurveyPlanDetailMapper rGeneralSurveyPlanDetailMapper; + private final DeptFeignClient deptFeignClient; + private final FileStorageUtil fileStorageUtil; + private final StatationStatClient statationStatClient; + private final DicDataFeignClient dicDataFeignClient; + private final RSurveyCycleMapper rSurveyCycleMapper; + private final RSurveyPlanConfigService rSurveyPlanConfigService; /** @@ -104,45 +89,57 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl rSurveyCyclePOQueryWrapper = new QueryWrapper ( ); - rSurveyCyclePOQueryWrapper.le ("start_year", rGeneralSurveyPlanPO.getPlanEndTime ( )); - rSurveyCyclePOQueryWrapper.ge ("end_year", rGeneralSurveyPlanPO.getPlanEndTime ( )); - RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper); + QueryWrapper rSurveyCyclePOQueryWrapper = new QueryWrapper(); + rSurveyCyclePOQueryWrapper.le("start_year", rGeneralSurveyPlanPO.getPlanEndTime()); + rSurveyCyclePOQueryWrapper.ge("end_year", rGeneralSurveyPlanPO.getPlanEndTime()); + RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne(rSurveyCyclePOQueryWrapper); - rGeneralSurveyPlanPO.setCycleId (rSurveyCyclePO.getId ( )); - String deptIndex = RequestUtil.getDeptIndex ( ); - Dept data = deptFeignClient.getDeptById (deptIndex).getData ( ); - rGeneralSurveyPlanPO.setCheckPerson (data.getPid ()); - rGeneralSurveyPlanPO.setCreatePerson (RequestUtil.getUserIndex ()); - boolean b = this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO); + rGeneralSurveyPlanPO.setCycleId(rSurveyCyclePO.getId()); + String deptIndex = RequestUtil.getDeptIndex(); + Dept data = deptFeignClient.getDeptById(deptIndex).getData(); + rGeneralSurveyPlanPO.setCheckPerson(data.getPid()); + rGeneralSurveyPlanPO.setCreatePerson(RequestUtil.getUserIndex()); + int count = this.count(new LambdaQueryWrapper() + .eq(RGeneralSurveyPlanPO::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo()) + ); + boolean b; + if (count > 0) { + b = this.updateByMultiId(rGeneralSurveyPlanPO); + } else { + /*todo 后期与工作流绑定*/ + rGeneralSurveyPlanPO.setStatus(0); + b = this.save(rGeneralSurveyPlanPO); + } - QueryWrapper queryWrapper = new QueryWrapper ( ); - queryWrapper.lambda ( ).eq (RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo ( )); - rGeneralSurveyPlanDetailService.remove (queryWrapper); - List rGeneralSurveyPlanDetailList = new ArrayList<> ( ); - rGeneralSurveyPlanAddParm.getSubIds ( ).forEach (temp -> { - StatationStat byId = statationStatService.getById (temp); - RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail ( ); - rGeneralSurveyPlanDetail.setPlanNo (rGeneralSurveyPlanAddParm.getPlanNo ( )); - rGeneralSurveyPlanDetail.setOrgNo (byId.getOrgId ( )); - rGeneralSurveyPlanDetail.setOrgName (byId.getOrgName ( )); - rGeneralSurveyPlanDetail.setSubId (byId.getPowerId ( )); - rGeneralSurveyPlanDetail.setSubName (byId.getPowerName ( )); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.lambda().eq(RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo()); + rGeneralSurveyPlanDetailService.remove(queryWrapper); + List rGeneralSurveyPlanDetailList = new ArrayList<>(); + + PmsStatationStatInfoParam param =new PmsStatationStatInfoParam(); + param.setPowerIds(rGeneralSurveyPlanAddParm.getSubIds()); + List stationList = statationStatClient.getPowerInfo(param).getData(); + for (StatationStat stat : stationList) { + RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail(); + rGeneralSurveyPlanDetail.setPlanNo(rGeneralSurveyPlanAddParm.getPlanNo()); + rGeneralSurveyPlanDetail.setOrgNo(stat.getOrgId()); + rGeneralSurveyPlanDetail.setOrgName(stat.getOrgName()); + rGeneralSurveyPlanDetail.setSubId(stat.getPowerId()); + rGeneralSurveyPlanDetail.setSubName(stat.getPowerName()); /*目前时间与计划开始时间，结束时间一致*/ - rGeneralSurveyPlanDetail.setGeneralSurveyStartTime (rGeneralSurveyPlanAddParm.getPlanStartTime ( )); - rGeneralSurveyPlanDetail.setGeneralSurveyTime (rGeneralSurveyPlanAddParm.getPlanStartTime ( )); - rGeneralSurveyPlanDetail.setGeneralSurveyEndTime (rGeneralSurveyPlanAddParm.getPlanEndTime ( )); - rGeneralSurveyPlanDetail.setPlanNo (rGeneralSurveyPlanAddParm.getPlanNo ( )); - rGeneralSurveyPlanDetail.setGeneralSurveyLeader (rGeneralSurveyPlanAddParm.getLeader ( )); - rGeneralSurveyPlanDetailList.add (rGeneralSurveyPlanDetail); - }); - boolean b1 = rGeneralSurveyPlanDetailService.saveOrUpdateBatchByMultiId (rGeneralSurveyPlanDetailList, 500); - + 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; } @@ -155,64 +152,64 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List statusList,String type) { - IPage page = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( )); - IPage returnpage = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( )); + public IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List statusList, String type) { + IPage page = new Page<>(rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize()); + IPage returnpage = new Page<>(rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> ( ); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); /*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/ - if(type=="1"||type=="3"){ - queryWrapper.eq (RGeneralSurveyPlanPO::getCreatePerson,RequestUtil.getUserIndex ()); + if (type == "1" || type == "3") { + queryWrapper.eq(RGeneralSurveyPlanPO::getCreatePerson, RequestUtil.getUserIndex()); } - if(type=="2"){ - queryWrapper.eq (RGeneralSurveyPlanPO::getCheckPerson,RequestUtil.getDeptIndex ()); + if (type == "2") { + queryWrapper.eq(RGeneralSurveyPlanPO::getCheckPerson, RequestUtil.getDeptIndex()); } - if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getOrgNo ( ))) { - List data = deptFeignClient.getDepSonIdtByDeptId (rGeneralSurveyPlanQueryParm.getOrgNo ( )).getData ( ); + if (!StringUtils.isEmpty(rGeneralSurveyPlanQueryParm.getOrgNo())) { + List data = deptFeignClient.getDepSonIdtByDeptId(rGeneralSurveyPlanQueryParm.getOrgNo()).getData(); - queryWrapper.in (RGeneralSurveyPlanPO::getOrgNo, data); + queryWrapper.in(RGeneralSurveyPlanPO::getOrgNo, data); } - if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getStatus ( ))) { - queryWrapper.eq (RGeneralSurveyPlanPO::getStatus, rGeneralSurveyPlanQueryParm.getStatus ( )); + if (!StringUtils.isEmpty(rGeneralSurveyPlanQueryParm.getStatus())) { + queryWrapper.eq(RGeneralSurveyPlanPO::getStatus, rGeneralSurveyPlanQueryParm.getStatus()); } - if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getIsFileUpload ( ))) { - queryWrapper.eq (RGeneralSurveyPlanPO::getIsFileUpload, rGeneralSurveyPlanQueryParm.getIsFileUpload ( )); + if (!StringUtils.isEmpty(rGeneralSurveyPlanQueryParm.getIsFileUpload())) { + queryWrapper.eq(RGeneralSurveyPlanPO::getIsFileUpload, rGeneralSurveyPlanQueryParm.getIsFileUpload()); } - if (!Objects.isNull (rGeneralSurveyPlanQueryParm.getPlanStartTime ( ))) { - queryWrapper.ge (RGeneralSurveyPlanPO::getPlanStartTime, rGeneralSurveyPlanQueryParm.getPlanStartTime ( )); + if (!Objects.isNull(rGeneralSurveyPlanQueryParm.getPlanStartTime())) { + queryWrapper.ge(RGeneralSurveyPlanPO::getPlanStartTime, rGeneralSurveyPlanQueryParm.getPlanStartTime()); } - if (!Objects.isNull (rGeneralSurveyPlanQueryParm.getPlanEndTime ( ))) { - queryWrapper.le (RGeneralSurveyPlanPO::getPlanStartTime, rGeneralSurveyPlanQueryParm.getPlanEndTime ( )); + if (!Objects.isNull(rGeneralSurveyPlanQueryParm.getPlanEndTime())) { + queryWrapper.le(RGeneralSurveyPlanPO::getPlanStartTime, rGeneralSurveyPlanQueryParm.getPlanEndTime()); } - queryWrapper.in (RGeneralSurveyPlanPO::getStatus, statusList); - queryWrapper.orderByAsc (RGeneralSurveyPlanPO::getStatus).orderByDesc (RGeneralSurveyPlanPO::getPlanCreateTime); + queryWrapper.in(RGeneralSurveyPlanPO::getStatus, statusList); + queryWrapper.orderByAsc(RGeneralSurveyPlanPO::getStatus).orderByDesc(RGeneralSurveyPlanPO::getPlanCreateTime); - List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage (page, queryWrapper).getRecords ( ); - if (CollectionUtils.isEmpty (rGeneralSurveyPlanPOS)) { + List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper).getRecords(); + if (CollectionUtils.isEmpty(rGeneralSurveyPlanPOS)) { return returnpage; } //部门处理：根据部门code取名称 - List dept = deptFeignClient.allDeptList ( ).getData ( ); - Map pvTerminalTreeVOMap = dept.stream ( ). - collect (Collectors. - toMap (PvTerminalTreeVO::getId, + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream(). + collect(Collectors. + toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName)); - List collect = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( )); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<> ( ); - lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, collect); - List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper); - List rGeneralSurveyPlanVOList = new ArrayList<> ( ); - rGeneralSurveyPlanPOS.forEach (temp -> { - RGeneralSurveyPlanVO rGeneralSurveyPlanVO = new RGeneralSurveyPlanVO ( ); - BeanUtils.copyProperties (temp, rGeneralSurveyPlanVO); - List collect1 = rGeneralSurveyPlanDetails.stream ( ). - filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). - map (RGeneralSurveyPlanDetail::getSubId).collect (Collectors.toList ( )); - rGeneralSurveyPlanVO.setSubCount (collect1.size ( )); - rGeneralSurveyPlanVO.setSubIds (collect1); + List collect = rGeneralSurveyPlanPOS.stream().map(RGeneralSurveyPlanPO::getPlanNo).collect(Collectors.toList()); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(RGeneralSurveyPlanDetail::getPlanNo, collect); + List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList(lambdaQueryWrapper); + List rGeneralSurveyPlanVOList = new ArrayList<>(); + rGeneralSurveyPlanPOS.forEach(temp -> { + RGeneralSurveyPlanVO rGeneralSurveyPlanVO = new RGeneralSurveyPlanVO(); + BeanUtils.copyProperties(temp, rGeneralSurveyPlanVO); + List collect1 = rGeneralSurveyPlanDetails.stream(). + filter(surveyPlanDetail -> Objects.equals(surveyPlanDetail.getPlanNo(), temp.getPlanNo())). + map(RGeneralSurveyPlanDetail::getSubId).collect(Collectors.toList()); + rGeneralSurveyPlanVO.setSubCount(collect1.size()); + rGeneralSurveyPlanVO.setSubIds(collect1); /* long Subcount = rGeneralSurveyPlanDetails.stream ( ). filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). @@ -225,13 +222,13 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl surveyResultDownload(String planNo) { - RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO ( ); - rGeneralSurveyPlanPO.setPlanNo (planNo); - rGeneralSurveyPlanPO = this.selectByMultiId (rGeneralSurveyPlanPO); - String filePath = rGeneralSurveyPlanPO.getFilePath ( ); - if (StringUtils.isEmpty (filePath)) { - throw new BusinessException (OssResponseEnum.DOWNLOAD_FILE_ERROR); + RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO(); + rGeneralSurveyPlanPO.setPlanNo(planNo); + rGeneralSurveyPlanPO = this.selectByMultiId(rGeneralSurveyPlanPO); + String filePath = rGeneralSurveyPlanPO.getFilePath(); + if (StringUtils.isEmpty(filePath)) { + throw new BusinessException(OssResponseEnum.DOWNLOAD_FILE_ERROR); } - String[] split = filePath.substring (0, filePath.length ( ) - 1).split (";"); - List collect = Stream.of (split).map (temp -> { - String[] split1 = temp.split ("##"); + String[] split = filePath.substring(0, filePath.length() - 1).split(";"); + List collect = Stream.of(split).map(temp -> { + String[] split1 = temp.split("##"); String OriginalFilename = split1[1]; String minoFileName = split1[0]; - MinIoUploadResDTO dto = new MinIoUploadResDTO (OriginalFilename, fileStorageUtil.getFileUrl (minoFileName)); + MinIoUploadResDTO dto = new MinIoUploadResDTO(OriginalFilename, fileStorageUtil.getFileUrl(minoFileName)); return dto; - }).collect (Collectors.toList ( )); + }).collect(Collectors.toList()); return collect; } @@ -307,36 +304,36 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl exportSurveyPlan(List planIdList) { - List surveyPlanExcels = new ArrayList<> ( ); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> ( ); - queryWrapper.in (RGeneralSurveyPlanPO::getPlanNo, planIdList); - List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<> ( ); - lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, planIdList); - List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper); + List surveyPlanExcels = new ArrayList<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(RGeneralSurveyPlanPO::getPlanNo, planIdList); + List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList(queryWrapper); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(RGeneralSurveyPlanDetail::getPlanNo, planIdList); + List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList(lambdaQueryWrapper); //部门处理：根据部门code取名称 - List dept = deptFeignClient.allDeptList ( ).getData ( ); - Map pvTerminalTreeVOMap = dept.stream ( ). - collect (Collectors. - toMap (PvTerminalTreeVO::getId, + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream(). + collect(Collectors. + toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName)); - rGeneralSurveyPlanPOS.forEach (temp -> { - SurveyPlanExcel surveyPlanExcel = new SurveyPlanExcel ( ); - BeanUtils.copyProperties (temp, surveyPlanExcel); + rGeneralSurveyPlanPOS.forEach(temp -> { + SurveyPlanExcel surveyPlanExcel = new SurveyPlanExcel(); + BeanUtils.copyProperties(temp, surveyPlanExcel); // long Busbarcount = rGeneralSurveyPlanDetails.stream ( ). // filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). // map (RGeneralSurveyPlanDetail::getBusbarId).distinct ( ).count ( ); - long Subcount = rGeneralSurveyPlanDetails.stream ( ). - filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). - map (RGeneralSurveyPlanDetail::getSubId).distinct ( ).count ( ); + long Subcount = rGeneralSurveyPlanDetails.stream(). + filter(surveyPlanDetail -> Objects.equals(surveyPlanDetail.getPlanNo(), temp.getPlanNo())). + map(RGeneralSurveyPlanDetail::getSubId).distinct().count(); // surveyPlanExcel.setBusCount (Busbarcount); - surveyPlanExcel.setSubCount (Subcount); - surveyPlanExcel.setOrgNo (pvTerminalTreeVOMap.get (surveyPlanExcel.getOrgNo ( ))); - surveyPlanExcel.setStatus (getPlanStatus(temp.getStatus ())); - surveyPlanExcels.add (surveyPlanExcel); + surveyPlanExcel.setSubCount(Subcount); + surveyPlanExcel.setOrgNo(pvTerminalTreeVOMap.get(surveyPlanExcel.getOrgNo())); + surveyPlanExcel.setStatus(getPlanStatus(temp.getStatus())); + surveyPlanExcels.add(surveyPlanExcel); }); return surveyPlanExcels; @@ -365,6 +362,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm) { - List rGeneralSurveyPlanDetailOnQuestionVOS = new ArrayList<> ( ); - rGeneralSurveyPlanDetailOnQuestionVOS = rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion (questionQueryParm); - - return rGeneralSurveyPlanDetailOnQuestionVOS; + return rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion(questionQueryParm); } /** @@ -392,14 +387,14 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm) { - List data = deptFeignClient.getDepSonIdtByDeptId (questionQueryParm.getOrgNo ( )).getData ( ); + List data = deptFeignClient.getDepSonIdtByDeptId(questionQueryParm.getOrgNo()).getData(); - QueryWrapper queryWrapper = new QueryWrapper<> ( ); - queryWrapper.select ("plan_name"). - in ("org_no", data). - eq ("DATE_FORMAT(upload_time, '%Y-%m')", new SimpleDateFormat ("yyyy-MM"). - format (questionQueryParm.getPlanStartTime ( ))); - List list = this.list (queryWrapper); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("plan_name"). + in("org_no", data). + eq("DATE_FORMAT(upload_time, '%Y-%m')", new SimpleDateFormat("yyyy-MM"). + format(questionQueryParm.getPlanStartTime())); + List list = this.list(queryWrapper); return list; } @@ -416,143 +411,83 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl updateWrapper = new UpdateWrapper ( ); - updateWrapper.eq ("plan_no", rGeneralSurveyPlanChcekParm.getPlanNo ( )); - updateWrapper.set ("check_comment", rGeneralSurveyPlanChcekParm.getCheckComment ( )); + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("plan_no", rGeneralSurveyPlanChcekParm.getPlanNo()); + updateWrapper.set("check_comment", rGeneralSurveyPlanChcekParm.getCheckComment()); // updateWrapper.set ("check_person", rGeneralSurveyPlanChcekParm.getCheckPerson ( )); - updateWrapper.set ("status", Objects.equals ("1", rGeneralSurveyPlanChcekParm.getCheckResult ( )) ? 3 : 2); - result = this.update (updateWrapper); + updateWrapper.set("status", Objects.equals("1", rGeneralSurveyPlanChcekParm.getCheckResult()) ? 3 : 2); + result = this.update(updateWrapper); 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 terminalBaseList = ExcelImportUtil.importExcelMore (file.getInputStream ( ), StatationStatExcel.class, params); - //如果存在非法数据，将不合格的数据导出 - - /*规则1:StatationStat的orgName要在原系统存在2:电压等级不对*/ - List data = deptFeignClient.allDeptList ( ).getData ( ); - Map pvTerminalTreeVOMap = data.stream ( ).collect (Collectors.toMap (PvTerminalTreeVO::getName, pvTerminalTreeVO -> pvTerminalTreeVO)); - //获取电压等级的字典 - List voltageLevelList = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.DEV_VOLTAGE.getCode ( )).getData ( ); - //将电压信息转成map，key：id value：name - Map voltageLevelMap = voltageLevelList.stream ( ).collect (Collectors.toMap (DictData::getName, voltageLevel -> voltageLevel)); - List trueCollect = new ArrayList<> ( ); - List 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 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 list = statationStatService.list ( ); + List list = statationStatClient.getPowerInfo(new PmsStatationStatInfoParam()).getData(); /**查出当前周期id**/ - QueryWrapper rSurveyCyclePOQueryWrapper = new QueryWrapper ( ); - rSurveyCyclePOQueryWrapper.le ("start_year", LocalDate.now ( )); - rSurveyCyclePOQueryWrapper.ge ("end_year", LocalDate.now ( )); - RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper); + QueryWrapper rSurveyCyclePOQueryWrapper = new QueryWrapper(); + rSurveyCyclePOQueryWrapper.le("start_year", LocalDate.now()); + rSurveyCyclePOQueryWrapper.ge("end_year", LocalDate.now()); + RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne(rSurveyCyclePOQueryWrapper); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> ( ); - queryWrapper.eq (RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId ( )); - List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper); - List planIds = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( )); - List subIds = new ArrayList<> ( ); - if (!CollectionUtils.isEmpty (planIds)) { - QueryWrapper rGeneralSurveyPlanDetailQueryWrapper = new QueryWrapper ( ); - rGeneralSurveyPlanDetailQueryWrapper.in ("plan_no", planIds); - List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (rGeneralSurveyPlanDetailQueryWrapper); - subIds = rGeneralSurveyPlanDetails.stream ( ).map (RGeneralSurveyPlanDetail::getSubId).collect (Collectors.toList ( )); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId()); + List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList(queryWrapper); + List planIds = rGeneralSurveyPlanPOS.stream().map(RGeneralSurveyPlanPO::getPlanNo).collect(Collectors.toList()); + List subIds = new ArrayList<>(); + if (!CollectionUtils.isEmpty(planIds)) { + QueryWrapper rGeneralSurveyPlanDetailQueryWrapper = new QueryWrapper(); + rGeneralSurveyPlanDetailQueryWrapper.in("plan_no", planIds); + List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList(rGeneralSurveyPlanDetailQueryWrapper); + subIds = rGeneralSurveyPlanDetails.stream().map(RGeneralSurveyPlanDetail::getSubId).collect(Collectors.toList()); } List finalSubIds = subIds; - List filterList = list.stream ( ).filter (temp -> !finalSubIds.contains (temp.getPowerId ( ))).collect (Collectors.toList ( )); - List addList = new ArrayList<> ( ); + List filterList = list.stream().filter(temp -> !finalSubIds.contains(temp.getPowerId())).collect(Collectors.toList()); + List addList = new ArrayList<>(); - List rSurveyPlanConfigPOList = rSurveyPlanConfigService.list ( ); - Map orgIdMap = rSurveyPlanConfigPOList.stream ( ). - collect (Collectors.toMap (RSurveyPlanConfigPO::getOrgId, temp -> temp)); - List data = deptFeignClient.allDeptList ( ).getData ( ); - data.stream ( ).forEach (temp -> { - DeptSubstationVO deptSubstationVO = new DeptSubstationVO ( ); - BeanUtils.copyProperties (temp, deptSubstationVO); + List rSurveyPlanConfigPOList = rSurveyPlanConfigService.list(); + Map orgIdMap = rSurveyPlanConfigPOList.stream(). + collect(Collectors.toMap(RSurveyPlanConfigPO::getOrgId, temp -> temp)); + List data = deptFeignClient.allDeptList().getData(); + data.stream().forEach(temp -> { + DeptSubstationVO deptSubstationVO = new DeptSubstationVO(); + BeanUtils.copyProperties(temp, deptSubstationVO); /*如果存在电站占比配置随机抽出配置电站个数*/ - if (orgIdMap.containsKey (temp.getId ( ))) { - List collect = filterList.stream ( ).filter (statationStat -> Objects. - equals (statationStat.getOrgId ( ), temp.getId ( ))).collect (Collectors.toList ( )); - RSurveyPlanConfigPO rSurveyPlanConfigPO = orgIdMap.get (temp.getId ( )); + if (orgIdMap.containsKey(temp.getId())) { + List collect = filterList.stream().filter(statationStat -> Objects. + equals(statationStat.getOrgId(), temp.getId())).collect(Collectors.toList()); + RSurveyPlanConfigPO rSurveyPlanConfigPO = orgIdMap.get(temp.getId()); //向上取整 - int v = (int) Math.ceil (rSurveyPlanConfigPO.getProportion ( ) * + int v = (int) Math.ceil(rSurveyPlanConfigPO.getProportion() * statetionNum); - if (collect.size ( ) >= v) { - Collections.shuffle (collect); - List lastList = collect.stream ( ).limit (v).collect (Collectors.toList ( )); - addList.addAll (lastList); + if (collect.size() >= v) { + Collections.shuffle(collect); + List lastList = collect.stream().limit(v).collect(Collectors.toList()); + addList.addAll(lastList); } else { - addList.addAll (collect); + addList.addAll(collect); } } }); - if (statetionNum > addList.size ( )) { + if (statetionNum > addList.size()) { /*取差集，当通过比例抽取变电站不够时 重差集里取*/ - List collect = filterList.stream ( ).filter (o -> !addList.contains (o)).collect (Collectors.toList ( )); - int differenceCount = statetionNum - addList.size ( ); - Collections.shuffle (collect); - List lastList = collect.stream ( ).limit (differenceCount).collect (Collectors.toList ( )); - addList.addAll (lastList); + List collect = filterList.stream().filter(o -> !addList.contains(o)).collect(Collectors.toList()); + int differenceCount = statetionNum - addList.size(); + Collections.shuffle(collect); + List lastList = collect.stream().limit(differenceCount).collect(Collectors.toList()); + addList.addAll(lastList); } - List result = addList.stream ( ).map (StatationStat::getPowerId).collect (Collectors.toList ( )); - RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = new RGeneralSurveyPlanAddParm ( ); - rGeneralSurveyPlanAddParm.setSubIds (result); + List result = addList.stream().map(StatationStat::getPowerId).collect(Collectors.toList()); + RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = new RGeneralSurveyPlanAddParm(); + rGeneralSurveyPlanAddParm.setSubIds(result); return rGeneralSurveyPlanAddParm; } @@ -560,98 +495,99 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl initDetpStataionTree(String orgdid) { /*查询所有电站并过滤已经参加当期普测电站*/ - List list = statationStatService.list ( ); + List list = statationStatClient.getPowerInfo(new PmsStatationStatInfoParam()).getData(); /**查出当前周期id**/ - QueryWrapper rSurveyCyclePOQueryWrapper = new QueryWrapper ( ); - rSurveyCyclePOQueryWrapper.le ("start_year", LocalDate.now ( )); - rSurveyCyclePOQueryWrapper.ge ("end_year", LocalDate.now ( )); - RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper); -/** - * 不存则新建周期 - */ - if (Objects.equals (rSurveyCyclePO, null)) { - List rSurveyCyclePOS = rSurveyCycleMapper.selectList (null); + QueryWrapper rSurveyCyclePOQueryWrapper = new QueryWrapper(); + rSurveyCyclePOQueryWrapper.le("start_year", LocalDate.now()); + rSurveyCyclePOQueryWrapper.ge("end_year", LocalDate.now()); + RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne(rSurveyCyclePOQueryWrapper); + /** + * 不存则新建周期 + */ + if (Objects.equals(rSurveyCyclePO, null)) { + List rSurveyCyclePOS = rSurveyCycleMapper.selectList(null); int cycleNum = 0; - if (CollectionUtils.isEmpty (rSurveyCyclePOS)) { + if (CollectionUtils.isEmpty(rSurveyCyclePOS)) { cycleNum = 5; } else { - rSurveyCyclePOS = rSurveyCyclePOS.stream ( ) - .sorted (Comparator.comparing (RSurveyCyclePO::getEndYear).reversed ( )) - .collect (Collectors.toList ( )); + rSurveyCyclePOS = rSurveyCyclePOS.stream() + .sorted(Comparator.comparing(RSurveyCyclePO::getEndYear).reversed()) + .collect(Collectors.toList()); - cycleNum = rSurveyCyclePOS.get (0).getSurveyCycle ( ); + cycleNum = rSurveyCyclePOS.get(0).getSurveyCycle(); } - LocalDate enddate = LocalDate.now ( ).plusYears (cycleNum); - rSurveyCyclePO = new RSurveyCyclePO ( ); - rSurveyCyclePO.setStartYear (LocalDate.now ( )); - rSurveyCyclePO.setEndYear (enddate); - rSurveyCyclePO.setSurveyCycle (cycleNum); - rSurveyCycleMapper.insert (rSurveyCyclePO); + LocalDate enddate = LocalDate.now().plusYears(cycleNum); + rSurveyCyclePO = new RSurveyCyclePO(); + rSurveyCyclePO.setStartYear(LocalDate.now()); + rSurveyCyclePO.setEndYear(enddate); + rSurveyCyclePO.setSurveyCycle(cycleNum); + rSurveyCycleMapper.insert(rSurveyCyclePO); } - LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<> ( ); - queryWrapper1.eq (RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId ( )); - queryWrapper1.in (RGeneralSurveyPlanPO::getStatus, Stream.of (3, 4).collect (Collectors.toList ( ))); - List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper1); - List planIds = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( )); - List subIds = new ArrayList<> ( ); - if (!CollectionUtils.isEmpty (planIds)) { - QueryWrapper rGeneralSurveyPlanDetailQueryWrapper = new QueryWrapper ( ); - rGeneralSurveyPlanDetailQueryWrapper.in ("plan_no", planIds); - List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (rGeneralSurveyPlanDetailQueryWrapper); - subIds = rGeneralSurveyPlanDetails.stream ( ).map (RGeneralSurveyPlanDetail::getSubId).collect (Collectors.toList ( )); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId()); + queryWrapper1.in(RGeneralSurveyPlanPO::getStatus, Stream.of(3, 4).collect(Collectors.toList())); + List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList(queryWrapper1); + List planIds = rGeneralSurveyPlanPOS.stream().map(RGeneralSurveyPlanPO::getPlanNo).collect(Collectors.toList()); + List subIds = new ArrayList<>(); + if (!CollectionUtils.isEmpty(planIds)) { + QueryWrapper rGeneralSurveyPlanDetailQueryWrapper = new QueryWrapper(); + rGeneralSurveyPlanDetailQueryWrapper.in("plan_no", planIds); + List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList(rGeneralSurveyPlanDetailQueryWrapper); + subIds = rGeneralSurveyPlanDetails.stream().map(RGeneralSurveyPlanDetail::getSubId).collect(Collectors.toList()); } List finalSubIds = subIds; - - List data = deptFeignClient.allDeptList ( ).getData ( ); - List deptSubstationVOList = data.stream ( ).map (temp -> { - DeptSubstationVO deptSubstationVO = new DeptSubstationVO ( ); - BeanUtils.copyProperties (temp, deptSubstationVO); - deptSubstationVO.setDisabled (true); - deptSubstationVO.setFlag (true); - QueryWrapper queryWrapper = new QueryWrapper<> ( ); - queryWrapper.eq ("org_id", temp.getCode ( )); - List list1 = statationStatService.list (queryWrapper); - List children = deptSubstationVO.getChildren ( ); - List collect = list1.stream ( ).map (statationStat -> { - DeptSubstationVO deptSubstationVO1 = new DeptSubstationVO ( ); - deptSubstationVO1.setId (statationStat.getPowerId ( )); - deptSubstationVO1.setPid (temp.getId ( )); - deptSubstationVO1.setName (statationStat.getPowerName ( )); - if (finalSubIds.contains (statationStat.getPowerId ( ))) { - deptSubstationVO1.setDisabled (true); + List data = deptFeignClient.allDeptList().getData(); + List deptSubstationVOList = data.stream().map(temp -> { + DeptSubstationVO deptSubstationVO = new DeptSubstationVO(); + BeanUtils.copyProperties(temp, deptSubstationVO); + deptSubstationVO.setDisabled(true); + deptSubstationVO.setFlag(true); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("org_id", temp.getCode()); + PmsStatationStatInfoParam param =new PmsStatationStatInfoParam(); + param.setOrgIds(Arrays.asList(temp.getCode())); + List list1 = statationStatClient.getPowerInfo(param).getData(); + List children = deptSubstationVO.getChildren(); + List collect = list1.stream().map(statationStat -> { + DeptSubstationVO deptSubstationVO1 = new DeptSubstationVO(); + deptSubstationVO1.setId(statationStat.getPowerId()); + deptSubstationVO1.setPid(temp.getId()); + deptSubstationVO1.setName(statationStat.getPowerName()); + if (finalSubIds.contains(statationStat.getPowerId())) { + deptSubstationVO1.setDisabled(true); } - deptSubstationVO1.setFlag (true); + deptSubstationVO1.setFlag(true); return deptSubstationVO1; - }).collect (Collectors.toList ( )); - children.addAll (collect); + }).collect(Collectors.toList()); + children.addAll(collect); return deptSubstationVO; - }).collect (Collectors.toList ( )); + }).collect(Collectors.toList()); /* 遍历两次data来组装带有children关联性的对象，如果找到子级就删除result的数据 */ - List result = new ArrayList<> (deptSubstationVOList); + List result = new ArrayList<>(deptSubstationVOList); for (DeptSubstationVO pv : deptSubstationVOList) { for (DeptSubstationVO pv2 : deptSubstationVOList) { /*如果本级id与数据的父id相同，就说明是子父级关系*/ - if (pv.getId ( ).equals (pv2.getPid ( ))) { - pv.getChildren ( ).add (pv2); - result.remove (pv2); + if (pv.getId().equals(pv2.getPid())) { + pv.getChildren().add(pv2); + result.remove(pv2); } } } - result = recursion (result.get (0), orgdid); + result = recursion(result.get(0), orgdid); return result; } @@ -661,40 +597,40 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl rSurveyCyclePOQueryWrapper = new QueryWrapper ( ); - rSurveyCyclePOQueryWrapper.le ("start_year", LocalDate.now ( )); - rSurveyCyclePOQueryWrapper.ge ("end_year", LocalDate.now ( )); - RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper); + QueryWrapper rSurveyCyclePOQueryWrapper = new QueryWrapper(); + rSurveyCyclePOQueryWrapper.le("start_year", LocalDate.now()); + rSurveyCyclePOQueryWrapper.ge("end_year", LocalDate.now()); + RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne(rSurveyCyclePOQueryWrapper); int insert = 0; Boolean flag = true; - if (Objects.equals (rSurveyCyclePO, null)) { - rSurveyCyclePO = new RSurveyCyclePO ( ); - LocalDate enddate = LocalDate.now ( ).plusYears (cycleNum); - rSurveyCyclePO.setStartYear (LocalDate.now ( )); - rSurveyCyclePO.setEndYear (enddate); - rSurveyCyclePO.setSurveyCycle (cycleNum); - insert = rSurveyCycleMapper.insert (rSurveyCyclePO); + if (Objects.equals(rSurveyCyclePO, null)) { + rSurveyCyclePO = new RSurveyCyclePO(); + LocalDate enddate = LocalDate.now().plusYears(cycleNum); + rSurveyCyclePO.setStartYear(LocalDate.now()); + rSurveyCyclePO.setEndYear(enddate); + rSurveyCyclePO.setSurveyCycle(cycleNum); + insert = rSurveyCycleMapper.insert(rSurveyCyclePO); } else { flag = false; } - RSurveyCycleVO rSurveyCycleVO = new RSurveyCycleVO ( ); - BeanUtils.copyProperties (rSurveyCyclePO, rSurveyCycleVO); - rSurveyCycleVO.setFlag (flag); + RSurveyCycleVO rSurveyCycleVO = new RSurveyCycleVO(); + BeanUtils.copyProperties(rSurveyCyclePO, rSurveyCycleVO); + rSurveyCycleVO.setFlag(flag); return rSurveyCycleVO; } public List recursion(DeptSubstationVO result, String orgdid) { - List deptSubstationVOList = new ArrayList<> ( ); - if (Objects.equals (result.getId ( ), orgdid)) { - deptSubstationVOList.add (result); + List deptSubstationVOList = new ArrayList<>(); + if (Objects.equals(result.getId(), orgdid)) { + deptSubstationVOList.add(result); return deptSubstationVOList; } else { - for (DeptSubstationVO deptSubstationVO : result.getChildren ( )) { + for (DeptSubstationVO deptSubstationVO : result.getChildren()) { - List recursion = recursion (deptSubstationVO, orgdid); - if(recursion.size ()>0){ + List recursion = recursion(deptSubstationVO, orgdid); + if (recursion.size() > 0) { return recursion; }