Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

谐波普测模块修改

Browse Source
This commit is contained in:
huangzj
2023-03-15 18:46:18 +08:00
parent c29e445933
commit 61216a0b37
25 changed files with 1192 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,21 +13,23 @@ import com.njcn.minioss.bo.MinIoUploadResDTO;
import com.njcn.poi.util.PoiUtil;
import com.njcn.process.pojo.param.*;
import com.njcn.process.pojo.po.RGeneralSurveyPlanPO;
import com.njcn.process.pojo.vo.SurveyPlanExcel;
import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO;
import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO;
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.factory.annotation.Autowired;
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.List;
@@ -52,8 +54,10 @@ public class RGeneralSurveyPlanController extends BaseController {
private final RGeneralSurveyPlanPOService rGeneralSurveyPlanPOService;
private @Autowired
private final
RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService;
private final
RSurveyPlanConfigService rSurveyPlanConfigService;
/**
* @Description: 新增/修改普测计划
* @Param: [rGeneralSurveyPlanAddParm]
@@ -72,7 +76,80 @@ public class RGeneralSurveyPlanController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/addPlanCycle")
@ApiOperation("设置普测周期")
@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);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/addPlanConfig")
@ApiOperation("增加普测计划参数")
@ApiImplicitParam(name = "rSurveyPlanConfigVOList", value = "", required = true)
public HttpResult<Boolean> addPlanConfig(@Validated @RequestBody List<RSurveyPlanConfigVO> rSurveyPlanConfigVOList){
String methodDescribe = getMethodDescribe("querySubStatation");
double sum = rSurveyPlanConfigVOList.stream ( ).mapToDouble (RSurveyPlanConfigVO::getProportion).sum ( );
if(sum>1){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.MATH_ERROR, false, methodDescribe);
}
List<RSurveyPlanConfigPO> collect = rSurveyPlanConfigVOList.stream ( ).map (temp -> {
RSurveyPlanConfigPO rs = new RSurveyPlanConfigPO ( );
BeanUtils.copyProperties (temp, rs);
return rs;
}).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<List<RSurveyPlanConfigVO>> queryPlanConfig(){
String methodDescribe = getMethodDescribe("queryPlanConfig");
List<RSurveyPlanConfigPO> list = rSurveyPlanConfigService.list ( );
List<RSurveyPlanConfigVO> collect = list.stream ( ).map (temp -> {
RSurveyPlanConfigVO rs = new RSurveyPlanConfigVO ( );
BeanUtils.copyProperties (temp, rs);
return rs;
}).collect (Collectors.toList ( ));
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, collect, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/querySubStatation")
@ApiOperation("电站勾选接口")
@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);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryPlan")
@@ -118,16 +195,16 @@ public class RGeneralSurveyPlanController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryPlandetail")
@ApiOperation("根据planNO查询普测计划详情")
@ApiImplicitParam(name = "rGeneralSurveyPlandetailQueryParm", value = "普测计划详情查询参数", required = true)
public HttpResult<IPage<RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO>> queryPlandetail(@Validated @RequestBody RGeneralSurveyPlandetailQueryParm rGeneralSurveyPlandetailQueryParm){
String methodDescribe = getMethodDescribe("queryPlandetail");
IPage<RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO> rGeneralSurveyPlanDetailVOIPage = rGeneralSurveyPlanDetailService.queryPlandetail (rGeneralSurveyPlandetailQueryParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanDetailVOIPage, methodDescribe);
}
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/queryPlandetail")
// @ApiOperation("根据planNO查询普测计划详情")
// @ApiImplicitParam(name = "rGeneralSurveyPlandetailQueryParm", value = "普测计划详情查询参数", required = true)
// public HttpResult<IPage<RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO>> queryPlandetail(@Validated @RequestBody RGeneralSurveyPlandetailQueryParm rGeneralSurveyPlandetailQueryParm){
// String methodDescribe = getMethodDescribe("queryPlandetail");
//
// IPage<RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO> rGeneralSurveyPlanDetailVOIPage = rGeneralSurveyPlanDetailService.queryPlandetail (rGeneralSurveyPlandetailQueryParm);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanDetailVOIPage, methodDescribe);
// }

16
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RSurveyCycleMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.po.RSurveyCyclePO;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/13 9:23【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface RSurveyCycleMapper extends BaseMapper<RSurveyCyclePO> {
}

17
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RSurveyPlanConfigMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.process.mapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/9 10:13【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface RSurveyPlanConfigMapper extends MppBaseMapper<RSurveyPlanConfigPO> {
}

43
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/StatationStatMapper.java Normal file
View File

@@ -0,0 +1,43 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
import com.njcn.device.pms.pojo.po.StatationStat;
import com.njcn.device.pms.pojo.vo.StatationStatVO;
import com.njcn.web.pojo.param.BaseParam;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author hongawen
* @since 2022-10-14
*/
public interface StatationStatMapper extends BaseMapper<StatationStat> {
/**
* 获取指定的变电站信息
*
* @param pmsStatationStatInfoParam 变电站详情数据入参
* @return 指定的变电站信息
*/
List<PmsStatationStatInfoDTO> getStatationStatInfo(@Param("pmsStatationStatInfoParam") PmsStatationStatInfoParam pmsStatationStatInfoParam);
/**
* 分页查询电站信息
* @author cdf
* @date 2022/11/18
*/
Page<StatationStatVO> getStatationStatPageList(Page<StatationStatVO> page, @Param("baseParam") BaseParam baseParam);
}

16
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RSurveyCycleMapper.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.process.mapper.RSurveyCycleMapper">
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.RSurveyCyclePO">
<!--@mbg.generated-->
<!--@Table r_survey_cycle-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="start_year" jdbcType="DATE" property="startYear" />
<result column="end_year" jdbcType="DATE" property="endYear" />
<result column="survey_cycle" jdbcType="INTEGER" property="surveyCycle" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, start_year, end_year, survey_cycle
</sql>
</mapper>

17
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RSurveyPlanConfigMapper.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.process.mapper.RSurveyPlanConfigMapper">
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.RSurveyPlanConfigPO">
<!--@mbg.generated-->
<!--@Table r_survey_plan_config-->
<id column="Id" jdbcType="CHAR" property="id" />
<result column="Org_Name" jdbcType="VARCHAR" property="orgName" />
<result column="Org_Id" jdbcType="CHAR" property="orgId" />
<result column="stat_num" jdbcType="INTEGER" property="statNum" />
<result column="proportion" jdbcType="FLOAT" property="proportion" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
Id, Org_Name, Org_Id, stat_num, proportion
</sql>
</mapper>

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

@@ -5,10 +5,10 @@ import com.github.jeffreyning.mybatisplus.service.IMppService;
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.SurveyPlanExcel;
import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO;
import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO;
import com.njcn.process.pojo.vo.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -86,4 +86,18 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
* @Date: 2023/2/22
*/
Boolean checkPlanAudit(RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm);
void importSubStatation(MultipartFile file, HttpServletResponse response);
RGeneralSurveyPlanAddParm querySubStatation(Integer statetionNum);
List<DeptSubstationVO> initDetpStataionTree(String orgid);
/**
* @Description: 设置普测周期
* @Param: [cycleNum]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/3/15
*/
RSurveyCycleVO addPlanCycle(Integer cycleNum);
}

