Merge branch 'master' of http://192.168.1.22:3000/root/pqs

2024-05-22 16:08:44 +08:00
parent d51c2cd28a 28487ceb63
commit 41e6d2efb8
12 changed files with 231 additions and 18 deletions
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java
@@ -7,9 +7,11 @@ 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.supervision.pojo.vo.leaflet.WarningLeafletVO;
+import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO;
 import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam;
+import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
 import com.njcn.supervision.service.leaflet.IWarningLeafletService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -19,9 +21,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
-import com.njcn.web.controller.BaseController;

 /**
 * <p>
@@ -61,5 +61,15 @@ public class WarningLeafletController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addLineOverLimitData")
+    @ApiOperation("监测点超标预警单/告警单新增")
+    @ApiImplicitParam(name = "rMpPartHarmonicDetailDTO", value = "参数", required = true)
+    public HttpResult<String> addLineOverLimitData(@RequestBody @Validated RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO) {
+        String methodDescribe = getMethodDescribe("addLineOverLimitData");
+        String out = warningLeafletService.addLineOverLimitData(rMpPartHarmonicDetailDTO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
+    }
+
 }

--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
@@ -20,6 +20,7 @@ import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
 import com.njcn.supervision.service.device.SupervisionTempLineReportService;
+import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.vo.UserVO;
@@ -56,7 +57,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
    private final BpmProcessFeignClient bpmProcessFeignClient;
    private final DeptFeignClient deptFeignClient;
    private final UserFeignClient userFeignClient;
-
+    private final DictTreeFeignClient dictTreeFeignClient;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public String addTempLineReport(SupervisionTempLineReportParam supervisionTempLineReportParam) {
@@ -146,7 +147,8 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
        UserVO userVO = userFeignClient.getUserById(vo.getReporter()).getData();
        vo.setReporter(userVO.getName());
        vo.setOrgName(deptFeignClient.getDeptById(vo.getOrgId()).getData().getName());
-
+        vo.setLoadType(dictTreeFeignClient.queryById(vo.getLoadType()).getData().getName());
+        vo.setBusinessType(dictTreeFeignClient.queryById(vo.getBusinessType()).getData().getName());
        return vo;
    }

--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java
@@ -2,6 +2,7 @@ package com.njcn.supervision.service.leaflet;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO;
 import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam;
 import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
 import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
@@ -30,4 +31,6 @@ public interface IWarningLeafletService extends IService<WarningLeaflet> {
    Page<WarningLeafletVO> alarmPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam);

    Page<WarningLeafletVO> warningPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam);
+
+    String addLineOverLimitData(RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO);
 }
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
@@ -1,25 +1,35 @@
 package com.njcn.supervision.service.leaflet.impl;

+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO;
 import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.enums.LeafletTypeEnum;
+import com.njcn.supervision.enums.ProblemTypeEnum;
 import com.njcn.supervision.mapper.leaflet.WarningLeafletMapper;
 import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam;
 import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
 import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
 import com.njcn.supervision.service.leaflet.IWarningLeafletService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

+import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;

 /**
 * <p>
@@ -34,6 +44,7 @@ import java.util.Objects;
 public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper, WarningLeaflet> implements IWarningLeafletService {

    private final UserFeignClient userFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;

    /**
     * 不创建工作流，只是创建一个告警单，需要待用户反馈后才会进入流程
@@ -88,4 +99,39 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
        return this.baseMapper.alarmPageData(new Page<>(PageFactory.getPageNum(warningLeafletQueryParam), PageFactory.getPageSize(warningLeafletQueryParam)), warningLeafletVOQueryWrapper);

    }
+
+    @Override
+    public String addLineOverLimitData(RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO) {
+        //组装预警告警信息
+        String info = assembleOverLimitInfo(rMpPartHarmonicDetailDTO);
+//        checkInfo(info);
+        this.createLeaflet(
+                rMpPartHarmonicDetailDTO.getMeasurementPointName(),
+                IdWorker.get32UUID(),
+                rMpPartHarmonicDetailDTO.getMeasurementPointId(),
+                ProblemTypeEnum.ONLINE.getCode(),
+                Objects.equals(rMpPartHarmonicDetailDTO.getAlarmFlag(),1) ? LeafletTypeEnum.ALARM.getCode(): LeafletTypeEnum.WARNING.getCode(),
+                assembleOverLimitInfo(rMpPartHarmonicDetailDTO)
+        );
+
+        return null;
+    }
+
+    private String assembleOverLimitInfo(RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO) {
+        String info ="";
+        String leafletType = Objects.equals(rMpPartHarmonicDetailDTO.getAlarmFlag(),1) ? "告警单" : "预警单";
+        /*获取稳态统计指标*/
+        List<DictData> steadyStatis = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData();
+        List<String> harmonicTypes = steadyStatis.stream().filter(temp -> rMpPartHarmonicDetailDTO.getHarmonicTypes().contains(temp.getId())).map(DictData::getName).collect(Collectors.toList());
+
+        info= "预警/告警单类型："+ "监测点超标"+leafletType+"    "+
+              "预警/告警单生成时间："+ LocalDateTimeUtil.format(LocalDate.now(), DatePattern.CHINESE_DATE_PATTERN)+"\n"+
+              "超标电站名称：" +rMpPartHarmonicDetailDTO.getSustationName()+"    "+"超标母线名称：" +rMpPartHarmonicDetailDTO.getBarName()+"    "+"超标监测点名称：" +rMpPartHarmonicDetailDTO.getMeasurementPointName()+"\n"+
+              "统计超标指标：" +String.join(",",harmonicTypes)+"\n"+
+              "当月累计超标天数：" +rMpPartHarmonicDetailDTO.getOverLimitDay()+"天"+"    "+ "当月累计连续天数：" +rMpPartHarmonicDetailDTO.getOverLimitContinuous()+"天"+"\n"+
+              "超标天数详情："+rMpPartHarmonicDetailDTO.getDateList();
+        log.warn(info);
+
+        return info;
+    }
 }
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.bpm.api.BpmProcessFeignClient;
+import com.njcn.bpm.enums.BpmTaskStatusEnum;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -101,6 +102,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
            }
        }
        supvPlan.setState(DataStateEnum.ENABLE.getCode());
