Merge branch 'energy-manage-chy2'

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisResultShowVo.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.domain.vo.analysis;
 
+import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -23,6 +24,6 @@ public class AnalysisResultShowVo {
     /**
      * 风机机组编号
      */
-    private List<String> windEngineGroupList;
+    private List<WindEngineGroupVo> windEngineGroupList;
 
 }

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

@@ -114,10 +114,10 @@ public class AnalysisServiceImpl implements AnalysisService {
             //将入参analysisDto转换为算法标准json
             dataProccess(analysisDto,rootNode);
             log.info("调用分析算法之前，将入参analysisDto转换为算法标准json = {}" , mapper.writeValueAsString(rootNode));
-            System.out.println("json入参：" + mapper.writeValueAsString(rootNode));
+            System.out.println("json入参：" + rootNode.toString());
             //调用算法
-            String result = HttpUtils.doPost(AlgorithmProperties.analysisUrl,mapper.writeValueAsString(rootNode));
-            log.info("调用算法分析返回结果：{}",result);
+//            String result = HttpUtils.doPost(AlgorithmProperties.analysisUrl,mapper.writeValueAsString(rootNode));
+//            log.info("调用算法分析返回结果：{}",result);
             //手动操作进行操作记录添加
             if(analysisDto.getAutoOrManual().equals(AnalysisConstants.MANUAL_ANALYSIS)){
                 addOptionRecords(analysisDto.getPowerFarmID(),null,OPTION_CONTENT);
@@ -209,12 +209,12 @@ public class AnalysisServiceImpl implements AnalysisService {
      * @param batchCode
      * @return
      */
-    private List<String> getWindEngineGroupByBatchCode(String batchCode){
-        List<WindEngineGroupVo> engineGroupVos = engineGroupMapper.selectWindEngineGroupByBatchCode(batchCode);
-        if(CollectionUtils.isEmpty(engineGroupVos)){
-            return new ArrayList<>();
-        }
-        return engineGroupVos.parallelStream().map(WindEngineGroupVo::getEngineCode).collect(Collectors.toList());
+    private List<WindEngineGroupVo> getWindEngineGroupByBatchCode(String batchCode){
+        return engineGroupMapper.selectWindEngineGroupByBatchCode(batchCode);
+//        if(CollectionUtils.isEmpty(engineGroupVos)){
+//            return new HashMap<>();
+//        }
+//        return engineGroupVos.parallelStream().collect(Collectors.toMap(WindEngineGroupVo::getEngineCode,WindEngineGroupVo::getEngineName, (k1, k2) -> k1, LinkedHashMap::new));
     }
 
 
@@ -311,25 +311,18 @@ public class AnalysisServiceImpl implements AnalysisService {
     private void dataProccess(AnalysisDto analysisDto,JsonNode rootNode){
         //前端入参类
         Field[] analysisFields = analysisDto.getClass().getDeclaredFields();
-//        List<String> propertyNames = new ArrayList<>();
         String scada = analysisDto.getScada();
         Arrays.asList(analysisFields).stream().forEach(field -> {
             field.setAccessible(true);
             try {
                 //值不能为空且值为list的时候list长度不能为0
                 if(field.get(analysisDto) != null){
-                    //放置值不为空的属性
-//                    propertyNames.add(field.getName());
                     updateNodesByPropertyName(rootNode, field.getName(), field.get(analysisDto),scada);
                 }
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
         });
-        //如果不包含该属性则设置默认值
-//        if(!propertyNames.contains("activePower")){
-//
-//        }
     }
 
     /**
@@ -428,7 +421,6 @@ public class AnalysisServiceImpl implements AnalysisService {
      */
     private void dealConfigAnalysis(JsonNode subNode, Object newValue,String scada){
         try{
-//            if(newValue == null){ return; }
             ArrayNode arrayNode = (ArrayNode) subNode;
             List<String> analysisTypes = (List) newValue;
             for(int i = 0 ; i < analysisTypes.size() ; i++){

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

@@ -9,6 +9,7 @@ import com.energy.manage.service.domain.vo.analysis.AnalysisTypeVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
 import com.energy.manage.service.mappers.analysis.AnalysisTypeMapper;
 import com.energy.manage.service.mappers.datatransfer.DataTransferMapper;
+import com.energy.manage.service.property.analysis.AlgorithmProperties;
 import com.energy.manage.service.service.analysis.AnalysisService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -61,6 +62,12 @@ public class TestController extends BaseServiceController {
         return success();
     }
 
+    @UserLoginToken
+    @PostMapping("/testRefresh")
+    public ResultResp testRefresh() {
+        return success(TestProperties.getdownloadUrl());
+    }
+
     /**
      * 设置分析参数
      * @param dataTransferVo
@@ -75,4 +82,6 @@ public class TestController extends BaseServiceController {
         analysisDto.setConfigAnalysis(typeCodeList);
         return analysisDto;
     }
+
+
 }

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

@@ -0,0 +1,29 @@
+package com.energy.manage.service.test;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author chy
+ * @date 2024/6/26 10:45
+ * @desc
+ */
+@Component
+@RefreshScope
+public class TestProperties {
+
+
+    private static String downloadUrl;
+
+
+    @Value("${download.url}")
+    private void setDownloadUrl(String downloadUrl){
+        TestProperties.downloadUrl = downloadUrl;
+    }
+
+    public static String getdownloadUrl(){
+        return downloadUrl;
+    }
+}