22
pqs-process/process-boot/src/main/java/com/njcn/process/service/RSurveyCycleServiceImpl.java Normal file
View File

@@ -0,0 +1,22 @@
package com.njcn.process.service;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.process.pojo.po.RSurveyCyclePO;
import com.njcn.process.mapper.RSurveyCycleMapper;
import com.njcn.process.service.impl.RSurveyCycleService;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/13 9:23【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
public class RSurveyCycleServiceImpl extends ServiceImpl<RSurveyCycleMapper, RSurveyCyclePO> implements RSurveyCycleService{
}

20
pqs-process/process-boot/src/main/java/com/njcn/process/service/RSurveyPlanConfigServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package com.njcn.process.service;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.process.mapper.RSurveyPlanConfigMapper;
import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
import com.njcn.process.service.impl.RSurveyPlanConfigService;
import org.springframework.stereotype.Service;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/9 10:13【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
public class RSurveyPlanConfigServiceImpl extends MppServiceImpl<RSurveyPlanConfigMapper, RSurveyPlanConfigPO> implements RSurveyPlanConfigService{
}

15
pqs-process/process-boot/src/main/java/com/njcn/process/service/StatationStatService.java Normal file
View File

@@ -0,0 +1,15 @@
package com.njcn.process.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pms.pojo.po.StatationStat;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/8 18:21【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface StatationStatService extends IService<StatationStat> {
}

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

