Merge branch 'energy-manage-chy2'

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

@@ -4,7 +4,6 @@ import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.analysis.AnalysisDiagramRelationPo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisDiagramRelationVo;
 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;
 
@@ -29,5 +28,5 @@ public interface AnalysisDiagramRelationMapper extends MyMapper<AnalysisDiagramR
 
 
     Set<WindEngineGroupShortVo> selectByBatchCodeAndAnalysisTypeCode(@Param("batchCode") String batchCode,
-                                                                     @Param("analysisTypeCode") String analysisTypeCode);
+                                                                         @Param("analysisTypeCode") String analysisTypeCode);
 }

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

@@ -194,7 +194,11 @@ public class AnalysisServiceImpl implements AnalysisService {
      */
     @Override
     public Set<WindEngineGroupShortVo> queryAnalysisedEngine(String batchCode, String analysisTypeCode){
-        return diagramRelationMapper.selectByBatchCodeAndAnalysisTypeCode(batchCode,analysisTypeCode);
+        Set<WindEngineGroupShortVo> set = diagramRelationMapper.selectByBatchCodeAndAnalysisTypeCode(batchCode,analysisTypeCode);
+        //排序
+        return set.stream()
+                .sorted(Comparator.comparing(WindEngineGroupShortVo::getEngineName))
+                .collect(Collectors.toCollection(LinkedHashSet :: new));
     }
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfer/impl/DataTransferServiceImpl.java

@@ -16,6 +16,7 @@ import com.energy.manage.service.mappers.datatransferhistory.DataTransferHistory
 import com.energy.manage.service.mappers.datatransfertype.DataTransferTypeMapper;
 import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
 import com.energy.manage.service.service.datatransfer.DataTransferService;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -86,6 +87,7 @@ public class DataTransferServiceImpl implements DataTransferService {
      */
     @Override
     public List<DataTransferBatchShortVo> queryDataTransferGroup(DataTransferDto dataTransferDto){
+        PageHelper.startPage(dataTransferDto.getPageNum(), dataTransferDto.getPageSize());
         List<DataTransferBatchShortVo> vos =  dataTransferMapper.queryDataTransferGroup(dataTransferDto.getFieldName(),
                                                                                         dataTransferDto.getBatchName(),
                                                                                         dataTransferDto.getRoleId());

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

@@ -47,6 +47,5 @@
         on relations.field_engine_code = engine.engine_code
         where relations.batch_code = #{batchCode,jdbcType=VARCHAR}
         and relations.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
-        order by engine.engine_name
     </select>
 </mapper>