+        supvPlan.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
        this.save(supvPlan);
        return supvPlan.getPlanId();
    }
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java
@@ -1,15 +1,16 @@
 package com.njcn.supervision.service.plan.impl;

 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.utils.PubUtils;
 import com.njcn.supervision.mapper.plan.SupervisionPlanPOMapper;
 import com.njcn.supervision.mapper.plan.SupervisionProblemPOMapper;
 import com.njcn.supervision.pojo.param.plan.SupervisopnProblemParam;
@@ -53,9 +54,9 @@ public class SupervisionProblemPOServiceImpl extends ServiceImpl<SupervisionProb
        checkParam(supvProblemParam.getPlanId(),supvProblemParam.getDiscoveryTime());
        SupervisionProblemPO supvProblem = new SupervisionProblemPO();
        BeanUtil.copyProperties(supvProblemParam, supvProblem);
-        supvProblem.setPlanRectificationTime(PubUtils.beginTimeToLocalDateTime(supvProblemParam.getPlanRectificationTime()));
+        supvProblem.setPlanRectificationTime(LocalDateTimeUtil.parse(supvProblemParam.getPlanRectificationTime(), DatePattern.NORM_DATETIME_PATTERN));
        if(StrUtil.isNotBlank(supvProblemParam.getRectificationTime())) {
-            supvProblem.setRectificationTime(PubUtils.beginTimeToLocalDateTime(supvProblemParam.getRectificationTime()));
+            supvProblem.setRectificationTime(LocalDateTimeUtil.parse(supvProblemParam.getRectificationTime(), DatePattern.NORM_DATETIME_PATTERN));
        }
        this.save(supvProblem);
    }