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

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

@@ -118,4 +118,16 @@ public class AnalysisResultPo {
      */
     private String dataTypeCode;
 
+    /**
+     * 分析开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date analysisStartTime;
+
+    /**
+     * 分析结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date analysisFinishTime;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysis/AnalysisController.java

@@ -15,8 +15,6 @@ import com.energy.manage.service.util.NetUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.cglib.beans.BeanCopier;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -137,6 +135,16 @@ public class AnalysisController extends BaseServiceController {
     }
 
     @UserLoginToken
+    @ApiOperation(value = "根据角色获取风场及分析编号信息")
+    @GetMapping("/getAnalysisCodeInfo")
+    public ResultResp<List<String>> getAnalysisCodeInfo()
+    {
+        Integer roleId = getRoleId();
+        return success(analysisService.getAnalysisCodeInfo(roleId));
+    }
+
+
+    @UserLoginToken
     @ApiOperation(value = "全部文件下载查询接口")
     @GetMapping("/queryDownloadFile")
     public ResultResp<List<String>> queryDownloadFile(@RequestParam(value = "fieldCode") String fieldCode,

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

@@ -3,6 +3,7 @@ package com.energy.manage.service.domain.dto.analysis;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -0,0 +1,25 @@
+package com.energy.manage.service.domain.vo.analysis;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author chy
+ * @date 2025/1/13 13:51
+ * @desc
+ */
+
+@Data
+@Accessors(chain = true)
+public class AnalysisInfoVo {
+
+    /**
+     * 分析编号
+     */
+    private String batchCode;
+
+    /**
+     * 分析名称
+     */
+    private String analysisName;
+}

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

@@ -3,7 +3,6 @@ package com.energy.manage.service.domain.vo.analysis;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.persistence.Table;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -116,6 +115,18 @@ public class AnalysisResultVo {
     private Integer onOffCall;
 
     /**
+     * 分析开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date analysisStartTime;
+
+    /**
+     * 分析结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date analysisFinishTime;
+
+    /**
      * 分析结果报告
      */
     private List<AnalysisResultReportVo> reportVos;

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

@@ -0,0 +1,48 @@
+package com.energy.manage.service.domain.vo.cockpit;
+
+import com.energy.manage.service.domain.vo.analysis.AnalysisInfoVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author chy
+ * @date 2025/1/13 14:07
+ * @desc
+ */
+@Data
+@Accessors(chain = true)
+public class CompanyFieldAndBatchTreeVo {
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 公司/风场编号
+     */
+    private String codeNumber;
+
+    /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
+     * 公司/风场类型 取值：field/company
+     */
+    private String codeType;
+
+    /**
+     * 父类code
+     */
+    private String parentCode;
+
+    /**
+     * 批次信息
+     */
+    private List<AnalysisInfoVo> batchCodes;
+}

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

@@ -1,11 +1,13 @@
 package com.energy.manage.service.domain.vo.cockpit;
 
+import com.energy.manage.service.domain.vo.analysis.AnalysisInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -45,5 +47,4 @@ public class CompanyFieldTreeRoleVo {
     @ApiModelProperty("最新分析时间")
     private Date wfbrCreateTime;
 
-
 }

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

@@ -1,9 +1,12 @@
 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

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

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

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/AnalysisService.java

@@ -110,6 +110,13 @@ public interface AnalysisService {
 
 
     /**
+     * 根据角色获取风场及分析编号信息
+     * @return
+     */
+    List<Map<String,Object>>getAnalysisCodeInfo(Integer roleId);
+
+
+    /**
      * 全部文件下载查询接口
      * @param fieldCode
      * @param batchCode

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

@@ -18,6 +18,9 @@ import com.energy.manage.service.constant.analysis.AnalysisConstants;
 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.*;
+import com.energy.manage.service.domain.vo.cockpit.CompanyFieldAndBatchTreeVo;
+import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
+import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupShortVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
@@ -25,6 +28,7 @@ import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 import com.energy.manage.service.filter.LoginUser;
 import com.energy.manage.service.filter.LoginUserContextHolder;
 import com.energy.manage.service.mappers.analysis.*;
+import com.energy.manage.service.mappers.system.SysOrganizationAuthMapper;
 import com.energy.manage.service.mappers.windenginegroup.WindEngineGroupMapper;
 import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
@@ -112,6 +116,9 @@ public class AnalysisServiceImpl implements AnalysisService {
     private WindFieldMapper windFieldMapper;
 
     @Autowired
+    private SysOrganizationAuthMapper sysOrganizationAuthMapper;
+
+    @Autowired
     private AlgorithmProperties algorithmProperties;
 
     @Autowired
@@ -362,6 +369,18 @@ public class AnalysisServiceImpl implements AnalysisService {
     }
 
     /**
+     * 根据角色获取风场及分析编号信息
+     *
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAnalysisCodeInfo(Integer roleId) {
+//        List<CompanyFieldAndBatchTreeVo> list = sysOrganizationAuthMapper.selectSysOrganizationAuthTreeByRoleId(roleId);
+
+        return null;
+    }
+
+    /**
      * 全部文件下载查询接口
      * @param fieldCode
      * @param batchCode

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

@@ -23,7 +23,8 @@
         <result column="data_end_time" property="dataEndTime" jdbcType="DATE"/>
         <result column="sketch" property="sketch" jdbcType="VARCHAR"/>
         <result column="data_type_code" property="dataTypeCode" jdbcType="VARCHAR"/>
-
+        <result column="analysis_start_time" property="analysisStartTime" jdbcType="DATE"/>
+        <result column="analysis_finish_time" property="analysisFinishTime" jdbcType="DATE"/>
 
     </resultMap>
 
@@ -43,6 +44,8 @@
             result.data_end_time,
             result.sketch,
             result.data_type_code,
+            result.analysis_start_time,
+            result.analysis_finish_time,
             type.transfer_type_name as data_type_name
         from analysis_result result
         left join sys_organization_auth auth
@@ -112,6 +115,7 @@
             data_start_time = #{beginTime,jdbcType=INTEGER},
             data_end_time = #{endTime,jdbcType=VARCHAR},
             data_type_code = #{scada,jdbcType=VARCHAR},
+            analysis_start_time = now(),
             update_time = now()
         where batch_code = #{dataBatchNum,jdbcType=VARCHAR}
     </update>

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

@@ -70,6 +70,18 @@
         where 1=1
         </select>
 
+    <select id="selectAnalysisCodeTreeByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldAndBatchTreeVo">
+        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
+    </select>
+
     <select id="selectSysOrganizationAuthListByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo">
         select
         soa.role_id as roleId,