页面展示：1.所有编号替换名称。

        2.数据重新转换新增时间粒度修改

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

@@ -93,4 +93,9 @@ public class DataTransferPo {
      * 是否已触发自动分析 0 ：无  1：是
      */
     private Integer callState;
+
+    /**
+     * 转换进度
+     */
+    private Integer transferProgress;
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/datatransfer/DataTransferController.java

@@ -59,7 +59,7 @@ public class DataTransferController extends BaseServiceController {
     @ApiOperation("转换/重新转换")
     @PostMapping("/dataTransfer")
     public ResultResp dataTransfer(@RequestBody EditDataTransferTypeDto editDto){
-        return dataTransferService.dataTransfer(editDto.getBatchCode(), editDto.getDataTransferType(),editDto.getDataTransferAddr(), getUserId());
+        return dataTransferService.dataTransfer(editDto, getUserId());
     }
 
     @UserLoginToken

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

@@ -19,6 +19,11 @@ public class DataTransferDto extends BaseDto {
     private String batchCode;
 
     /**
+     * 批次名称
+     */
+    private String batchName;
+
+    /**
      * 转换状态
      */
     private Integer transferState;

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

@@ -32,6 +32,11 @@ public class AnalysisResultVo {
     private String batchCode ;
 
     /**
+     * 批次名称
+     */
+    private String batchName;
+
+    /**
      * 分析状态
      */
     private Integer analysisState ;

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

@@ -1,6 +1,7 @@
 package com.energy.manage.service.domain.vo.datatransfer;
 
 import com.energy.manage.common.po.datatransfer.DataTransferTypePo;
+import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 import lombok.Data;
 
 import java.util.List;
@@ -16,7 +17,7 @@ public class DataTransferQueryAndAddVo {
     /**
      * 批次列表
      */
-    private List<String> batchCodeList;
+    private List<WindFieldBatchVo> batchCodeList;
 
     /**
      * 转换类型列表

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

@@ -20,11 +20,21 @@ public class DataTransferVo {
     private String fieldCode;
 
     /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
      * 批次编号
      */
     private String batchCode;
 
     /**
+     * 批次名称
+     */
+    private String batchName;
+
+    /**
      * 风机数量
      */
     private Integer engineCount;
@@ -75,5 +85,10 @@ public class DataTransferVo {
      */
     private String downloadUrl;
 
+    /**
+     * 下载地址
+     */
+    private String transferProgress;
+
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfer/DataTransferService.java

@@ -3,6 +3,7 @@ package com.energy.manage.service.service.datatransfer;
 import com.energy.manage.common.po.datatransfer.DataTransferPo;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.datatransfer.DataTransferDto;
+import com.energy.manage.service.domain.dto.datatransfer.EditDataTransferTypeDto;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferQueryAndAddVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
 
@@ -39,12 +40,11 @@ public interface DataTransferService {
 
     /**
      * 数据转换（转换/重新转换）
-     * @param batchCode
+     * @param editDto
+     * @param updateBy
+     * @return
      */
-    ResultResp dataTransfer(String batchCode,
-                            String dataTransferType,
-                            String dataTransferAddr,
-                            Integer updateBy);
+    ResultResp dataTransfer(EditDataTransferTypeDto editDto, Integer updateBy);
 
 
     /**

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

@@ -6,6 +6,7 @@ import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.datatransfer.DataTransferDto;
 import com.energy.manage.service.domain.dto.datatransfer.DataTransferTypePathDto;
+import com.energy.manage.service.domain.dto.datatransfer.EditDataTransferTypeDto;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferQueryAndAddVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferTypeVo;
@@ -68,7 +69,7 @@ public class DataTransferServiceImpl implements DataTransferService {
     @Override
     public DataTransferQueryAndAddVo fieldBatchListForDataTransfer(Integer roleId) {
         DataTransferQueryAndAddVo queryAndAddVo = new DataTransferQueryAndAddVo();
-        List<String> batchCodeList = getDataTransferBatchList(roleId);
+        List<WindFieldBatchVo> batchCodeList = getDataTransferBatchList(roleId);
         if(CollectionUtils.isEmpty(batchCodeList)){
             return queryAndAddVo;
         }
@@ -123,25 +124,25 @@ public class DataTransferServiceImpl implements DataTransferService {
 
     /**
      * 数据转换（转换/重新转换）
-     * @param batchCode
+     * @param editDto
+     * @param updateBy
+     * @return
      */
     @Override
-    public ResultResp dataTransfer(String batchCode,
-                                   String dataTransferType,
-                                   String dataTransferAddr,
-                                   Integer updateBy) {
+    public ResultResp dataTransfer(EditDataTransferTypeDto editDto, Integer updateBy) {
 //        //检查转换状态是否有正在转换的数据 有的话 不转换
 //        if(checkTransferState()){
 //            return ResultResp.FAIL(ConstVar.DATA_TRANSFERING);
 //        }
-        DataTransferPo po = dataTransferMapper.selectByBatchCodeAndDataTransferType(batchCode,dataTransferType);
+        DataTransferPo po = dataTransferMapper.selectByBatchCodeAndDataTransferType(editDto.getDataTransferType(),editDto.getDataTransferType());
         //如果数据库中存在的数据路径地址不为空的话 说明已经转换过了 需要重新转换 备份数据
         if(po != null && StringUtils.isNotBlank(po.getTransferAddr())){
             saveHistory(po);
         }
         //状态重新置换为转换中
         po.setTransferState(DATA_TRANSFERING_STATE);
-        po.setTransferAddr(dataTransferAddr);
+        po.setTransferAddr(editDto.getDataTransferAddr());
+        po.setTimeGranularity(editDto.getTimeGranularity());
         po.setUpdateBy(updateBy);
         return ResultResp.SUCCESS(dataTransferMapper.updateDataTransfer(po));
     }
@@ -172,14 +173,14 @@ public class DataTransferServiceImpl implements DataTransferService {
      * @param roleId
      * @return
      */
-    private List<String> getDataTransferBatchList(Integer roleId) {
+    private List<WindFieldBatchVo> getDataTransferBatchList(Integer roleId) {
         //获取角色可以看到的风场批次信息
         List<WindFieldBatchVo>  batchVoList = windFieldBatchMapper.selectWindFieldBatch(new WindFileBatchPageDto().setRoleId(roleId));
         //获取批次号
-        List<String> batchCodeList = batchVoList.parallelStream().map(WindFieldBatchVo::getBatchCode).collect(Collectors.toList());
+//        List<String> batchCodeList = batchVoList.parallelStream().map(WindFieldBatchVo::getBatchCode).collect(Collectors.toList());
         //获取已经进行过数据转换的批次号
         List<String> dataTransferBatchList = dataTransferMapper.selectAllWindFieldBtach(roleId);
-        return batchCodeList.parallelStream().filter(batchCode -> !dataTransferBatchList.contains(batchCode)).collect(Collectors.toList());
+        return batchVoList.parallelStream().filter(item -> !dataTransferBatchList.contains(item.getBatchCode())).collect(Collectors.toList());
     }
 
     /**

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

@@ -19,6 +19,7 @@
         select
             batch.field_name,
             batch.field_code,
+            batch.batch_name,
             result.batch_code,
             result.analysis_state,
             result.err_state,

energy-manage-service/src/main/resources/mybatis/datatransfer/DataTransferMapper.xml

@@ -18,6 +18,7 @@
         <result property="createBy" column="create_by" jdbcType="INTEGER"/>
         <result property="updateBy" column="update_by" jdbcType="INTEGER"/>
         <result property="callState" column="call_state" jdbcType="INTEGER"/>
+        <result property="transferProgress" column="transfer_progress" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="BASE_SQL">
         id,
@@ -61,6 +62,8 @@
 
     <select id="selectDataTransferListByCondition" parameterType="com.energy.manage.service.domain.dto.datatransfer.DataTransferDto" resultType="com.energy.manage.service.domain.vo.datatransfer.DataTransferVo">
         select
+            batch.batch_name,
+            batch.field_name,
             transfer.batch_code,
             transfer.field_code,
             transfer.engine_count,
@@ -69,11 +72,17 @@
             transfer.time_granularity,
             transfer.err_info,
             transfer.transfer_addr,
-            transfer.transfer_finish_time
+            transfer.transfer_finish_time,
+            transfer.transfer_progress
         from data_transfer transfer
         left join sys_organization_auth auth
         on transfer.field_code = auth.code_number
+        left join wind_field_batch batch
+        on batch.batch_code = transfer.batch_code
         WHERE auth.role_id = #{roleId,jdbcType=INTEGER}
+        <if test="batchName != null and batchName != ''">
+            and batch.batch_name like concat('%', #{batchName,jdbcType=VARCHAR}, '%')
+        </if>
         <if test="batchCode != null and batchCode != ''">
             and transfer.batch_code = #{batchCode,jdbcType=VARCHAR}
         </if>