过程监督代码提交

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java

@@ -77,7 +77,7 @@ public class AlgorithmController extends BaseController {
     @ResponseBody
     public HttpResult<String> uploadFile(MultipartFile file) {
         try {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, fileStorageUtil.uploadMultipart(file,OssPath.ALGORITHM), null);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,fileStorageUtil.getFileUrl(fileStorageUtil.uploadMultipart(file,OssPath.ALGORITHM)), null);
         } catch (Exception e) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, null);
         }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java

@@ -21,11 +21,9 @@ public class GeneralSurveyParam extends IssuesParam {
     private String substationId;
 
     @ApiModelProperty(name = "busbarId",value = "母线ID")
-    @NotNull(message = "母线ID不可为空")
     private String busbarId;
 
     @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
-    @NotNull(message = "监测点ID不可为空")
     private String measurementPointId;
 
     @ApiModelProperty(name = "steadyState",value = "稳态指标")

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java

@@ -36,6 +36,9 @@ public class StrategyParam {
         @ApiModelProperty("名称")
         private String name;
 
+        @ApiModelProperty("等级（0：一级；1：二级；2：三级）")
+        private String grade;
+
         @ApiModelProperty(value = "区分预警单/告警单（0：预警单 ；1：告警单）")
         private Integer type;
     }
@@ -72,8 +75,8 @@ public class StrategyParam {
         private Integer operation;
 
         @ApiModelProperty(value = "监测点标签")
-        @NotBlank(message = "监测点标签不能为空")
+        @NotEmpty(message = "监测点标签集合不能为空")
-        private String monitorTag;
+        private List<String> monitorTag;
 
         @ApiModelProperty(value = "指标类型")
         @NotEmpty(message = "指标类型集合不能为空")

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

@@ -8,6 +8,7 @@ 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.minioss.bo.MinIoUploadResDTO;
 import com.njcn.process.pojo.param.*;
 import com.njcn.process.pojo.vo.*;
 import com.njcn.process.service.IssuesService;
@@ -184,11 +185,10 @@ public class ElectricityQualityIssuesController extends BaseController {
     @PostMapping("/uploadFile")
     @ApiOperation("上传文件")
     @ApiImplicitParam(name = "file", value = "填报进度文件", required = true)
-    public HttpResult<String> uploadFile(@RequestParam("file") MultipartFile issuesFile){
+    public HttpResult<MinIoUploadResDTO> uploadFile(@RequestParam("file") MultipartFile issuesFile){
         String methodDescribe = getMethodDescribe("uploadFile");
         String filePath = issuesService.uploadFile(issuesFile);
-//        out.setMinFileName(issuesFile.getOriginalFilename());
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(issuesFile.getOriginalFilename(),filePath), methodDescribe);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, filePath, methodDescribe);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)

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

@@ -121,6 +121,7 @@ public class IssuesServiceImpl implements IssuesService {
      * 填报在线监测超标问题
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void addExcessiveIssues(ExcessiveParam excessiveParam) {
         IssuesParam issuesParam = new IssuesParam();
         BeanUtil.copyProperties(excessiveParam, issuesParam);
@@ -137,6 +138,7 @@ public class IssuesServiceImpl implements IssuesService {
      * 填报普测超标问题
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void addGeneralSurveyIssues(GeneralSurveyParam generalSurveyParam) {
         IssuesParam issuesParam = new IssuesParam();
         BeanUtil.copyProperties(generalSurveyParam, issuesParam);
@@ -154,6 +156,7 @@ public class IssuesServiceImpl implements IssuesService {
      * 填报用户投诉问题
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void addComplaintIssues(ComplaintParam complaintParam) {
         IssuesParam issuesParam = new IssuesParam();
         BeanUtil.copyProperties(complaintParam, issuesParam);
@@ -171,6 +174,7 @@ public class IssuesServiceImpl implements IssuesService {
      * 填报运维监控异常问题
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void addAbnormalIssues(AbnormalParam abnormalParam) {
         IssuesParam issuesParam = new IssuesParam();
         BeanUtil.copyProperties(abnormalParam, issuesParam);

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java

@@ -82,6 +82,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
                         .le(StrUtil.isNotBlank(param.getEndTime()), PmsTerminalDetection::getInspectionTime, param.getEndTime())
 
                         .le(param.getType() != 0, PmsTerminalDetection::getNextInspectionTime, LocalDate.now())
+                        .orderByDesc(PmsTerminalDetection::getCreateTime)
         );
         List<TerminalVO> rMpWpPowerDetailVOS2 = BeanUtil.copyToList(pageList.getRecords(), TerminalVO.class);
 

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java

@@ -3,13 +3,17 @@ package com.njcn.process.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
+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.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
 import com.njcn.process.pojo.param.StrategyParam;
+import com.njcn.process.pojo.po.PmsTerminalDetection;
 import com.njcn.process.pojo.po.ThsDeptAlarm;
 import com.njcn.process.pojo.po.ThsWarnStrategy;
 import com.njcn.process.mapper.ThsWarnStrategyMapper;
@@ -49,13 +53,20 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
         return this.page(new Page<>(param.getPageNum(), param.getPageSize())
                 , new LambdaQueryWrapper<ThsWarnStrategy>()
                         .like(StrUtil.isNotBlank(param.getName()), ThsWarnStrategy::getName, param.getName())
-                        .le(param.getType() != 0, ThsWarnStrategy::getType, param.getType())
+                        .eq(param.getGrade() != null, ThsWarnStrategy::getGrade, param.getGrade())
+                        .le(param.getType() != null, ThsWarnStrategy::getType, param.getType())
 
         );
     }
 
     @Override
     public Boolean insertStrategy(StrategyParam.StrategyInsertParam param) {
+        int count = this.count(new LambdaQueryWrapper<ThsWarnStrategy>()
+                .eq(ThsWarnStrategy::getName, param.getName())
+        );
+        if (count > 0) {
+            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+        }
         ThsWarnStrategy thsWarnStrategy = BeanUtil.copyProperties(param, ThsWarnStrategy.class);
         thsWarnStrategy.setCreateBy(RequestUtil.getLoginName());
         thsWarnStrategy.setState(1);
@@ -66,20 +77,10 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
     public Boolean bindStrategy(StrategyParam.BindParam param) {
         List<ThsWarnStrategyAss> assList = new ArrayList<>();
         //监测点标签绑定
-        ThsWarnStrategyAss ass = new ThsWarnStrategyAss();
+        add(assList,param.getId(),0,param.getMonitorTag());
-        ass.setWarnId(param.getId());
-        ass.setAssId(param.getMonitorTag());
-        ass.setType(0);
-        assList.add(ass);
         //指标类型绑定
-        ThsWarnStrategyAss assType;
+        add(assList,param.getId(),1,param.getIndicatorTypes());
-        for (String indicatorType : param.getIndicatorTypes()) {
+
-            assType = new ThsWarnStrategyAss();
-            assType.setWarnId(param.getId());
-            assType.setAssId(indicatorType);
-            assType.setType(1);
-            assList.add(assType);
-        }
         thsWarnStrategyAssService.saveBatch(assList);
         ThsWarnStrategy warnStrategy = new ThsWarnStrategy();
         warnStrategy.setId(param.getId());
@@ -87,7 +88,25 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
         return this.updateById(warnStrategy);
 
     }
-
+    /***
+     * 告警单 监测点标签或指标类型绑定
+     * @author wr
+     * @date 2023-03-20 18:57
+     * @param assList 绑定信息
+     * @param id 告警单id
+     * @param type 0:监测点标签 1：指标类型
+     * @param ids 监测点标签集合 或 指标类型集合
+     */
+    private void add( List<ThsWarnStrategyAss> assList,String id,Integer type,List<String> ids){
+        ThsWarnStrategyAss ass ;
+        for (String indicatorType : ids) {
+            ass = new ThsWarnStrategyAss();
+            ass.setWarnId(id);
+            ass.setAssId(indicatorType);
+            ass.setType(type);
+            assList.add(ass);
+        }
+    }
     @Override
     public StrategyParam.StrategyUpdateParam getUpdateStrategy(String id) {
         return this.baseMapper.selectUpdateStrategy(id);
@@ -95,6 +114,16 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
 
     @Override
     public Boolean updateStrategy(StrategyParam.StrategyUpdateParam param) {
+        ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper<ThsWarnStrategy>()
+                .ne(ThsWarnStrategy::getId, param.getId())
+                .and(wrapper ->
+                        wrapper.eq(ThsWarnStrategy::getName, param.getName())
+                )
+
+        );
+        if (ObjectUtil.isNotNull(one)) {
+            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+        }
         ThsWarnStrategy thsWarnStrategy = BeanUtil.copyProperties(param, ThsWarnStrategy.class);
         return this.updateById(thsWarnStrategy);
     }