Merge branch 'energy-manage-chy2'

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/datatransfer/DataTransferVo.java

@@ -41,7 +41,7 @@ public class DataTransferVo {
     private Integer engineCount;
 
     /**
-     * 转换状态 1：初始化状态 0-转换中 1-转换成功 2-转换失败
+     * 转换状态 -1：初始化状态 0-转换中 1-转换成功 2-转换失败
      */
     private Integer transferState;
 

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

@@ -88,11 +88,9 @@ 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(),
+        return dataTransferMapper.queryDataTransferGroup(dataTransferDto.getFieldName(),
                                                                                         dataTransferDto.getBatchName(),
                                                                                         dataTransferDto.getRoleId());
-        vos.stream().forEach(item -> item.setUniqueCode(UUIDTools.getShortUUIDLowCase()));
-        return vos;
     }
 
     /**
@@ -257,7 +255,7 @@ public class DataTransferServiceImpl implements DataTransferService {
         DataTransferTypePathDto pathDto = getTransferAddr(dataTransferDto,dataTransferType);
         if(pathDto != null && StringUtils.isNotBlank(pathDto.getTransferAddr())){
             dataTransferPo.setTransferAddr(pathDto.getTransferAddr());
-//            dataTransferPo.setTransferState(DATA_TRANSFERING_STATE);
+            dataTransferPo.setTransferState(DATA_TRANSFERING_STATE);
         }
         if(pathDto != null && pathDto.getTimeGranularity() != null){
             dataTransferPo.setTimeGranularity(pathDto.getTimeGranularity());