驾驶舱异常数设置

energy-manage-service/src/main/java/com/energy/manage/service/config/xxl/XxlJobConfig.java

@@ -13,43 +13,43 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 public class XxlJobConfig {
 
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-
-    @Value("${xxl.job.executor.appname}")
-    private String appname;
-
-    @Value("${xxl.job.executor.address}")
-    private String address;
-
-    @Value("${xxl.job.executor.ip}")
-    private String ip;
-
-    @Value("${xxl.job.executor.port}")
-    private int port;
-
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        log.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppname(appname);
-        xxlJobSpringExecutor.setAddress(address);
-        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-
-        return xxlJobSpringExecutor;
-    }
+//    @Value("${xxl.job.admin.addresses}")
+//    private String adminAddresses;
+//
+//    @Value("${xxl.job.accessToken}")
+//    private String accessToken;
+//
+//    @Value("${xxl.job.executor.appname}")
+//    private String appname;
+//
+//    @Value("${xxl.job.executor.address}")
+//    private String address;
+//
+//    @Value("${xxl.job.executor.ip}")
+//    private String ip;
+//
+//    @Value("${xxl.job.executor.port}")
+//    private int port;
+//
+//    @Value("${xxl.job.executor.logpath}")
+//    private String logPath;
+//
+//    @Value("${xxl.job.executor.logretentiondays}")
+//    private int logRetentionDays;
+//
+//    @Bean
+//    public XxlJobSpringExecutor xxlJobExecutor() {
+//        log.info(">>>>>>>>>>> xxl-job config init.");
+//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+//        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+//        xxlJobSpringExecutor.setAppname(appname);
+//        xxlJobSpringExecutor.setAddress(address);
+//        xxlJobSpringExecutor.setIp(ip);
+//        xxlJobSpringExecutor.setPort(port);
+//        xxlJobSpringExecutor.setAccessToken(accessToken);
+//        xxlJobSpringExecutor.setLogPath(logPath);
+//        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+//
+//        return xxlJobSpringExecutor;
+//    }
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysis/AnalysisController.java

@@ -8,7 +8,6 @@ import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
 import com.energy.manage.service.domain.vo.analysis.AnalysisResultVo;
-import com.energy.manage.service.property.analysis.AlgorithmProperties;
 import com.energy.manage.service.service.analysis.AnalysisService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysiscomment/AnalysisCommentController.java

