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-02-27 11:24:58 +08:00
parent 5915ed87ac
commit 338b659d94
58 changed files with 2932 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-process/process-boot/pom.xml
View File

@@ -108,6 +108,12 @@
<artifactId>pinyin4j</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>prepare-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

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

@@ -24,6 +24,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* 电能质量问题
* @author xiaoyao
@@ -213,14 +215,26 @@ public class ElectricityQualityIssuesController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
@PostMapping("/queryIssuesAndOrder")
@ApiOperation("查询问题及工单（当前部门下）")
@ApiImplicitParam(name = "orgNo", value = "部门id", required = true)
public HttpResult<IssueesAndOrderVO> queryIssuesAndOrder(@RequestParam("orgNo") String orgNo){
String methodDescribe = getMethodDescribe("queryIssuesAndOrder");
IssueesAndOrderVO issueesAndOrderVO =issuesService.queryIssuesAndOrder(orgNo);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, issueesAndOrderVO, methodDescribe);
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/checkPowerQuality")
@ApiOperation("电能质量问题审核")
@ApiImplicitParam(name = "electricityQualityCheckParam", value = "电能质量问题审核参数", required = true)
public HttpResult<Boolean> checkPowerQuality(@Validated @RequestBody ElectricityQualityCheckParam electricityQualityCheckParam){
String methodDescribe = getMethodDescribe("checkPowerQuality");
Boolean flag = issuesService.checkPowerQuality (electricityQualityCheckParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
/*todo*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryCheckTrack")
@ApiOperation("历史审核记录查询")
@ApiImplicitParam(name = "powerQualityProblemNo", value = "历史审核记录查询参数", required = true)
public HttpResult<List<RStatElectricQualityProblemLogVO>> queryCheckTrack(@RequestParam("powerQualityProblemNo") String powerQualityProblemNo){
String methodDescribe = getMethodDescribe("checkPowerQuality");
List<RStatElectricQualityProblemLogVO> rStatElectricQualityProblemLogVOS = issuesService.queryCheckTrack (powerQualityProblemNo);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatElectricQualityProblemLogVOS, methodDescribe);
}
}

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

@@ -92,7 +92,27 @@ public class LoadTypeUserManageController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/checkLoadTypeUserI")
@ApiOperation("入网评估报告审核")
@ApiImplicitParam(name = "loadTypeUserCheckParam", value = "入网评估报告审核参数", required = true)
public HttpResult<Boolean> checkLoadTypeUserI(@Validated @RequestBody LoadTypeUserCheckParam loadTypeUserCheckParam){
String methodDescribe = getMethodDescribe("checkLoadTypeUserI");
Boolean flag = loadTypeUserManageService.checkLoadTypeUserI (loadTypeUserCheckParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/checkLoadTypeUserA")
@ApiOperation("实测报告审核")
@ApiImplicitParam(name = "loadTypeUserCheckParam", value = "实测报告参数", required = true)
public HttpResult<Boolean> checkLoadTypeUserA(@Validated @RequestBody LoadTypeUserCheckParam loadTypeUserCheckParam){
String methodDescribe = getMethodDescribe("checkLoadTypeUserA");
Boolean flag = loadTypeUserManageService.checkLoadTypeUserA (loadTypeUserCheckParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
/**
* 上传干扰源用户入网报告
* @author qijian

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

@@ -92,10 +92,21 @@ public class RGeneralSurveyPlanController extends BaseController {
public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
String methodDescribe = getMethodDescribe("queryPlanAudit");
IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1").collect (Collectors.toList ()));
IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()));
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/checkPlanAudit")
@ApiOperation("普测计划-审核")
@ApiImplicitParam(name = "rGeneralSurveyPlanChcekParm", value = "普测计划审核参数", required = true)
public HttpResult<Boolean> checkPlanAudit(@Validated @RequestBody RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm){
String methodDescribe = getMethodDescribe("checkPlanAudit");
Boolean flag = rGeneralSurveyPlanPOService.checkPlanAudit (rGeneralSurveyPlanChcekParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryPlanResult")
@ApiOperation("查询普测计划-结果页面")

67
pqs-process/process-boot/src/main/java/com/njcn/process/controller/RStatWorkOrderController.java
View File

@@ -1,13 +1,18 @@
package com.njcn.process.controller;
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.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO;
import com.njcn.process.pojo.param.RStatProblemAndWorkOrderParam;
import com.njcn.process.pojo.vo.IssueesAndOrderVO;
import com.njcn.process.pojo.vo.OrderCountVO;
import com.njcn.process.pojo.vo.RStatDistributionProblemVO;
import com.njcn.process.pojo.vo.RStatWorkOrderDetailVO;
import com.njcn.process.service.RStatDistributionProblemService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
@@ -15,10 +20,10 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Description:
@@ -56,4 +61,58 @@ public class RStatWorkOrderController extends BaseController {
OrderCountVO orderCountVO =rStatDistributionProblemService.queryOrderCount(orgNo);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, orderCountVO, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
@PostMapping("/createProblem")
@ApiOperation("创建问题接口")
@ApiImplicitParam(name = "overLimitFlagDTOList", value = "部门id", required = true)
public HttpResult<Boolean> createProblem(@RequestBody List<OverLimitFlagDTO> overLimitFlagDTOList){
String methodDescribe = getMethodDescribe("createProblem");
Boolean problem = rStatDistributionProblemService.createProblem (overLimitFlagDTOList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, problem, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryProblem")
@ApiOperation("查询工单问题")
@ApiImplicitParam(name = "rStatProblemAndWorkOrderParam", value = "查询工单问题参数", required = true)
public HttpResult<IPage<RStatDistributionProblemVO>> queryProblem(@Validated @RequestBody RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam){
String methodDescribe = getMethodDescribe("queryProblem");
IPage<RStatDistributionProblemVO> rStatDistributionProblemVOIPage = rStatDistributionProblemService.queryProblem (rStatProblemAndWorkOrderParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatDistributionProblemVOIPage, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/checkProblem")
@ApiOperation("审核处理")
@ApiImplicitParam(name = "rStatDistributionProblemVO", value = "审核工单问题参数", required = true)
public HttpResult<Boolean> checkProblem(@Validated @RequestBody RStatDistributionProblemVO rStatDistributionProblemVO){
String methodDescribe = getMethodDescribe("checkProblem");
Boolean flag = rStatDistributionProblemService.checkProblem (rStatDistributionProblemVO);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryWorkOrder")
@ApiOperation("查询工单")
@ApiImplicitParam(name = "rStatProblemAndWorkOrderParam", value = "查询工单问题参数", required = true)
public HttpResult<IPage<RStatWorkOrderDetailVO>> queryWorkOrder(@Validated @RequestBody RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam){
String methodDescribe = getMethodDescribe("queryWorkOrder");
IPage<RStatWorkOrderDetailVO> rStatWorkOrderDetailVOIPage = rStatDistributionProblemService.queryWorkOrder (rStatProblemAndWorkOrderParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatWorkOrderDetailVOIPage, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/updateWorkOrderStatus")
@ApiOperation("更新工单进度")
@ApiImplicitParam(name = "rStatWorkOrderDetailVO", value = "查询工单问题参数", required = true)
public HttpResult<Boolean> updateWorkOrderStatus(@Validated @RequestBody RStatWorkOrderDetailVO rStatWorkOrderDetailVO){
String methodDescribe = getMethodDescribe("updateWorkOrderStatus");
Boolean flag = rStatDistributionProblemService.updateWorkOrderStatus (rStatWorkOrderDetailVO);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
}

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

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

26
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatWorkOrderDetailMapper.java
View File

@@ -1,7 +1,12 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.process.pojo.param.RStatProblemAndWorkOrderParam;
import com.njcn.process.pojo.po.RStatWorkOrderDetailPO;
import com.njcn.process.pojo.vo.RStatWorkOrderDetailVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
*
@@ -13,4 +18,25 @@ import com.njcn.process.pojo.po.RStatWorkOrderDetailPO;
* @version V1.0.0
*/
public interface RStatWorkOrderDetailMapper extends MppBaseMapper<RStatWorkOrderDetailPO> {
@Select ({"<script>",
"SELECT\n" +
"\ta.*, b.problem_describe\n" +
"FROM\n" +
"\tr_stat_work_order_detail a\n" +
"INNER JOIN r_stat_distribution_problem b ON a.problem_no = b.problem_no\n" +
"WHERE 1=1 \n" +
"<when test='temp.problemType!=null and temp.problemType!=\"\"'>",
"\t AND a.two_business_type = #{temp.problemType}\n" +
"</when>",
"<when test='temp.occurTime!=null and temp.occurTime!=\"\"'>",
"AND DATE_FORMAT(b.occur_time, '%Y%m%d') = #{temp.occurTime}\n" +
"</when>",
"<when test='temp.workOrderStatus!=null and temp.workOrderStatus!=\"\"'>",
"AND a.work_order_status = #{temp.workOrderStatus}\n" +
"</when>",
"<when test='temp.problemNo!=null and temp.problemNo!=\"\"'>",
"AND a.problem_no = #{temp.problemNo}",
"</when>",
"</script>"})
Page<RStatWorkOrderDetailVO> getPageVo(Page<RStatWorkOrderDetailVO> returnpage,@Param("temp") RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam);
}

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

@@ -0,0 +1,20 @@
<?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.RStatElectricQualityProblemLogMapper">
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.RStatElectricQualityProblemLogPO">
<!--@mbg.generated-->
<!--@Table r_stat_electric_quality_problem_log-->
<id column="power_quality_problem_no" jdbcType="VARCHAR" property="powerQualityProblemNo" />
<result column="data_date" jdbcType="TIMESTAMP" property="dataDate" />
<result column="checker" jdbcType="VARCHAR" property="checker" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="report_process" jdbcType="VARCHAR" property="reportProcess" />
<result column="report_process_content" jdbcType="VARCHAR" property="reportProcessContent" />
<result column="type" jdbcType="VARCHAR" property="type" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
power_quality_problem_no, data_date, checker, description, report_process, report_process_content,
`type`
</sql>
</mapper>

18
pqs-process/process-boot/src/main/java/com/njcn/process/service/IssuesService.java
View File

@@ -6,6 +6,8 @@ import com.njcn.process.pojo.param.*;
import com.njcn.process.pojo.vo.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* 电能质量问题接口类
* @author xiaoyao
@@ -96,4 +98,20 @@ public interface IssuesService {
* @Date: 2023/1/5
*/
IssueesAndOrderVO queryIssuesAndOrder(String orgNo);
/**
* @Description: 电能质量问题审核
* @Param: [electricityQualityCheckParam]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
Boolean checkPowerQuality(ElectricityQualityCheckParam electricityQualityCheckParam);
/**
* @Description: 历史审核记录查询
* @Param: [powerQualityProblemNo]
* @return: java.util.List<com.njcn.process.pojo.vo.RStatElectricQualityProblemLogVO>
* @Author: clam
* @Date: 2023/2/23
*/
List<RStatElectricQualityProblemLogVO> queryCheckTrack(String powerQualityProblemNo);
}

16
pqs-process/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java
View File

@@ -79,4 +79,20 @@ public interface LoadTypeUserManageService {
* @return
*/
List<LoadTypeRelationExcel> exportLoadTypeRelationList(List<String> list);
/**
* @Description: 入网评估报告审核
* @Param: [loadTypeUserCheckParam]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
Boolean checkLoadTypeUserI(LoadTypeUserCheckParam loadTypeUserCheckParam);
/**
* @Description: 实测报告审核
* @Param: [loadTypeUserCheckParam]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
Boolean checkLoadTypeUserA(LoadTypeUserCheckParam loadTypeUserCheckParam);
}

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

@@ -3,10 +3,7 @@ package com.njcn.process.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.minio.bo.MinIoUploadResDTO;
import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm;
import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm;
import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm;
import com.njcn.process.pojo.param.SurveyResultUploadParam;
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;
@@ -81,4 +78,12 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
* @Date: 2022/12/1
*/
List<RGeneralSurveyPlanPO> querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm);
/**
* @Description: checkPlanAudit
* @Param: [rGeneralSurveyPlanChcekParm]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
Boolean checkPlanAudit(RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm);
}

47
pqs-process/process-boot/src/main/java/com/njcn/process/service/RStatDistributionProblemService.java
View File

@@ -1,9 +1,16 @@
package com.njcn.process.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO;
import com.njcn.process.pojo.param.RStatProblemAndWorkOrderParam;
import com.njcn.process.pojo.po.RStatDistributionProblemPO;
import com.njcn.process.pojo.vo.IssueesAndOrderVO;
import com.njcn.process.pojo.vo.OrderCountVO;
import com.njcn.process.pojo.vo.RStatDistributionProblemVO;
import com.njcn.process.pojo.vo.RStatWorkOrderDetailVO;
import java.util.List;
/**
*
@@ -32,4 +39,44 @@ public interface RStatDistributionProblemService extends IMppService<RStatDistri
* @Date: 2023/2/2
*/
OrderCountVO queryOrderCount(String orgNo);
/**
* @Description: 创建问题接口
* @Param: [overLimitFlagDTOList]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/15
*/
Boolean createProblem(List<OverLimitFlagDTO> overLimitFlagDTOList);
/**
* @Description: 查询问题接口
* @Param: [rStatProblemAndWorkOrderParam]
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.njcn.process.pojo.vo.RStatDistributionProblemVO>
* @Author: clam
* @Date: 2023/2/16
*/
IPage<RStatDistributionProblemVO> queryProblem(RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam);
/**
* @Description: 审核处理
* @Param: [rStatDistributionProblemVO]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/17
*/
Boolean checkProblem(RStatDistributionProblemVO rStatDistributionProblemVO);
/**
* @Description: queryWorkOrder
* @Param: [rStatProblemAndWorkOrderParam]
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.njcn.process.pojo.vo.RStatWorkOrderDetailVO>
* @Author: clam
* @Date: 2023/2/17
*/
IPage<RStatWorkOrderDetailVO> queryWorkOrder(RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam);
/**
* @Description: 更新工单进度
* @Param: [rStatWorkOrderDetailVO]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/17
*/
Boolean updateWorkOrderStatus(RStatWorkOrderDetailVO rStatWorkOrderDetailVO);
}

88
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java
View File

@@ -9,6 +9,7 @@ import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
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.extension.plugins.pagination.Page;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.common.pojo.exception.BusinessException;
@@ -36,6 +37,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* 电能质量问题实现类
@@ -64,6 +66,8 @@ public class IssuesServiceImpl implements IssuesService {
private final RMpElectricQualityProblemFlowDetailsMapper flowDetailsMapper;
private final RStatElectricQualityProblemLogMapper rStatElectricQualityProblemLogMapper;
@Resource
private MinIoUtils minIoUtils;
@@ -561,4 +565,88 @@ public class IssuesServiceImpl implements IssuesService {
return issueesAndOrderVO;
}
/**
* @param electricityQualityCheckParam
* @Description: 电能质量问题审核
* @Param: [electricityQualityCheckParam]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
@Override
public Boolean checkPowerQuality(ElectricityQualityCheckParam electricityQualityCheckParam) {
boolean result = true;
RStatElectricQualityProblemLogPO rStatElectricQualityProblemLogPO = new RStatElectricQualityProblemLogPO();
rStatElectricQualityProblemLogPO.setPowerQualityProblemNo (electricityQualityCheckParam.getPowerQualityProblemNo ());
rStatElectricQualityProblemLogPO.setChecker (electricityQualityCheckParam.getCheckPerson ());
rStatElectricQualityProblemLogPO.setDataDate ( new Date ());
rStatElectricQualityProblemLogPO.setDescription (electricityQualityCheckParam.getCheckComment ());
rStatElectricQualityProblemLogPO.setReportProcess (electricityQualityCheckParam.getReportProcess ());
rStatElectricQualityProblemLogPO.setReportProcessContent (electricityQualityCheckParam.getCheckComment ());
rStatElectricQualityProblemLogPO.setType (Objects.equals ("1", electricityQualityCheckParam.getCheckResult ())?DicDataEnum.SUCCESS.getCode ( ):DicDataEnum.FAIL.getCode ( ));
/*插入审核日志表*/
int insert = rStatElectricQualityProblemLogMapper.insert (rStatElectricQualityProblemLogPO);
String report_process ="";
String report_process_status ="";
String reportProcess =electricityQualityCheckParam.getReportProcess ();
String checkResult = electricityQualityCheckParam.getCheckResult ( );
if (DicDataEnum.CAUSE_ANALYSIS.getCode ().equals(reportProcess)){
if(Objects.equals ("1", checkResult)){
report_process_status = DicDataEnum.AUDITT.getCode ();
report_process = DicDataEnum.PLAN_MEASURES.getCode ();
}else{
report_process_status = DicDataEnum.FAIL.getCode ();
report_process = DicDataEnum.CAUSE_ANALYSIS.getCode ();
}
}else if (DicDataEnum.PLAN_MEASURES.getCode().equals(reportProcess)){
if(Objects.equals ("1", checkResult)){
report_process_status = DicDataEnum.AUDITT.getCode ();
report_process = DicDataEnum.ACTUAL_MEASURES.getCode ();
}else{
report_process_status = DicDataEnum.FAIL.getCode ();
report_process = DicDataEnum.PLAN_MEASURES.getCode ();
}
}else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(reportProcess)){
if(Objects.equals ("1", checkResult)){
report_process_status = DicDataEnum.AUDITT.getCode ();
report_process = DicDataEnum.INSIGHTS.getCode ();
}else{
report_process_status = DicDataEnum.FAIL.getCode ();
report_process = DicDataEnum.ACTUAL_MEASURES.getCode ();
}
}else if (DicDataEnum.INSIGHTS.getCode().equals(reportProcess)){
if(Objects.equals ("1", checkResult)){
report_process_status = DicDataEnum.AUDITT.getCode ();
report_process = DicDataEnum.ARCHIVED.getCode ();
}else{
report_process_status = DicDataEnum.FAIL.getCode ();
report_process = DicDataEnum.INSIGHTS.getCode ();
}
}
UpdateWrapper<RStatElectricQualityProblemFlow> updateWrapper = new UpdateWrapper ();
updateWrapper.eq ("power_quality_problem_no", electricityQualityCheckParam.getPowerQualityProblemNo ());
updateWrapper.set ("report_process", report_process);
updateWrapper.set ("report_process_status",report_process_status);
int i= issuesMapper.update (null,updateWrapper);
result = insert==1&&i==1;
return result;
}
/**
* @param powerQualityProblemNo
* @Description: 历史审核记录查询
* @Param: [powerQualityProblemNo]
* @return: java.util.List<com.njcn.process.pojo.vo.RStatElectricQualityProblemLogVO>
* @Author: clam
* @Date: 2023/2/23
*/
@Override
public List<RStatElectricQualityProblemLogVO> queryCheckTrack(String powerQualityProblemNo) {
return null;
}
}

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

