首页分析状态修改

energy-manage-service/src/main/java/com/energy/manage/service/constant/analysis/AnalysisConstants.java

@@ -50,14 +50,6 @@ public interface AnalysisConstants {
      */
     String PATH_SEPARATOR = "/";
 
-    /**
-     * 分析完成状态
-     */
-    Integer ANALYSISED_STATE = 30;
 
-    /**
-     * 分析中状态
-     */
-    Integer ANALYSISING_STATE = 20;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/constant/analysis/AnalysisStatusConstants.java

@@ -0,0 +1,31 @@
+package com.energy.manage.service.constant.analysis;
+
+/**
+ * 分析状态类
+ * @author chy
+ * @date 2024/7/22 10:10
+ * @desc
+ */
+public interface AnalysisStatusConstants {
+
+    /**
+     * 未分析状态
+     */
+    Integer NO_ANALYSISED_STATE = -1;
+
+    /**
+     * 排队中
+     */
+    Integer ANALYSIS_QUEUE_STATE = 10;
+
+    /**
+     * 分析中状态
+     */
+    Integer ANALYSISING_STATE = 20;
+
+    /**
+     * 分析完成状态
+     */
+    Integer ANALYSISED_STATE = 30;
+
+}

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

@@ -3,6 +3,7 @@ package com.energy.manage.service.service.homepage.impl;
 import com.energy.manage.common.enums.TypeRelationEnum;
 import com.energy.manage.common.po.windrelation.WindRelationPO;
 import com.energy.manage.service.constant.analysis.AnalysisConstants;
+import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
 import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisResultVo;
 import com.energy.manage.service.domain.vo.homepage.HomePageVo;
@@ -153,11 +154,11 @@ public class HomePageServiceImpl implements HomePageService {
         resultVos.stream().forEach(item -> {
             Integer analysisState = item.getAnalysisState();
             //分析中
-            if(analysisState.equals(AnalysisConstants.ANALYSISING_STATE)){
+            if(analysisState.equals(AnalysisStatusConstants.ANALYSISING_STATE)){
                 homePageVo.analysisingCountAdd();
             }
             //分析完成
-            if(analysisState.equals(AnalysisConstants.ANALYSISED_STATE)){
+            if(analysisState.equals(AnalysisStatusConstants.ANALYSISED_STATE)){
                 homePageVo.analysisedCountAdd();
             }
         });

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysOrganizationAuthServiceImpl.java

@@ -1,10 +1,9 @@
 package com.energy.manage.service.service.system.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.energy.manage.common.enums.TypeRelationEnum;
-import com.energy.manage.common.po.powerwordcriterion.PowerWordCriterionPO;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
-import com.energy.manage.common.po.windrelation.WindRelationPO;
+import com.energy.manage.service.constant.analysis.AnalysisConstants;
+import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldGroupNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
@@ -114,14 +113,15 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
                 engineGroupNumber += companyFieldGroupNumberVo.getEngineGroupNumber();
             }
             // 未分析
-            if (companyFieldGroupNumberVo.getAnalysisState() != null && companyFieldGroupNumberVo.getAnalysisState() <= 0) {
+            if (companyFieldGroupNumberVo.getAnalysisState() != null && companyFieldGroupNumberVo.getAnalysisState() < AnalysisStatusConstants.ANALYSISING_STATE) {
                 analysisUnFinishedNumber += 1;
             }
             if (companyFieldGroupNumberVo.getAnalysisState() == null) {
                 analysisUnFinishedNumber += 1;
             }
             // 已分析
-            if (companyFieldGroupNumberVo.getAnalysisState() != null && companyFieldGroupNumberVo.getAnalysisState() > 0) {
+            if (companyFieldGroupNumberVo.getAnalysisState() != null
+                    && companyFieldGroupNumberVo.getAnalysisState() > AnalysisStatusConstants.ANALYSISING_STATE) {
                 analysisFinishNumber += 1;
             }
         }