Merge branch 'master' into energy-manage-shiyue

energy-manage-service/src/main/java/com/energy/manage/service/config/AnalysisTypeConfig.java

@@ -0,0 +1,18 @@
+package com.energy.manage.service.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author chy
+ * @date 2024/7/31 15:38
+ * @desc
+ */
+@Data
+@Configuration
+public class AnalysisTypeConfig {
+
+    @Value("${analysis.type.config}")
+    private String analysisTypeConfig;
+}

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

@@ -100,4 +100,12 @@ public class AnalysisController extends BaseServiceController {
     {
         return success(analysisService.queryAnalysisedEngine(batchCode,analysisTypeCode));
     }
+
+    @UserLoginToken
+    @ApiOperation(value = "分析类型结果图配置接口")
+    @GetMapping("/queryAnalysisTypeConfig")
+    public ResultResp queryAnalysisTypeConfig()
+    {
+        return success(analysisService.queryAnalysisTypeConfig());
+    }
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/AnalysisService.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.service.analysis;
 
+import com.alibaba.fastjson.JSONArray;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
@@ -87,5 +88,12 @@ public interface AnalysisService {
     int onOffAutoAnalysis(String batchCode, Integer onOffCall);
 
 
+    /**
+     * 分析类型结果图配置接口
+     * @return
+     */
+    JSONArray queryAnalysisTypeConfig();
+
+
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -1,9 +1,11 @@
 package com.energy.manage.service.service.analysis.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
 import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.common.util.HttpUtils;
+import com.energy.manage.service.config.AnalysisTypeConfig;
 import com.energy.manage.service.constant.analysis.AnalysisConstants;
 import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
@@ -81,11 +83,11 @@ public class AnalysisServiceImpl implements AnalysisService {
     private WindEngineGroupMapper windEngineGroupMapper;
 
     @Autowired
-    private DataTransferMapper dataTransferMapper;
-
-    @Resource
     private AlgorithmProperties algorithmProperties;
 
+    @Autowired
+    private AnalysisTypeConfig analysisTypeConfig;
+
 
     private static AnalysisOptionRecordsMapper optionRecordsMapper;
 
@@ -257,6 +259,16 @@ public class AnalysisServiceImpl implements AnalysisService {
         return analysisResultMapper.updateOnOffCall(batchCode,onOffCall);
     }
 
+    /**
+     * 分析类型结果图配置接口
+     *
+     * @return
+     */
+    @Override
+    public JSONArray queryAnalysisTypeConfig() {
+        return JSONArray.parseArray(analysisTypeConfig.getAnalysisTypeConfig());
+    }
+
 
     /**
      * 获取分析类型

energy-manage-service/src/main/java/com/energy/manage/service/test/TestController.java

@@ -1,6 +1,8 @@
 package com.energy.manage.service.test;
 
+import com.alibaba.fastjson.JSONArray;
 import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.config.AnalysisTypeConfig;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.constant.analysis.AnalysisConstants;
 import com.energy.manage.service.controller.base.BaseServiceController;
@@ -48,6 +50,9 @@ public class TestController extends BaseServiceController {
     @Autowired
     private AnalysisResultMapper analysisResultMapper;
 
+    @Autowired
+    private AnalysisTypeConfig analysisTypeConfig;
+
     @Value("${download.url}")
     private String downloadUrl;
 
@@ -76,7 +81,7 @@ public class TestController extends BaseServiceController {
     @UserLoginToken
     @PostMapping("/testRefresh")
     public ResultResp testRefresh() {
-        return success(downloadUrl);
+        return success(JSONArray.parseArray(analysisTypeConfig.getAnalysisTypeConfig()));
     }
 
     @UserLoginToken

energy-manage-service/src/main/resources/bootstrap.properties

@@ -2,9 +2,11 @@
 #============================nacos配置=========================================
 spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
 spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191
-spring.cloud.nacos.config.prefix = application
-spring.cloud.nacos.config.file-extension = properties
+spring.cloud.nacos.config.name=application.properties
 spring.cloud.nacos.config.group = @profiles.active@
+spring.cloud.nacos.config.extension-configs[0].data-id=analysis_type_config.properties
+spring.cloud.nacos.config.extension-configs[0].group=DEFAULT_GROUP
+spring.cloud.nacos.config.extension-configs[0].refresh=true
 
 
 #============================mybatis配置=========================================