@@ -2,6 +2,7 @@ package com.njcn.process.service.impl;
import cn.hutool.core.date.DateUtil;
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.pojo.exception.BusinessException;
import com.njcn.device.pms.api.DistributionMonitorClient;
@@ -342,4 +343,54 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
return resultList;
}
/**
* @param loadTypeUserCheckParam
* @Description: 入网评估报告审核
* @Param: [loadTypeUserCheckParam]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
@Override
public Boolean checkLoadTypeUserI(LoadTypeUserCheckParam loadTypeUserCheckParam) {
boolean result = true;
UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper ();
updateWrapper.eq ("id", loadTypeUserCheckParam.getId ());
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();
updateWrapper.set ("i_status", Objects.equals ("1", loadTypeUserCheckParam.getCheckResult ())?finish.getId ():fail.getId ());
int i= loadTypeUserManageMapper.update (null,updateWrapper);
result = i==1;
return result;
}
/**
* @param loadTypeUserCheckParam
* @Description: 实测报告审核
* @Param: [loadTypeUserCheckParam]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
@Override
public Boolean checkLoadTypeUserA(LoadTypeUserCheckParam loadTypeUserCheckParam) {
boolean result = true;
UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper ();
updateWrapper.eq ("id", loadTypeUserCheckParam.getId ());
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();
updateWrapper.set ("a_status", Objects.equals ("1", loadTypeUserCheckParam.getCheckResult ())?finish.getId ():fail.getId ());
int i= loadTypeUserManageMapper.update (null,updateWrapper);
result = i==1;
return result;
}
}

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

@@ -2,6 +2,7 @@ package com.njcn.process.service.impl;
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;
@@ -12,10 +13,7 @@ import com.njcn.minio.utils.MinIoUtils;
import com.njcn.process.enums.ProcessResponseEnum;
import com.njcn.process.mapper.RGeneralSurveyPlanDetailMapper;
import com.njcn.process.mapper.RGeneralSurveyPlanPOMapper;
import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm;
import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm;
import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm;
import com.njcn.process.pojo.param.SurveyResultUploadParam;
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;
@@ -85,7 +83,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO ();
BeanUtils.copyProperties (rGeneralSurveyPlanAddParm,rGeneralSurveyPlanPO);
/*todo 后期与工作流绑定*/
rGeneralSurveyPlanPO.setStatus (0);
rGeneralSurveyPlanPO.setStatus (1);
boolean b = this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO);
List<RGeneralSurveyPlanAddParm.RGeneralSurveyPlanDetailAddParm> rGeneralSurveyPlanDetailAddParm = rGeneralSurveyPlanAddParm.getRGeneralSurveyPlanDetailAddParm ( );
@@ -333,6 +331,26 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
return list;
}
/**
* @param rGeneralSurveyPlanChcekParm
* @Description: checkPlanAudit
* @Param: [rGeneralSurveyPlanChcekParm]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/22
*/
@Override
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);
return result;
}
/**
* 上传文件到Minio
*

242
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RStatDistributionProblemServiceImpl.java
View File

@@ -1,25 +1,37 @@
package com.njcn.process.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.device.pms.api.PmsPowerDistributionareaClient;
import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
import com.njcn.device.pms.pojo.po.PowerDistributionarea;
import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO;
import com.njcn.process.mapper.RStatDistributionProblemMapper;
import com.njcn.process.mapper.RStatWorkOrderDetailMapper;
import com.njcn.process.pojo.param.RStatProblemAndWorkOrderParam;
import com.njcn.process.pojo.po.RStatDistributionProblemPO;
import com.njcn.process.pojo.po.RStatWorkOrderDetailPO;
import com.njcn.process.pojo.vo.IssueesAndOrderVO;
import com.njcn.process.pojo.vo.OrderCountVO;
import com.njcn.process.pojo.vo.RStatDistributionProblemVO;
import com.njcn.process.pojo.vo.RStatWorkOrderDetailVO;
import com.njcn.process.service.RStatDistributionProblemService;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.user.api.DeptFeignClient;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/2/1 14:17【需求编号】
@@ -29,10 +41,11 @@ import java.util.stream.Collectors;
*/
@Service
@AllArgsConstructor
public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDistributionProblemMapper, RStatDistributionProblemPO> implements RStatDistributionProblemService{
public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDistributionProblemMapper, RStatDistributionProblemPO> implements RStatDistributionProblemService {
private final DeptFeignClient deptFeignClient;
private final PmsPowerDistributionareaClient pmsPowerDistributionareaClient;
private final RStatDistributionProblemMapper rStatDistributionProblemMapper;
@@ -48,22 +61,22 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDis
*/
@Override
public IssueesAndOrderVO queryIssuesAndOrder(String orgNo) {
IssueesAndOrderVO issueesAndOrderVO = new IssueesAndOrderVO();
IssueesAndOrderVO issueesAndOrderVO = new IssueesAndOrderVO ( );
List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(orgNo).getData();
List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId (orgNo).getData ( );
/*问题个数*/
QueryWrapper<RStatDistributionProblemPO> problemPOQueryWrapper = new QueryWrapper<> ();
QueryWrapper<RStatDistributionProblemPO> problemPOQueryWrapper = new QueryWrapper<> ( );
problemPOQueryWrapper.select ("problem_no").
in ("org_no",deptIds);
in ("org_no", deptIds);
List<RStatDistributionProblemPO> rStatDistributionProblemPOS = rStatDistributionProblemMapper.selectList (problemPOQueryWrapper);
issueesAndOrderVO.setId (orgNo);
issueesAndOrderVO.setIssueesCount (rStatDistributionProblemPOS.size ());
issueesAndOrderVO.setIssueesCount (rStatDistributionProblemPOS.size ( ));
List<String> problemNoList = rStatDistributionProblemPOS.stream ( ).map (RStatDistributionProblemPO::getProblemNo).collect (Collectors.toList ( ));
/*已关联工单数量*/
QueryWrapper<RStatWorkOrderDetailPO> workOrderDetailPOQueryWrapper = new QueryWrapper<> ();
QueryWrapper<RStatWorkOrderDetailPO> workOrderDetailPOQueryWrapper = new QueryWrapper<> ( );
workOrderDetailPOQueryWrapper.select ("1").
in("problem_no",problemNoList).
in ("org_no",deptIds);
in ("problem_no", problemNoList).
in ("org_no", deptIds);
Integer relatedOrderCount = rStatWorkOrderDetailMapper.selectCount (workOrderDetailPOQueryWrapper);
issueesAndOrderVO.setRelatedOrderCount (relatedOrderCount);
return issueesAndOrderVO;
@@ -79,18 +92,209 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDis
*/
@Override
public OrderCountVO queryOrderCount(String orgNo) {
OrderCountVO orderCountVO = new OrderCountVO();
List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(orgNo).getData();
OrderCountVO orderCountVO = new OrderCountVO ( );
List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId (orgNo).getData ( );
/*工单数量*/
QueryWrapper<RStatWorkOrderDetailPO> workOrderDetailPOQueryWrapper = new QueryWrapper<> ();
QueryWrapper<RStatWorkOrderDetailPO> workOrderDetailPOQueryWrapper = new QueryWrapper<> ( );
workOrderDetailPOQueryWrapper.
in ("org_no",deptIds);
in ("org_no", deptIds);
List<RStatWorkOrderDetailPO> rStatWorkOrderDetailPOS = rStatWorkOrderDetailMapper.selectList (workOrderDetailPOQueryWrapper);
orderCountVO.setId (orgNo);
orderCountVO.setOrderCount (rStatWorkOrderDetailPOS.size ());
orderCountVO.setOrderCount (rStatWorkOrderDetailPOS.size ( ));
/*已完成工单数量*/
long count = rStatWorkOrderDetailPOS.stream ( ).filter (t -> Objects.equals (t.getWorkOrderStatus ( ), DicDataEnum.CLOSED.getCode ())).count ( );
orderCountVO.setCompelteOrderCount (Integer.valueOf (count+""));
long count = rStatWorkOrderDetailPOS.stream ( ).filter (t -> Objects.equals (t.getWorkOrderStatus ( ), DicDataEnum.CLOSED.getCode ( ))).count ( );
orderCountVO.setCompelteOrderCount (Integer.valueOf (count + ""));
return orderCountVO;
}
/**
* @param overLimitFlagDTOList
* @Description: 创建问题接口
* @Param: [overLimitFlagDTOList]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/15
*/
@Override
public Boolean createProblem(List<OverLimitFlagDTO> overLimitFlagDTOList) {
List<RStatDistributionProblemPO> rStatDistributionProblemPOList = new ArrayList<> ( );
DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMdd");
PowerDistributionareaParam powerDistributionareaParam = new PowerDistributionareaParam();
List<PowerDistributionarea> data = pmsPowerDistributionareaClient.getPowerDistributionList (powerDistributionareaParam).getData ( );
Map<String, PowerDistributionarea> collect = data.stream ( ).collect (Collectors.
toMap (PowerDistributionarea::getId,
powerDistributionarea->powerDistributionarea));
overLimitFlagDTOList.forEach (overLimitFlagDTO -> {
RStatDistributionProblemPO rStatDistributionProblemPO = new RStatDistributionProblemPO ( );
rStatDistributionProblemPO.setProblemNo (createproblemNo(overLimitFlagDTO.getOverLimtType (),overLimitFlagDTO.getStartTime ().format(fmt)));
rStatDistributionProblemPO.setOrgNo (collect.get(overLimitFlagDTO.getLineId ()).getOrgId ());
rStatDistributionProblemPO.setOrgName (collect.get(overLimitFlagDTO.getLineId ()).getOrgName ());
rStatDistributionProblemPO.setProblemType (overLimitFlagDTO.getOverLimtType ());
rStatDistributionProblemPO.setOccurTime (Date.from(overLimitFlagDTO.getStartTime ().atZone(ZoneId.systemDefault()).toInstant()));
rStatDistributionProblemPO.setLastTime (Date.from(overLimitFlagDTO.getEndTime ().atZone(ZoneId.systemDefault()).toInstant()));
rStatDistributionProblemPO.setCheckStatus (DicDataEnum.REVIEW.getCode ());
rStatDistributionProblemPO.setDistributionId (overLimitFlagDTO.getLineId ( ));
rStatDistributionProblemPO.setDistributionName (collect.get(overLimitFlagDTO.getLineId ()).getName ());
rStatDistributionProblemPO.setMeasurementPointId (overLimitFlagDTO.getLineId ( ));
rStatDistributionProblemPO.setProblemDescribe ("......");
rStatDistributionProblemPOList.add (rStatDistributionProblemPO);
}
);
boolean b = this.saveBatch (rStatDistributionProblemPOList);
return b;
}
/**
* @param rStatProblemAndWorkOrderParam
* @Description: 查询问题接口
* @Param: [rStatProblemAndWorkOrderParam]
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.njcn.process.pojo.vo.RStatDistributionProblemVO>
* @Author: clam
* @Date: 2023/2/16
*/
@Override
public IPage<RStatDistributionProblemVO> queryProblem(RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam) {
IPage<RStatDistributionProblemPO> page = new Page<> (rStatProblemAndWorkOrderParam.getCurrentPage(), rStatProblemAndWorkOrderParam.getPageSize());
IPage<RStatDistributionProblemVO> returnpage = new Page<> (rStatProblemAndWorkOrderParam.getCurrentPage(), rStatProblemAndWorkOrderParam.getPageSize());
QueryWrapper<RStatDistributionProblemPO> queryWrapper = new QueryWrapper<> ();
queryWrapper.eq (StrUtil.isNotBlank(rStatProblemAndWorkOrderParam.getProblemType ()),"problem_type",rStatProblemAndWorkOrderParam.getProblemType ()).
eq (StrUtil.isNotBlank (rStatProblemAndWorkOrderParam.getCheckStatus ()),"check_status",rStatProblemAndWorkOrderParam.getCheckStatus ()).
eq (StrUtil.isNotBlank (rStatProblemAndWorkOrderParam.getOccurTime ()),"DATE_FORMAT( occur_time ,'%Y-%m-%d')",rStatProblemAndWorkOrderParam.getOccurTime ()).
like (StrUtil.isNotBlank (rStatProblemAndWorkOrderParam.getDistributionName ()), "distribution_name",rStatProblemAndWorkOrderParam.getDistributionName ());
List<RStatDistributionProblemPO> records = rStatDistributionProblemMapper.selectPage (page, queryWrapper).getRecords ( );
if(CollectionUtils.isEmpty (records)){
return returnpage;
}
List<RStatDistributionProblemVO> list = new ArrayList<> ();
records.forEach (temp->{
RStatDistributionProblemVO rStatDistributionProblemVO = new RStatDistributionProblemVO();
BeanUtils.copyProperties (temp, rStatDistributionProblemVO);
list.add (rStatDistributionProblemVO);
});
returnpage.setRecords (list);
return returnpage;
}
/**
* @param rStatDistributionProblemVO
* @Description: 审核处理(更新问题表,生成工单表)
* @Param: [rStatDistributionProblemVO]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/17
*/
@Override
public Boolean checkProblem(RStatDistributionProblemVO rStatDistributionProblemVO) {
Boolean flag = true;
RStatDistributionProblemPO rStatDistributionProblemPO = new RStatDistributionProblemPO();
BeanUtils.copyProperties (rStatDistributionProblemVO, rStatDistributionProblemPO);
flag = this.updateByMultiId (rStatDistributionProblemPO);
if(!flag){
return flag;
}
/*生成工单表*/
if(Objects.equals (DicDataEnum.GENERATE.getCode (),rStatDistributionProblemPO.getCheckResult ())){
/*处理台区信息*/
PowerDistributionareaParam powerDistributionareaParam = new PowerDistributionareaParam();
List<PowerDistributionarea> data = pmsPowerDistributionareaClient.getPowerDistributionList (powerDistributionareaParam).getData ( );
Map<String, PowerDistributionarea> collect = data.stream ( ).collect (Collectors.
toMap (PowerDistributionarea::getId,
powerDistributionarea->powerDistributionarea));
RStatWorkOrderDetailPO po = new RStatWorkOrderDetailPO();
BeanUtils.copyProperties (rStatDistributionProblemVO, po);
po.setProblemNo (rStatDistributionProblemVO.getProblemNo ());
po.setWorkOrderStatus (DicDataEnum.PEND_DISPATCH.getCode ());
po.setWorkOrderType (DicDataEnum.RECT_ORDER.getCode ());
po.setPrimaryBusinessType (DicDataEnum.TRANS_BUSINESS.getCode ());
po.setTwoBusinessType (rStatDistributionProblemVO.getProblemType ());
po.setPowerSupplyStation (collect.get (rStatDistributionProblemVO.getDistributionId ()).getPowerStationId ());
po.setWorkOrderProcess (DicDataEnum.GENERATED.getCode ());
int insert = rStatWorkOrderDetailMapper.insert (po);
if(!(insert==1)){
flag=false;
}
}
return flag;
}
/**
* @param rStatProblemAndWorkOrderParam
* @Description: queryWorkOrder
* @Param: [rStatProblemAndWorkOrderParam]
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.njcn.process.pojo.vo.RStatWorkOrderDetailVO>
* @Author: clam
* @Date: 2023/2/17
*/
@Override
public IPage<RStatWorkOrderDetailVO> queryWorkOrder(RStatProblemAndWorkOrderParam rStatProblemAndWorkOrderParam) {
// IPage<RStatWorkOrderDetailPO> page = new Page<> (rStatProblemAndWorkOrderParam.getCurrentPage(), rStatProblemAndWorkOrderParam.getPageSize());
Page<RStatWorkOrderDetailVO> returnpage = new Page<> (rStatProblemAndWorkOrderParam.getCurrentPage(), rStatProblemAndWorkOrderParam.getPageSize());
// QueryWrapper<RStatWorkOrderDetailPO> queryWrapper = new QueryWrapper<> ();
// queryWrapper.eq (StrUtil.isNotBlank(rStatProblemAndWorkOrderParam.getProblemType ()),"problem_type",rStatProblemAndWorkOrderParam.getProblemType ()).
// eq (StrUtil.isNotBlank (rStatProblemAndWorkOrderParam.getOccurTime ()),"DATE_FORMAT( occur_time ,'%Y-%m-%d')",rStatProblemAndWorkOrderParam.getOccurTime ()).
// eq (StrUtil.isNotBlank (rStatProblemAndWorkOrderParam.getWorkOrderStatus ()),"work_order_status",rStatProblemAndWorkOrderParam.getWorkOrderStatus ()).
// eq (StrUtil.isNotBlank (rStatProblemAndWorkOrderParam.getProblemNo ()), "problem_no",rStatProblemAndWorkOrderParam.getProblemNo ());
returnpage = rStatWorkOrderDetailMapper.getPageVo (returnpage ,rStatProblemAndWorkOrderParam);
// List<RStatWorkOrderDetailVO> list = new ArrayList<> ();
// records.forEach (temp->{
// RStatWorkOrderDetailVO rStatWorkOrderDetailVO = new RStatWorkOrderDetailVO();
// BeanUtils.copyProperties (temp, rStatWorkOrderDetailVO);
// list.add (rStatWorkOrderDetailVO);
// });
// returnpage.setRecords (list);
return returnpage;
}
/**
* @param rStatWorkOrderDetailVO
* @Description: 更新工单进度
* @Param: [rStatWorkOrderDetailVO]
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/2/17
*/
@Override
public Boolean updateWorkOrderStatus(RStatWorkOrderDetailVO rStatWorkOrderDetailVO) {
Boolean flag= true;
RStatWorkOrderDetailPO rStatWorkOrderDetailPO = new RStatWorkOrderDetailPO();
BeanUtils.copyProperties (rStatWorkOrderDetailVO, rStatWorkOrderDetailPO);
int i = rStatWorkOrderDetailMapper.updateByMultiId (rStatWorkOrderDetailPO);
if(!(i==1)){
flag=false;
}
return flag;
}
/**
* @Description: 系统根据规则生成：
* 县公司首字母缩写+“-”+问题首字母缩写+问题上报日期+5位随机数
* 例如：萧山公司2022年9月1日的谐波电压越限问题，编号为：XS-DY2022090200001
* 修改需求：问题首字母缩写+问题上报日期+8位随机数
* @Param: [OrgName, problemShortName, date]
* @return: java.lang.String
* @Author: clam
* @Date: 2023/2/15
*/
public String createproblemNo(String problemType,String date){
/*生成8位随机数*/
int i = (int) ((Math.random ( ) * 9 + 1) * 10000000);
String problemShortName = "";
if(Objects.equals (problemType,DicDataEnum.VOLTAGE_LIMIT.getCode ())){
problemShortName = "DY";
}else if(Objects.equals (problemType,DicDataEnum.CURRENT_LIMIT.getCode ())){
problemShortName = "DL";
}
return problemShortName+date+i;
}
}