1.优化分析算法入参json解析

2.lombok生成setter getter时候 属性名第二字母不能大写，否则无法获取到值

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisDto.java

@@ -91,22 +91,22 @@ public class AnalysisDto {
     /**
      * 直驱发电机转速轴系
      */
-    private List<Double> dGeneratorSpeed;
+    private List<Double> dgeneratorSpeed;
 
     /**
      * 非直驱发电机转速轴系设置
      */
-    private List<Double> iGeneratorSpeed;
+    private List<Double> igeneratorSpeed;
 
     /**
      * 直驱发电机转矩轴系
      */
-    private List<Double> dGeneratorTorque;
+    private List<Double> dgeneratorTorque;
 
     /**
      * 非直驱发电机转矩轴系
      */
-    private List<Double> iGeneratorTorque;
+    private List<Double> igeneratorTorque;
 
     /**
      *风能利用系数轴系

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

@@ -361,19 +361,33 @@ public class AnalysisServiceImpl implements AnalysisService {
             Map.Entry<String, JsonNode> entry = it.next();
             // 匹配到属性名称，进行值的修改
             if (entry.getKey().equalsIgnoreCase(propertyName)) {
-                //判断当前节点有没有子节点 排除分析节点
-                if(!entry.getValue().fields().hasNext() && !propertyName.equalsIgnoreCase(algorithmProperties.getConfigAnalysisProperties())){
-                    //数组属性得特殊处理
-                    if(algorithmProperties.getAnalysisArrayProperties().contains(propertyName)){
-                        ArrayNode arrayNode = mapper.createArrayNode();
-                        ((List<String>)newValue).stream().forEach(item-> arrayNode.add(item));
-                        ((ObjectNode) parentNode).set(propertyName,arrayNode);
-                    }else{
-                        ((ObjectNode) parentNode).put(propertyName, newValue.toString());
-                    }
-                }else{
+                //分析类型及有子节点的处理
+                if(propertyName.equalsIgnoreCase(algorithmProperties.getConfigAnalysisProperties()) || entry.getValue().fields().hasNext()){
                     assignmentByPropertyName(entry.getValue(), propertyName, newValue,scada);
+                    return;
                 }
+                //数组属性得特殊处理
+                if(algorithmProperties.getAnalysisArrayProperties().contains(propertyName)){
+                    ArrayNode arrayNode = mapper.createArrayNode();
+                    ((List<String>)newValue).stream().forEach(item-> arrayNode.add(item));
+                    ((ObjectNode) parentNode).set(propertyName,arrayNode);
+                    return;
+                }
+                //普通单节点
+                ((ObjectNode) parentNode).put(propertyName, newValue.toString());
+                //判断当前节点有没有子节点 排除分析节点
+//                if(!entry.getValue().fields().hasNext() && !propertyName.equalsIgnoreCase(algorithmProperties.getConfigAnalysisProperties())){
+//                    //数组属性得特殊处理
+//                    if(algorithmProperties.getAnalysisArrayProperties().contains(propertyName)){
+//                        ArrayNode arrayNode = mapper.createArrayNode();
+//                        ((List<String>)newValue).stream().forEach(item-> arrayNode.add(item));
+//                        ((ObjectNode) parentNode).set(propertyName,arrayNode);
+//                    }else{
+//                        ((ObjectNode) parentNode).put(propertyName, newValue.toString());
+//                    }
+//                }else{
+//                    assignmentByPropertyName(entry.getValue(), propertyName, newValue,scada);
+//                }
                 return;
             }
             // 递归搜索子节点