修改查询风机信息查询接口

energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisGeneralFilePo.java

@@ -2,6 +2,7 @@ package com.energy.manage.common.po.analysis;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import javax.persistence.Table;
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Date;
  */
 @Table(name = "analysis_general_file")
 @Data
+@Accessors(chain = true)
 public class AnalysisGeneralFilePo {
 
     /**
@@ -24,7 +26,7 @@ public class AnalysisGeneralFilePo {
     /**
      * 批次号
      */
-    private Integer batchCode ;
+    private String batchCode ;
 
     /**
      * 分析类型编号

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

@@ -2,6 +2,7 @@ package com.energy.manage.service.domain.vo.analysis;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import javax.persistence.Table;
 import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
  * @desc
  */
 @Data
+@Accessors(chain = true)
 public class AnalysisGeneralFileVo {
 
 

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

@@ -1,6 +1,7 @@
 package com.energy.manage.service.mappers.analysis;
 
 import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.analysis.AnalysisGeneralFilePo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisGeneralFileVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -13,7 +14,7 @@ import java.util.List;
  * @desc
  */
 @Repository
-public interface AnalysisGeneralFileMapper extends MyMapper<AnalysisGeneralFileVo> {
+public interface AnalysisGeneralFileMapper extends MyMapper<AnalysisGeneralFilePo> {
 
     /**
      * 根据批次号与分型类型编号查询通用文件

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windenginegroup/WindEngineGroupMapper.java

@@ -6,6 +6,7 @@ import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
 import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupPageDto;
 import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupUpdateDto;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
+import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupShortVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -67,4 +68,11 @@ public interface WindEngineGroupMapper extends MyMapper<WindEngineGroupPO> {
     */
    Integer updateWindEngineGroupList(@Param("list")List<WindEngineGroupUpdateDto> list);
 
+   /**
+    * 查询该风场下所有风机
+    * @param fieldCode
+    * @return
+    */
+   List<WindEngineGroupShortVo> selectWindEngineGroupShortList(@Param("fieldCode") String fieldCode);
+
 }

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
 import com.energy.manage.common.enums.IdPrefixEnum;
+import com.energy.manage.common.po.analysis.AnalysisGeneralFilePo;
 import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
 import com.energy.manage.common.po.analysis.AnalysisResultPo;
 import com.energy.manage.common.po.analysis.AnalysisTypePo;
@@ -446,27 +447,29 @@ public class AnalysisServiceImpl implements AnalysisService {
     }
 
     /**
-     * 查询所有的分析类型
-     */
-    @Override
-    public List<Map<String, Object>> queryAllAnalysisType() {
-        return getAnalysisType(null);
-    }
-
-    /**
      *过滤分析类型并生成树形结构
      * @param analysisCodes
      * @return
      */
     private List<Map<String, Object>> getAnalysisType(Set<String> analysisCodes){
-        List<AnalysisTypePo> analysisTypePos = analysisTypeMapper.selectAllByOrderNum();
-        if(CollectionUtils.isNotEmpty(analysisCodes)){
-            analysisTypePos = analysisTypePos.stream().filter(item -> analysisCodes.contains(item.getTypeCode()) || item.getParentId().equals(ZREO_STR)).collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(analysisCodes)){
+            return new ArrayList<>();
         }
+        List<AnalysisTypePo> analysisTypePos = analysisTypeMapper.selectAllByOrderNum();
+        analysisTypePos = analysisTypePos.stream().filter(item -> analysisCodes.contains(item.getTypeCode()) || item.getParentId().equals(ZREO_STR)).collect(Collectors.toList());
         return TreeUtil.getJava8ResultTree(BeanMapUtils.listBeanToListMap(analysisTypePos), "parentId", "id");
     }
 
     /**
+     * 查询所有的分析类型
+     */
+    @Override
+    public List<Map<String, Object>> queryAllAnalysisType() {
+        List<AnalysisTypePo> analysisTypeList = analysisTypeMapper.selectAllByOrderNum();
+        return TreeUtil.getJava8ResultTree(BeanMapUtils.listBeanToListMap(analysisTypeList), "parentId", "id");
+    }
+
+    /**
      * 查询已经分析的风机信息
      * @param batchCode
      * @param analysisTypeCode
@@ -475,6 +478,16 @@ public class AnalysisServiceImpl implements AnalysisService {
     @Override
     public Set<WindEngineGroupShortVo> queryAnalysisedEngine(String batchCode, String analysisTypeCode){
         Set<WindEngineGroupShortVo> set = diagramRelationMapper.selectByBatchCodeAndAnalysisTypeCode(batchCode,analysisTypeCode);
+        if(CollectionUtils.isEmpty(set)){
+            int count  = generalFileMapper.selectCount(new AnalysisGeneralFilePo().setBatchCode(batchCode));
+            if(count > 0){
+                AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
+                set = engineGroupMapper.selectWindEngineGroupShortList(analysisResultPo.getFieldCode())
+                        .stream().collect(Collectors.toSet());
+            }else{
+                return new HashSet<>();
+            }
+        }
         //排序
         return set.stream()
                 .sorted(Comparator.comparing(WindEngineGroupShortVo::getEngineName))