合并代码

energy-manage-common/src/main/java/com/energy/manage/common/po/system/SysOrganizationAuthPO.java

@@ -24,11 +24,6 @@ public class SysOrganizationAuthPO extends NewBaseDomain {
     private String codeNumber;
 
     /**
-     * 风场名称
-     */
-    private String fieldName;
-
-    /**
      * 组织类型
      */
     private String codeType;

energy-manage-common/src/main/java/com/energy/manage/common/util/HttpUtils.java

@@ -1,5 +1,6 @@
 package com.energy.manage.common.util;
 
+import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 
@@ -37,7 +38,122 @@ public class HttpUtils {
      * @param params
      * @return
      */
-    public static JSONObject doPost(String url, Map<String,Object> params){
-        return JSONObject.parseObject(HttpUtil.post(url,params,TIME_OUT));
+    public static String doPost(String url, Map<String,Object> params){
+        // 创建POST请求
+        HttpRequest request = HttpUtil.createPost(url);
+        // 设置请求头Content-Type为application/json
+        request.header("Content-Type", "application/json");
+        // 执行请求
+        return request.body(params.toString()).execute().body();
+    }
+
+    public static void main(String[] args) {
+        String param = "{\n" +
+                "\t\"dataContractType\": {\n" +
+                "\t\t\"type\": \"analysisExecuteOrder\",\n" +
+                "\t\t\"version\": \"1.2.0\"\n" +
+                "\t},\n" +
+                "\t\"dataContract\": {\n" +
+                "\t\t\"autoOrManual\": \"automatic\",\n" +
+                "\t\t\"dataFilter\": {\n" +
+                "\t\t\t\"powerFarmID\": \"WOF031300036\",\n" +
+                "\t\t\t\"turbines\": null,\n" +
+                "\t\t\t\"dataBatchNum\": \"zhaoyuan_20240528\",\n" +
+                "\t\t\t\"beginTime\": \"2023-01-01 00:00:00\",\n" +
+                "\t\t\t\"endTime\": \"2024-12-31 23:59:59\",\n" +
+                "\t\t\t\"excludingMonths\": [\n" +
+                "\t\t\t\t\"2023-12\",\n" +
+                "\t\t\t\t\"2023-09\"\n" +
+                "\t\t\t],\n" +
+                "\t\t\t\"customFilter\": {\n" +
+                "\t\t\t\t\"valueWindSpeed\": {\n" +
+                "\t\t\t\t\t\"min\": null,\n" +
+                "\t\t\t\t\t\"max\": null\n" +
+                "\t\t\t\t},\n" +
+                "\t\t\t\t\"valuePitchAngle\": {\n" +
+                "\t\t\t\t\t\"min\": null,\n" +
+                "\t\t\t\t\t\"max\": null\n" +
+                "\t\t\t\t},\n" +
+                "\t\t\t\t\"valueActivePower\": {\n" +
+                "\t\t\t\t\t\"min\": null,\n" +
+                "\t\t\t\t\t\"max\": null\n" +
+                "\t\t\t\t},\n" +
+                "\t\t\t\t\"valueGeneratorSpeed\": {\n" +
+                "\t\t\t\t\t\"min\": null,\n" +
+                "\t\t\t\t\t\"max\": null\n" +
+                "\t\t\t\t}\n" +
+                "\t\t\t}\n" +
+                "\t\t},\n" +
+                "\t\t\"configAnalysis\": [\n" +
+                "\t\t\t{\n" +
+                "\t\t\t\t\"package\": \"algorithm.temperatureLargeComponentsAnalyst\",\n" +
+                "\t\t\t\t\"className\": \"TemperatureLargeComponentsAnalyst\",\n" +
+                "\t\t\t\t\"methodName\": \"executeAnalysis\",\n" +
+                "\t\t\t\t\"scada\": \"minute\"\n" +
+                "\t\t\t},\n" +
+                "\t\t\t{\n" +
+                "\t\t\t\t\"package\": \"algorithm.generatorSpeedPowerAnalyst\",\n" +
+                "\t\t\t\t\"className\": \"GeneratorSpeedPowerAnalyst\",\n" +
+                "\t\t\t\t\"methodName\": \"executeAnalysis\",\n" +
+                "\t\t\t\t\"scada\": \"minute\"\n" +
+                "\t\t\t},\n" +
+                "\t\t\t{\n" +
+                "\t\t\t\t\"package\": \"algorithm.generatorSpeedTorqueAnalyst\",\n" +
+                "\t\t\t\t\"className\": \"GeneratorSpeedTorqueAnalyst\",\n" +
+                "\t\t\t\t\"methodName\": \"executeAnalysis\",\n" +
+                "\t\t\t\t\"scada\": \"minute\"\n" +
+                "\t\t\t}\n" +
+                "\t\t],\n" +
+                "\t\t\"graphSets\": {\n" +
+                "            \"DgeneratorSpeed\": {\n" +
+                "                \"step\": 5,\n" +
+                "                \"min\": 0,\n" +
+                "                \"max\": 30\n" +
+                "            },\n" +
+                "            \"DgeneratorTorque\": {\n" +
+                "                \"step\": 10000,\n" +
+                "                \"min\": 0,\n" +
+                "                \"max\": 100000\n" +
+                "            },\n" +
+                "            \"IgeneratorSpeed\": {\n" +
+                "                \"step\": 200,\n" +
+                "                \"min\": 1000,\n" +
+                "                \"max\": 2000\n" +
+                "            },\n" +
+                "            \"IgeneratorTorque\": {\n" +
+                "                \"step\": 2000,\n" +
+                "                \"min\": 0,\n" +
+                "                \"max\": 12000\n" +
+                "\t\t\t},\n" +
+                "\t\t\t\"cp\": {\n" +
+                "\t\t\t\t\"step\": 0.5,\n" +
+                "\t\t\t\t\"min\": 0,\n" +
+                "\t\t\t\t\"max\": 2\n" +
+                "\t\t\t},\n" +
+                "\t\t\t\"tsr\": {\n" +
+                "\t\t\t\t\"step\": 5,\n" +
+                "\t\t\t\t\"min\": 0,\n" +
+                "\t\t\t\t\"max\": 30\n" +
+                "\t\t\t},\n" +
+                "\t\t\t\"pitchAngle\": {\n" +
+                "\t\t\t\t\"step\": 1,\n" +
+                "\t\t\t\t\"min\": -1,\n" +
+                "\t\t\t\t\"max\": 20\n" +
+                "\t\t\t},\n" +
+                "\t\t\t\"activePower\": {\n" +
+                "\t\t\t\t\"step\": 250,\n" +
+                "\t\t\t\t\"min\": 0,\n" +
+                "\t\t\t\t\"max\": 2000\n" +
+                "\t\t\t}\n" +
+                "\t\t}\n" +
+                "\t}\n" +
+                "}";
+        // 创建POST请求
+        HttpRequest request = HttpUtil.createPost("http://192.168.5.7:8000/demo/dataAnalysis/analysis");
+        // 设置请求头Content-Type为application/json
+        request.header("Content-Type", "application/json");
+        // 执行请求
+        String response = request.body(param).execute().body();
+        System.out.println(response);
     }
 }

energy-manage-service/src/main/java/com/energy/manage/service/ManageAppApplication.java

@@ -6,8 +6,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -30,4 +28,4 @@ public class ManageAppApplication {
     }
 
 
-}
+}

