新增:1.创建总览页风场批次树形接口

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/cockpit/CompanyFieldAndBatchTreeVo.java

@@ -17,19 +17,15 @@ import java.util.List;
 public class CompanyFieldAndBatchTreeVo {
 
     /**
-     * 公司名称
+     * 公司/风场名称
      */
-    private String companyName;
+    private String fieldOrCompanyName;
 
     /**
      * 公司/风场编号
      */
     private String codeNumber;
 
-    /**
-     * 风场名称
-     */
-    private String fieldName;
 
     /**
      * 公司/风场类型 取值：field/company

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/system/SysOrganizationAuthVo.java

@@ -1,12 +1,9 @@
 package com.energy.manage.service.domain.vo.system;
 
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
-import com.energy.manage.service.domain.vo.analysis.AnalysisInfoVo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.List;
-
 /**
  * @author chy
  * @date 2024/6/14 09:39
@@ -20,4 +17,14 @@ public class SysOrganizationAuthVo extends SysOrganizationAuthPO {
      * 风场名称
      */
     private String fieldName;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 企业code
+     */
+    private String companyCode;
 }

energy-manage-service/src/main/java/com/energy/manage/service/mappers/analysis/AnalysisResultMapper.java

@@ -4,6 +4,7 @@ import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.analysis.AnalysisResultPo;
 import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
+import com.energy.manage.service.domain.vo.analysis.AnalysisInfoVo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisResultVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -68,4 +69,11 @@ public interface AnalysisResultMapper extends MyMapper<AnalysisResultPo> {
      */
     int updateByBatchCode(AnalysisDto analysisDto);
 
+    /**
+     * 查询风场下的分析编号
+     * @param fieldCode
+     * @return
+     */
+    List<AnalysisInfoVo> selectShortInfoByFieldCode(@Param("fieldCode") String fieldCode);
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/mappers/system/SysOrganizationAuthMapper.java

@@ -20,7 +20,8 @@ public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthP
 
     List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);
 
-    List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);
+
+    List<SysOrganizationAuthVo> selectInfoByRoleId(@Param("roleId") Integer roleId);
 
 
     List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthListByRoleId(@Param("roleId") Integer roleId);

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -113,10 +113,10 @@ public class AnalysisServiceImpl implements AnalysisService {
     private AnalysisResultReportMapper resultReportMapper;
 
     @Autowired
-    private WindFieldMapper windFieldMapper;
+    private SysOrganizationAuthMapper sysOrganizationAuthMapper;
 
     @Autowired
-    private SysOrganizationAuthMapper sysOrganizationAuthMapper;
+    private WindFieldMapper windFieldMapper;
 
     @Autowired
     private AlgorithmProperties algorithmProperties;
@@ -154,6 +154,9 @@ public class AnalysisServiceImpl implements AnalysisService {
      */
     private final static String SEPARATOR = "-";
 
+
+    private final static String ZREO_STR = "0";
+
     /**
      * 风机编号正则
      */
@@ -375,9 +378,32 @@ public class AnalysisServiceImpl implements AnalysisService {
      */
     @Override
     public List<Map<String, Object>> getAnalysisCodeInfo(Integer roleId) {
-//        List<CompanyFieldAndBatchTreeVo> list = sysOrganizationAuthMapper.selectSysOrganizationAuthTreeByRoleId(roleId);
+        //查询所有权限风场
+        List<SysOrganizationAuthVo> list = sysOrganizationAuthMapper.selectInfoByRoleId(roleId);
+        List<CompanyFieldAndBatchTreeVo> transferList = new ArrayList<>();
+        list.stream().forEachOrdered(item -> transferList.add(transferVo(item)));
+        return TreeUtil.getJava8ResultTree(BeanMapUtils.listBeanToListMap(transferList));
+    }
 
-        return null;
+    /**
+     * 转换vo
+     * @param authVo
+     * @return
+     */
+    private CompanyFieldAndBatchTreeVo transferVo(SysOrganizationAuthVo authVo){
+        CompanyFieldAndBatchTreeVo treeVo = new CompanyFieldAndBatchTreeVo();
+        treeVo.setCodeNumber(authVo.getCodeNumber())
+                .setCodeType(authVo.getCodeType());
+        if(StringUtils.isBlank(authVo.getCompanyCode())){
+            treeVo.setFieldOrCompanyName(authVo.getCompanyName())
+                    .setParentCode(ZREO_STR);
+        }else{
+            treeVo.setFieldOrCompanyName(authVo.getFieldName())
+                    .setCodeNumber(authVo.getCodeNumber())
+                    .setParentCode(authVo.getCompanyCode())
+                    .setBatchCodes(analysisResultMapper.selectShortInfoByFieldCode(authVo.getCodeNumber()));
+        }
+        return treeVo;
     }
 
     /**

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

@@ -73,6 +73,10 @@
         where analysis_state in (10,20)
     </select>
 
+    <select id="selectShortInfoByFieldCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisInfoVo">
+        select batch_code, analysis_name from analysis_result where field_code = #{fieldCode}
+    </select>
+
     <select id="selectLastBatchResultByFieldCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisResultVo">
         select result.*
         from analysis_result result

energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -70,16 +70,20 @@
         where 1=1
         </select>
 
-    <select id="selectAnalysisCodeTreeByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldAndBatchTreeVo">
+    <select id="selectInfoByRoleId" resultType="com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo">
         select
-            soa.role_id as roleId,
-            soa.code_number as codeNumber,
-            soa.parent_code as parentCode,
-            soa.code_type as codeType,
-            wc.company_name as fieldOrCompanyName,
-            wf.field_name as fieldOrCompanyName
-        from sys_organization_auth soa
-        where 1=1
+               auth.code_number,
+               auth.code_type,
+               auth.role_id,
+               wc.company_name,
+               wf.field_name,
+               wf.company_code
+        from sys_organization_auth auth
+        left join wind_company wc
+        on auth.code_number = wc.company_code
+        left join wind_field wf
+        on auth.code_number = wf.field_code
+        where auth.role_id = #{roleId}
     </select>
 
     <select id="selectSysOrganizationAuthListByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo">