Merge branch 'energy-manage-chy2'

energy-manage-common/src/main/java/com/energy/manage/common/po/datatransfer/DataTransferPo.java

@@ -1,8 +1,11 @@
 package com.energy.manage.common.po.datatransfer;
 
+import com.alibaba.excel.util.BeanMapUtils;
+import com.energy.manage.common.util.BeanTools;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.apache.commons.beanutils.BeanMap;
 
 import javax.persistence.Table;
 import java.math.BigDecimal;
@@ -106,4 +109,5 @@ public class DataTransferPo {
      * 数据最大时间
      */
     private Date dataMaxTime;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/datatransfer/DataTransferDto.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.domain.dto.datatransfer;
 
 import com.energy.manage.service.domain.dto.BaseDto;
+import com.energy.manage.service.util.BeanMapUtils;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -54,4 +55,9 @@ public class DataTransferDto extends BaseDto {
      * 路径地址集合
      */
     List<DataTransferTypePathDto> dataTransferTypePathDtoList;
+
+    @Override
+    public String toString(){
+        return BeanMapUtils.beanToMap(this).toString();
+    }
 }

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

@@ -140,6 +140,7 @@ public class DataTransferServiceImpl implements DataTransferService {
      */
     @Override
     public ResultResp addDataTransfer(DataTransferDto dataTransferDto) {
+        log.info("新增转换开始，入参 dataTransferDto = {}",dataTransferDto.toString());
         List<DataTransferTypeVo> typeList = dataTransferTypeMapper.selectAllInfo();
         if(CollectionUtils.isEmpty(typeList)){
             log.error("风场批次batchCode = {} 新增转换失败，转换类型初始化数据是空导致！！",dataTransferDto.getBatchCode());
@@ -149,6 +150,7 @@ public class DataTransferServiceImpl implements DataTransferService {
         dataTransferDto.setFieldCode(getFieldCode(dataTransferDto.getBatchCode()));
         List<DataTransferPo> dataTransferPos = new ArrayList<>();
         typeList.parallelStream().forEach(item -> dataTransferPos.add(getDataTransferPo(dataTransferDto,item.getTransferType())));
+        log.info("新增转换，批量添加的转换数据长度 = {}",dataTransferPos.size());
         return ResultResp.SUCCESS(dataTransferMapper.addDataTransferBatch(dataTransferPos));
     }
 
@@ -255,7 +257,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());