energy-manage-service/src/main/java/com/energy/manage/service/config/xxl/XxlJobConfig.java

@@ -13,43 +13,43 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 public class XxlJobConfig {
 
-//    @Value("${xxl.job.admin.addresses}")
-//    private String adminAddresses;
-//
-//    @Value("${xxl.job.accessToken}")
-//    private String accessToken;
-//
-//    @Value("${xxl.job.executor.appname}")
-//    private String appname;
-//
-//    @Value("${xxl.job.executor.address}")
-//    private String address;
-//
-//    @Value("${xxl.job.executor.ip}")
-//    private String ip;
-//
-//    @Value("${xxl.job.executor.port}")
-//    private int port;
-//
-//    @Value("${xxl.job.executor.logpath}")
-//    private String logPath;
-//
-//    @Value("${xxl.job.executor.logretentiondays}")
-//    private int logRetentionDays;
-//
-//    @Bean
-//    public XxlJobSpringExecutor xxlJobExecutor() {
-//        log.info(">>>>>>>>>>> xxl-job config init.");
-//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-//        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-//        xxlJobSpringExecutor.setAppname(appname);
-//        xxlJobSpringExecutor.setAddress(address);
-//        xxlJobSpringExecutor.setIp(ip);
-//        xxlJobSpringExecutor.setPort(port);
-//        xxlJobSpringExecutor.setAccessToken(accessToken);
-//        xxlJobSpringExecutor.setLogPath(logPath);
-//        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-//
-//        return xxlJobSpringExecutor;
-//    }
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appname;
+
+    @Value("${xxl.job.executor.address}")
+    private String address;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        log.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appname);
+        xxlJobSpringExecutor.setAddress(address);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+        return xxlJobSpringExecutor;
+    }
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysiscomment/AnalysisCommentController.java

