数据转换批次整合

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

@@ -6,6 +6,7 @@ import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.controller.base.BaseServiceController;
 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.DataTransferBatchShortVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
 import com.energy.manage.service.service.datatransfer.DataTransferService;
 import io.swagger.annotations.Api;
@@ -38,11 +39,18 @@ public class DataTransferController extends BaseServiceController {
     }
 
     @UserLoginToken
-    @ApiOperation("数据转换列表")
-    @GetMapping("/queryDataTransferList")
-    public ResultResp<Page<DataTransferVo>> queryDataTransferList(DataTransferDto dataTransferDto){
+    @ApiOperation("查询转换数据组")
+    @GetMapping("/queryDataTransferGroup")
+    public ResultResp<Page<DataTransferBatchShortVo>> queryDataTransferGroup(DataTransferDto dataTransferDto){
         dataTransferDto.setRoleId(getRoleId());
-        return pageResult(dataTransferService.queryDataTransferList(dataTransferDto),dataTransferDto);
+        return pageResult(dataTransferService.queryDataTransferGroup(dataTransferDto),dataTransferDto);
+    }
+
+    @UserLoginToken
+    @ApiOperation("查询批次下数据转换信息")
+    @GetMapping("/queryDataTransferByBatchCode")
+    public ResultResp queryDataTransferByBatchCode(@RequestParam("batchCode") String batchCode){
+        return success(dataTransferService.queryDataTransferByBatchCode(batchCode));
     }
 
 

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

@@ -2,6 +2,7 @@ package com.energy.manage.service.domain.dto.datatransfer;
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.util.List;
 
@@ -11,6 +12,7 @@ import java.util.List;
  * @desc
  */
 @Data
+@Accessors(chain = true)
 public class DataTransferDto extends BaseDto {
 
     /**
@@ -44,6 +46,11 @@ public class DataTransferDto extends BaseDto {
     private String fieldCode;
 
     /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
      * 路径地址集合
      */
     List<DataTransferTypePathDto> dataTransferTypePathDtoList;

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

@@ -0,0 +1,34 @@
+package com.energy.manage.service.domain.vo.datatransfer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author chy
+ * @date 2024/7/17 16:10
+ * @desc
+ */
+@Data
+@Accessors(chain = true)
+public class DataTransferBatchShortVo {
+
+    /**
+     * 风场编号
+     */
+    private String fieldCode;
+
+    /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
+     * 批次编号
+     */
+    private String batchCode;
+
+    /**
+     * 批次名称
+     */
+    private String batchName;
+}

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

@@ -20,9 +20,4 @@ public class DataTransferTypeVo {
      */
     private String transferTypeName;
 
-    /**
-     * 时间粒度名称
-     */
-    private String timeGranularityName;
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/mappers/datatransfer/DataTransferMapper.java

@@ -3,6 +3,7 @@ package com.energy.manage.service.mappers.datatransfer;
 import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.datatransfer.DataTransferPo;
 import com.energy.manage.service.domain.dto.datatransfer.DataTransferDto;
+import com.energy.manage.service.domain.vo.datatransfer.DataTransferBatchShortVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferDataTimeVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
 import org.apache.ibatis.annotations.Param;
@@ -33,12 +34,27 @@ public interface DataTransferMapper extends MyMapper<DataTransferPo>{
     DataTransferVo selectBatchCodeForAutoAnaly();
 
     /**
+     * 查询转换数据组
+     * @param fieldName
+     * @param batchName
+     * @return
+     */
+    List<DataTransferBatchShortVo> queryDataTransferGroup(@Param("fieldName") String fieldName, @Param("batchName") String batchName);
+
+    /**
      * 查询数据转换列表
      * @param dataTransferDto
      * @return
      */
     List<DataTransferVo> selectDataTransferListByCondition(DataTransferDto dataTransferDto);
 
+    /**
+     * 查询批次下数据转换信息
+     * @param batchCode
+     * @return
+     */
+    List<DataTransferVo> selectDataTransferListByBatchCode(@Param("batchCode") String batchCode);
+
 
     /**
      * 批量添加

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

@@ -4,6 +4,7 @@ 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.DataTransferBatchShortVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferDataTimeVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferQueryAndAddVo;
 import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
@@ -25,6 +26,20 @@ public interface DataTransferService {
      */
     DataTransferQueryAndAddVo fieldBatchListForDataTransfer(Integer roleId);
 
+    /**
+     * 转换数据组查询
+     * @param dataTransferDto
+     * @return
+     */
+    List<DataTransferBatchShortVo> queryDataTransferGroup(DataTransferDto dataTransferDto);
+
+    /**
+     * 查询批次下数据转换信息
+     * @param batchCode
+     * @return
+     */
+    List<DataTransferVo> queryDataTransferByBatchCode(String batchCode);
+
 
     /**
      * 查询数据转换列表

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

@@ -8,10 +8,7 @@ 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.DataTransferDataTimeVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferQueryAndAddVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferTypeVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
+import com.energy.manage.service.domain.vo.datatransfer.*;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 import com.energy.manage.service.mappers.datatransfer.DataTransferMapper;
 import com.energy.manage.service.mappers.datatransferhistory.DataTransferHistoryMapper;
@@ -77,12 +74,35 @@ public class DataTransferServiceImpl implements DataTransferService {
         }
         queryAndAddVo.setBatchCodeList(batchCodeList);
         List<DataTransferTypeVo> typeVos = typeMapper.selectAllInfo();
-        typeVos.parallelStream().forEach(item -> item.setTimeGranularityName(item.getTransferTypeName().replace("路径","时间粒度")));
         queryAndAddVo.setDataTransferTypeVoList(typeVos);
         return queryAndAddVo;
     }
 
     /**
+     * 查询转换数据组
+     * @param dataTransferDto
+     * @return
+     */
+    @Override
+    public List<DataTransferBatchShortVo> queryDataTransferGroup(DataTransferDto dataTransferDto){
+        return dataTransferMapper.queryDataTransferGroup(dataTransferDto.getFieldName(),dataTransferDto.getBatchName());
+    }
+
+    /**
+     * 查询批次下数据转换信息
+     * @param batchCode
+     * @return
+     */
+    @Override
+    public List<DataTransferVo> queryDataTransferByBatchCode(String batchCode){
+        List<DataTransferVo> dataTransferVos = dataTransferMapper.selectDataTransferListByBatchCode(batchCode);
+        if(CollectionUtils.isNotEmpty(dataTransferVos)){
+            //设置转换类型名称
+            dataTransferVos.parallelStream().forEach(item -> item.setDownloadUrl(downloadUrl));
+        }
+        return dataTransferVos;
+    }
+    /**
      * 查询数据转换列表
      * @return
      */
@@ -96,7 +116,6 @@ public class DataTransferServiceImpl implements DataTransferService {
                 //设置转换类型名称
                 dataTransferVos.parallelStream().forEach(item -> {
                     item.setTransferTypeName(getDataTransferTypeName(typeVos,item.getTransferType()));
-                    item.setTimeGranularityName(item.getTransferTypeName().replace("路径","时间粒度"));
                     item.setDownloadUrl(downloadUrl);
                 });
             }

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

@@ -64,6 +64,33 @@
         limit 1
     </select>
 
+    <select id="queryDataTransferGroup" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.datatransfer.DataTransferBatchShortVo">
+        select
+            transfer.field_code,
+            transfer.batch_code,
+            field.field_name,
+            batch.batch_name
+        from
+            data_transfer  transfer
+        left join wind_field_batch batch
+        on transfer.batch_code = batch.batch_code
+        left join wind_field field
+        on transfer.field_code = field.field_code
+        where
+            1 = 1
+            <if test="fieldName != null and fieldName != ''">
+                and field.field_name like concat('%',#{fieldName},'%')
+            </if>
+            <if test="batchName != null and batchName != ''">
+                and batch.batch_name like concat('%',#{batchName},'%')
+            </if>
+        group by
+            transfer.field_code,
+            transfer.batch_code,
+            field.field_name,
+            batch.batch_name
+    </select>
+
     <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,
@@ -83,7 +110,7 @@
         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}
+        where auth.role_id = #{roleId,jdbcType=INTEGER}
         <if test="batchName != null and batchName != ''">
             and batch.batch_name like concat('%', #{batchName,jdbcType=VARCHAR}, '%')
         </if>
@@ -95,6 +122,29 @@
         </if>
         order by transfer.update_time desc
     </select>
+    <select id="selectDataTransferListByBatchCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.datatransfer.DataTransferVo">
+        select
+            batch.batch_name,
+            field.field_name,
+            transfer.batch_code,
+            transfer.field_code,
+            transfer.engine_count,
+            transfer.transfer_type,
+            transfer.transfer_state,
+            transfer.time_granularity,
+            transfer.err_info,
+            transfer.transfer_addr,
+            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
+        left join wind_field field
+        on field.field_code = transfer.field_code
+        where transfer.batch_code = #{batchCode,jdbcType=VARCHAR}
+    </select>
 
     <select id="selectByBatchCodeAndDataTransferType" parameterType="java.lang.String" resultType="com.energy.manage.common.po.datatransfer.DataTransferPo">
         select