1.pms bug修改

2.监测点稳态指标合格率算法开发
2023-03-06 10:32:03 +08:00
parent c20ef391d7
commit 779b95d6b5
43 changed files with 1735 additions and 229 deletions
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemLogMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemLogMapper.java
@@ -2,6 +2,11 @@ package com.njcn.process.mapper;

 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 import com.njcn.process.pojo.po.RStatElectricQualityProblemLogPO;
+import com.njcn.process.pojo.vo.RStatElectricQualityProblemLogVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;

 /**
 * 
@@ -13,4 +18,20 @@ import com.njcn.process.pojo.po.RStatElectricQualityProblemLogPO;
 * @version V1.0.0
 */
 public interface RStatElectricQualityProblemLogMapper extends MppBaseMapper<RStatElectricQualityProblemLogPO> {
+    @Select ("SELECT\n" +
+            "\tb.power_quality_problem_no,\n" +
+            "\ta.org_no org_name,\n" +
+            "b.data_date,\n" +
+            "b.checker,\n" +
+            "b.description,\n" +
+            "b.report_process,\n" +
+            "b.report_process_content,\n" +
+            "b.type\n" +
+            "FROM\n" +
+            "\tr_stat_electric_quality_problem_flow a,\n" +
+            "\tr_stat_electric_quality_problem_log b\n" +
+            "WHERE\n" +
+            "\ta.power_quality_problem_no = b.power_quality_problem_no\n" +
+            "AND b.power_quality_problem_no = #{powerQualityProblemNo}")
+    List<RStatElectricQualityProblemLogVO> selectByProblemNo(@Param ("powerQualityProblemNo") String powerQualityProblemNo);
 }
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java
@@ -27,9 +27,11 @@ import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;

@@ -37,7 +39,9 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;

 /**
 * 电能质量问题实现类
@@ -385,6 +389,7 @@ public class IssuesServiceImpl implements IssuesService {
     * 原因分析
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public void reasonAnalysis(ProcessParam processParam) {
        LocalDateTime local = LocalDateTimeUtil.now();
        RMpElectricQualityProblemFlowDetails details = new RMpElectricQualityProblemFlowDetails();
@@ -420,6 +425,7 @@ public class IssuesServiceImpl implements IssuesService {
     * 计划整改措施、实际采取措施、成效分析
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public void process(ProcessParam processParam, String code) {
        LambdaQueryWrapper<RStatElectricQualityProblemFlow> issuesQuery = new LambdaQueryWrapper<>();
        issuesQuery.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo());
@@ -460,6 +466,7 @@ public class IssuesServiceImpl implements IssuesService {
     * 问题归档
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public void archive(String powerQualityProblemNo) {
        LambdaQueryWrapper<RStatElectricQualityProblemFlow> query = new LambdaQueryWrapper<>();
        query.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,powerQualityProblemNo);
@@ -510,6 +517,7 @@ public class IssuesServiceImpl implements IssuesService {
     * 删除问题
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public void deleteIssues(String powerQualityProblemNo) {
        LambdaQueryWrapper<RStatElectricQualityProblemFlow> query = new LambdaQueryWrapper<>();
        query.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,powerQualityProblemNo);
@@ -574,6 +582,7 @@ public class IssuesServiceImpl implements IssuesService {
     * @Date: 2023/2/22
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public Boolean checkPowerQuality(ElectricityQualityCheckParam electricityQualityCheckParam) {
        boolean result = true;
        RStatElectricQualityProblemLogPO rStatElectricQualityProblemLogPO = new RStatElectricQualityProblemLogPO();
@@ -646,7 +655,17 @@ public class IssuesServiceImpl implements IssuesService {
     */
    @Override
    public List<RStatElectricQualityProblemLogVO> queryCheckTrack(String powerQualityProblemNo) {
-        return null;
+
+        //部门处理：根据部门code取名称
+        List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
+        Map<String, String> pvTerminalTreeVOMap = dept.stream().
+                collect(Collectors.
+                        toMap(PvTerminalTreeVO::getId,
+                                PvTerminalTreeVO::getName));
+        List<RStatElectricQualityProblemLogVO> rStatElectricQualityProblemLogVOList = rStatElectricQualityProblemLogMapper.selectByProblemNo(powerQualityProblemNo);
+        rStatElectricQualityProblemLogVOList.stream ().forEach (temp->temp.setOrgName (pvTerminalTreeVOMap.get (temp.getOrgName ())));
+
+        return rStatElectricQualityProblemLogVOList;
    }

 }
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java
@@ -28,6 +28,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;

 import javax.annotation.Resource;
@@ -134,6 +135,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     * @return
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public boolean uploadLoadTypeUserI(LoadTypeUserIUploadParam loadTypeUserIUploadParam) {

        RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
@@ -166,6 +168,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     * @return
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public boolean linkUser(LoadTypeUserAssociateParam loadTypeUserAssociateParam) {
        RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
        //填入数据修改
@@ -221,6 +224,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     * @return
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public boolean uploadLoadTypeUserA(LoadTypeUserAUploadParam loadTypeUserAUploadParam) {

        RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
@@ -353,6 +357,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     * @Date: 2023/2/22
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public Boolean checkLoadTypeUserI(LoadTypeUserCheckParam loadTypeUserCheckParam) {
        boolean result = true;
        UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper ();
@@ -378,6 +383,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
     * @Date: 2023/2/22
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public Boolean checkLoadTypeUserA(LoadTypeUserCheckParam loadTypeUserCheckParam) {
        boolean result = true;
        UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper ();
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
@@ -196,6 +196,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
     * @Date: 2022/11/18
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public boolean surveyResultUpload(SurveyResultUploadParam surveyResultUploadParam) {
        boolean result = true;
        RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO();
@@ -340,6 +341,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
     * @Date: 2023/2/22
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public Boolean checkPlanAudit(RGeneralSurveyPlanChcekParm rGeneralSurveyPlanChcekParm) {
        boolean result = true;
        UpdateWrapper<RGeneralSurveyPlanPO> updateWrapper = new UpdateWrapper();
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RStatDistributionProblemServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RStatDistributionProblemServiceImpl.java
@@ -24,6 +24,7 @@ import com.njcn.user.api.DeptFeignClient;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;

 import java.time.ZoneId;
@@ -116,6 +117,7 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDis
     * @Date: 2023/2/15
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public Boolean createProblem(List<OverLimitFlagDTO> overLimitFlagDTOList) {
        List<RStatDistributionProblemPO> rStatDistributionProblemPOList = new ArrayList<> ( );
        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMdd");
@@ -185,6 +187,7 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDis
     * @Date: 2023/2/17
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public Boolean checkProblem(RStatDistributionProblemVO rStatDistributionProblemVO) {
        Boolean flag = true;
        RStatDistributionProblemPO rStatDistributionProblemPO = new RStatDistributionProblemPO();
@@ -262,6 +265,7 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl<RStatDis
     * @Date: 2023/2/17
     */
    @Override
+    @Transactional(rollbackFor = {Exception.class})
    public Boolean updateWorkOrderStatus(RStatWorkOrderDetailVO rStatWorkOrderDetailVO) {
        Boolean flag= true;
        RStatWorkOrderDetailPO rStatWorkOrderDetailPO = new RStatWorkOrderDetailPO();