Merge branch 'master' into energy-manage-shiyue

energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisOptionRecordsPo.java → energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisOptionRecords.java

@@ -16,7 +16,7 @@ import java.util.Date;
 
 @Data
 @Accessors(chain = true)
-public class AnalysisOptionRecordsPo {
+public class AnalysisOptionRecords {
 
     private Long id;
 

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

@@ -16,7 +16,7 @@ public class XxlJobConfig {
 //    @Value("${xxl.job.admin.addresses}")
 //    private String adminAddresses;
 //
-//    @Value("${xxl.job.accessToken}")
+//    @Value("${xxl.job.admin.accessToken}")
 //    private String accessToken;
 //
 //    @Value("${xxl.job.executor.appname}")
@@ -49,7 +49,6 @@ public class XxlJobConfig {
 //        xxlJobSpringExecutor.setAccessToken(accessToken);
 //        xxlJobSpringExecutor.setLogPath(logPath);
 //        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-//
 //        return xxlJobSpringExecutor;
 //    }
 }

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

@@ -12,8 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @author chy
  * @date 2024/5/24 17:09

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

@@ -1,6 +1,6 @@
 package com.energy.manage.service.domain.dto.analysis;
 
-import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,5 +11,5 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class AnalysisOptionRecordsDto extends AnalysisOptionRecordsPo {
+public class AnalysisOptionRecordsDto extends AnalysisOptionRecords {
 }

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

@@ -1,6 +1,6 @@
 package com.energy.manage.service.domain.vo.analysis;
 
-import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,5 +11,5 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class AnalysisOptionRecordsVo extends AnalysisOptionRecordsPo {
+public class AnalysisOptionRecordsVo extends AnalysisOptionRecords {
 }

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

@@ -1,7 +1,7 @@
 package com.energy.manage.service.mappers.analysis;
 
 import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
 import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -14,7 +14,7 @@ import java.util.List;
  * @desc
  */
 @Repository
-public interface AnalysisOptionRecordsMapper extends MyMapper<AnalysisOptionRecordsPo> {
+public interface AnalysisOptionRecordsMapper extends MyMapper<AnalysisOptionRecords> {
 
 
     List<AnalysisOptionRecordsVo> selectAllByTimeDesc(@Param("fieldCodes") List<String> fieldCodes);

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

@@ -1,13 +1,12 @@
 package com.energy.manage.service.service.analysis.impl;
 
-import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
 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.constant.analysis.AnalysisConstants;
 import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
-import com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto;
 import com.energy.manage.service.domain.vo.analysis.*;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
@@ -362,21 +361,23 @@ public class AnalysisServiceImpl implements AnalysisService {
      * @param newValue 新值
      */
     private void updateNodesByPropertyName(JsonNode parentNode, String propertyName, Object newValue,String scada) {
-        if (parentNode.isObject()) {
-            parentNode.fields().forEachRemaining(entry -> {
-                // 匹配到属性名称，进行值的修改
-                if (entry.getKey().equalsIgnoreCase(propertyName)) {
-                    //判断当前节点有没有子节点
-                    if(!entry.getValue().fields().hasNext() && !propertyName.equalsIgnoreCase(AlgorithmProperties.configAnalysisProperties)){
-                        ((ObjectNode) parentNode).put(propertyName, newValue.toString());
-                    }else{
-                        assignmentByPropertyName(entry.getValue(), propertyName, newValue,scada);
-                    }
+        //遍历当前节点
+        for (Iterator<Map.Entry<String, JsonNode>> it = parentNode.fields(); it.hasNext(); ) {
+            Map.Entry<String, JsonNode> entry = it.next();
+            // 匹配到属性名称，进行值的修改
+            if (entry.getKey().equalsIgnoreCase(propertyName)) {
+                //判断当前节点有没有子节点
+                if(!entry.getValue().fields().hasNext() && !propertyName.equalsIgnoreCase(AlgorithmProperties.configAnalysisProperties)){
+                    ((ObjectNode) parentNode).put(propertyName, newValue.toString());
+                }else{
+                    assignmentByPropertyName(entry.getValue(), propertyName, newValue,scada);
                 }
-                // 递归搜索子节点
-                updateNodesByPropertyName(entry.getValue(), propertyName, newValue,scada);
-            });
+                return;
+            }
+            // 递归搜索子节点
+            updateNodesByPropertyName(entry.getValue(), propertyName, newValue,scada);
         }
+
     }
 
     /**
@@ -423,6 +424,7 @@ 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++){
@@ -455,7 +457,7 @@ public class AnalysisServiceImpl implements AnalysisService {
                 WindFieldBatchVo windFieldBatchVo = windFieldBatchMapper.selectByBatchCode(batchCode);
                 fieldCode = windFieldBatchVo.getFieldCode();
             }
-            AnalysisOptionRecordsPo optionRecordsPo = new AnalysisOptionRecordsPo();
+            AnalysisOptionRecords optionRecordsPo = new AnalysisOptionRecords();
             LoginUser user = LoginUserContextHolder.get();
             optionRecordsPo.setOptionBy(user.getUserId());
             optionRecordsPo.setOptionByName(user.getUserName());

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

@@ -126,9 +126,12 @@ public class AnalysisCommentServiceImpl implements AnalysisCommentService {
     private int saveCommentDescription(AnalysisCommentDescriptionDto commentDescriptionDto, CommentDto commentDto){
         AnalysisCommentDescriptionPo commentDescriptionPo = new AnalysisCommentDescriptionPo();
         //拷贝批次编号 分析类型编号
-        BeanTools.copyProperties(commentDescriptionPo,commentDescriptionDto);
-        //拷贝评论编号 以及内容
-        BeanTools.copyNotNullProperties(commentDescriptionPo,commentDto);
+        commentDescriptionPo.setBatchCode(commentDescriptionDto.getBatchCode())
+                            .setAnalysisTypeCode(commentDescriptionDto.getAnalysisTypeCode())
+                            .setCommentTypeCode(commentDto.getCommentTypeCode())
+                            .setComment(commentDto.getComment())
+                            .setCreateBy(commentDescriptionDto.getCreateBy())
+                            .setUpdateBy(commentDescriptionDto.getUpdateBy());
         int count =  commentDescriptionMapper.selectCountByCommentTypeCode(commentDto.getCommentTypeCode());
         //空则添加 非空则编辑
         if(count == 0){

energy-manage-service/src/main/java/com/energy/manage/service/task/EnergyDataTask.java

@@ -1,20 +1,20 @@
-//package com.energy.manage.service.task;
-//
-//import com.xxl.job.core.handler.annotation.XxlJob;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Component;
-//
-//@Slf4j
-//@Component
-//public class EnergyDataTask {
-//
-//    /**
-//     * 开始定时器
-//     */
-//    @XxlJob(value = "demoJobHandler")
-//    public void demoJobHandler() {
-//        log.info(" xxl-job >>>> test ");
-//        return;
-//    }
-//
-//}
+package com.energy.manage.service.task;
+
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class EnergyDataTask {
+
+    /**
+     * 开始定时器
+     */
+    @XxlJob(value = "demoJobHandler")
+    public void demoJobHandler() {
+        log.info(" xxl-job >>>> test ");
+        return;
+    }
+
+}

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

@@ -53,8 +53,19 @@ template.htpower = http://192.168.50.234:6900/bucket-zhzn/template/%E5%90%88%E5%
 template.field = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E5%9C%BA%E8%A1%A8%E6%A8%A1%E7%89%88.xlsx
 template.draught = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E6%9C%BA%E8%A1%A8%E6%A8%A1%E7%89%88.xlsx
 
-#算法调用默认值
-analysis.url= http://192.168.5.7:8000/demo/dataAnalysis/analysis
+
+
+#xxl-job
+xxl.job.admin.addresses = http://192.168.50.234:16800/xxl-job-admin
+xxl.job.admin.accessToken = default_token
+xxl.job.executor.appname = xxl-job-executor-sample
+xxl.job.executor.address =
+xxl.job.executor.ip =
+xxl.job.executor.port = 9999
+xxl.job.executor.logpath = /usr/local/logs/xxl
+xxl.job.executor.logretentiondays = 30
+
+
 #分析算法入参json格式
 analysis.algorithm.json={"dataContractType": {"type": "analysisExecuteOrder","version": "1.2.0"},"dataContract": {"autoOrManual": null,"dataFilter": {"powerFarmID": null,"turbines": null,"dataBatchNum": null,"beginTime": null,"endTime": null,"excludingMonths": null,"customFilter": {"valueWindSpeed": {"min": null,"max": null},"valuePitchAngle": {"min":null,"max": null},"valueActivePower": {"min": null,"max": null},"valueGeneratorSpeed": {"min": null,"max": null}}},"configAnalysis": [],"graphSets": {"DgeneratorSpeed": {"step": 5,"min": 0,"max": 30},"DgeneratorTorque": {"step": 10000,"min": 0,"max": 10000},"IgeneratorSpeed": {"step": 200,"min": 1000,"max": 2000},"IgeneratorTorque": {"step": 2000,"min": 0,"max": 12000},"cp": {"step": 0.5,"min": 0,"max": 2},"tsr": {"step": 5,"min": 0,"max": 30},"pitchAngle": {"step": 1,"min": -1,"max": 20},"activePower": {"step": 250,"min": 0,"max": 2000}}}}
 #需要特殊处理的图像设置属性

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.energy.manage.service.mappers.analysis.AnalysisOptionRecordsMapper">
-    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo">
+    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisOptionRecords">
         <id column="id" property="id" jdbcType="BIGINT"/>
         <result column="option_content" property="optionContent" jdbcType="VARCHAR"/>
         <result column="option_by" property="optionBy" jdbcType="INTEGER"/>