@@ -49,7 +49,7 @@ public class AnalysisCommentController extends BaseServiceController {
     @UserLoginToken
     @ApiOperation(value = "富文本类型删除")
     @PostMapping("/delAnalysisCommentType")
-    public ResultResp delAnalysisCommentType(@RequestBody String commentTypeCode)
+    public ResultResp delAnalysisCommentType(@RequestParam("commentTypeCode") String commentTypeCode)
     {
         return analysisCommentService.delAnalysisCommentType(commentTypeCode);
     }

energy-manage-service/src/main/java/com/energy/manage/service/mappers/analysis/AnalysisCommentTypeRelationMapper.java

@@ -31,7 +31,7 @@ public interface AnalysisCommentTypeRelationMapper extends MyMapper<AnalysisComm
      * @param commentTypeCode
      * @return
      */
-    AnalysisCommentTypeRelationVo selectByTypeCode(String commentTypeCode);
+    AnalysisCommentTypeRelationVo selectByTypeCode(@Param("commentTypeCode") String commentTypeCode);
 
     /**
      * 新增富文本类型

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiscomment/impl/AnalysisCommentServiceImpl.java

@@ -60,8 +60,10 @@ public class AnalysisCommentServiceImpl implements AnalysisCommentService {
         }
         AnalysisCommentTypeRelationDto analysisCommentTypeRelationDto = new AnalysisCommentTypeRelationDto();
         String typeCode = UUIDTools.getUUIDLowCase();
-        analysisCommentTypeRelationDto.setCommentTypeCode(typeCode)
-                                      .setCommentTypeCode(saveTypeName)
+        analysisCommentTypeRelationDto.setBatchCode(typeRelationDto.getBatchCode())
+                                      .setAnalysisTypeCode(typeRelationDto.getAnalysisTypeCode())
+                                      .setCommentTypeCode(typeCode)
+                                      .setCommentTypeName(saveTypeName)
                                       .setCreateBy(typeRelationDto.getCreateBy());
         return analysisCommentTypeRelationtMapper.insertPoSelective(analysisCommentTypeRelationDto) > 0 ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -106,7 +108,7 @@ public class AnalysisCommentServiceImpl implements AnalysisCommentService {
     private boolean duplicateCheckByTypeName(AnalysisCommentTypeRelationDto typeRelationDto){
         List<AnalysisCommentTypeRelationVo> voList = analysisCommentTypeRelationtMapper
                                                         .selectByAnalysisTypeCode(typeRelationDto.getBatchCode(), typeRelationDto.getAnalysisTypeCode());
-        voList.parallelStream().filter(vo -> vo.getCommentTypeName().equals(typeRelationDto.getCommentTypeName())).collect(Collectors.toList());
+        voList = voList.parallelStream().filter(vo -> vo.getCommentTypeName().equals(typeRelationDto.getCommentTypeName())).collect(Collectors.toList());
         return voList.size() > 0;
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/service/homepage/impl/HomePageServiceImpl.java

@@ -10,13 +10,13 @@ import com.energy.manage.service.mappers.analysis.AnalysisResultMapper;
 import com.energy.manage.service.mappers.windexceptioncount.WindExceptionCountMapper;
 import com.energy.manage.service.mappers.windrelation.WindRelationMapper;
 import com.energy.manage.service.service.homepage.HomePageService;
+import com.energy.manage.service.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author chy
@@ -125,6 +125,39 @@ public class HomePageServiceImpl implements HomePageService {
      */
     public void setErrCount(HomePageVo homePageVo, List<String> fieldCodes){
         List<WindExceptionCountVo> exceptionCounts = exceptionCountMapper.selectByfieldCodes(fieldCodes);
+        //风机异常数
+        Set<String> engineCodes = new HashSet<>();
+        //处理异常数
+        AtomicInteger handleErrCount = new AtomicInteger(0);
+        //当月异常数
+        AtomicInteger errCountCurrentMonth = new AtomicInteger(0);
+        exceptionCounts.stream().forEach(item -> {
+            //设置总异常数
+            homePageVo.setErrCounrt(homePageVo.getErrCounrt() + item.getErrCount());
+            //异常处理数
+            handleErrCount.addAndGet(item.getHandleErrCount());
+            engineCodes.add(item.getEngineCode());
+            if(isCurrentMonth(item.getCreateTime())){
+                errCountCurrentMonth.addAndGet(item.getErrCount());
+            }
+        });
+        //设置未处理异常数
+        homePageVo.setErrCountNotDeal(homePageVo.getErrCounrt() - handleErrCount.get());
+        //设置当月异常数
+        homePageVo.setErrCountInCurrentMonth(errCountCurrentMonth.get());
+        //设置异常设备数
+        homePageVo.setErrDeviceCount(engineCodes.size());
+    }
 
+    /**
+     * 判断是否是当月
+     * @param createTime
+     * @return
+     */
+    private Boolean isCurrentMonth(Date createTime){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(createTime);
+        Calendar now = Calendar.getInstance();
+        return calendar.get(Calendar.MONTH) == now.get(Calendar.MONTH);
     }
 }

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisCommentTypeRelationMapper.xml

@@ -44,13 +44,13 @@
             <if test="batchCode != null and batchCode != ''">
                 batch_code,
             </if>
-            <if test="analysisTypeCode != null and batchCode != ''">
+            <if test="analysisTypeCode != null and analysisTypeCode != ''">
                 analysis_type_code,
             </if>
-            <if test="commentTypeCode != null and batchCode != ''and batchCode != ''">
+            <if test="commentTypeCode != null and commentTypeCode != ''">
                 comment_type_code,
             </if>
-            <if test="commentTypeName != null and batchCode != ''">
+            <if test="commentTypeName != null and commentTypeName != ''">
                 comment_type_name,
             </if>
             <if test="createBy != null">
@@ -61,14 +61,14 @@
             <if test="batchCode != null and batchCode != ''">
                 #{batchCode,jdbcType=VARCHAR},
             </if>
-            <if test="analysisTypeCode != null and batchCode != ''">
+            <if test="analysisTypeCode != null and analysisTypeCode != ''">
                 #{analysisTypeCode,jdbcType=VARCHAR},
             </if>
-            <if test="commentTypeCode != null and batchCode != ''">
+            <if test="commentTypeCode != null and commentTypeCode != ''">
                 #{commentTypeCode,jdbcType=VARCHAR},
             </if>
-            <if test="commentTypeName != null and batchCode != ''">
-                #{commentTypeName,jdbcType}
+            <if test="commentTypeName != null and commentTypeName != ''">
+                #{commentTypeName,jdbcType=VARCHAR},
             </if>
            <if test="createBy != null">
                 #{createBy,jdbcType=INTEGER}