@@ -1,28 +1,42 @@
package com.njcn.process.service.impl;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.pojo.po.StatationStat;
import com.njcn.minioss.bo.MinIoUploadResDTO;
import com.njcn.oss.constant.OssPath;
import com.njcn.oss.enums.OssResponseEnum;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.poi.util.PoiUtil;
import com.njcn.process.mapper.RGeneralSurveyPlanDetailMapper;
import com.njcn.process.mapper.RGeneralSurveyPlanPOMapper;
import com.njcn.process.mapper.RSurveyCycleMapper;
import com.njcn.process.pojo.param.*;
import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail;
import com.njcn.process.pojo.po.RGeneralSurveyPlanPO;
import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO;
import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO;
import com.njcn.process.pojo.vo.SurveyPlanExcel;
import com.njcn.process.pojo.po.RSurveyCyclePO;
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;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.vo.PvTerminalTreeVO;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,7 +46,9 @@ 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;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -63,6 +79,17 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
@Resource
private FileStorageUtil fileStorageUtil;
@Autowired
private StatationStatService statationStatService;
@Autowired
private DicDataFeignClient dicDataFeignClient;
@Autowired
private RSurveyCycleMapper rSurveyCycleMapper;
@Autowired
private RSurveyPlanConfigService rSurveyPlanConfigService;
/**
* @param rGeneralSurveyPlanAddParm
@@ -76,29 +103,40 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
@Transactional(rollbackFor = Exception.class)
public Boolean addPlan(RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm) {
RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO();
BeanUtils.copyProperties(rGeneralSurveyPlanAddParm, rGeneralSurveyPlanPO);
RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO ( );
BeanUtils.copyProperties (rGeneralSurveyPlanAddParm, rGeneralSurveyPlanPO);
/*todo 后期与工作流绑定*/
rGeneralSurveyPlanPO.setStatus(1);
boolean b = this.saveOrUpdateByMultiId(rGeneralSurveyPlanPO);
rGeneralSurveyPlanPO.setStatus (1);
/**查出周期id**/
QueryWrapper<RSurveyCyclePO> rSurveyCyclePOQueryWrapper = new QueryWrapper ( );
rSurveyCyclePOQueryWrapper.le ("start_year", rGeneralSurveyPlanPO.getPlanEndTime ( ));
rSurveyCyclePOQueryWrapper.ge ("end_year", rGeneralSurveyPlanPO.getPlanEndTime ( ));
RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper);
List<RGeneralSurveyPlanAddParm.RGeneralSurveyPlanDetailAddParm> rGeneralSurveyPlanDetailAddParm = rGeneralSurveyPlanAddParm.getRGeneralSurveyPlanDetailAddParm();
QueryWrapper<RGeneralSurveyPlanDetail> queryWrapper = new QueryWrapper();
queryWrapper.lambda().eq(RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo());
rGeneralSurveyPlanDetailService.remove(queryWrapper);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetailList = new ArrayList<>();
rGeneralSurveyPlanDetailAddParm.forEach(temp -> {
RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail();
BeanUtils.copyProperties(temp, rGeneralSurveyPlanDetail);
rGeneralSurveyPlanPO.setCycleId (rSurveyCyclePO.getId ( ));
boolean b = this.saveOrUpdateByMultiId (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);
RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail ( );
rGeneralSurveyPlanDetail.setPlanNo (rGeneralSurveyPlanAddParm.getPlanNo ( ));
rGeneralSurveyPlanDetail.setOrgNo (byId.getOrgId ( ));
rGeneralSurveyPlanDetail.setOrgName (byId.getOrgName ( ));
rGeneralSurveyPlanDetail.setSubId (byId.getPowerId ( ));
rGeneralSurveyPlanDetail.setSubName (byId.getPowerName ( ));
/*目前时间与计划开始时间，结束时间一致*/
rGeneralSurveyPlanDetail.setGeneralSurveyStartTime(rGeneralSurveyPlanAddParm.getPlanStartTime());
rGeneralSurveyPlanDetail.setGeneralSurveyTime(rGeneralSurveyPlanAddParm.getPlanStartTime());
rGeneralSurveyPlanDetail.setGeneralSurveyEndTime(rGeneralSurveyPlanAddParm.getPlanEndTime());
rGeneralSurveyPlanDetail.setPlanNo(rGeneralSurveyPlanAddParm.getPlanNo());
rGeneralSurveyPlanDetail.setGeneralSurveyLeader(rGeneralSurveyPlanAddParm.getLeader());
rGeneralSurveyPlanDetailList.add(rGeneralSurveyPlanDetail);
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, 5);
boolean b1 = rGeneralSurveyPlanDetailService.saveOrUpdateBatchByMultiId (rGeneralSurveyPlanDetailList, 500);
return b && b1;
}
@@ -113,73 +151,75 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
*/
@Override
public IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List<String> statusList) {
IPage<RGeneralSurveyPlanPO> page = new Page<>(rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize());
IPage<RGeneralSurveyPlanVO> returnpage = new Page<>(rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize());
IPage<RGeneralSurveyPlanPO> page = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( ));
IPage<RGeneralSurveyPlanVO> returnpage = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( ));
LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<>();
if (!StringUtils.isEmpty(rGeneralSurveyPlanQueryParm.getOrgNo())) {
List<String> data = deptFeignClient.getDepSonIdtByDeptId(rGeneralSurveyPlanQueryParm.getOrgNo()).getData();
LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<> ( );
if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getOrgNo ( ))) {
List<String> 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::getPlanEndTime, 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<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper).getRecords();
if (CollectionUtils.isEmpty(rGeneralSurveyPlanPOS)) {
List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage (page, queryWrapper).getRecords ( );
if (CollectionUtils.isEmpty (rGeneralSurveyPlanPOS)) {
return returnpage;
}
//部门处理：根据部门code取名称
List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
Map<String, String> pvTerminalTreeVOMap = dept.stream().
collect(Collectors.
toMap(PvTerminalTreeVO::getId,
List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList ( ).getData ( );
Map<String, String> pvTerminalTreeVOMap = dept.stream ( ).
collect (Collectors.
toMap (PvTerminalTreeVO::getId,
PvTerminalTreeVO::getName));
List<String> collect = rGeneralSurveyPlanPOS.stream().map(RGeneralSurveyPlanPO::getPlanNo).collect(Collectors.toList());
LambdaQueryWrapper<RGeneralSurveyPlanDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(RGeneralSurveyPlanDetail::getPlanNo, collect);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList(lambdaQueryWrapper);
List<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOList = new ArrayList<>();
rGeneralSurveyPlanPOS.forEach(temp -> {
RGeneralSurveyPlanVO rGeneralSurveyPlanVO = new RGeneralSurveyPlanVO();
BeanUtils.copyProperties(temp, rGeneralSurveyPlanVO);
long Busbarcount = rGeneralSurveyPlanDetails.stream().
filter(surveyPlanDetail -> Objects.equals(surveyPlanDetail.getPlanNo(), temp.getPlanNo())).
map(RGeneralSurveyPlanDetail::getBusbarId).distinct().count();
List<String> collect = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( ));
LambdaQueryWrapper<RGeneralSurveyPlanDetail> lambdaQueryWrapper = new LambdaQueryWrapper<> ( );
lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, collect);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper);
List<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOList = new ArrayList<> ( );
rGeneralSurveyPlanPOS.forEach (temp -> {
RGeneralSurveyPlanVO rGeneralSurveyPlanVO = new RGeneralSurveyPlanVO ( );
BeanUtils.copyProperties (temp, rGeneralSurveyPlanVO);
List<String> 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 ( ))).
map (RGeneralSurveyPlanDetail::getSubId).distinct ( ).count ( );*/
// rGeneralSurveyPlanVO.setBusCount (Busbarcount);
// List<RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO> collect1 = rGeneralSurveyPlanDetails.stream ( ).
// filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))).
// map (surveyPlanDetail -> {
// RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO rGeneralSurveyPlanDetailVO = new RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO ( );
// BeanUtils.copyProperties (surveyPlanDetail, rGeneralSurveyPlanDetailVO);
// return rGeneralSurveyPlanDetailVO;
// }).collect (Collectors.toList ( ));
rGeneralSurveyPlanVO.setOrgName (pvTerminalTreeVOMap.get (temp.getOrgNo ( ))); //单位名称
//
// rGeneralSurveyPlanVO.setRGeneralSurveyPlanDetailVOList (collect1);
long Subcount = rGeneralSurveyPlanDetails.stream().
filter(surveyPlanDetail -> Objects.equals(surveyPlanDetail.getPlanNo(), temp.getPlanNo())).
map(RGeneralSurveyPlanDetail::getSubId).distinct().count();
rGeneralSurveyPlanVO.setBusCount(Busbarcount);
rGeneralSurveyPlanVO.setSubCount(Subcount);
List<RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO> collect1 = rGeneralSurveyPlanDetails.stream().
filter(surveyPlanDetail -> Objects.equals(surveyPlanDetail.getPlanNo(), temp.getPlanNo())).
map(surveyPlanDetail -> {
RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO rGeneralSurveyPlanDetailVO = new RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO();
BeanUtils.copyProperties(surveyPlanDetail, rGeneralSurveyPlanDetailVO);
return rGeneralSurveyPlanDetailVO;
}).collect(Collectors.toList());
rGeneralSurveyPlanVO.setOrgName(pvTerminalTreeVOMap.get(temp.getOrgNo())); //单位名称
rGeneralSurveyPlanVO.setRGeneralSurveyPlanDetailVOList(collect1);
rGeneralSurveyPlanVOList.add(rGeneralSurveyPlanVO);
rGeneralSurveyPlanVOList.add (rGeneralSurveyPlanVO);
});
returnpage.setRecords(rGeneralSurveyPlanVOList);
returnpage.setRecords (rGeneralSurveyPlanVOList);
return returnpage;
}
@@ -195,26 +235,26 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
@Transactional(rollbackFor = {Exception.class})
public boolean surveyResultUpload(SurveyResultUploadParam surveyResultUploadParam) {
boolean result = true;
RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO();
rGeneralSurveyPlanPO.setPlanNo(surveyResultUploadParam.getPlanId());
rGeneralSurveyPlanPO = this.selectByMultiId(rGeneralSurveyPlanPO);
String filePath = rGeneralSurveyPlanPO.getFilePath();
filePath = Optional.ofNullable(filePath).orElse("");
Integer fileCount = rGeneralSurveyPlanPO.getFileCount();
fileCount = Optional.ofNullable(fileCount).orElse(0);
for (int i = 0; i < surveyResultUploadParam.getFile().length; i++) {
String OriginalFilename = surveyResultUploadParam.getFile()[i].getOriginalFilename();
String fileStoragePath = fileStorageUtil.uploadMultipart(surveyResultUploadParam.getFile()[i], OssPath.SURVEY_RESULT);
RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO ( );
rGeneralSurveyPlanPO.setPlanNo (surveyResultUploadParam.getPlanId ( ));
rGeneralSurveyPlanPO = this.selectByMultiId (rGeneralSurveyPlanPO);
String filePath = rGeneralSurveyPlanPO.getFilePath ( );
filePath = Optional.ofNullable (filePath).orElse ("");
Integer fileCount = rGeneralSurveyPlanPO.getFileCount ( );
fileCount = Optional.ofNullable (fileCount).orElse (0);
for (int i = 0; i < surveyResultUploadParam.getFile ( ).length; i++) {
String OriginalFilename = surveyResultUploadParam.getFile ( )[i].getOriginalFilename ( );
String fileStoragePath = fileStorageUtil.uploadMultipart (surveyResultUploadParam.getFile ( )[i], OssPath.SURVEY_RESULT);
/*filePath格式：minIo服务文件名+##+原始文件名+；*/
filePath = filePath + fileStoragePath + "##" + OriginalFilename + ";";
fileCount++;
}
rGeneralSurveyPlanPO.setStatus(4);
rGeneralSurveyPlanPO.setFileCount(fileCount);
rGeneralSurveyPlanPO.setFilePath(filePath);
rGeneralSurveyPlanPO.setIsFileUpload(1);
rGeneralSurveyPlanPO.setUploadTime(new Date());
this.saveOrUpdateByMultiId(rGeneralSurveyPlanPO);
rGeneralSurveyPlanPO.setStatus (4);
rGeneralSurveyPlanPO.setFileCount (fileCount);
rGeneralSurveyPlanPO.setFilePath (filePath);
rGeneralSurveyPlanPO.setIsFileUpload (1);
rGeneralSurveyPlanPO.setUploadTime (new Date ( ));
this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO);
return result;
}
@@ -228,21 +268,21 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
*/
@Override
public List<MinIoUploadResDTO> 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<MinIoUploadResDTO> collect = Stream.of(split).map(temp -> {
String[] split1 = temp.split("##");
String[] split = filePath.substring (0, filePath.length ( ) - 1).split (";");
List<MinIoUploadResDTO> 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;
}
@@ -255,35 +295,35 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
*/
@Override
public List<SurveyPlanExcel> exportSurveyPlan(List<String> planIdList) {
List<SurveyPlanExcel> surveyPlanExcels = new ArrayList<>();
LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(RGeneralSurveyPlanPO::getPlanNo, planIdList);
List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList(queryWrapper);
LambdaQueryWrapper<RGeneralSurveyPlanDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(RGeneralSurveyPlanDetail::getPlanNo, planIdList);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList(lambdaQueryWrapper);
List<SurveyPlanExcel> surveyPlanExcels = new ArrayList<> ( );
LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<> ( );
queryWrapper.in (RGeneralSurveyPlanPO::getPlanNo, planIdList);
List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper);
LambdaQueryWrapper<RGeneralSurveyPlanDetail> lambdaQueryWrapper = new LambdaQueryWrapper<> ( );
lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, planIdList);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper);
//部门处理：根据部门code取名称
List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
Map<String, String> pvTerminalTreeVOMap = dept.stream().
collect(Collectors.
toMap(PvTerminalTreeVO::getId,
List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList ( ).getData ( );
Map<String, String> 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 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();
surveyPlanExcel.setBusCount(Busbarcount);
surveyPlanExcel.setSubCount(Subcount);
surveyPlanExcel.setOrgNo(pvTerminalTreeVOMap.get(surveyPlanExcel.getOrgNo()));
surveyPlanExcels.add(surveyPlanExcel);
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 ( )));
surveyPlanExcels.add (surveyPlanExcel);
});
return surveyPlanExcels;
@@ -299,8 +339,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
*/
@Override
public List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm) {
List<RGeneralSurveyPlanDetailOnQuestionVO> rGeneralSurveyPlanDetailOnQuestionVOS = new ArrayList<>();
rGeneralSurveyPlanDetailOnQuestionVOS = rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion(questionQueryParm);
List<RGeneralSurveyPlanDetailOnQuestionVO> rGeneralSurveyPlanDetailOnQuestionVOS = new ArrayList<> ( );
rGeneralSurveyPlanDetailOnQuestionVOS = rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion (questionQueryParm);
return rGeneralSurveyPlanDetailOnQuestionVOS;
}
@@ -316,14 +356,14 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
@Override
public List<RGeneralSurveyPlanPO> querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm) {
List<String> data = deptFeignClient.getDepSonIdtByDeptId(questionQueryParm.getOrgNo()).getData();
List<String> data = deptFeignClient.getDepSonIdtByDeptId (questionQueryParm.getOrgNo ( )).getData ( );
QueryWrapper<RGeneralSurveyPlanPO> 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<RGeneralSurveyPlanPO> list = this.list(queryWrapper);
QueryWrapper<RGeneralSurveyPlanPO> 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<RGeneralSurveyPlanPO> list = this.list (queryWrapper);
return list;
}
@@ -340,13 +380,271 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
@Transactional(rollbackFor = {Exception.class})
public Boolean checkPlanAudit(RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm) {
boolean result = true;
UpdateWrapper<RGeneralSurveyPlanPO> 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<RGeneralSurveyPlanPO> 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);
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 ( );
/**查出当前周期id**/
QueryWrapper<RSurveyCyclePO> rSurveyCyclePOQueryWrapper = new QueryWrapper ( );
rSurveyCyclePOQueryWrapper.le ("start_year", LocalDate.now ( ));
rSurveyCyclePOQueryWrapper.ge ("end_year", LocalDate.now ( ));
RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper);
LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<> ( );
queryWrapper.eq (RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId ( ));
List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper);
List<String> planIds = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( ));
List<String> subIds = new ArrayList<> ( );
if (!CollectionUtils.isEmpty (planIds)) {
QueryWrapper<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetailQueryWrapper = new QueryWrapper ( );
rGeneralSurveyPlanDetailQueryWrapper.in ("plan_no", planIds);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (rGeneralSurveyPlanDetailQueryWrapper);
subIds = rGeneralSurveyPlanDetails.stream ( ).map (RGeneralSurveyPlanDetail::getSubId).collect (Collectors.toList ( ));
}
List<String> finalSubIds = subIds;
List<StatationStat> filterList = list.stream ( ).filter (temp -> !finalSubIds.contains (temp.getPowerId ( ))).collect (Collectors.toList ( ));
List<StatationStat> addList = new ArrayList<> ( );
List<RSurveyPlanConfigPO> rSurveyPlanConfigPOList = rSurveyPlanConfigService.list ( );
Map<String, RSurveyPlanConfigPO> orgIdMap = rSurveyPlanConfigPOList.stream ( ).
collect (Collectors.toMap (RSurveyPlanConfigPO::getOrgId, temp -> temp));
List<PvTerminalTreeVO> data = deptFeignClient.allDeptList ( ).getData ( );
data.stream ( ).forEach (temp -> {
DeptSubstationVO deptSubstationVO = new DeptSubstationVO ( );
BeanUtils.copyProperties (temp, deptSubstationVO);
/*如果存在电站占比配置随机抽出配置电站个数*/
if (orgIdMap.containsKey (temp.getId ( ))) {
List<StatationStat> 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 ( ) *
statetionNum);
if (collect.size ( ) >= v) {
Collections.shuffle (collect);
List<StatationStat> lastList = collect.stream ( ).limit (v).collect (Collectors.toList ( ));
addList.addAll (lastList);
} else {
addList.addAll (collect);
}
}
});
if (statetionNum > addList.size ( )) {
/*取差集，当通过比例抽取变电站不够时 重差集里取*/
List<StatationStat> collect = filterList.stream ( ).filter (o -> !addList.contains (o)).collect (Collectors.toList ( ));
int differenceCount = statetionNum - addList.size ( );
Collections.shuffle (collect);
List<StatationStat> lastList = collect.stream ( ).limit (differenceCount).collect (Collectors.toList ( ));
addList.addAll (lastList);
}
List<String> result = addList.stream ( ).map (StatationStat::getPowerId).collect (Collectors.toList ( ));
RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = new RGeneralSurveyPlanAddParm ( );
rGeneralSurveyPlanAddParm.setSubIds (result);
return rGeneralSurveyPlanAddParm;
}
@Override
public List<DeptSubstationVO> initDetpStataionTree(String orgdid) {
/*查询所有电站并过滤已经参加当期普测电站*/
List<StatationStat> list = statationStatService.list ( );
/**查出当前周期id**/
QueryWrapper<RSurveyCyclePO> 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<RSurveyCyclePO> rSurveyCyclePOS = rSurveyCycleMapper.selectList (null);
int cycleNum = 0;
if (CollectionUtils.isEmpty (rSurveyCyclePOS)) {
cycleNum = 5;
} else {
rSurveyCyclePOS = rSurveyCyclePOS.stream ( )
.sorted (Comparator.comparing (RSurveyCyclePO::getEndYear).reversed ( ))
.collect (Collectors.toList ( ));
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);
}
LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper1 = new LambdaQueryWrapper<> ( );
queryWrapper1.eq (RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId ( ));
List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper1);
List<String> planIds = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( ));
List<String> subIds = new ArrayList<> ( );
if (!CollectionUtils.isEmpty (planIds)) {
QueryWrapper<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetailQueryWrapper = new QueryWrapper ( );
rGeneralSurveyPlanDetailQueryWrapper.in ("plan_no", planIds);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (rGeneralSurveyPlanDetailQueryWrapper);
subIds = rGeneralSurveyPlanDetails.stream ( ).map (RGeneralSurveyPlanDetail::getSubId).collect (Collectors.toList ( ));
}
List<String> finalSubIds = subIds;
List<PvTerminalTreeVO> data = deptFeignClient.allDeptList ( ).getData ( );
List<DeptSubstationVO> deptSubstationVOList = data.stream ( ).map (temp -> {
DeptSubstationVO deptSubstationVO = new DeptSubstationVO ( );
BeanUtils.copyProperties (temp, deptSubstationVO);
deptSubstationVO.setDisabled (true);
deptSubstationVO.setFlag (true);
QueryWrapper<StatationStat> queryWrapper = new QueryWrapper<> ( );
queryWrapper.eq ("org_id", temp.getCode ( ));
List<StatationStat> list1 = statationStatService.list (queryWrapper);
List<DeptSubstationVO> children = deptSubstationVO.getChildren ( );
List<DeptSubstationVO> 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);
return deptSubstationVO1;
}).collect (Collectors.toList ( ));
children.addAll (collect);
return deptSubstationVO;
}).collect (Collectors.toList ( ));
/*
遍历两次data来组装带有children关联性的对象，如果找到子级就删除result的数据
*/
List<DeptSubstationVO> 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);
}
}
}
result = result.stream ( ).filter (temp -> Objects.equals (temp.getId ( ), orgdid)).collect (Collectors.toList ( ));
return result;
}
@Override
@Transactional(rollbackFor = {Exception.class})
public RSurveyCycleVO addPlanCycle(Integer cycleNum) {
/**查出当前周期id**/
QueryWrapper<RSurveyCyclePO> 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);
} else {
flag = false;
}
RSurveyCycleVO rSurveyCycleVO = new RSurveyCycleVO();
BeanUtils.copyProperties (rSurveyCyclePO, rSurveyCycleVO);
rSurveyCycleVO.setFlag (flag);
return rSurveyCycleVO;
}
}

17
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyCycleService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.process.service.impl;
import com.njcn.process.pojo.po.RSurveyCyclePO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/13 9:23【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface RSurveyCycleService extends IService<RSurveyCyclePO>{
}

17
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyPlanConfigService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.process.service.impl;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/9 10:13【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface RSurveyPlanConfigService extends IMppService<RSurveyPlanConfigPO> {
}

20
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/StatationStatServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package com.njcn.process.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.device.pms.pojo.po.StatationStat;
import com.njcn.process.mapper.StatationStatMapper;
import com.njcn.process.service.StatationStatService;
import org.springframework.stereotype.Service;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/8 18:22【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper,StatationStat> implements StatationStatService {
}