Merge remote-tracking branch 'origin/master'

energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisResultPo.java

@@ -28,7 +28,7 @@ public class AnalysisResultPo {
     private String batchCode ;
 
     /**
-     * 分析状态
+     * 分析状态 -1:未分析 10：排队中  20：分析中 30：分析完成
      */
     private Integer analysisState ;
 

energy-manage-service/src/main/java/com/energy/manage/service/constant/analysis/AnalysisConstants.java

@@ -50,4 +50,6 @@ public interface AnalysisConstants {
      */
     String PATH_SEPARATOR = "/";
 
+
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/constant/analysis/AnalysisStatusConstants.java

@@ -0,0 +1,31 @@
+package com.energy.manage.service.constant.analysis;
+
+/**
+ * 分析状态类
+ * @author chy
+ * @date 2024/7/22 10:10
+ * @desc
+ */
+public interface AnalysisStatusConstants {
+
+    /**
+     * 未分析状态
+     */
+    Integer NO_ANALYSISED_STATE = -1;
+
+    /**
+     * 排队中
+     */
+    Integer ANALYSIS_QUEUE_STATE = 10;
+
+    /**
+     * 分析中状态
+     */
+    Integer ANALYSISING_STATE = 20;
+
+    /**
+     * 分析完成状态
+     */
+    Integer ANALYSISED_STATE = 30;
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/controller/homepage/HomePageController.java

@@ -30,7 +30,7 @@ public class HomePageController extends BaseServiceController {
     @GetMapping("/queryStatistics")
     public ResultResp queryStatistics(@RequestParam("codeNumber") String codeNumber,
                             @RequestParam("codeType") String codeType){
-        return success(homePageService.queryStatistics(codeNumber,codeType));
+        return success(homePageService.queryStatistics(getRoleId(), codeNumber, codeType));
     }
 
 
@@ -39,7 +39,7 @@ public class HomePageController extends BaseServiceController {
     @GetMapping("/queryOptionRecords")
     public ResultResp queryOptionRecords(@RequestParam("codeNumber") String codeNumber,
                             @RequestParam("codeType") String codeType){
-        return success(homePageService.queryOptionRecords(codeNumber,codeType));
+        return success(homePageService.queryOptionRecords(getRoleId(), codeNumber, codeType));
     }
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisResultDto.java

@@ -33,7 +33,7 @@ public class AnalysisResultDto extends BaseDto {
     private String batchName ;
 
     /**
-     * 分析状态
+     * 分析状态 -1:未分析 10：排队中  20：分析中 30：分析完成
      */
     private Integer analysisState ;
 

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

@@ -37,7 +37,7 @@ public class AnalysisResultVo {
     private String batchName;
 
     /**
-     * 分析状态
+     * 分析状态 -1:未分析 10：排队中  20：分析中 30：分析完成
      */
     private Integer analysisState ;
 

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/analysis/AnalysisResultMapper.java

@@ -52,4 +52,11 @@ public interface AnalysisResultMapper extends MyMapper<AnalysisResultPo> {
      */
     int updateOnOffCall(@Param("batchCode")String batchCode, @Param("onOffCall") Integer onOffCall);
 
+    /**
+     * 更新为排队中状态
+     * @param batchCode
+     * @return
+     */
+    int updateAnalysisState(@Param("batchCode") String batchCode);
+
 }

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/analysis/impl/AnalysisServiceImpl.java

@@ -142,6 +142,8 @@ public class AnalysisServiceImpl implements AnalysisService {
             //调用算法
             String result = HttpUtils.doPost(algorithmProperties.getAnalysisUrl(),mapper.writeValueAsString(rootNode));
             log.info("调用算法分析返回结果：{}",result);
+            //调用分析算法接口后直接更新分析状态为排队中
+            analysisResultMapper.updateAnalysisState(analysisDto.getDataBatchNum());
             //手动操作进行操作记录添加
             if(analysisDto.getAutoOrManual().equals(AnalysisConstants.MANUAL_ANALYSIS)){
                 addOptionRecords(analysisDto.getPowerFarmID(),null,OPTION_CONTENT);

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/java/com/energy/manage/service/service/homepage/HomePageService.java

@@ -17,7 +17,7 @@ public interface HomePageService {
      * @param codeNumber
      * @param codeType
      */
-    HomePageVo queryStatistics(String codeNumber, String codeType);
+    HomePageVo queryStatistics(Integer roleId, String codeNumber, String codeType);
 
 
     /**
@@ -26,7 +26,7 @@ public interface HomePageService {
      * @param codeType
      * @return
      */
-    List<AnalysisOptionRecordsVo> queryOptionRecords(String codeNumber, String codeType);
+    List<AnalysisOptionRecordsVo> queryOptionRecords(Integer roleId, String codeNumber, String codeType);
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/homepage/impl/HomePageServiceImpl.java

@@ -2,12 +2,16 @@ package com.energy.manage.service.service.homepage.impl;
 
 import com.energy.manage.common.enums.TypeRelationEnum;
 import com.energy.manage.common.po.windrelation.WindRelationPO;
+import com.energy.manage.service.constant.analysis.AnalysisConstants;
+import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
 import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisResultVo;
 import com.energy.manage.service.domain.vo.homepage.HomePageVo;
+import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
 import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
 import com.energy.manage.service.mappers.analysis.AnalysisOptionRecordsMapper;
 import com.energy.manage.service.mappers.analysis.AnalysisResultMapper;
+import com.energy.manage.service.mappers.system.SysOrganizationAuthMapper;
 import com.energy.manage.service.mappers.windexceptioncount.WindExceptionCountMapper;
 import com.energy.manage.service.mappers.windrelation.WindRelationMapper;
 import com.energy.manage.service.service.homepage.HomePageService;
@@ -43,6 +47,9 @@ public class HomePageServiceImpl implements HomePageService {
     @Autowired
     private AnalysisOptionRecordsMapper analysisOptionRecordsMapper;
 
+    @Autowired
+    private SysOrganizationAuthMapper authMapper;
+
 
     /**
      * 驾驶舱首页查询
@@ -50,14 +57,14 @@ public class HomePageServiceImpl implements HomePageService {
      * @param codeType
      */
     @Override
-    public HomePageVo queryStatistics(String codeNumber, String codeType) {
+    public HomePageVo queryStatistics(Integer roleId,String codeNumber, String codeType) {
         //返回实体对象
         HomePageVo homePageVo = new HomePageVo();
         //风场
         List<String> fieldCodes = new ArrayList<>();
         //根据类型判断获取风场code
         if(codeType.equals(TypeRelationEnum.COMPANY_NUMBER.getCode())){
-            getFieldCodeList(Arrays.asList(codeNumber), fieldCodes);
+            filterAuthFieldCode(roleId,Arrays.asList(codeNumber), fieldCodes);
         }else{
             fieldCodes.add(codeNumber);
         }
@@ -79,13 +86,13 @@ public class HomePageServiceImpl implements HomePageService {
      * @return
      */
     @Override
-    public List<AnalysisOptionRecordsVo> queryOptionRecords(String codeNumber, String codeType){
+    public List<AnalysisOptionRecordsVo> queryOptionRecords(Integer roleId, String codeNumber, String codeType){
         List<AnalysisOptionRecordsVo> voList = new ArrayList<>();
         //风场
         List<String> fieldCodes = new ArrayList<>();
         //根据类型判断获取风场code
         if(codeType.equals(TypeRelationEnum.COMPANY_NUMBER.getCode())){
-            getFieldCodeList(Arrays.asList(codeNumber), fieldCodes);
+            filterAuthFieldCode(roleId,Arrays.asList(codeNumber), fieldCodes);
         }else{
             fieldCodes.add(codeNumber);
         }
@@ -97,6 +104,19 @@ public class HomePageServiceImpl implements HomePageService {
     }
 
     /**
+     * 根据角色权限过滤fieldCode
+     * @param roleId
+     * @param companyCodes
+     * @param fieldCodes
+     */
+    private void filterAuthFieldCode(Integer roleId, List<String> companyCodes, List<String> fieldCodes){
+        getFieldCodeList(companyCodes, fieldCodes);
+        List<SysOrganizationAuthVo> vos = authMapper.selectByRoleId(roleId);
+        List<String> codes = vos.stream().map(SysOrganizationAuthVo::getCodeNumber).collect(Collectors.toList());
+        fieldCodes.retainAll(codes);
+    }
+
+    /**
      * 递归获取风场code
      * @param companyCodes
      * @param fieldCodes
@@ -134,11 +154,11 @@ public class HomePageServiceImpl implements HomePageService {
         resultVos.stream().forEach(item -> {
             Integer analysisState = item.getAnalysisState();
             //分析中
-            if(analysisState.equals(0)){
+            if(analysisState.equals(AnalysisStatusConstants.ANALYSISING_STATE)){
                 homePageVo.analysisingCountAdd();
             }
             //分析完成
-            if(analysisState.equals(1)){
+            if(analysisState.equals(AnalysisStatusConstants.ANALYSISED_STATE)){
                 homePageVo.analysisedCountAdd();
             }
         });

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysOrganizationAuthServiceImpl.java

@@ -1,10 +1,9 @@
 package com.energy.manage.service.service.system.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.energy.manage.common.enums.TypeRelationEnum;
-import com.energy.manage.common.po.powerwordcriterion.PowerWordCriterionPO;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
-import com.energy.manage.common.po.windrelation.WindRelationPO;
+import com.energy.manage.service.constant.analysis.AnalysisConstants;
+import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldGroupNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
@@ -114,14 +113,15 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
                 engineGroupNumber += companyFieldGroupNumberVo.getEngineGroupNumber();
             }
             // 未分析
-            if (companyFieldGroupNumberVo.getAnalysisState() != null && companyFieldGroupNumberVo.getAnalysisState() <= 0) {
+            if (companyFieldGroupNumberVo.getAnalysisState() != null && companyFieldGroupNumberVo.getAnalysisState() < AnalysisStatusConstants.ANALYSISING_STATE) {
                 analysisUnFinishedNumber += 1;
             }
             if (companyFieldGroupNumberVo.getAnalysisState() == null) {
                 analysisUnFinishedNumber += 1;
             }
             // 已分析
-            if (companyFieldGroupNumberVo.getAnalysisState() != null && companyFieldGroupNumberVo.getAnalysisState() > 0) {
+            if (companyFieldGroupNumberVo.getAnalysisState() != null
+                    && companyFieldGroupNumberVo.getAnalysisState() > AnalysisStatusConstants.ANALYSISING_STATE) {
                 analysisFinishNumber += 1;
             }
         }

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

@@ -41,11 +41,13 @@
         </if>
         order by result.update_time desc
     </select>
+
     <select id="selectAlasisingCount" resultType="int">
         select count(*)
         from analysis_result
-        where analysis_state = 0
+        where analysis_state in (10,20)
     </select>
+
     <select id="selectLastBatchResultByFieldCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisResultVo">
         select result.*
         from analysis_result result
@@ -75,4 +77,10 @@
         set call_status = 1
         where batch_code = #{batchCode,jdbcType=VARCHAR}
     </update>
+
+    <update id="updateAnalysisState" parameterType="java.lang.String">
+        update analysis_result
+        set analysis_state = 10
+        where batch_code = #{batchCode,jdbcType=VARCHAR}
+    </update>
 </mapper>

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

@@ -64,20 +64,23 @@
         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,
             field.field_name,
-            batch.batch_name
+            batch.batch_name,
+            max(transfer.update_time) update_time
         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
+        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>
@@ -89,6 +92,7 @@
             transfer.batch_code,
             field.field_name,
             batch.batch_name
+        order by update_time desc
     </select>
 
     <select id="selectDataTransferListByCondition" parameterType="com.energy.manage.service.domain.dto.datatransfer.DataTransferDto" resultType="com.energy.manage.service.domain.vo.datatransfer.DataTransferVo">
@@ -130,6 +134,7 @@
             transfer.field_code,
             transfer.engine_count,
             transfer.transfer_type,
+            type.transfer_type_name,
             transfer.transfer_state,
             transfer.time_granularity,
             transfer.err_info,
@@ -137,8 +142,8 @@
             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 data_transfer_type type
+        on transfer.transfer_type = type.transfer_type
         left join wind_field_batch batch
         on batch.batch_code = transfer.batch_code
         left join wind_field field