@@ -57,9 +57,12 @@ public class AnalysisCommentController extends BaseServiceController {
     @UserLoginToken
     @ApiOperation(value = "富文本编辑")
     @PostMapping("/analysisCommentEdit")
-    public ResultResp analysisCommentEdit(@RequestBody List<AnalysisCommentDescriptionDto> commentDescriptionDtos)
+    public ResultResp analysisCommentEdit(@RequestBody AnalysisCommentDescriptionDto commentDescriptionDto)
     {
-        return success(analysisCommentService.analysisCommentEdit(commentDescriptionDtos,getUserId()));
+        Integer userId = getUserId();
+        commentDescriptionDto.setCreateBy(userId);
+        commentDescriptionDto.setUpdateBy(userId);
+        return success(analysisCommentService.analysisCommentEdit(commentDescriptionDto));
     }
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/windfieldbatch/WindFieldBatchController.java

@@ -5,6 +5,7 @@ import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto;
+import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 import com.energy.manage.service.service.windfieldbatch.WindFieldBatchService;
 import io.swagger.annotations.Api;
@@ -30,9 +31,9 @@ public class WindFieldBatchController extends BaseServiceController {
     @UserLoginToken
     @ApiOperation(value = "风场批次信息列表")
     @GetMapping("/batchList")
-    public ResultResp<Page<WindFieldBatchVo>> batchList(WindFieldBatchDto windFieldBatchDto){
-        windFieldBatchDto.setRoleId(getRoleId());
-        return pageResult(windFieldBatchService.queryWindFieldBatch(windFieldBatchDto), windFieldBatchDto);
+    public ResultResp<Page<WindFieldBatchVo>> batchList(WindFileBatchPageDto windFieldBatchPageDto){
+        windFieldBatchPageDto.setRoleId(getRoleId());
+        return pageResult(windFieldBatchService.queryWindFieldBatch(windFieldBatchPageDto), windFieldBatchPageDto);
     }
 
     @UserLoginToken

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfieldbatch/WindFieldBatchDto.java

@@ -15,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-public class WindFieldBatchDto extends BaseDto {
+public class WindFieldBatchDto {
 
     /**
      * 风场名称

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfieldbatch/WindFileBatchPageDto.java

@@ -0,0 +1,77 @@
+package com.energy.manage.service.domain.dto.windfieldbatch;
+
+import com.energy.manage.service.domain.dto.BaseDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author chy
+ * @date 2024/6/14 10:03
+ * @desc
+ */
+@Data
+@Accessors(chain = true)
+public class WindFileBatchPageDto extends BaseDto {
+    /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
+     * 风场编号
+     */
+    private String fieldCode;
+
+    /**
+     * 批次名称
+     */
+    private String batchName;
+
+    /**
+     * 批次编号
+     */
+    private String batchCode;
+
+    /**
+     * 批次状态 0：启用 1：停用
+     */
+    private Integer batchState;
+
+    /**
+     * 删除状态 0：未删除 1：删除
+     */
+    private Integer isDelete;
+
+    /**
+     * 登录用角色id （由代码设置，前端不用传）
+     */
+    private Integer roleId;
+
+    /**
+     * 创建人id
+     */
+    private Integer createBy;
+
+    /**
+     * 更新人id
+     */
+    private Integer updateBy;
+
+    /**
+     * 创建开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startTime;
+
+    /**
+     * 创建结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endTime;
+}

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

@@ -0,0 +1,20 @@
+package com.energy.manage.service.domain.vo.system;
+
+import com.energy.manage.common.po.system.SysOrganizationAuthPO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author chy
+ * @date 2024/6/14 09:39
+ * @desc
+ */
+@Data
+@Accessors(chain = true)
+public class SysOrganizationAuthVo extends SysOrganizationAuthPO {
+
+    /**
+     * 风场名称
+     */
+    private String fieldName;
+}

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

@@ -5,6 +5,7 @@ import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldGroupNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
+import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +15,7 @@ import java.util.List;
 public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthPO> {
 
 
-    List<SysOrganizationAuthPO> selectByRoleId(@Param("roleId") Integer roleId);
+    List<SysOrganizationAuthVo> selectByRoleId(@Param("roleId") Integer roleId);
 
 
     List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windfieldbatch/WindFieldBatchMapper.java

@@ -3,6 +3,7 @@ package com.energy.manage.service.mappers.windfieldbatch;
 import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.windfieldbatch.WindFieldBatchPo;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto;
+import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 import org.springframework.stereotype.Repository;
 
@@ -33,7 +34,7 @@ public interface WindFieldBatchMapper extends MyMapper<WindFieldBatchPo>{
      * 查询批次列表
      * @return
      */
-    List<WindFieldBatchVo> selectWindFieldBatch(WindFieldBatchDto windFieldBatchDto);
+    List<WindFieldBatchVo> selectWindFieldBatch(WindFileBatchPageDto windFieldBatchDto);
 
     /**
      * 根据批次号查询批次信息

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

@@ -100,8 +100,8 @@ public class AnalysisServiceImpl implements AnalysisService {
             dataProccess(analysisDto,rootNode);
             log.info("调用分析算法之前，将入参analysisDto转换为算法标准json = {}" + rootNode.toString());
             //调用算法
-//            JSONObject jsonObject = HttpUtils.doPost(AlgorithmProperties.analysisUrl,mapper.convertValue(rootNode, Map.class));
-//            log.info("调用算法分析返回结果：{}",jsonObject);
+            String result = HttpUtils.doPost(AlgorithmProperties.analysisUrl,mapper.convertValue(rootNode, Map.class));
+            log.info("调用算法分析返回结果：{}",result);
             return ResultResp.SUCCESS();
         } catch (JsonProcessingException e) {
             log.error("批次号 = {} 手动分析异常",analysisDto.getDataBatchNum(),e);

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiscomment/AnalysisCommentService.java

@@ -41,8 +41,8 @@ public interface AnalysisCommentService {
 
     /**
      * 富文本编辑
-     * @param commentDescriptionDtos
+     * @param commentDescriptionDto
      * @return
      */
-    int analysisCommentEdit(List<AnalysisCommentDescriptionDto> commentDescriptionDtos,Integer userId);
+    int analysisCommentEdit(AnalysisCommentDescriptionDto commentDescriptionDto);
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiscomment/impl/AnalysisCommentServiceImpl.java

@@ -86,18 +86,14 @@ public class AnalysisCommentServiceImpl implements AnalysisCommentService {
 
     /**
      * 富文本编辑
-     * @param dtos
+     * @param dto
      * @Param userId
      * @return
      */
     @Override
-    public int analysisCommentEdit(List<AnalysisCommentDescriptionDto> dtos, Integer userId) {
+    public int analysisCommentEdit(AnalysisCommentDescriptionDto dto) {
         AtomicInteger count = new AtomicInteger(0);
-        for(AnalysisCommentDescriptionDto dto : dtos){
-            dto.setCreateBy(userId);
-            dto.setUpdateBy(userId);
-            dto.getCommentList().parallelStream().forEach(item -> count.addAndGet(saveCommentDescription(dto, item)));
-        }
+        dto.getCommentList().parallelStream().forEach(item -> count.addAndGet(saveCommentDescription(dto, item)));
         return count.get();
     }
 

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

@@ -6,7 +6,7 @@ import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
 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.windfieldbatch.WindFieldBatchDto;
+import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 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;
@@ -135,7 +135,7 @@ public class DataTransferServiceImpl implements DataTransferService {
             saveHistory(po);
         }
         //状态重新置换为转换中
-        po.setTransferState(0);
+        po.setTransferState(DATA_TRANSFERING_STATE);
         po.setTransferAddr(dataTransferAddr);
         po.setUpdateBy(updateBy);
         return ResultResp.SUCCESS(dataTransferMapper.updateDataTransfer(po));
@@ -169,7 +169,7 @@ public class DataTransferServiceImpl implements DataTransferService {
      */
     private List<String> getDataTransferBatchList(Integer roleId) {
         //获取角色可以看到的风场批次信息
-        List<WindFieldBatchVo>  batchVoList = windFieldBatchMapper.selectWindFieldBatch(new WindFieldBatchDto().setRoleId(roleId));
+        List<WindFieldBatchVo>  batchVoList = windFieldBatchMapper.selectWindFieldBatch(new WindFileBatchPageDto().setRoleId(roleId));
         //获取批次号
         List<String> batchCodeList = batchVoList.parallelStream().map(WindFieldBatchVo::getBatchCode).collect(Collectors.toList());
         //获取已经进行过数据转换的批次号
@@ -206,8 +206,9 @@ public class DataTransferServiceImpl implements DataTransferService {
         dataTransferPo.setCreateBy(userId);
         dataTransferPo.setUpdateBy(userId);
         DataTransferTypePathDto pathDto = getTransferAddr(dataTransferDto,dataTransferType);
-        if(pathDto != null && pathDto.getTransferAddr() != null){
+        if(pathDto != null && StringUtils.isNotBlank(pathDto.getTransferAddr())){
             dataTransferPo.setTransferAddr(pathDto.getTransferAddr());
+            dataTransferPo.setTransferState(DATA_TRANSFERING_STATE);
         }
         if(pathDto != null && pathDto.getTimeGranularity() != null){
             dataTransferPo.setTimeGranularity(pathDto.getTimeGranularity());

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

@@ -106,11 +106,11 @@ public class HomePageServiceImpl implements HomePageService {
         resultVos.stream().forEach(item -> {
             Integer analysisState = item.getAnalysisState();
             //分析中
-            if(item.getAnalysisState().equals(0)){
+            if(analysisState.equals(0)){
                 homePageVo.analysisingCountAdd();
             }
             //分析完成
-            if(item.getAnalysisState().equals(1)){
+            if(analysisState.equals(1)){
                 homePageVo.analysisedCountAdd();
             }
         });

energy-manage-service/src/main/java/com/energy/manage/service/service/system/SysOrganizationAuthService.java

@@ -3,6 +3,7 @@ package com.energy.manage.service.service.system;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
+import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
 
 import java.util.List;
 import java.util.Map;
@@ -21,7 +22,7 @@ public interface SysOrganizationAuthService {
      * @param roleId
      * @return
      */
-    Map<String, List<SysOrganizationAuthPO>> queryCodeNunByRoleId(Integer roleId);
+    Map<String, List<SysOrganizationAuthVo>> queryCodeNunByRoleId(Integer roleId);
 
 
     /**

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

@@ -8,6 +8,7 @@ import com.energy.manage.common.po.windrelation.WindRelationPO;
 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;
+import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
 import com.energy.manage.service.mappers.system.SysOrganizationAuthMapper;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import com.energy.manage.service.util.BeanMapUtils;
@@ -48,9 +49,9 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
      * @return
      */
     @Override
-    public Map<String, List<SysOrganizationAuthPO>> queryCodeNunByRoleId(Integer roleId) {
-        Map<String, List<SysOrganizationAuthPO>> returnMap = new HashMap<>();
-        List<SysOrganizationAuthPO> authPoList = sysOrganizationAuthMapper.selectByRoleId(roleId);
+    public Map<String, List<SysOrganizationAuthVo>> queryCodeNunByRoleId(Integer roleId) {
+        Map<String, List<SysOrganizationAuthVo>> returnMap = new HashMap<>();
+        List<SysOrganizationAuthVo> authPoList = sysOrganizationAuthMapper.selectByRoleId(roleId);
         authPoList.parallelStream().filter(po -> po.getCodeType().equals(TypeRelationEnum.WIND_FIELD_NUMBER.getCode()))
                 .collect(Collectors.toList());
         returnMap.put(FILE_CODE_LIST_KEY, authPoList);

energy-manage-service/src/main/java/com/energy/manage/service/service/windfieldbatch/WindFieldBatchService.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.service.windfieldbatch;
 
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto;
+import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 
 import java.util.List;
@@ -42,6 +43,6 @@ public interface WindFieldBatchService {
      * @param windFieldBatchDto
      * @return
      */
-    List<WindFieldBatchVo> queryWindFieldBatch(WindFieldBatchDto windFieldBatchDto);
+    List<WindFieldBatchVo> queryWindFieldBatch(WindFileBatchPageDto windFieldBatchDto);
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windfieldbatch/impl/WindFieldBatchServiceImpl.java

@@ -4,6 +4,7 @@ import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
 import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto;
+import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 import com.energy.manage.service.mappers.windfield.WindFieldMapper;
@@ -81,7 +82,7 @@ public class WindFieldBatchServiceImpl implements WindFieldBatchService {
      * @return
      */
     @Override
-    public List<WindFieldBatchVo> queryWindFieldBatch(WindFieldBatchDto windFieldBatchDto) {
+    public List<WindFieldBatchVo> queryWindFieldBatch(WindFileBatchPageDto windFieldBatchDto) {
         PageHelper.startPage(windFieldBatchDto);
         return windFieldBatchMapper.selectWindFieldBatch(windFieldBatchDto);
     }

energy-manage-service/src/main/java/com/energy/manage/service/test/TestJson.java

@@ -35,11 +35,11 @@ public class TestJson {
                 "        \"autoOrManual\": \"automatic\",\n" +
                 "        \"dataFilter\": {\n" +
                 "            \"powerFarmID\": \"010-00001\",\n" +
-                "            \"turbines\": [],\n" +
+                "            \"turbines\": null,\n" +
                 "            \"dataBatchNum\": \"B2024042211-0\",\n" +
                 "            \"beginTime\": \"2023-01-01 00:00:00\",\n" +
                 "            \"endTime\": \"2023-12-31 23:59:59\",\n" +
-                "            \"excludingMonths\": [],\n" +
+                "            \"excludingMonths\": null,\n" +
                 "            \"customFilter\": {\n" +
                 "                \"valueWindSpeed\": {\n" +
                 "                    \"min\": null,\n" +

energy-manage-service/src/main/resources/bootstrap.properties

@@ -54,9 +54,9 @@ template.field = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E5%9C
 template.draught = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E6%9C%BA%E8%A1%A8%E6%A8%A1%E7%89%88.xlsx
 
 #算法调用默认值
-analysis.url= http://192.168.50.234:16200/energy-manage-service/analysis/analysisData
+analysis.url= http://192.168.5.7:8000/demo/dataAnalysis/analysis
 #分析算法入参json格式
-analysis.algorithm.json={"dataContractType": {"type": "analysisExecuteOrder","version": "1.2.0"},"dataContract": {"autoOrManual": "","dataFilter": {"powerFarmID": "","turbines": [],"dataBatchNum": "","beginTime": "","endTime": "","excludingMonths": [],"customFilter": {"valueWindSpeed": {"min": null,"max": null},"valuePitchAngle": {"min":null,"max": null},"valueActivePower": {"min": null,"max": null},"valueGeneratorSpeed": {"min": null,"max": null}}},"configAnalysis": [],"graphSets": {"generatorSpeed": {"step": 200,"min": 1000,"max": 2000},"generatorTorque": {"step": 2000,"min": 0,"max": 12000},"cp": {"step": 0.5,"min": 0,"max": 2},"tsr": {"step": 5,"min": 0,"max": 30},"pitchAngle": {"step": 1,"min": -1,"max": 20},"activePower": {"step": 250,"min": 0,"max": 2000}}}}
+analysis.algorithm.json={"dataContractType": {"type": "analysisExecuteOrder","version": "1.2.0"},"dataContract": {"autoOrManual": "","dataFilter": {"powerFarmID": "","turbines": null,"dataBatchNum": "","beginTime": "","endTime": "","excludingMonths": null,"customFilter": {"valueWindSpeed": {"min": null,"max": null},"valuePitchAngle": {"min":null,"max": null},"valueActivePower": {"min": null,"max": null},"valueGeneratorSpeed": {"min": null,"max": null}}},"configAnalysis": [],"graphSets": {"generatorSpeed": {"step": 200,"min": 1000,"max": 2000},"generatorTorque": {"step": 2000,"min": 0,"max": 12000},"cp": {"step": 0.5,"min": 0,"max": 2},"tsr": {"step": 5,"min": 0,"max": 30},"pitchAngle": {"step": 1,"min": -1,"max": 20},"activePower": {"step": 250,"min": 0,"max": 2000}}}}
 #需要特殊处理的图像设置属性
 graphSets.properties=dGeneratorSpeed,iGeneratorSpeed,dGeneratorTorque,iGeneratorTorque,cp,tsr,pitchAngle,activePower
 #scada数据筛选

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

@@ -80,6 +80,7 @@
         <if test="transferState != null">
             and transfer.transfer_state = #{transferState,jdbcType=INTEGER}
         </if>
+        order by transfer.update_time desc
     </select>
 
     <select id="selectByBatchCodeAndDataTransferType" parameterType="java.lang.String" resultType="com.energy.manage.common.po.datatransfer.DataTransferPo">
@@ -108,6 +109,7 @@
             field_code,
             transfer_type,
             transfer_addr,
+            transfer_state,
             time_granularity,
             create_by,
             update_by
@@ -117,9 +119,11 @@
             #{po.fieldCode,jdbcType=VARCHAR},
             #{po.transferType,jdbcType=VARCHAR},
             #{po.transferAddr,jdbcType=VARCHAR},
+            #{po.transferState,jdbcType=INTEGER},
             #{po.timeGranularity,jdbcType=INTEGER},
             #{po.createBy,jdbcType=INTEGER},
-            #{po.updateBy,jdbcType=INTEGER})
+            #{po.updateBy,jdbcType=INTEGER}
+            )
         </foreach>
     </insert>
 

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

@@ -14,7 +14,7 @@
     <sql id="Base_Sql">
         id,role_id,code_number,code_type,create_by,create_time,update_by,update_time
     </sql>
-    <select id="selectByRoleId" parameterType="java.lang.Integer" resultMap="resultMap">
+    <select id="selectByRoleId" parameterType="java.lang.Integer" resultType="com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo">
         select
             auth.code_number,
             auth.code_type,

energy-manage-service/src/main/resources/mybatis/windenginebatch/WindFieldBatchMapper.xml

@@ -82,7 +82,7 @@
         where batch_code = #{batchCode,jdbcType=VARCHAR}
     </update>
 
-    <select id="selectWindFieldBatch" parameterType="com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto" resultType="com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo">
+    <select id="selectWindFieldBatch" parameterType="com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto" resultType="com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo">
         select batch.batch_code,
                batch.batch_name,
                batch.field_name,
@@ -113,6 +113,7 @@
         <if test="endTime != null">
             and batch.create_time &lt;= #{endTime}
         </if>
+        order by batch.update_time desc
     </select>
 
     <select id="selectByBatchCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo">