1.修改数据转换列表权限过滤

2.数据转换列表两个接口新增唯一字符串

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

@@ -31,4 +31,10 @@ public class DataTransferBatchShortVo {
      * 批次名称
      */
     private String batchName;
+
+    /**
+     * 无任何意义，用于前端遍历使用
+     */
+    private String uniqueCode;
+
 }

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

@@ -91,5 +91,10 @@ public class DataTransferVo {
      */
     private BigDecimal transferProgress;
 
+    /**
+     * 唯一字符串，无任何意义，只为前端遍历
+     */
+    private String uniqueCode;
+
 
 }

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

@@ -39,7 +39,9 @@ public interface DataTransferMapper extends MyMapper<DataTransferPo>{
      * @param batchName
      * @return
      */
-    List<DataTransferBatchShortVo> queryDataTransferGroup(@Param("fieldName") String fieldName, @Param("batchName") String batchName);
+    List<DataTransferBatchShortVo> queryDataTransferGroup(@Param("fieldName") String fieldName,
+                                                          @Param("batchName") String batchName,
+                                                          @Param("roleId") Integer roleId);
 
     /**
      * 查询数据转换列表

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

@@ -4,6 +4,7 @@ import com.energy.manage.common.po.datatransfer.DataTransferHistoryPo;
 import com.energy.manage.common.po.datatransfer.DataTransferPo;
 import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.common.util.UUIDTools;
 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;
@@ -85,7 +86,11 @@ public class DataTransferServiceImpl implements DataTransferService {
      */
     @Override
     public List<DataTransferBatchShortVo> queryDataTransferGroup(DataTransferDto dataTransferDto){
-        return dataTransferMapper.queryDataTransferGroup(dataTransferDto.getFieldName(),dataTransferDto.getBatchName());
+        List<DataTransferBatchShortVo> vos =  dataTransferMapper.queryDataTransferGroup(dataTransferDto.getFieldName(),
+                                                                                        dataTransferDto.getBatchName(),
+                                                                                        dataTransferDto.getRoleId());
+        vos.stream().forEach(item -> item.setUniqueCode(UUIDTools.getShortUUIDLowCase()));
+        return vos;
     }
 
     /**
@@ -98,7 +103,10 @@ public class DataTransferServiceImpl implements DataTransferService {
         List<DataTransferVo> dataTransferVos = dataTransferMapper.selectDataTransferListByBatchCode(batchCode);
         if(CollectionUtils.isNotEmpty(dataTransferVos)){
             //设置转换类型名称
-            dataTransferVos.parallelStream().forEach(item -> item.setDownloadUrl(downloadUrl));
+            dataTransferVos.parallelStream().forEach(item -> {
+                item.setDownloadUrl(downloadUrl);
+                item.setUniqueCode(UUIDTools.getShortUUIDLowCase());
+            });
         }
         return dataTransferVos;
     }

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

@@ -64,7 +64,7 @@
         limit 1
     </select>
 
-    <select id="queryDataTransferGroup" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.datatransfer.DataTransferBatchShortVo">
+    <select id="queryDataTransferGroup" resultType="com.energy.manage.service.domain.vo.datatransfer.DataTransferBatchShortVo">
         select
             transfer.field_code,
             transfer.batch_code,
@@ -76,8 +76,10 @@
         on transfer.batch_code = batch.batch_code
         left join wind_field field
         on transfer.field_code = field.field_code
+        left join sys_organization_auth auth
+        on transfer.field_code = auth.code_number
         where
-            1 = 1
+            auth.role_id = #{roleId,jdbcType=INTEGER}
             <if test="fieldName != null and fieldName != ''">
                 and field.field_name like concat('%',#{fieldName},'%')
             </if>