Merge branch 'master' into energy-manage-shiyue

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

@@ -313,7 +313,11 @@ public class AnalysisServiceImpl implements AnalysisService {
         Arrays.asList(analysisFields).stream().forEach(field -> {
             field.setAccessible(true);
             try {
+                //值不能为空且值为list的时候list长度不能为0
                 if(field.get(analysisDto) != null){
+//                if(field.get(analysisDto) != null
+//                        && List.class.isAssignableFrom(field.getType())
+//                        && ((List)field.get(analysisDto)).size() > 0){
                     //放置值不为空的属性
 //                    propertyNames.add(field.getName());
                     updateNodesByPropertyName(rootNode, field.getName(), field.get(analysisDto),scada);

energy-manage-service/src/main/java/com/energy/manage/service/service/windfieldbatch/impl/WindFieldBatchServiceImpl.java

@@ -2,11 +2,14 @@ package com.energy.manage.service.service.windfieldbatch.impl;
 
 import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
 import com.energy.manage.common.enums.IdPrefixEnum;
+import com.energy.manage.common.po.analysis.AnalysisResultPo;
 import com.energy.manage.common.util.IdGeneratorUtil;
+import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
+import com.energy.manage.service.mappers.analysis.AnalysisResultMapper;
 import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
 import com.energy.manage.service.service.cache.CacheService;
@@ -33,6 +36,9 @@ public class WindFieldBatchServiceImpl implements WindFieldBatchService {
      @Autowired
      private WindFieldMapper windFieldMapper;
 
+    @Autowired
+    private AnalysisResultMapper analysisResultMapper;
+
      @Autowired
      private CacheService cacheService;
 
@@ -45,7 +51,10 @@ public class WindFieldBatchServiceImpl implements WindFieldBatchService {
         windEgineBatchDto.setBatchCode(createWindFieldBatchCode(windEgineBatchDto.getFieldCode()));
         WindFieldVo windFieldVo = windFieldMapper.selectByCodeNumber(windEgineBatchDto.getFieldCode());
         windEgineBatchDto.setFieldName(windFieldVo.getFieldName());
-        return windFieldBatchMapper.addWindFieldBatch(windEgineBatchDto);
+        windFieldBatchMapper.addWindFieldBatch(windEgineBatchDto);
+        AnalysisResultPo analysisResultPo = new AnalysisResultPo();
+        analysisResultPo.setBatchCode(windEgineBatchDto.getBatchCode());
+        return analysisResultMapper.insertSelective(analysisResultPo);
     }
 
     /**

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

@@ -33,6 +33,7 @@
         <if test="fieldName != null and fieldName != ''">
             and batch.field_name like concat('%', #{fieldName,jdbcType=VARCHAR}, '%')
         </if>
+        order by result.update_time desc
     </select>
     <select id="selectAlasisingCount" resultType="int">
         select count(*)