代码重构

energy-manage-service/pom.xml

@@ -166,15 +166,21 @@
     <!-- 配置环境 -->
     <profiles>
         <profile>
-            <id>dev</id>
+            <id>datang</id>
             <properties>
-                <profiles.active>dev</profiles.active>
+                <profiles.active>datang</profiles.active>
             </properties>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
         <profile>
+            <id>dev</id>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+        </profile>
+        <profile>
             <id>show</id>
             <properties>
                 <profiles.active>show</profiles.active>

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

@@ -7,6 +7,7 @@ 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.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -19,6 +20,8 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableAspectJAutoProxy(exposeProxy = true)
 @EnableTransactionManagement
 @EnableAsync
+// com.energy.manage.common 中承载了与 energy-manage-healthcheck 共享的 CacheService 等组件
+@ComponentScan(basePackages = {"com.energy.manage.service", "com.energy.manage.common"})
 @ForestScan(basePackages = "com.energy.manage.service.client")
 @MapperScan(value = "com.energy.manage.service.mappers", markerInterface = MyMapper.class)
 @Slf4j

energy-manage-service/src/main/java/com/energy/manage/service/client/skf/DynamicMeasurementsClient.java

@@ -11,15 +11,19 @@ public interface DynamicMeasurementsClient {
 
 
     /**
-     * 获取skf DynamicMeasurementsClient
+     * 9.2 Spectrum/TWF Measurements —— GET v1/points/{pointId}/dynamicMeasurements
      *
-     * @return
+     * @param includeMeasurements 位掩码：1=时域波形、2=频谱幅值、4=相位谱、8=触发脉冲（默认 1）
+     * @param numReadings         单次最大返回条数，文档要求小于 1000（默认仅 100）
      */
     @Get(
             url = SkfClientConstants.SKF_REQUEST_PATH + SkfClientConstants.SKF_DM_PATH + "{1}/dynamicMeasurements"
     )
     List<DynamicMeasurementsVo> getSkfDynamicMeasurements(@Header("Authorization") String authorization, Integer pointId,
-                                                          @Query("fromDateUTC")String fromDateUTC, @Query("toDateUTC")String toDateUTC);
+                                                          @Query("fromDateUTC") String fromDateUTC,
+                                                          @Query("toDateUTC") String toDateUTC,
+                                                          @Query("includeMeasurements") Integer includeMeasurements,
+                                                          @Query("numReadings") Integer numReadings);
 
 
     @Get(

energy-manage-service/src/main/java/com/energy/manage/service/config/AnalysisTypeConfig.java

@@ -1,20 +0,0 @@
-package com.energy.manage.service.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author chy
- * @date 2024/7/31 15:38
- * @desc
- */
-@Data
-@Configuration
-@RefreshScope
-public class AnalysisTypeConfig {
-
-    @Value("${analysis.type.config}")
-    private String analysisTypeConfig;
-}

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

@@ -1,110 +0,0 @@
-package com.energy.manage.service.constant.analysis;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/31 09:46
- * @desc
- */
-public interface AnalysisConstants {
-
-    /**
-     * 分析类型父节点key属性名
-     */
-    String ANALYSIS_TYPE_PARRENT_KEY = "parentId";
-
-    /**
-     * 分析类型节点key属性名
-     */
-    String ANALYSIS_TYPE_KEY = "id";
-
-    /**
-     * 算法服务器数量
-     */
-     int SERVER_MERCHINE_COUNT = 3;
-
-    /**
-     * 自动分析标识
-     */
-    String AUTO_ANALYSIS = "automatic";
-
-    /**
-     * 手动分析标识
-     */
-    String MANUAL_ANALYSIS = "manual";
-
-    /**
-     * 分析类型中数据源属性名称
-     */
-    String SCADA = "scada";
-
-    /**
-     * 有功功率轴系设置
-     */
-    List<Double> ACTIVITY_POWER = Arrays.asList(250.0, 0.0,2000.0);
-
-    /**
-     * 路径分隔符
-     */
-    String PATH_SEPARATOR = "/";
-
-
-    /**
-     * 放置minio 文件下载的目录
-     */
-    String FILE_DIR = "file";
-
-
-    /**
-     * 放置minio 文件下载的目录
-     */
-    String ZIP_DIR = "zip";
-
-
-    /**
-     * 放置minio 文件下载的目录
-     */
-    String ZIP_SUFFIX = ".zip";
-
-
-    String IMAGE_SUFFIX = ".png";
-
-    /**
-     * 已执行状态/或开启状态
-     */
-    Integer ON_CALL = 1;
-
-    /**
-     * 自动分析标识
-     */
-    Integer ANALYSIS_AUTO = 1;
-
-    /**
-     * 分钟级
-     */
-    String MINUTE = "minute";
-
-    /**
-     * 秒级
-     */
-    String SECEND = "second";
-
-    /**
-     * 字符分隔符
-     */
-    String CHAR_SEPARATOR = "|";
-
-
-    /**
-     * 字符分隔符(转义符)
-     */
-    String CHAR_ESCAPE_SEPARATOR = "\\|";
-
-    /**
-     * 自动主题
-     */
-    String AUTO_ANALYSIS_NAME = "自动分析";
-
-}

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

@@ -1,31 +0,0 @@
-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/UploadController.java

@@ -1,115 +0,0 @@
-package com.energy.manage.service.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.energy.manage.common.reponse.RespMsg;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.config.annotations.PassToken;
-import com.energy.manage.service.controller.base.BaseServiceController;
-import com.energy.manage.service.util.MinioUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 上传模块
- */
-@Slf4j
-@RestController
-@RequestMapping(value = "/api/check")
-@CrossOrigin
-@Api(value = "UploadController", tags = "上传接口")
-public class UploadController extends BaseServiceController {
-
-  @Autowired
-  private MinioUtils minioUtils;
-
-  @PassToken
-  @RequestMapping(value = "/uploadMaterial", method = RequestMethod.POST)
-  @ApiOperation(value = "文件上传")
-  public ResultResp uploadMaterial(@RequestPart MultipartFile[] files) {
-    if (null == files || files.length == 0) {
-      return ResultResp.FAIL("请选择要上传的内容");
-    }
-    try {
-      List<String> list = minioUtils.upload(files);
-      if (CollectionUtils.isEmpty(list)) {
-        return ResultResp.FAIL("文件上传失败，请重试或联系管理员");
-      }
-      return ResultResp.SUCCESS(list);
-    } catch (Exception ex) {
-      log.error(ex.getMessage(), ex);
-    }
-    return ResultResp.FAIL("文件上传失败，请重试或联系管理员");
-  }
-
-  /**
-   * 单文件上传
-   *
-   * @param file
-   * @return
-   */
-  @PassToken
-  @RequestMapping(value = "/upload", method = RequestMethod.POST)
-  @ApiOperation(value = "单文件上传")
-  public JSONObject upload(@RequestPart MultipartFile file) {
-
-    if (null == file) {
-      return RespMsg.FAIL("请选择要上传的内容");
-    }
-    log.info("文件名称：===>" + file.getName());
-    log.info("文件大小：===>" + file.getSize());
-    String path = minioUtils.upload(file);
-    if (StringUtils.isEmpty(path)) {
-      return RespMsg.FAIL("文件上传失败，请重试或联系管理员");
-    }
-    return RespMsg.SUCCESS(path);
-  }
-
-  /**
-   * 内部方法，有序Map转list
-   *
-   * @param map
-   * @return
-   */
-  private List<String> sortMap2List(Map<Integer, String> map) {
-    if (CollectionUtils.isEmpty(map)) {
-      return Collections.EMPTY_LIST;
-    }
-    List<String> list = new ArrayList<>(map.size());
-    for (Integer item : map.keySet()) {
-      list.add(map.get(item));
-    }
-    return list;
-  }
-
-
-  /**
-   * 判断文件大小
-   *
-   * @param len  文件长度
-   * @param size 限制大小
-   *             //   * @param unit
-   *             限制单位（B,K,M,G）
-   * @return
-   */
-  private boolean checkFileSize(Long len, int size) {
-    double fileSize = (double) len / 1048576;
-    if (fileSize >= size) {
-      return false;
-    }
-    return true;
-  }
-
-
-}

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

@@ -1,195 +0,0 @@
-package com.energy.manage.service.controller.analysis;
-
-import com.energy.manage.common.base.Page;
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-import com.energy.manage.common.po.windfield.WindFieldPO;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.config.annotations.UserLoginToken;
-import com.energy.manage.service.constant.analysis.AnalysisConstants;
-import com.energy.manage.service.controller.base.BaseServiceController;
-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.AnalysisResultVo;
-import com.energy.manage.service.domain.vo.analysis.FieldAndAnalysisInfoVo;
-import com.energy.manage.service.service.analysis.AnalysisService;
-import com.energy.manage.service.util.IPUtils;
-import com.energy.manage.service.util.NetUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 分析
- * @author chy
- * @date 2024/5/23 12:57
- * @desc
- */
-@Api(value = "AnalysisController",tags = "分析")
-@Slf4j
-@RestController
-@RequestMapping("/analysis")
-public class AnalysisController extends BaseServiceController {
-
-    @Autowired
-    private AnalysisService analysisService;
-
-
-    @UserLoginToken
-    @ApiOperation(value = "分析结果列表")
-    @GetMapping("/analysisResultList")
-    public ResultResp<Page<AnalysisResultVo>> analysisResultList(HttpServletRequest request,AnalysisResultDto analysisResultDto)
-    {
-        analysisResultDto.setRoleId(getRoleId());
-        boolean isIntranet = NetUtils.isIntranet(IPUtils.getIpAddr(request));
-        return pageResult(analysisService.analysisResultList(analysisResultDto,isIntranet),analysisResultDto);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "分析结果风场列表")
-    @GetMapping("/analysisResulFieldList")
-    public ResultResp<Page<WindFieldPO>> analysisResulFieldList(AnalysisResultDto analysisResultDto)
-    {
-        analysisResultDto.setRoleId(getRoleId());
-        return success(analysisService.analysisResulFieldList(analysisResultDto));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "风场下所有的分析编号")
-    @GetMapping("/analysisResultListByFieldCode")
-    public ResultResp<List<AnalysisResultVo>> analysisResultListByAnalysisCode(@RequestParam(value = "fieldCode") String fieldCode)
-    {
-        return success(analysisService.analysisResultListByAnalysisCode(fieldCode));
-    }
-
-
-    @UserLoginToken
-    @ApiOperation(value = "增加分析")
-    @PostMapping("/addAnalysisResult")
-    public ResultResp addAnalysisResult(@RequestBody AnalysisResultPo analysisResultPo)
-    {
-        Integer loginUserId = getUserId();
-        analysisResultPo.setCreateBy(loginUserId).setUpdateBy(loginUserId);
-        return success(analysisService.addAnalysisResult(analysisResultPo));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "手动分析触发")
-    @PostMapping("/analysis")
-    public ResultResp analysis(@Valid @RequestBody AnalysisDto analysisto)
-    {
-        //设置为手动分析
-        analysisto.setAutoOrManual(AnalysisConstants.MANUAL_ANALYSIS);
-        analysisto.setUpdateBy(getLoginUser().getUserId());
-        return analysisService.analysis(analysisto);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "分析编辑查询")
-    @GetMapping("/analysisEditQuery")
-    public ResultResp analysisEditQuery(@RequestParam("batchCode") String batchCode)
-    {
-        return success(analysisService.analysisEditQuery(batchCode));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "分析详情")
-    @GetMapping("/analysisDetail")
-    public ResultResp analysisDetail(@RequestParam("batchCode") String batchCode,
-                                     @RequestParam(value = "analysisTypeCode",required = false) String analysisTypeCode,
-                                     @RequestParam(value = "fieldEngineCodes",required = false) List<String> fieldEngineCodes,
-                                     HttpServletRequest request)
-    {
-        //判断是否是内网
-        boolean isIntranet = NetUtils.isIntranet(IPUtils.getIpAddr(request));
-        return success(analysisService.analysisDetail(batchCode,analysisTypeCode,fieldEngineCodes,isIntranet));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "开启/关闭自动分析")
-    @PostMapping("/onOffAutoAnalysis")
-    public ResultResp onOffAutoAnalysis(@RequestParam(value = "batchCode") String batchCode,
-                                        @RequestParam(value = "onOffCall") Integer onOffCall)
-    {
-        return success(analysisService.onOffAutoAnalysis(batchCode,onOffCall));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "根据批次查询已分析的分析类型")
-    @GetMapping("/queryAnalysisedType")
-    public ResultResp queryAnalysisedType(@RequestParam(value = "batchCode") String batchCode)
-    {
-        return success(analysisService.queryAnalysisedType(batchCode));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "查询所有分析类型")
-    @GetMapping("/queryAllAnalysisType")
-    public ResultResp queryAllAnalysisType()
-    {
-        return success(analysisService.queryAllAnalysisType());
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "根据批次与分析类型查询已有分析结果的风机")
-    @GetMapping("/queryAnalysisedEngine")
-    public ResultResp queryAnalysisedEngine(@RequestParam(value = "batchCode") String batchCode,
-                                            @RequestParam(value = "analysisTypeCode") String analysisTypeCode)
-    {
-        return success(analysisService.queryAnalysisedEngine(batchCode,analysisTypeCode));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "分析类型结果图配置接口")
-    @GetMapping("/queryAnalysisTypeConfig")
-    public ResultResp queryAnalysisTypeConfig()
-    {
-        return success(analysisService.queryAnalysisTypeConfig());
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "根据角色获取风场及分析编号信息")
-    @GetMapping("/getAnalysisCodeInfo")
-    public ResultResp<List<String>> getAnalysisCodeInfo()
-    {
-        Integer roleId = getRoleId();
-        return success(analysisService.getAnalysisCodeInfo(roleId));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "当前批次风场及分析信息")
-    @GetMapping("/getFieldInfo")
-    public ResultResp<FieldAndAnalysisInfoVo> getFieldInfo(@RequestParam String batchCode)
-    {
-        return success(analysisService.getFieldInfo(batchCode));
-    }
-
-
-
-    @UserLoginToken
-    @ApiOperation(value = "全部文件下载查询接口")
-    @GetMapping("/queryDownloadFile")
-    public ResultResp<List<String>> queryDownloadFile(@RequestParam(value = "fieldCode") String fieldCode,
-                                                      @RequestParam("batchCode") String batchCode)
-    {
-        return success(analysisService.queryDownloadFile(fieldCode,batchCode));
-    }
-
-
-    @UserLoginToken
-    @ApiOperation(value = "文件下载")
-    @PostMapping("/downloadFile")
-    public ResultResp downloadFile(@RequestParam(value = "fieldCode") String fieldCode,
-                             @RequestParam("batchCode") String batchCode,
-                             @RequestParam(value = "analysisTypeCode",required = false) String analysisTypeCode,
-                             HttpServletResponse response)
-    {
-        return analysisService.downloadFile(fieldCode,batchCode,analysisTypeCode,response);
-    }
-}

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

@@ -1,69 +0,0 @@
-package com.energy.manage.service.controller.analysis;
-
-import com.energy.manage.common.base.Page;
-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.analysis.AutoAnalysisConfigDetailDto;
-import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
-import com.energy.manage.service.service.analysis.AutoAnalysisService;
-import com.energy.manage.service.service.autoanalysisconfig.AutoAnalysisConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author chy
- * @date 2025/3/27 09:05
- * @desc 自动分析配置
- */
-@Api(value = "AutoAnalysisConfigController",tags = "自动分析配置")
-@RestController
-@RequestMapping("/autoAnalysis")
-public class AutoAnalysisConfigController extends BaseServiceController {
-
-    @Autowired
-    private AutoAnalysisConfigService autoAnalysisConfigService;
-
-
-    @ApiOperation(value = "自动分析配置列表")
-    @UserLoginToken
-    @GetMapping("/configList")
-    public ResultResp<Page<AutoAnalysisConfigDetailVo>> configList(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
-        return pageResult(autoAnalysisConfigService.configList(autoAnalysisConfigDetailDto),autoAnalysisConfigDetailDto);
-    }
-
-    @ApiOperation(value = "增加配置")
-    @UserLoginToken
-    @PostMapping("/configSave")
-    public ResultResp configSave(@RequestBody AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
-        return autoAnalysisConfigService.configSave(autoAnalysisConfigDetailDto);
-    }
-
-
-    @ApiOperation(value = "编辑配置")
-    @UserLoginToken
-    @PostMapping("/configEdit")
-    public ResultResp configEdit(@RequestBody AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
-        return autoAnalysisConfigService.configEdit(autoAnalysisConfigDetailDto);
-    }
-
-    @ApiOperation(value = "开启/关停自动分析")
-    @UserLoginToken
-    @PostMapping("/onOff")
-    public ResultResp onOff(@RequestBody AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
-        return autoAnalysisConfigService.onOff(autoAnalysisConfigDetailDto);
-    }
-
-    @Autowired
-    private AutoAnalysisService autoAnalysisService;
-
-    @ApiOperation(value = "自动分析测试")
-    @UserLoginToken
-    @PostMapping("/testAutoAnalysis")
-    public ResultResp autoAnalysis() {
-        autoAnalysisService.autoAnalysis();
-        return success();
-    }
-}

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

@@ -1,76 +0,0 @@
-package com.energy.manage.service.controller.analysiscomment;
-
-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.analysis.AnalysisCommentDescriptionDto;
-import com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo;
-import com.energy.manage.service.service.analysiscomment.AnalysisCommentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author chy
- * @date 2024/5/24 17:09
- * @desc
- */
-@Api(value = "AnalysisCommentController",tags = "富文本")
-@Slf4j
-@RestController
-@RequestMapping("/analysisComment")
-public class AnalysisCommentController extends BaseServiceController {
-
-    @Autowired
-    private AnalysisCommentService analysisCommentService;
-
-    @UserLoginToken
-    @ApiOperation(value = "富文本类型查询")
-    @GetMapping("/analysisCommentTypeList")
-    public ResultResp analysisCommentTypeList(@RequestParam(name = "batchCode") String batchCode,
-                                              @RequestParam(name = "analysisTypeCode") String analysisTypeCode)
-    {
-        return success(analysisCommentService.analysisCommentTypeList(batchCode,analysisTypeCode));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "评论查询")
-    @GetMapping("/analysisCommentDescList")
-    public ResultResp<AnalysisCommentDescriptionVo> analysisCommentDescList(@RequestParam(name = "batchCode", required = false) String batchCode,
-                                                                            @RequestParam(name = "analysisTypeCode", required = false) String analysisTypeCode)
-    {
-        return success(analysisCommentService.analysisCommentDescList(batchCode,analysisTypeCode));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "富文本类型添加")
-    @PostMapping("/addAnalysisCommentType")
-    public ResultResp addAnalysisCommentType(@RequestBody AnalysisCommentTypeRelationDto typeRelationDto)
-    {
-        typeRelationDto.setCreateBy(getUserId());
-        return analysisCommentService.addAnalysisCommentType(typeRelationDto);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "富文本类型删除")
-    @PostMapping("/delAnalysisCommentType")
-    public ResultResp delAnalysisCommentType(@RequestParam("commentTypeCode") String commentTypeCode)
-    {
-        return analysisCommentService.delAnalysisCommentType(commentTypeCode);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "富文本编辑")
-    @PostMapping("/analysisCommentEdit")
-    public ResultResp analysisCommentEdit(@RequestBody AnalysisCommentDescriptionDto commentDescriptionDto)
-    {
-        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/analysiserr/AnalysisErrController.java

@@ -1,74 +0,0 @@
-package com.energy.manage.service.controller.analysiserr;
-
-import com.energy.manage.common.base.Page;
-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.windexceptioncount.WindExceptionCountDto;
-import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
-import com.energy.manage.service.service.analysiserr.AnalysisErrService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 分析结果异常数统计
- * @author chy
- * @date 2024/5/23 17:22
- * @desc
- */
-@Api(value = "AnalysisErrController",tags = "分析结果异常数统计")
-@RestController
-@RequestMapping("/analysisErr")
-public class AnalysisErrController extends BaseServiceController {
-
-    @Autowired
-    private AnalysisErrService analysisErrService;
-
-    @UserLoginToken
-    @ApiOperation(value = "异常查询")
-    @GetMapping("/analysisErrQuery")
-    public ResultResp<Page<WindExceptionCountVo>> analysisErrQuery(WindExceptionCountDto windExceptionCountDto)
-    {
-        return pageResult(analysisErrService.analysisErrQuery(windExceptionCountDto),windExceptionCountDto);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "异常添加")
-    @PostMapping("/analysisErrAdd")
-    public ResultResp analysisErrAdd(@RequestBody WindExceptionCountDto windExceptionCountDto)
-    {
-        Integer loginUserId = getUserId();
-        windExceptionCountDto.setCreateBy(loginUserId);
-        windExceptionCountDto.setUpdateBy(loginUserId);
-        return analysisErrService.analysisErrAdd(windExceptionCountDto);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "异常编辑")
-    @PostMapping("/analysisErrEdit")
-    public ResultResp analysisErrEdit(@RequestBody WindExceptionCountDto windExceptionCountDto)
-    {
-        windExceptionCountDto.setUpdateBy(getUserId());
-        return success(analysisErrService.analysisErrEdit(windExceptionCountDto));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "异常删除")
-    @PostMapping("/analysisErrDel")
-    public ResultResp analysisErrDel(@RequestBody WindExceptionCountDto windExceptionCountDto)
-    {
-        windExceptionCountDto.setUpdateBy(getUserId());
-        return success(analysisErrService.analysisErrDel(windExceptionCountDto));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "查询风机异常信息")
-    @GetMapping("/queryErrDescByEngine")
-    public ResultResp queryErrDescByEngine(@RequestParam(name = "batchCode") String batchCode,
-                                           @RequestParam(name = "engineCode") String engineCode)
-    {
-        return success(analysisErrService.queryErrDescByEngine(batchCode,engineCode));
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysispriority/AnalysisPriorityController.java

@@ -1,39 +0,0 @@
-package com.energy.manage.service.controller.analysispriority;
-
-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.service.analysispriority.AnalysisPriorityService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author chy
- * @date 2025/2/12 15:35
- * @desc
- */
-@Api(value = "AnalysisPriorityController",tags = "分析优先级")
-@Slf4j
-@RestController
-@RequestMapping("/analysisPriority")
-public class AnalysisPriorityController extends BaseServiceController {
-
-    @Autowired
-    private AnalysisPriorityService analysisPriorityService;
-
-
-    @UserLoginToken
-    @ApiOperation(value = "插队")
-    @PostMapping("/editPriority")
-    public ResultResp editPriority(@RequestParam(value = "batchCode") String batchCode,
-                                   @RequestParam(value = "priority") Integer priority)
-    {
-        return success(analysisPriorityService.editPriority(batchCode,priority));
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysisresultreport/AnalysisResultReportController.java

@@ -1,46 +0,0 @@
-package com.energy.manage.service.controller.analysisresultreport;
-
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.controller.base.BaseServiceController;
-import com.energy.manage.service.domain.vo.analysis.AnalysisResultReportVo;
-import com.energy.manage.service.service.analysis.AnalysisResultReportService;
-import com.energy.manage.service.util.IPUtils;
-import com.energy.manage.service.util.NetUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/9/20 18:17
- * @desc
- */
-@RestController
-@RequestMapping("/analysisResultReport")
-public class AnalysisResultReportController extends BaseServiceController {
-
-
-    @Autowired
-    private AnalysisResultReportService analysisResultReportService;
-
-    /**
-     * 批量添加保存报告
-     * @param reportVoList
-     * @return
-     */
-    @PostMapping("/saveReportBatch")
-    public ResultResp saveReportBatch(@RequestBody List<AnalysisResultReportVo> reportVoList)
-    {
-        return success(analysisResultReportService.saveReportBatch(reportVoList));
-    }
-
-    @GetMapping("/getRportType")
-    public ResultResp getRportType(HttpServletRequest request)
-    {
-        boolean isIntranet = NetUtils.isIntranet(IPUtils.getIpAddr(request));
-        return success(analysisResultReportService.getRportType(isIntranet));
-    }
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/chartsdata/CreateChartsDataController.java

@@ -1,38 +0,0 @@
-package com.energy.manage.service.controller.chartsdata;
-
-import com.energy.manage.common.base.Page;
-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.analysis.PlotlyDataItem;
-import com.energy.manage.service.service.chartsdata.ChartsDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author chy
- * @date 2024/8/15 09:31
- * @desc
- */
-@RestController
-@RequestMapping("/createChartsData")
-public class CreateChartsDataController extends BaseServiceController {
-
-    @Autowired
-    private ChartsDataService chartsDataService;
-
-    @UserLoginToken
-    @GetMapping("/getChartsData")
-    public ResultResp<Page<PlotlyDataItem>> getChartsData(Integer pageNum) {
-        return success(chartsDataService.queryChartsData(pageNum));
-
-    }
-
-    @UserLoginToken
-    @GetMapping("/getCharstDataCount")
-    public ResultResp getChartsDataCount() {
-        return success(chartsDataService.getChartsDataCount());
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/datatransfer/DataTransferController.java

@@ -1,86 +0,0 @@
-package com.energy.manage.service.controller.datatransfer;
-
-import com.energy.manage.common.base.Page;
-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.datatransfer.DataTransferDto;
-import com.energy.manage.service.domain.dto.datatransfer.EditDataTransferTypeDto;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferBatchShortVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
-import com.energy.manage.service.service.datatransfer.DataTransferService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 数据转换模块儿
- * @author chy
- * @date 2024/5/20 10:17
- * @desc
- */
-@Slf4j
-@Api(value = "DataTransferController",tags = "数据转换")
-@RestController
-@RequestMapping("/dataTransfer")
-public class DataTransferController extends BaseServiceController {
-
-    @Autowired
-    private DataTransferService dataTransferService;
-
-
-    @UserLoginToken
-    @ApiOperation(value = "查询可以数据转换批次")
-    @GetMapping("/fieldBatchListForDataTransfer")
-    public ResultResp fieldBatchListForDataTransfer(){
-        return success(dataTransferService.fieldBatchListForDataTransfer(getRoleId()));
-    }
-
-    @UserLoginToken
-    @ApiOperation("查询转换数据组")
-    @GetMapping("/queryDataTransferGroup")
-    public ResultResp<Page<DataTransferBatchShortVo>> queryDataTransferGroup(DataTransferDto dataTransferDto){
-        dataTransferDto.setRoleId(getRoleId());
-        return pageResult(dataTransferService.queryDataTransferGroup(dataTransferDto),dataTransferDto);
-    }
-
-    @UserLoginToken
-    @ApiOperation("查询批次下数据转换信息")
-    @GetMapping("/queryDataTransferByBatchCode")
-    public ResultResp queryDataTransferByBatchCode(@RequestParam("batchCode") String batchCode){
-        return success(dataTransferService.queryDataTransferByBatchCode(batchCode));
-    }
-
-
-    @UserLoginToken
-    @ApiOperation("新增数据转换")
-    @PostMapping("/addDataTransferList")
-    public ResultResp addDataTransferList(@RequestBody DataTransferDto dataTransferDto){
-        dataTransferDto.setRoleId(getRoleId());
-        dataTransferDto.setUserId(getUserId());
-        return dataTransferService.addDataTransfer(dataTransferDto);
-    }
-
-    @UserLoginToken
-    @ApiOperation("转换/重新转换")
-    @PostMapping("/dataTransfer")
-    public ResultResp dataTransfer(@RequestBody EditDataTransferTypeDto editDto){
-        return dataTransferService.dataTransfer(editDto, getUserId());
-    }
-
-    @UserLoginToken
-    @ApiOperation("时间粒度编辑")
-    @PostMapping("/editTimeGranularity")
-    public ResultResp editTimeGranularity(@RequestBody EditDataTransferTypeDto editDto){
-        return dataTransferService.editTimeGranularity(editDto.getBatchCode(), editDto.getDataTransferType(), editDto.getTimeGranularity(),getUserId());
-    }
-
-    @UserLoginToken
-    @ApiOperation("转换数据时间范围查询")
-    @GetMapping("/queryDataTime")
-    public ResultResp queryDataTime(@RequestParam("batchCode") String batchCode, @RequestParam("dataTransferType") String dataTransferType){
-        return success(dataTransferService.queryDataTime(batchCode, dataTransferType));
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/datatransfertype/DataTransferTypeController.java

@@ -1,40 +0,0 @@
-package com.energy.manage.service.controller.datatransfertype;
-
-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.vo.datatransfer.DataTransferTypeVo;
-import com.energy.manage.service.service.datatransfertype.DataTransferTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2025/1/7 10:46
- * @desc
- */
-@Slf4j
-@Api(value = "DataTransferTypeController",tags = "数据转换类型")
-@RestController
-@RequestMapping("/dataTransferType")
-public class DataTransferTypeController extends BaseServiceController {
-
-    @Autowired
-    private DataTransferTypeService dataTransferTypeService;
-
-
-    @ApiOperation(value = "查询可以数据转换批次")
-    @UserLoginToken
-    @GetMapping("/queryAllType")
-    public ResultResp<List<DataTransferTypeVo>> queryAllType()
-    {
-        return success(dataTransferTypeService.queryAllType());
-    }
-}

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

@@ -1,92 +0,0 @@
-package com.energy.manage.service.controller.homepage;
-
-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.vo.homepage.WaitTaskVo;
-import com.energy.manage.service.service.homepage.HomePageService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author chy
- * @date 2024/6/13 13:52
- * @desc
- */
-@Api(value = "HomePageController",tags = "首页查询")
-@RestController
-@RequestMapping("/homePage")
-public class HomePageController extends BaseServiceController {
-
-    @Autowired
-    private HomePageService homePageService;
-
-    @ApiOperation("驾驶舱首页查询")
-    @UserLoginToken
-    @GetMapping("/queryStatistics")
-    public ResultResp queryStatistics(@RequestParam("codeNumber") String codeNumber,
-                            @RequestParam("codeType") String codeType,
-                            @RequestParam("startTime") String startTime,
-                            @RequestParam("endTime") String endTime){
-        return success(homePageService.queryStatistics(getRoleId(), codeNumber, codeType,startTime,endTime));
-    }
-
-
-    @ApiOperation("驾驶舱首页查询操作记录")
-    @UserLoginToken
-    @GetMapping("/queryOptionRecords")
-    public ResultResp queryOptionRecords(@RequestParam("codeNumber") String codeNumber,
-                            @RequestParam("codeType") String codeType,
-                            @RequestParam(value = "startTime",required = false) String startTime,
-                            @RequestParam(value = "endTime",required = false) String endTime){
-        return success(homePageService.queryOptionRecords(getRoleId(), codeNumber, codeType,startTime,endTime));
-    }
-
-    @ApiOperation("风机悬浮窗信息")
-    @UserLoginToken
-    @GetMapping("/queryFloatingWindowInfo")
-    public ResultResp queryFloatingWindowInfo(@RequestParam(value = "batchCode", required = false) String batchCode,
-                                              @RequestParam("fieldCode") String fieldCode){
-        return success(homePageService.queryFloatingWindowInfo(batchCode,fieldCode));
-    }
-
-
-    @ApiOperation("待办任务")
-    @UserLoginToken
-    @GetMapping("/queryWaitTask")
-    public ResultResp<WaitTaskVo> queryWaitTask(){
-        return success(homePageService.getWaitTask(getRoleId()));
-    }
-
-
-    @ApiOperation("未关联数据集合")
-    @UserLoginToken
-    @GetMapping("/getAnalysisResultStateList")
-    @Deprecated
-    public ResultResp getAnalysisResultStateList(){
-        return success(homePageService.getAnalysisResultStateList(getRoleId()));
-    }
-
-    @ApiOperation("分析异常数集合")
-    @UserLoginToken
-    @GetMapping("/getAnalysisResultErrStateList")
-    @Deprecated
-    public ResultResp getAnalysisResultErrStateList(){
-        return success(homePageService.getAnalysisResultErrStateList(getRoleId()));
-    }
-
-
-
-
-
-
-
-
-
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysTestController.java

@@ -1,96 +0,0 @@
-package com.energy.manage.service.controller.system;
-
-import cn.hutool.core.io.FileUtil;
-import com.alibaba.excel.EasyExcel;
-import com.energy.manage.service.config.annotations.PassToken;
-import com.energy.manage.service.domain.vo.excel.MinTestDataVo;
-import com.energy.manage.service.service.kafka.producer.KafkaSendService;
-import com.energy.manage.service.service.vibration.VibrationService;
-import com.energy.manage.service.util.BatchDownloadUtil;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.File;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-
-/**
- * 测试kafka消息
- *
- * @author sy
- * @date 2021-10-18 13:32:05
- */
-@Slf4j
-@RestController
-@RequestMapping("SysTestController")
-@CrossOrigin
-@Api(value = "SysTestController", tags = "测试Controller")
-public class SysTestController {
-
-    @Autowired
-    private BatchDownloadUtil batchDownloadUtil;
-
-    @Autowired
-    private VibrationService vibrationService;
-
-    // 定义时间格式
-    private final String dateTimeFormatter = "yyyyMMdd";
-
-//	@Autowired
-//	private KafkaSendService kafkaSendService;
-//
-//	@GetMapping("/topic-abc-test")
-//	public void abc() {
-//		// 发送消息
-//		kafkaSendService.sendMessage("abc", "abc kafka");
-//	}
-//
-//
-//	@GetMapping("/topic-test-test")
-//	public void test() {
-//		// 发送消息
-//		kafkaSendService.sendMessage("test", "test kafka");
-//	}
-    @PassToken
-    @GetMapping("minio-test-d")
-	public void minioTestd() {
-		// 发送消息
-       String value =  batchDownloadUtil.backResourceAddress("wof085500002","WOF085500002-WOB00002/");
-       System.out.println(value);
-	}
-
-
-
-    @PassToken
-	@GetMapping("/vibrationData")
-	public void vibrationData() {
-
-//        vibrationService.extractSkfPointData();
-
-        String yesterdayDate = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(dateTimeFormatter));
-
-
-//        vibrationService.extracTwindGeneratorSkfPointData(yesterdayDate);
-
-//        vibrationService.extracTwindGeneratorSkfMachinePart(yesterdayDate);
-
-        vibrationService.extracTwindGeneratorSkfPointData(yesterdayDate);
-	}
-
-
-
-
-
-
-
-
-
-
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/wavedatatransfer/WaveDatatransferController.java

@@ -1,60 +0,0 @@
-package com.energy.manage.service.controller.wavedatatransfer;
-
-import com.energy.manage.common.base.Page;
-import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.controller.base.BaseServiceController;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
-import com.energy.manage.service.service.wavedatatransfer.WaveDatatransferServce;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author chy
- * @date 2024/11/7 16:08
- * @desc
- */
-@Api(value = "WaveDatatransferController", tags = "振动数据转换")
-@RestController
-@RequestMapping("/waveDataTransfer")
-public class WaveDatatransferController extends BaseServiceController {
-
-    @Autowired
-    private WaveDatatransferServce waveDatatransferServce;
-
-
-    @ApiOperation(value = "振动/激光数据转换查询列表")
-    @GetMapping("/queryDataTransfer")
-    public ResultResp<Page<WaveDataTransferVo>> queryDataTransfer(WaveDataTransferDto waveDatatransferDto) {
-        return pageResult(waveDatatransferServce.queryDataTransfer(waveDatatransferDto), waveDatatransferDto);
-    }
-
-    @Deprecated
-    @ApiOperation(value = "新增振动/激光数据转换查重")
-    @GetMapping("/beforAddDataTransferQuery")
-    public ResultResp beforAddDataTransferQuery(WaveDataTransferDto waveDatatransferDto) {
-        return success(waveDatatransferServce.beforAddDataTransferQuery(waveDatatransferDto));
-    }
-
-    @ApiOperation(value = "新增振动/激光数据转换")
-    @PostMapping("/addDataTransfer")
-    public ResultResp addDataTransfer(@RequestBody WaveDataTransferPo waveDatatransferPo) {
-        return success(waveDatatransferServce.addDataTransfer(waveDatatransferPo, getUserId()));
-    }
-
-    @Deprecated
-    @ApiOperation(value = "编辑振动数据转换")
-    @PostMapping("/editDataTransfer")
-    public ResultResp editDataTransfer(@RequestBody WaveDataTransferPo waveDatatransferPo) {
-        return success(waveDatatransferServce.editDataTransfer(waveDatatransferPo, getUserId()));
-    }
-
-    @ApiOperation(value = "转换/重新转换")
-    @PostMapping("/dataTransfer")
-    public ResultResp dataTransfer(@RequestBody WaveDataTransferDto waveDatatransferDto) {
-        return success(waveDatatransferServce.dataTransfer(waveDatatransferDto));
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/controller/wavedic/WaveDicController.java

@@ -1,35 +0,0 @@
-package com.energy.manage.service.controller.wavedic;
-
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.controller.base.BaseServiceController;
-import com.energy.manage.service.service.wavedic.WaveDicService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/11/21 09:24
- * @desc
- */
-@RestController
-@RequestMapping("/waveDic")
-public class WaveDicController extends BaseServiceController {
-
-    @Autowired
-    private WaveDicService waveDicService;
-
-    /**
-     * 查询测点字典
-     * @param engineCodes
-     * @return
-     */
-    @GetMapping("/queryDetectionDic")
-    public ResultResp queryWaveDic(@RequestParam List<String> engineCodes){
-        return success(waveDicService.queryWaveDic(engineCodes));
-    }
-}

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

@@ -1,88 +0,0 @@
-package com.energy.manage.service.controller.windfieldbatch;
-
-import com.energy.manage.common.base.Page;
-import com.energy.manage.common.reponse.ConstVar;
-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 com.energy.manage.service.util.IPUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author chy
- * @date 2024/5/20 17:32
- * @desc
- */
-@Slf4j
-@Api(value = "WindFieldBatchController", tags = "风场批次管理")
-@RestController
-@RequestMapping("/windEnginBatch")
-public class WindFieldBatchController extends BaseServiceController {
-
-    @Autowired
-    private WindFieldBatchService windFieldBatchService;
-
-    @UserLoginToken
-    @ApiOperation(value = "风场批次信息列表")
-    @GetMapping("/batchList")
-    public ResultResp<Page<WindFieldBatchVo>> batchList(WindFileBatchPageDto windFieldBatchPageDto){
-        windFieldBatchPageDto.setRoleId(getRoleId());
-        return pageResult(windFieldBatchService.queryWindFieldBatch(windFieldBatchPageDto), windFieldBatchPageDto);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "添加风场批次")
-    @PostMapping("/addFieldBatch")
-    public ResultResp addFieldBatch(@RequestBody WindFieldBatchDto windFieldBatchDto){
-        Integer loginUserId = getUserId();
-        windFieldBatchDto.setCreateBy(loginUserId);
-        windFieldBatchDto.setUpdateBy(loginUserId);
-        int result = windFieldBatchService.addWindFieldBatch(windFieldBatchDto);
-        if (result == -1) {
-            return ResultResp.FAIL(ConstVar.EXSIT_BATCH_NAME);
-        }
-        return result == -1 ? ResultResp.FAIL(ConstVar.EXSIT_BATCH_NAME) : success(result);
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "编辑风场批次")
-    @PostMapping("/updateFieldBatch")
-    public ResultResp updateFieldBatch(@RequestBody WindFieldBatchDto windFieldBatchDto){
-        windFieldBatchDto.setUpdateBy(getUserId());
-        return success(windFieldBatchService.updateWindFieldBatch(windFieldBatchDto));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "启用/停用风场批次")
-    @PostMapping("/onOrOffFieldBatch")
-    public ResultResp onOrOffFieldBatch(@RequestBody WindFieldBatchDto windFieldBatchDto){
-        windFieldBatchDto.setUpdateBy(getUserId());
-        return success(windFieldBatchService.onOrOffFieldBatch(windFieldBatchDto));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "删除风场批次")
-    @PostMapping("/deleteFieldBatch")
-    public ResultResp deleteFieldBatch(@RequestBody WindFieldBatchDto windFieldBatchDto){
-        windFieldBatchDto.setUpdateBy(getUserId());
-        return success(windFieldBatchService.deleteWindFieldBatch(windFieldBatchDto));
-    }
-
-    @UserLoginToken
-    @ApiOperation(value = "生成批次名称")
-    @PostMapping("/createBatchName")
-    public ResultResp createBatchName(@RequestParam String fieldName){
-        return success(windFieldBatchService.createBatchName(fieldName));
-    }
-
-}

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

@@ -1,53 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisCommentDescriptionPo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/23 13:04
- * @desc
- */
-@Repository
-public interface AnalysisCommentDescriptionMapper extends MyMapper<AnalysisCommentDescriptionPo> {
-
-
-    /**
-     * 根据条件查询评论数（批次 + 分析类型 + 文本类型编号）
-     * @param batchCode
-     * @param analysisTypeCode
-     * @param commentTypeCode
-     * @return
-     */
-   int selectCountByAllCode(@Param("batchCode") String batchCode,@Param("analysisTypeCode") String analysisTypeCode,@Param("commentTypeCode") String commentTypeCode);
-
-
-    /**
-     * 根据条件查询评论数（批次 + 分析类型）
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    List<AnalysisCommentDescriptionVo> selecByBatchCodeAndAnalysisTypeCode(@Param("batchCode") String batchCode, @Param("analysisTypeCode") String analysisTypeCode);
-
-    /**
-     *  新增
-     * @param commentDescriptionPo
-     * @return
-     */
-   int insertPoSelective(AnalysisCommentDescriptionPo commentDescriptionPo);
-
-    /**
-     * 更新
-     * @param commentDescriptionPo
-     * @return
-     */
-   int updatePoSelective(AnalysisCommentDescriptionPo commentDescriptionPo);
-
-
-}

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

@@ -1,51 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisCommentTypeRelationPo;
-import com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisCommentTypeRelationVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/23 13:05
- * @desc
- */
-@Repository
-public interface AnalysisCommentTypeRelationMapper extends MyMapper<AnalysisCommentTypeRelationPo> {
-
-    /**
-     * 根据批次号与分析类型查询
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    List<AnalysisCommentTypeRelationVo> selectByAnalysisTypeCode(@Param("batchCode") String batchCode,
-                                                                 @Param("analysisTypeCode") String analysisTypeCode);
-
-    /**
-     * 根据typeCode 查询信息
-     * @param commentTypeCode
-     * @return
-     */
-    AnalysisCommentTypeRelationVo selectByTypeCode(@Param("commentTypeCode") String commentTypeCode);
-
-    /**
-     * 新增富文本类型
-     * @param analysisCommentTypeRelationDto
-     * @return
-     */
-    int insertPoSelective(AnalysisCommentTypeRelationDto analysisCommentTypeRelationDto);
-
-
-    /**
-     * 删除自定义评论类型
-     * @param commentTypeCode
-     * @return
-     */
-    int deleteByTypeCode(String commentTypeCode);
-
-}

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

@@ -1,32 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisDiagramRelationPo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisDiagramRelationVo;
-import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupShortVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author chy
- * @date 2024/5/23 16:41
- * @desc
- */
-@Repository
-public interface AnalysisDiagramRelationMapper extends MyMapper<AnalysisDiagramRelationPo>{
-
-
-    List<AnalysisDiagramRelationVo> selectByCondition(@Param("batchCode") String batchCode,
-                                                      @Param("analysisTypeCode") String analysisTypeCode,
-                                                      @Param("fieldEngineCode") List<String> fieldEngineCode);
-
-
-    List<AnalysisDiagramRelationVo> selectByBatchCode(@Param("batchCode") String batchCode);
-
-
-    Set<WindEngineGroupShortVo> selectByBatchCodeAndAnalysisTypeCode(@Param("batchCode") String batchCode,
-                                                                         @Param("analysisTypeCode") String analysisTypeCode);
-}

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

@@ -1,34 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisGeneralFilePo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisGeneralFileVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/23 13:04
- * @desc
- */
-@Repository
-public interface AnalysisGeneralFileMapper extends MyMapper<AnalysisGeneralFilePo> {
-
-    /**
-     * 根据批次号与分型类型编号查询通用文件
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    List<AnalysisGeneralFileVo> selectByCondition(@Param("batchCode") String batchCode, @Param("analysisTypeCode") String analysisTypeCode);
-
-    /**
-     * 查询分析类型，名称
-     * @param batchCode
-     * @return
-     */
-    List<AnalysisGeneralFileVo> selectByBatchCode(@Param("batchCode") String batchCode);
-
-}

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

@@ -1,23 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/6/15 14:15
- * @desc
- */
-@Repository
-public interface AnalysisOptionRecordsMapper extends MyMapper<AnalysisOptionRecordsPo> {
-
-
-    List<AnalysisOptionRecordsVo> selectAllByTimeDesc(@Param("fieldCodes") List<String> fieldCodes,
-                                                      @Param("startTime") String startTime,
-                                                      @Param("endTime") String endTime);
-}

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

@@ -1,111 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-import com.energy.manage.common.po.windfield.WindFieldPO;
-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;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/23 13:03
- * @desc
- */
-@Repository
-public interface AnalysisResultMapper extends MyMapper<AnalysisResultPo> {
-
-    /**
-     * 查询分析结果
-     * @param analysisResultDto
-     * @return
-     */
-    List<AnalysisResultVo> selectByCondition(AnalysisResultDto analysisResultDto);
-
-
-    /**
-     * 根据风场编号查询分析结果
-     * @param fieldCode
-     * @return
-     */
-    List<AnalysisResultVo> selectByFieldCode(@Param("fieldCode") String fieldCode);
-
-
-    /**
-     * 查询分析中的数据量
-     * @return
-     */
-    int selectAlasisingCount();
-
-    /**
-     * 查询风场最新批次的分析结果
-     * @param fieldCodes
-     * @return
-     */
-    List<AnalysisResultVo> selectLastBatchResultByFieldCode(@Param("fieldCodes") List<String> fieldCodes,
-                                                            @Param("startTime") String startTime,
-                                                            @Param("endTime") String endTime);
-
-
-    /**
-     * 分析结果风场列表
-     * @param analysisResultDto
-     * @return
-     */
-    List<WindFieldPO> selectFieldCode(AnalysisResultDto analysisResultDto);
-
-
-    /**
-     * 是否开启自动分析
-     * @param batchCode
-     * @return
-     */
-    int updateOnOffCall(@Param("batchCode")String batchCode, @Param("onOffCall") Integer onOffCall);
-
-    /**
-     * 更新为排队中状态
-     * @param batchCode
-     * @return
-     */
-    int updateAnalysisState(@Param("batchCode") String batchCode);
-
-    /**
-     * 数据筛选更新
-     * @param analysisDto
-     * @return
-     */
-    int updateByBatchCode(AnalysisDto analysisDto);
-
-    /**
-     * 查询风场下的分析编号
-     * @param fieldCode
-     * @return
-     */
-    List<AnalysisInfoVo> selectShortInfoByFieldCode(@Param("fieldCode") String fieldCode);
-
-    /**
-     * 根据分析编号查询分析结果
-     * @param batchCode
-     * @return
-     */
-    AnalysisResultPo selectByBatchCode(@Param("batchCode") String batchCode);
-
-
-    /**
-     * 查询排队中或运行中的分析数量
-     * @return
-     */
-    int selectAnalysisingCount();
-
-    /**
-     * 查询运行中的分析数量
-     * @return
-     */
-    int selectAnalysisProcessingCount();
-
-}

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

@@ -1,57 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisResultReportPo;
-import com.energy.manage.service.domain.dto.analysis.AnalysisResultReportDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisResultReportVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/9/20 16:58
- * @desc
- */
-@Repository
-public interface AnalysisResultReportMapper extends MyMapper<AnalysisResultReportPo> {
-
-    /**
-     * 保存报表
-     * @return
-     */
-    int saveReportBatch(@Param("list") List<AnalysisResultReportDto> resultReportDto);
-
-    /**
-     * 保存单个报表
-     * @param resultReportVo
-     * @return
-     */
-    int insertReport(AnalysisResultReportVo resultReportVo);
-
-    /**
-     * 更新报表
-     * @param resultReportVo
-     * @return
-     */
-    int updateReport(AnalysisResultReportVo resultReportVo);
-
-    /**
-     * 根据批次查询报表
-     * @param batchCode
-     * @return
-     */
-    List<AnalysisResultReportVo> selectByBatchCode(@Param("batchCode") String batchCode);
-
-
-    /**
-     * 查询报告
-     * @param batchCode
-     * @param reportType
-     * @return
-     */
-    AnalysisResultReportPo selectByBatchCodeAndReportType(@Param("batchCode") String batchCode,
-                                                          @Param("reportType") Integer reportType);
-
-}

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

@@ -1,51 +0,0 @@
-package com.energy.manage.service.mappers.analysis;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisTypePo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisTypeVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/23 13:03
- * @desc
- */
-@Repository
-public interface AnalysisTypeMapper extends MyMapper <AnalysisTypePo>{
-
-    /**
-     * 查询所有的分析类型
-     * @return
-     */
-    List<AnalysisTypeVo> selectAllVo();
-
-    /**
-     * 根据类型编号查询所有的分析类型
-     * @param typeCode
-     * @return
-     */
-    List<AnalysisTypeVo> selectByTypeCode(@Param("typeCode") String typeCode);
-
-    /**
-     * 根据code 查询flag
-     * @param typeCodes
-     * @return
-     */
-    List<String> selecFlagtByCodes(@Param("typeCodes") List<String> typeCodes);
-
-    /**
-     * 单个查询
-     * @param typeCode
-     * @return
-     */
-    String selecFlagByCode(@Param("typeCode") String typeCode);
-
-    /**
-     * 按照顺序查询
-     * @return
-     */
-    List<AnalysisTypePo> selectAllByOrderNum();
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/analysisdatarelationrecords/AnalysisDataRelationRecordsMapper.java

@@ -1,21 +0,0 @@
-package com.energy.manage.service.mappers.analysisdatarelationrecords;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysisdatarelationrecords.AnalysisDataRelationRecordsPo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Author: chy
- * @Date: 2025/2/11 10:02
- */
-@Repository
-public interface AnalysisDataRelationRecordsMapper extends MyMapper<AnalysisDataRelationRecordsPo> {
-
-
-    AnalysisDataRelationRecordsPo selectByTaskId(@Param("taskId") String taskId);
-
-    @Override
-    int insertSelective(AnalysisDataRelationRecordsPo analysisDataRelationRecordsPo);
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/analysispriorityrecords/AnalysisPriorityRecordsMapper.java

@@ -1,47 +0,0 @@
-package com.energy.manage.service.mappers.analysispriorityrecords;
-
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysispriorityrecords.AnalysisPriorityRecordsPo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: chy
- * @Date: 2025/2/11 10:02
- */
-
-@Repository
-public interface AnalysisPriorityRecordsMapper extends MyMapper<AnalysisPriorityRecordsPo> {
-
-    /**
-     * 查询排在第一位的优先级
-     * @return
-     */
-    AnalysisPriorityRecordsPo queryFirstPriority();
-
-    /**
-     * 更新执行状态
-     * @param taskId
-     * @param executeStatus
-     * @return
-     */
-    int updateExecuteStatus(@Param("taskId") String taskId,
-                            @Param("executeStatus") Integer executeStatus);
-
-    /**
-     * 查询所有的优先级
-     * @return
-     */
-    List<AnalysisPriorityRecordsPo> queryAllPriority();
-
-    /**
-     * 更新优先级
-     * @param batchCode
-     * @param priority
-     * @return
-     */
-    int updatePriotityByBatchCode(@Param("batchCode") String batchCode, @Param("priority") Integer priority);
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/autoanalysisconfigdetail/AutoAnalysisConfigDetailMapper.java

@@ -1,49 +0,0 @@
-package com.energy.manage.service.mappers.autoanalysisconfigdetail;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.autoanalysisconfigdetail.AutoAnalysisConfigDetailPo;
-import com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto;
-import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface AutoAnalysisConfigDetailMapper extends MyMapper<AutoAnalysisConfigDetailPo> {
-
-    /**
-     * 根据条件查询配置
-     * @param detail
-     * @return
-     */
-    List<AutoAnalysisConfigDetailVo> selectByCondition(AutoAnalysisConfigDetailDto detail);
-
-    /**
-     * 插入配置
-     * @param detailDto
-     * @return
-     */
-    int insertConfig(AutoAnalysisConfigDetailDto detailDto);
-
-    /**
-     * 根据条件更新配置
-     * @param detailDto
-     * @return
-     */
-    int updateConfigByCondition(AutoAnalysisConfigDetailDto detailDto);
-
-    /**
-     * 根据唯一id查询配置
-     * @param configUniqueId
-     * @return
-     */
-    AutoAnalysisConfigDetailPo selectByUniqueId(@Param("configUniqueId") String configUniqueId);
-
-    /**
-     * 查询配置是否存在
-     * @param detailDto
-     * @return
-     */
-    int selectExistConfig(AutoAnalysisConfigDetailDto detailDto);
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/autoanalysisconfigdetailoptionrecords/AutoAnalysisConfigDetailOptionRecordsMapper.java

@@ -1,17 +0,0 @@
-package com.energy.manage.service.mappers.autoanalysisconfigdetailoptionrecords;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsPo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AutoAnalysisConfigDetailOptionRecordsMapper extends MyMapper<AutoAnalysisConfigDetailOptionRecordsPo> {
-
-
-    /**
-     * 查询最晚的一次修改记录
-     */
-    AutoAnalysisConfigDetailOptionRecordsPo selectEditByCreateTime(@Param("configUniqueId") String configUniqueId);
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/autoanalysisconfigrelations/AutoAnalysisConfigRelationsMapper.java

@@ -1,13 +0,0 @@
-package com.energy.manage.service.mappers.autoanalysisconfigrelations;
-
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.autoanalysisconfigrelations.AutoAnalysisConfigRelationsPo;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AutoAnalysisConfigRelationsMapper extends MyMapper<AutoAnalysisConfigRelationsPo> {
-
-
-    AutoAnalysisConfigRelationsPo selectByConfigUniqueId(String configUniqueId);
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/chartsdata/ChartsDataMapper.java

@@ -1,25 +0,0 @@
-package com.energy.manage.service.mappers.chartsdata;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.chartsdata.ChartsDataPo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/8/15 10:09
- * @desc
- */
-
-@Repository
-public interface ChartsDataMapper extends MyMapper<ChartsDataPo> {
-
-    List<ChartsDataPo> queryData(@Param("startNum") int startNum, @Param("pageSize") Integer pageSize);
-
-    List<ChartsDataPo> queryDataByTime(@Param("timeStamp") String timeStamp, @Param("pageSize") Integer pageSize);
-
-    Integer selectAllCount();
-
-}

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

@@ -1,92 +0,0 @@
-package com.energy.manage.service.mappers.datatransfer;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.datatransfer.DataTransferPo;
-import com.energy.manage.service.domain.dto.datatransfer.DataTransferDto;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferBatchShortVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferDataTimeVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 数据转换持久层
- * @author chy
- * @date 2024/5/20 15:04
- * @desc
- */
-@Repository
-public interface DataTransferMapper extends MyMapper<DataTransferPo>{
-
-    /**
-     * 获取当前角色所有进行过数据转的风场批次号
-     * @param roleId
-     * @return
-     */
-    List<String> selectAllWindFieldBtach(Integer roleId);
-
-
-    /**
-     * 查询转换数据组
-     * @param fieldName
-     * @param batchName
-     * @return
-     */
-    List<DataTransferBatchShortVo> queryDataTransferGroup(@Param("fieldName") String fieldName,
-                                                          @Param("batchName") String batchName,
-                                                          @Param("roleId") Integer roleId);
-
-    /**
-     * 查询数据转换列表
-     * @param dataTransferDto
-     * @return
-     */
-    List<DataTransferVo> selectDataTransferListByCondition(DataTransferDto dataTransferDto);
-
-    /**
-     * 查询批次下数据转换信息
-     * @param batchCode
-     * @return
-     */
-    List<DataTransferVo> selectDataTransferListByBatchCode(@Param("batchCode") String batchCode);
-
-
-    /**
-     * 批量添加
-     * @param poList
-     * @return
-     */
-    int addDataTransferBatch(@Param("poList") List<DataTransferPo> poList);
-
-    /**
-     * 查询批次号下的数据转换列表
-     * @param batchCode
-     * @param transferType
-     * @return
-     */
-    DataTransferPo selectByBatchCodeAndDataTransferType(@Param("batchCode") String batchCode,@Param("transferType") String transferType);
-
-
-    /**
-     * 更新数据转换
-     * @param dataTransferPo
-     * @return
-     */
-    int updateDataTransfer(DataTransferPo dataTransferPo);
-
-    /**
-     * 查询某种状态下的数据量
-     * @param transferState
-     * @return
-     */
-    int selectCountByTransferState(Integer transferState);
-
-    /**
-     * 查询数据转换中数据的起始时间和结束时间
-     * @param batchCode
-     * @return
-     */
-    DataTransferDataTimeVo selectDataTimeByBatchCodeAndType(@Param("batchCode") String batchCode,@Param("transferType") String transferType);
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/datatransferhistory/DataTransferHistoryMapper.java

@@ -1,17 +0,0 @@
-package com.energy.manage.service.mappers.datatransferhistory;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.datatransfer.DataTransferHistoryPo;
-import org.springframework.stereotype.Repository;
-
-/**
- * 数据转换历史记录
- * @author chy
- * @date 2024/5/20 15:04
- * @desc
- */
-@Repository
-public interface DataTransferHistoryMapper extends MyMapper<DataTransferHistoryPo>{
-
-    int addDataTransferHistory(DataTransferHistoryPo po);
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/datatransfertype/DataTransferTypeMapper.java

@@ -1,24 +0,0 @@
-package com.energy.manage.service.mappers.datatransfertype;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.datatransfer.DataTransferTypePo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferTypeVo;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 数据转换类型持久层
- * @author chy
- * @date 2024/5/20 15:06
- * @desc
- */
-@Repository
-public interface DataTransferTypeMapper extends MyMapper<DataTransferTypePo>{
-
-    /**
-     * 查询所有转换类型信息
-     * @return
-     */
-    List<DataTransferTypeVo> selectAllInfo();
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/detectionpointdic/DetectionPointDicMapper.java

@@ -1,21 +0,0 @@
-package com.energy.manage.service.mappers.detectionpointdic;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.detectionpointdic.DetectionPointDicPo;
-import com.energy.manage.service.domain.vo.detectionpointdic.DetectionPointDicVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.Set;
-
-@Repository
-public interface DetectionPointDicMapper extends MyMapper<DetectionPointDicPo> {
-
-    /**
-     * 根据驱动模式查询测点
-     * @param driveMode
-     * @return
-     */
-    Set<DetectionPointDicVo> selectByCondition(@Param("driveMode") String driveMode);
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/wavedatatransfer/WaveDataTransferMapper.java

@@ -1,23 +0,0 @@
-package com.energy.manage.service.mappers.wavedatatransfer;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface WaveDataTransferMapper extends MyMapper<WaveDataTransferPo> {
-
-
-    List<WaveDataTransferVo> selectByCondition(WaveDataTransferDto waveDataTransferDto);
-
-
-    Integer selectCountByCondition(WaveDataTransferDto datatransferDto);
-
-
-    int update(WaveDataTransferPo record);
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/wavedatatransferhistory/WaveDataTransferHistoryMapper.java

@@ -1,10 +0,0 @@
-package com.energy.manage.service.mappers.wavedatatransferhistory;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.wavetransferhistory.WaveDataTransferHistoryPo;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface WaveDataTransferHistoryMapper extends MyMapper<WaveDataTransferHistoryPo> {
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/property/analysis/AlgorithmProperties.java

@@ -1,89 +0,0 @@
-package com.energy.manage.service.property.analysis;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 算法属性值
- * @author chy
- * @date 2024/5/30 17:37
- * @desc
- */
-@Data
-@Component
-@RefreshScope
-public class AlgorithmProperties {
-
-    /**
-     * 算法地址
-     */
-    @Value("${analysis.url}")
-    public String analysisUrl;
-
-    /**
-     * 传给分析算法json
-     */
-    @Value("${analysis.algorithm.json}")
-    public String analysisAlgorithmJson;
-
-    /**
-     * 分析类型json
-     */
-    @Value("${analysis.type.json}")
-    public String analysisTypeJson;
-
-    /**
-     * 图像设置参数属性
-     */
-    @Value("${graphSets.properties}")
-    public List<String> graphSetsProperties;
-
-    /**
-     * scada 数据过滤属性
-     */
-    @Value("${customFilter.properties}")
-    public List<String> customFilterProperties;
-
-    /**
-     * 分析类型属性
-     */
-    @Value("${analysis.properties.name}")
-    public String configAnalysisProperties;
-
-    /**
-     * 功率因数
-     */
-    @Value("${power.factor.rated}")
-    public String powerFactorRated;
-
-
-    /**
-     * 算法json中无子节点数组
-     */
-    @Value("${analysis.array.properties}")
-    public List<String> analysisArrayProperties;
-
-    /**
-     * 分析文件内网地址
-     */
-    @Value("${analysis.file.intranet.addr}")
-    public String analysisFileIntranetAddr;
-
-    /**
-     * 分析文件外网地址
-     */
-    @Value("${analysis.file.external.addr}")
-    public String analysisFileExternalAddr;
-
-    /**
-     * 替换分析结果文件路径中的手动、自动片段
-     *character
-     */
-    @Value("${analysis.file.replace.str}")
-    public List<String> analysisFileReplaceStr;
-
-}

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

@@ -1,30 +0,0 @@
-package com.energy.manage.service.service.analysis;
-
-import com.energy.manage.service.domain.vo.analysis.AnalysisResultReportTypeVo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisResultReportVo;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/9/20 17:31
- * @desc
- */
-public interface AnalysisResultReportService {
-
-
-
-    /**
-     * 批量添加保存报告
-     * @param resultReportVos
-     * @return
-     */
-    int saveReportBatch(List<AnalysisResultReportVo> resultReportVos);
-
-
-    /**
-     * 查询报告类型
-     * @return
-     */
-    List<AnalysisResultReportTypeVo> getRportType(Boolean isIntranet);
-}

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

@@ -1,174 +0,0 @@
-package com.energy.manage.service.service.analysis;
-
-import com.alibaba.fastjson.JSONArray;
-import com.energy.manage.common.base.Page;
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-import com.energy.manage.common.po.windfield.WindFieldPO;
-import com.energy.manage.common.reponse.ResultResp;
-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.windenginegroup.WindEngineGroupShortVo;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * 分析服务
- * @author chy
- * @date 2024/5/23 12:59
- * @desc
- */
-public interface AnalysisService {
-
-    /**
-     * 分析结果列表
-     * @param analysisResultDto
-     * @return
-     */
-    List<AnalysisResultVo> analysisResultList(AnalysisResultDto analysisResultDto,Boolean isIntranet);
-
-
-
-    /**
-     * 分析结果风场列表
-     * @param analysisResultDto
-     * @return
-     */
-    Page<WindFieldPO> analysisResulFieldList(AnalysisResultDto analysisResultDto);
-
-    /**
-     * 根据风场查询分析结果
-     * @param fieldCode
-     * @return
-     */
-    List<AnalysisResultVo> analysisResultListByAnalysisCode(String fieldCode);
-
-    /**
-     * 添加分析结果
-     * @param analysisResultPo
-     * @return
-     */
-    int addAnalysisResult(AnalysisResultPo analysisResultPo);
-
-
-    /**
-     * 分析
-     * @param analysisDto
-     * @return
-     */
-    ResultResp analysis(AnalysisDto analysisDto);
-
-
-    /**
-     * 调用分析并做调用算法参数处理
-     * @param analysisDto
-     * @throws Exception
-     */
-    void callAnalysis(AnalysisDto analysisDto) throws Exception;
-
-
-    /**
-     * 分析编辑查询
-     * @param batchCode
-     * @return
-     */
-    AnalysisResultShowVo analysisEditQuery(String batchCode);
-
-    /**
-     * 查询已经分析的分析类型
-     * @param batchCode
-     * @return
-     */
-    List<Map<String, Object>> queryAnalysisedType(String batchCode);
-
-    /**
-     * 查询所有的分析类型
-     */
-    List<Map<String, Object>> queryAllAnalysisType();
-
-    /**
-     * 查询已经分析的风机信息
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    Set<WindEngineGroupShortVo> queryAnalysisedEngine(String batchCode, String analysisTypeCode);
-
-    /**
-     * 分析详情
-     * @param batchCode
-     * @param analysisTypeCode
-     * @param fieldEngineCodes
-     * @param isIntranet
-     * @return
-     */
-    List<AnalysisDetailVo> analysisDetail(String batchCode, String analysisTypeCode, List<String> fieldEngineCodes, boolean isIntranet);
-
-
-    /**
-     * 分析中检查
-     * @return
-     */
-    boolean checkAnalysising();
-
-    /**
-     * 开启/关闭自动分析
-     * @param batchCode
-     * @param onOffCall
-     * @return
-     */
-    int onOffAutoAnalysis(String batchCode, Integer onOffCall);
-
-
-    /**
-     * 分析类型结果图配置接口
-     * @return
-     */
-    JSONArray queryAnalysisTypeConfig();
-
-
-    /**
-     * 根据角色获取风场及分析编号信息
-     * @return
-     */
-    List<Map<String,Object>>getAnalysisCodeInfo(Integer roleId);
-
-
-    /**
-     * 查询风场及分析信息
-     * @param batchCode
-     * @return
-     */
-    FieldAndAnalysisInfoVo getFieldInfo(String batchCode);
-
-
-    /**
-     * 全部文件下载查询接口
-     * @param fieldCode
-     * @param batchCode
-     * @return
-     */
-    List<String> queryDownloadFile(String fieldCode, String batchCode);
-
-
-    /**
-     * 文件现在
-     * @param batchCode
-     * @param fieldCode
-     * @param analysisTypeCode
-     * @return
-     */
-    ResultResp downloadFile(String fieldCode, String batchCode, String analysisTypeCode, HttpServletResponse response);
-
-
-    /**
-     * 创建批次号
-     * @param fieldCode
-     * @return
-     */
-    String createWindFieldBatchCode(String fieldCode);
-
-}

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

@@ -1,19 +0,0 @@
-package com.energy.manage.service.service.analysis;
-
-/**
- * 自动分析
- * @author chy
- * @date 2025/3/31 15:42
- * @desc
- */
-
-public interface AutoAnalysisService {
-
-
-    /**
-     * 自动分析
-     */
-    void autoAnalysis();
-
-
-}

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

@@ -1,69 +0,0 @@
-package com.energy.manage.service.service.analysis.impl;
-
-import com.energy.manage.common.enums.ResultReportEnums;
-import com.energy.manage.common.po.analysis.AnalysisResultReportPo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisResultReportTypeVo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisResultReportVo;
-import com.energy.manage.service.mappers.analysis.AnalysisResultReportMapper;
-import com.energy.manage.service.service.analysis.AnalysisResultReportService;
-import com.energy.manage.service.util.NetUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author chy
- * @date 2024/9/20 17:33
- * @desc
- */
-@Service
-public class AnalysisResultReportServiceImpl implements AnalysisResultReportService {
-
-    @Autowired
-    private AnalysisResultReportMapper analysisResultReportMapper;
-    /**
-     * 批量添加保存报告
-     *
-     * @param resultReportVos
-     * @return
-     */
-    @Override
-    public int saveReportBatch(List<AnalysisResultReportVo> resultReportVos) {
-        AtomicInteger integer = new AtomicInteger(0);
-        resultReportVos.forEach(item -> {
-            item.setReportAddr(item.getReportAddr().replaceFirst(NetUtils.IP_PORT_REGEX, ""));
-            AnalysisResultReportPo resultReportPo = analysisResultReportMapper.selectByBatchCodeAndReportType(item.getBatchCode(),item.getReportType());
-            if(resultReportPo != null){
-                analysisResultReportMapper.updateReport(item);
-            }else{
-                analysisResultReportMapper.insertReport(item);
-            }
-            integer.getAndIncrement();
-        });
-        return integer.get();
-    }
-
-    /**
-     * 查询报告类型
-     *
-     * @return
-     */
-    @Override
-    public List<AnalysisResultReportTypeVo> getRportType(Boolean isIntranet) {
-        List<AnalysisResultReportTypeVo> resultReportTypeVos = new ArrayList<>();
-        Arrays.stream(ResultReportEnums.values()).forEach(item -> {
-            AnalysisResultReportTypeVo resultReportTypeVo = new AnalysisResultReportTypeVo();
-            resultReportTypeVo.setReportType(item.getReportType());
-            resultReportTypeVo.setReportTypeName(item.getReportName());
-            resultReportTypeVos.add(resultReportTypeVo);
-        });
-        return resultReportTypeVos;
-    }
-
-
-
-}

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

@@ -1,1289 +0,0 @@
-package com.energy.manage.service.service.analysis.impl;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.energy.manage.common.base.Page;
-import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
-import com.energy.manage.common.enums.IdPrefixEnum;
-import com.energy.manage.common.po.analysis.AnalysisGeneralFilePo;
-import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-import com.energy.manage.common.po.analysis.AnalysisTypePo;
-import com.energy.manage.common.po.analysisdatarelationrecords.AnalysisDataRelationRecordsPo;
-import com.energy.manage.common.po.analysispriorityrecords.AnalysisPriorityRecordsPo;
-import com.energy.manage.common.po.windfield.WindFieldPO;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.common.util.HttpUtils;
-import com.energy.manage.common.util.IdGeneratorUtil;
-import com.energy.manage.service.config.AnalysisTypeConfig;
-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.datatransfer.DataTransferTypeVo;
-import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
-import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
-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.WindFieldDescriptVo;
-import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
-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.analysisdatarelationrecords.AnalysisDataRelationRecordsMapper;
-import com.energy.manage.service.mappers.analysispriorityrecords.AnalysisPriorityRecordsMapper;
-import com.energy.manage.service.mappers.datatransfertype.DataTransferTypeMapper;
-import com.energy.manage.service.mappers.system.SysOrganizationAuthMapper;
-import com.energy.manage.service.mappers.system.SysUserInfoMapper;
-import com.energy.manage.service.mappers.windenginegroup.WindEngineGroupMapper;
-import com.energy.manage.service.mappers.windfield.WindFieldMapper;
-import com.energy.manage.service.property.analysis.AlgorithmProperties;
-import com.energy.manage.service.service.analysis.AnalysisService;
-import com.energy.manage.service.service.cache.CacheService;
-import com.energy.manage.service.util.*;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import io.minio.GetObjectArgs;
-import io.minio.ListObjectsArgs;
-import io.minio.MinioClient;
-import io.minio.Result;
-import io.minio.messages.Item;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * 分析服务
- * @author chy
- * @date 2024/5/23 12:59
- * @desc
- */
-@Slf4j
-@Service
-public class AnalysisServiceImpl implements AnalysisService {
-
-    @Autowired
-    private AnalysisTypeMapper analysisTypeMapper;
-
-    @Autowired
-    private WindEngineGroupMapper engineGroupMapper;
-
-    @Autowired
-    private AnalysisCommentDescriptionMapper commentDescriptionMapper;
-
-    @Autowired
-    private AnalysisCommentTypeRelationMapper commentTypeRelationMapper;
-
-    @Autowired
-    private AnalysisDiagramRelationMapper diagramRelationMapper;
-
-    @Autowired
-    private AnalysisGeneralFileMapper generalFileMapper;
-
-    @Autowired
-    private WindEngineGroupMapper windEngineGroupMapper;
-
-    @Autowired
-    private SysUserInfoMapper sysUserInfoMapper;
-
-    @Autowired
-    private AnalysisResultReportMapper resultReportMapper;
-
-    @Autowired
-    private SysOrganizationAuthMapper sysOrganizationAuthMapper;
-
-    @Autowired
-    private WindFieldMapper windFieldMapper;
-
-    @Autowired
-    private AnalysisPriorityRecordsMapper priorityRecordsMapper;
-
-    @Autowired
-    private AnalysisDataRelationRecordsMapper dataRelationRecordsMapper;
-
-    @Autowired
-    private DataTransferTypeMapper dataTransferTypeMapper;
-
-    @Autowired
-    private AlgorithmProperties algorithmProperties;
-
-    @Autowired
-    private AnalysisTypeConfig analysisTypeConfig;
-
-    @Autowired
-    private  MinioClient minioClient;
-
-    @Autowired
-    private BatchDownloadUtil batchDownloadUtil;
-
-    @Autowired
-    private CacheService cacheService;
-
-
-    private static AnalysisOptionRecordsMapper optionRecordsMapper;
-
-
-    private static AnalysisResultMapper analysisResultMapper;
-
-    /**
-     * 操作内容
-     */
-    private static final String OPTION_CONTENT = "手动分析";
-
-    /**
-     * 分析编号分隔符
-     */
-    private final static String SEPARATOR = "-";
-
-
-    private final static String ZREO_STR = "0";
-
-    /**
-     * 当分析类型不按照机型分析的话 总图数据库表中风机类型编号的值为total
-     */
-    private final static String GENERAL_FILE_TYPE_CODE = "total";
-
-    /**
-     * 过滤掉html展示
-     */
-    private final static String FILTER_PATTEN = ".html";
-
-    /**
-     * 风机编号正则
-     */
-    private static final String ENGINE_CODE_PATTEN = IdPrefixEnum.WIND_EILL_NUMBER.getCode() + "\\d{3," + IdGeneratorUtil.DEC_INIT_LENGTH + "}";
-
-
-    private static ObjectMapper mapper = new ObjectMapper();
-
-
-    /**
-     * 分析结果列表
-     * @param analysisResultDto
-     * @param isIntranet
-     * @return
-     */
-    @Override
-    public List<AnalysisResultVo> analysisResultList(AnalysisResultDto analysisResultDto, Boolean isIntranet) {
-        List<DataTransferTypeVo> transferTypeVos = dataTransferTypeMapper.selectAllInfo();
-        List<AnalysisResultVo> resultVos = analysisResultMapper.selectByCondition(analysisResultDto);
-        List<AnalysisPriorityRecordsPo> priorityRecords = priorityRecordsMapper.queryAllPriority();
-        resultVos.stream().forEach(item -> {
-            //设置数据类型名称
-            setDataTypeName(item,transferTypeVos);
-            if(CollectionUtils.isNotEmpty(priorityRecords)){
-                setOrderNum(item,priorityRecords);
-            }
-            //设置报告
-            item.setReportVos(setReportAddress(resultReportMapper.selectByBatchCode(item.getBatchCode()),isIntranet));
-        });
-        return resultVos;
-    }
-
-    /**
-     * 设置数据类型名称
-     * @param analysisResultVo
-     * @param transferTypeVos
-     */
-    private void setDataTypeName(AnalysisResultVo analysisResultVo, List<DataTransferTypeVo> transferTypeVos) {
-        if(StringUtils.isBlank(analysisResultVo.getDataTypeCode())){
-            return;
-        }
-        Map<String,String> typeMap = transferTypeVos.stream().collect(Collectors.toMap(DataTransferTypeVo::getTransferType, DataTransferTypeVo::getTransferTypeName));
-        List<String> dataTypeCodes = Arrays.asList(analysisResultVo.getDataTypeCode().split(","));
-        List<String> dataTypeNames = dataTypeCodes.stream().map(typeCode -> typeMap.get(typeCode)).collect(Collectors.toList());
-        analysisResultVo.setDataTypeName(dataTypeNames.stream().collect(Collectors.joining(",")));
-     }
-
-    /**
-     * 设置排队中的任务排队序号
-     * @param analysisResultVo
-     */
-    private void setOrderNum(AnalysisResultVo analysisResultVo, List<AnalysisPriorityRecordsPo> priorityRecords) {
-        priorityRecords.stream().forEach(item -> {
-            if(item.getBatchCode().equals(analysisResultVo.getBatchCode())){
-                String currentOrderNum = analysisResultVo.getOrderNum();
-                String newOrderNum = String.valueOf(priorityRecords.indexOf(item) + 1);
-                String orderNum = StringUtils.isBlank(currentOrderNum)  ? newOrderNum : currentOrderNum + "," + newOrderNum;
-                analysisResultVo.setOrderNum(orderNum);
-            }
-        });
-    }
-
-    /**
-     * 设置报告地址
-     * @param reportVos
-     * @return
-     */
-    private List<AnalysisResultReportVo> setReportAddress(List<AnalysisResultReportVo> reportVos, Boolean isIntranet) {
-        if(CollectionUtils.isNotEmpty(reportVos)){
-            reportVos.stream().forEach(item -> item.setReportAddr(NetUtils.getFilePath(isIntranet,item.getReportAddr())));
-        }
-        return reportVos;
-    }
-
-    @Override
-    public Page<WindFieldPO> analysisResulFieldList(AnalysisResultDto analysisResultDto){
-        int pageNum = analysisResultDto.getPageNum();
-        int pageSize = analysisResultDto.getPageSize();
-        PageHelper.startPage(pageNum, pageSize);
-        List<WindFieldPO> resultVos = analysisResultMapper.selectFieldCode(analysisResultDto);
-        Long total = org.apache.commons.collections.CollectionUtils.isEmpty(resultVos) ? 0L : new PageInfo<>(resultVos).getTotal();
-        return Page.build(pageNum, pageSize, total, resultVos);
-    }
-
-    @Override
-    public List<AnalysisResultVo> analysisResultListByAnalysisCode(String fieldCode){
-        List<AnalysisResultVo> resultVos = analysisResultMapper.selectByFieldCode(fieldCode);
-        resultVos.stream().forEach(item -> item.setReportVos(resultReportMapper.selectByBatchCode(item.getBatchCode())));
-        return resultVos;
-    }
-
-    /**
-     * 添加分析结果
-     *
-     * @param analysisResultPo
-     * @return
-     */
-    @Override
-    public int addAnalysisResult(AnalysisResultPo analysisResultPo) {
-        String fieldCode = analysisResultPo.getFieldCode();
-        String batchCode = createWindFieldBatchCode(fieldCode);
-        analysisResultPo.setBatchCode(batchCode);
-        if(StringUtils.isBlank(analysisResultPo.getAnalysisName())){
-            WindFieldVo  windFieldVo = windFieldMapper.selectByCodeNumber(fieldCode);
-            analysisResultPo.setAnalysisName(createBatchName(windFieldVo.getFieldName()));
-        }
-
-        return analysisResultMapper.insertSelective(analysisResultPo);
-    }
-
-    /**
-     * 分析
-     * @param analysisDto
-     * @return
-     */
-    @Override
-    public ResultResp analysis(AnalysisDto analysisDto) {
-        try {
-            //（是因为算法分析类型code与平台分析类型code没有做统一，开发之后才做统一，所以需要转换）
-            transferAnalysisFlagByCode(analysisDto);
-            //当有功功率没有设置的话 设置默认值 整个风场最大额定功率*1.2 （图像设计移动到前端了，废弃）
-            //setActivePower(analysisDto);
-            //查询分析中或者排队中的数量
-            int analysingCount = analysisResultMapper.selectAnalysisingCount();
-            if(analysingCount > 0){
-                String taskId = UUIDUtil.getShortUUIDLowCase();
-                //排队
-                addPriorityRecord(analysisDto.getDataBatchNum(), taskId);
-                //保存请求参数
-                addDataRelationRecord(analysisDto,taskId);
-                //更新任务状态为排队中（只更新分析完成与未分析状态）
-                analysisResultMapper.updateAnalysisState(analysisDto.getDataBatchNum());
-            }else{
-                //调用算法逻辑
-                callAnalysis(analysisDto);
-            }
-            return ResultResp.SUCCESS();
-        } catch (Exception e) {
-            log.error("批次号 = {} 手动分析异常",analysisDto.getDataBatchNum(),e);
-            return ResultResp.FAIL();
-        }
-    }
-
-    /**
-     * 将任务添加到优先级记录表
-     * @param batchCode
-     */
-    private void addPriorityRecord(String batchCode,String taskId) {
-        AnalysisPriorityRecordsPo priorityRecordsPo = new AnalysisPriorityRecordsPo()
-                                                            .setBatchCode(batchCode)
-                                                            .setTaskId(taskId);
-        priorityRecordsMapper.insertSelective(priorityRecordsPo);
-    }
-
-    /**
-     * 将任务参数传入参数数据表
-     * @param analysisDto
-     */
-    private void addDataRelationRecord(AnalysisDto analysisDto,String taskId) {
-        AnalysisDataRelationRecordsPo relationRecordsPo = new AnalysisDataRelationRecordsPo();
-        BeanUtils.copyProperties(analysisDto,relationRecordsPo);
-        //设置分析类型
-        relationRecordsPo.setConfigAnalysis(analysisDto.getConfigAnalysis().stream().collect(Collectors.joining(",")));
-        //设置风机
-        if(CollectionUtils.isNotEmpty(analysisDto.getTurbines())){
-            relationRecordsPo.setTurbines(analysisDto.getTurbines().stream().collect(Collectors.joining(",")));
-        }
-        //设置排除月份
-        if(CollectionUtils.isNotEmpty(analysisDto.getExcludingMonths())) {
-            relationRecordsPo.setExcludingMonths(analysisDto.getExcludingMonths().stream().collect(Collectors.joining(",")));
-        }
-        //设置有功功率
-        if(CollectionUtils.isNotEmpty(analysisDto.getValueActivePower())) {
-            relationRecordsPo.setValueActivePower(analysisDto.getValueActivePower().stream().map(Object::toString).collect(Collectors.joining(",")));
-        }
-        //设置风机转速
-        if(CollectionUtils.isNotEmpty(analysisDto.getValueGeneratorSpeed())) {
-            relationRecordsPo.setValueGeneratorSpeed(analysisDto.getValueGeneratorSpeed().stream().map(Object::toString).collect(Collectors.joining(",")));
-        }
-        //设置桨距角
-        if(CollectionUtils.isNotEmpty(analysisDto.getValuePitchAngle())) {
-            relationRecordsPo.setValuePitchAngle(analysisDto.getValuePitchAngle().stream().map(Object::toString).collect(Collectors.joining(",")));
-        }
-        //设置风速
-        if(CollectionUtils.isNotEmpty(analysisDto.getValueWindSpeed())) {
-            relationRecordsPo.setValueWindSpeed(analysisDto.getValueWindSpeed().stream().map(Object::toString).collect(Collectors.joining(",")));
-        }
-        relationRecordsPo.setTaskId(taskId);
-        dataRelationRecordsMapper.insertSelective(relationRecordsPo);
-    }
-    /**
-     * 调用算法
-     * @param analysisDto
-     * @throws Exception
-     */
-    @Override
-    public void callAnalysis(AnalysisDto analysisDto) throws Exception{
-        //将配置文件中的算法json转换为对象
-        JsonNode rootNode = mapper.readTree(algorithmProperties.getAnalysisAlgorithmJson());
-        //将入参analysisDto转换为算法标准json
-        dataProccess(analysisDto,rootNode);
-        log.info("调用分析算法之前，将入参analysisDto转换为算法标准json = {}" , mapper.writeValueAsString(rootNode));
-        //调用算法
-        String result = HttpUtils.doPost(algorithmProperties.getAnalysisUrl(),mapper.writeValueAsString(rootNode));
-        log.info("调用算法分析返回结果：{}",result);
-        //调用分析算法接口后更新数据筛选记录
-        updateAnalysisByBatchCode(analysisDto);
-        //手动操作进行操作记录添加
-        if(analysisDto.getAutoOrManual().equals(AnalysisConstants.MANUAL_ANALYSIS)){
-            addOptionRecords(analysisDto.getPowerFarmID(),null,OPTION_CONTENT);
-        }
-    }
-
-
-    /**
-     * 更新数据筛选记录
-     * @param analysisDto
-     */
-    private void updateAnalysisByBatchCode(AnalysisDto analysisDto){
-        //多数据源拼接
-        Set<String> dataTypeCode = analysisDto.getConfigAnalysis().stream().map(item -> getLastStr(item)).collect(Collectors.toSet());
-        analysisDto.setScada(dataTypeCode.stream().collect(Collectors.joining(",")));
-        analysisResultMapper.updateByBatchCode(analysisDto);
-    }
-
-    /**
-     * 获取最后一个字符串
-     * @return
-     */
-    private String getLastStr(String str){
-        String[] strings = str.split("\\|");
-        return strings[strings.length-1];
-    }
-
-    /**
-     * 分析编辑查询（查询分析类型、风机组）
-     * @param batchCode
-     * @return
-     */
-    @Override
-    public AnalysisResultShowVo analysisEditQuery(String batchCode){
-        AnalysisResultShowVo analysisResultShowVo = new AnalysisResultShowVo();
-        return analysisResultShowVo.setAnalysisTypeList(getAnalysisType())
-                .setWindEngineGroupList(getWindEngineGroupByBatchCode(batchCode));
-    }
-
-    /**
-     * 查询已经分析的分析类型
-     * @param batchCode
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> queryAnalysisedType(String batchCode){
-        Set<String> analysisCodes = new HashSet<>();
-        //总图分析类型
-        List<AnalysisGeneralFileVo> generalFileVos = generalFileMapper.selectByBatchCode(batchCode);
-        generalFileVos.stream().forEach(item -> analysisCodes.add(item.getAnalysisTypeCode()));
-        //分图分析类型
-        List<AnalysisDiagramRelationVo> relationVos = diagramRelationMapper.selectByBatchCode(batchCode);
-        relationVos.stream().forEach(item -> analysisCodes.add(item.getAnalysisTypeCode()));
-        return getAnalysisType(analysisCodes);
-    }
-
-    /**
-     *过滤分析类型并生成树形结构
-     * @param analysisCodes
-     * @return
-     */
-    private List<Map<String, Object>> getAnalysisType(Set<String> analysisCodes){
-        if(CollectionUtils.isEmpty(analysisCodes)){
-            return new ArrayList<>();
-        }
-        List<AnalysisTypePo> analysisTypePos = analysisTypeMapper.selectAllByOrderNum();
-        analysisTypePos = analysisTypePos.stream().filter(item -> analysisCodes.contains(item.getTypeCode()) || item.getParentId().equals(ZREO_STR)).collect(Collectors.toList());
-        return TreeUtil.getJava8ResultTree(BeanMapUtils.listBeanToListMap(analysisTypePos), "parentId", "id");
-    }
-
-    /**
-     * 查询所有的分析类型
-     */
-    @Override
-    public List<Map<String, Object>> queryAllAnalysisType() {
-        List<AnalysisTypePo> analysisTypeList = analysisTypeMapper.selectAllByOrderNum();
-        return TreeUtil.getJava8ResultTree(BeanMapUtils.listBeanToListMap(analysisTypeList), "parentId", "id");
-    }
-
-    /**
-     * 查询已经分析的风机信息
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    @Override
-    public Set<WindEngineGroupShortVo> queryAnalysisedEngine(String batchCode, String analysisTypeCode){
-        Set<WindEngineGroupShortVo> set = diagramRelationMapper.selectByBatchCodeAndAnalysisTypeCode(batchCode,analysisTypeCode);
-        if(CollectionUtils.isEmpty(set)){
-            int count  = generalFileMapper.selectCount(new AnalysisGeneralFilePo().setBatchCode(batchCode));
-            if(count > 0){
-                AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
-                set = engineGroupMapper.selectWindEngineGroupShortList(analysisResultPo.getFieldCode())
-                        .stream().collect(Collectors.toSet());
-            }else{
-                return new HashSet<>();
-            }
-        }
-        //排序
-        return set.stream()
-                .sorted(Comparator.comparing(WindEngineGroupShortVo::getEngineName))
-                .collect(Collectors.toCollection(LinkedHashSet :: new));
-    }
-
-    /**
-     * 分析详情
-     * @param batchCode
-     * @param analysisTypeCode
-     * @param fieldEngineCodes
-     * @return
-     */
-    @Override
-    public List<AnalysisDetailVo> analysisDetail(String batchCode, String analysisTypeCode, List<String> fieldEngineCodes, boolean isIntranet) {
-        List<AnalysisDetailVo> analysisDetailVos = new ArrayList<>();
-        //获取所有的分析类型
-        List<AnalysisTypeVo> analysisTypeVos = analysisTypeMapper.selectByTypeCode(analysisTypeCode);
-        if(CollectionUtils.isEmpty(analysisTypeVos)){
-            return analysisDetailVos;
-        }
-        Set<String> analysisTypeCodes = analysisTypeVos.stream().map(item -> item.getTypeCode()).collect(Collectors.toSet());
-        //最新总文件
-        List<AnalysisGeneralFileVo> newGeneralFileVos = getAllGeneralFiles(batchCode,analysisTypeCodes,isIntranet);
-        //获取最新分文件
-        List<AnalysisDiagramRelationVo> newDiagramRelationVos = getNewDiagramRelations(batchCode, analysisTypeCode, fieldEngineCodes,isIntranet);
-        //查询评论
-        List<AnalysisCommentDescriptionVo> commentDescriptionVos = commentDescriptionMapper.selecByBatchCodeAndAnalysisTypeCode(batchCode,analysisTypeCode);
-        //根据分析类型设置分析结果
-        analysisTypeVos.forEach(analysisTypeVo -> {
-            //设置相应参数
-            AnalysisDetailVo analysisDetailVo = getAnalysisDetailVo(analysisTypeVo,
-                                                                    newGeneralFileVos,
-                                                                    newDiagramRelationVos,
-                                                                    commentDescriptionVos);
-            if(analysisDetailVo != null){
-                analysisDetailVos.add(analysisDetailVo);
-            }
-        });
-        //只有当分析类型不为空的时候才返回评论类型
-        if(StringUtils.isNotBlank(analysisTypeCode) && CollectionUtils.isNotEmpty(analysisDetailVos)){
-            analysisDetailVos.get(0).setCommentTypeRelations(commentTypeRelationMapper.selectByAnalysisTypeCode(batchCode,analysisTypeCode));
-        }
-
-        return analysisDetailVos;
-    }
-
-
-    /**
-     * 分析中检查
-     * @return
-     */
-    @Override
-    public boolean checkAnalysising(){
-        return analysisResultMapper.selectAlasisingCount() > AnalysisConstants.SERVER_MERCHINE_COUNT;
-    }
-
-    /**
-     * 开启/关闭自动分析
-     * @param batchCode
-     * @return
-     */
-    @Override
-    public int onOffAutoAnalysis(String batchCode, Integer onOffCall) {
-        return analysisResultMapper.updateOnOffCall(batchCode,onOffCall);
-    }
-
-    /**
-     * 分析类型结果图配置接口
-     *
-     * @return
-     */
-    @Override
-    public JSONArray queryAnalysisTypeConfig() {
-        return JSONArray.parseArray(analysisTypeConfig.getAnalysisTypeConfig());
-    }
-
-    /**
-     * 根据角色获取风场及分析编号信息
-     *
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAnalysisCodeInfo(Integer 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));
-    }
-
-    /**
-     * 转换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;
-    }
-
-
-    /**
-     * 查询风场及分析信息
-     * @param batchCode
-     * @return
-     */
-    @Override
-    public FieldAndAnalysisInfoVo getFieldInfo(String batchCode) {
-        if(StringUtils.isBlank(batchCode)){
-            return new FieldAndAnalysisInfoVo();
-        }
-        AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
-        return  new FieldAndAnalysisInfoVo().setFieldInfo(getWindFieldDescriptVo(analysisResultPo.getFieldCode()))
-                                            .setAnalysisInfo(getAnalysisCodeInfo(batchCode));
-    }
-
-    /**
-     * 根据风场编号获取风场信息
-     * @param fieldCode
-     * @return
-     */
-    private WindFieldDescriptVo getWindFieldDescriptVo(String fieldCode){
-        WindFieldVo windFieldVo = windFieldMapper.selectByCodeNumber(fieldCode);
-        if(windFieldVo == null){
-            return new WindFieldDescriptVo();
-        }
-        windFieldVo.setRatedCapacityNumber(windFieldVo.getRatedCapacityNumber()/1000);
-        WindFieldDescriptVo windFieldDescriptVo = new WindFieldDescriptVo();
-        BeanUtils.copyProperties(windFieldVo,windFieldDescriptVo);
-        List<WindEngineGroupPageVo> windEngineGroupPageVos = windEngineGroupMapper.selectWindEngineGroupListByFieldCode(fieldCode);
-        //设置风机数量
-        windFieldDescriptVo.setEngineCount(windEngineGroupPageVos.size());
-        //设置机型集合
-        windFieldDescriptVo.setEngineMillTypes(windEngineGroupPageVos.stream().map(WindEngineGroupPageVo::getMachineTypeCode).collect(Collectors.toSet()));
-        return windFieldDescriptVo;
-    }
-
-    /**
-     *根据分析编号获取分析信息
-     * @param batchCode
-     * @return
-     */
-    private AnalysisRelateInfoVo getAnalysisCodeInfo(String batchCode){
-        AnalysisRelateInfoVo returnVo = new AnalysisRelateInfoVo();
-        AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
-        BeanUtils.copyProperties(analysisResultPo,returnVo);
-        List<Map<String,Object>> list = queryAnalysisedType(batchCode);
-        returnVo.setUpdateByName(sysUserInfoMapper.getUserInfoByUserId(analysisResultPo.getCreateBy()).getUserName())
-                .setAnalysisTypes(list)
-                .setWindEngineGroups(queryAnalysisedEngine(batchCode,null));
-        return returnVo;
-    }
-
-    /**
-     * 全部文件下载查询接口
-     * @param fieldCode
-     * @param batchCode
-     * @return
-     */
-    @Override
-    public List<String> queryDownloadFile(String fieldCode, String batchCode){
-        String resourcePath = createSourceFilePath(batchCode,null);
-        Iterable<Result<Item>> results = minioClient.listObjects(ListObjectsArgs.builder().bucket(StringUtils.lowerCase(fieldCode)).prefix(resourcePath).build());
-        List<String> returnList = new ArrayList<>();
-        for(Result<Item> result : results){
-            returnList.add(getAnalysisTypeCode(result));
-        }
-        return returnList;
-    }
-
-    /**
-     * 获取分析类型
-     * @param item
-     * @return
-     */
-    private String getAnalysisTypeCode(Result<Item> item){
-        String analysisTypeCode = null;
-        try {
-            analysisTypeCode = item.get().objectName().split(File.separator)[1];
-        } catch (Exception e) {
-            log.error("analysisTypeCode = {} 查询文件异常", analysisTypeCode, e);
-        }
-        return analysisTypeCode;
-    }
-
-    /**
-     * 文件下载
-     * @param fieldCode 风场code
-     * @param batchCode 批次code
-     * @param analysisTypeCode 分析类型code
-     * @param response 响应
-     */
-    @Override
-    public ResultResp downloadFile(String fieldCode, String batchCode, String analysisTypeCode, HttpServletResponse response) {
-        List<InputStream> inputStreams = new ArrayList<>();
-        List<String> zipFilePaths = new ArrayList<>();
-        try{
-            String resourcePath = createSourceFilePath(batchCode,analysisTypeCode);
-            setStreamAndPath(fieldCode, resourcePath, zipFilePaths, inputStreams);
-            log.info("fieldCode = {} ,batchCode = {} ,analysisTypeCode = {} 文件数量 = {}",fieldCode,batchCode,analysisTypeCode,zipFilePaths.size());
-            String[] pathsArray = zipFilePaths.stream().toArray(String[] :: new);
-            InputStream[] inputStreamsArray = inputStreams.stream().toArray(InputStream[] :: new);
-            response.reset();
-            String zipName = batchCode + analysisTypeCode + AnalysisConstants.ZIP_SUFFIX;
-            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(zipName, "UTF-8"));
-            response.setContentType("application/octet-stream");
-            log.info("fieldCode = {} ,batchCode = {} ,analysisTypeCode = {} 响应头部设置完毕，准备压缩下载",fieldCode,batchCode,analysisTypeCode);
-            ZipUtil.zip(response.getOutputStream(), pathsArray, inputStreamsArray);
-            log.info("fieldCode = {} ,batchCode = {} ,analysisTypeCode = {} 压缩下载完毕 ！！！",fieldCode,batchCode,analysisTypeCode);
-            //这个结果不会返回，但是错误的必须返回
-            return ResultResp.SUCCESS();
-        }catch (Exception e){
-            log.error("fileCode = {} batchCode = {} analysisTypeCode = {} 文件下载失败",fieldCode,batchCode,analysisTypeCode,e);
-            return ResultResp.FAIL("文件下载失败，请重试或联系管理员");
-        }
-    }
-
-//    /**
-//     * 文件下载
-//     * @param fieldCode
-//     * @param batchCode
-//     * @return
-//     */
-//    @Override
-//    public void downloadFile(String fieldCode, String batchCode, String analysisTypeCode, HttpServletResponse response) {
-//        //下载文件到本地
-//        String downloadUrl = BatchDownloadUtil.backResourceAddress(StringUtils.lowerCase(fieldCode),createSourceFilePath(batchCode,analysisTypeCode));
-//        if(StringUtils.isBlank(downloadUrl)){
-//            log.info("fieldCode = {} ,batchCode = {} ,analysisTypeCode = {} 文件不存在",fieldCode,batchCode,analysisTypeCode);
-//            return ;
-//        }
-//        File file = ZipUtil.zip(downloadUrl, createZipPath(batchCode),true);
-//        //异步删除临时文件与zip文件
-//        deleteFileDir(downloadUrl);
-//        downloadZip(file,response);
-//        //异步删除临时文件与zip文件
-//        deleteFileDir(createDeleteZipPath());
-//    }
-
-
-    /**
-     * 设置文件流与文件路径
-     * @param bucketName
-     * @param resoucePath
-     * @param zipFilePaths
-     * @param inputStreams
-     * @throws Exception
-     */
-    private void setStreamAndPath (String bucketName,
-                                   String resoucePath,
-                                   List<String> zipFilePaths,
-                                   List<InputStream> inputStreams) throws Exception {
-        bucketName = StringUtils.lowerCase(bucketName);
-        //递归获取文件列表（只有文件不含文件夹）
-        Iterable<Result<Item>> results = minioClient.listObjects(ListObjectsArgs.builder().bucket(bucketName).prefix(resoucePath).recursive(true).build());
-        int count = 0;
-        for(Result<Item> result : results){
-            Item item = result.get();
-            String objectName = item.objectName();
-            log.info("当前操作文件名称 {} ", resoucePath, objectName);
-            GetObjectArgs getObjectArgs = GetObjectArgs.builder().bucket(bucketName).object(objectName).build();
-            String filePath = objectName.replace(resoucePath, resoucePath.replaceFirst(File.separator,"_"));
-            zipFilePaths.add(filePath);
-            log.info("当前放入文件-{} ", resoucePath, objectName);
-            inputStreams.add(minioClient.getObject(getObjectArgs));
-            log.info("文件-{} 放入下载列表成功,当前放入文件数量 = {}",objectName,++count);
-        }
-    }
-
-
-    /**
-     * 生成源文件路径
-     * @param batchCode 批次编号
-     * @param analysisTypeCode 分析类型code
-     * @return
-     */
-    private String createSourceFilePath(String batchCode,String analysisTypeCode){
-        String resourcePath = batchCode + AnalysisConstants.PATH_SEPARATOR ;
-        if(StringUtils.isNotBlank(analysisTypeCode)){
-            resourcePath +=  analysisTypeCode + AnalysisConstants.PATH_SEPARATOR;
-        }
-        return resourcePath;
-    }
-
-    /**
-     * 创建压缩文件路径
-     * @param batchCode
-     * @return
-     */
-    private String createZipPath(String batchCode){
-        return batchDownloadUtil.localDir + AnalysisConstants.ZIP_DIR
-                + AnalysisConstants.PATH_SEPARATOR + batchCode
-                + AnalysisConstants.ZIP_SUFFIX;
-    }
-
-    /**
-     * 删除路径
-     * @return
-     */
-    private String createDeleteZipPath(){
-        return batchDownloadUtil.localDir + AnalysisConstants.PATH_SEPARATOR + AnalysisConstants.ZIP_DIR;
-    }
-
-    /**
-     * 下载zip文件
-     * @param file
-     * @param response
-     * @throws IOException
-     */
-    private void downloadZip(File file,HttpServletResponse response){
-        try{
-            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(file.getName(), "UTF-8"));
-            response.setContentType("application/octet-stream");
-            byte[] bytes = FileUtil.readBytes(file.getAbsolutePath());
-            OutputStream os = response.getOutputStream();
-            os.write(bytes);
-            os.flush();
-            os.close();
-        }catch (IOException ioe){
-            log.error("fileName = {} 文件下载失败",file.getName(),ioe);
-        }
-    }
-
-    /**
-     * 异步删除文件
-     * @param filePath
-     */
-    private void deleteFileDir(String filePath){
-        File file = new File(filePath);
-        if(file.exists()){
-            CompletableFuture.supplyAsync(() -> FileUtil.del(file))
-                    .thenAccept(result -> log.info("filePath = {} 删除结果result = :{} " , filePath, result));
-        }
-    }
-
-
-    /**
-     * 获取分析类型
-     */
-    private List<Map<String,Object>> getAnalysisType(){
-        List<Map<String,Object>> resultList = new ArrayList<>();
-        List<AnalysisTypeVo> analysisTypeVos =  analysisTypeMapper.selectAllVo();
-        if(CollectionUtils.isEmpty(analysisTypeVos)){
-            return resultList;
-        }
-        analysisTypeVos = analysisTypeVos.stream().filter(item->StringUtils.isNotBlank(item.getTypeCode())).sorted(Comparator.comparing(AnalysisTypeVo::getParentId)).collect(Collectors.toList());
-        analysisTypeVos.forEach(analysisTypeVo -> {
-            String[] typeFlagStrs = analysisTypeVo.getTypeFlag().split("\\|");
-            analysisTypeVo.setTypeFlag(typeFlagStrs[typeFlagStrs.length-1]);
-            resultList.add(BeanMapUtils.beanToMap(analysisTypeVo));
-        });
-        return resultList;
-//        return TreeUtil.getJava8ResultTree(resultList, AnalysisConstants.ANALYSIS_TYPE_PARRENT_KEY,AnalysisConstants.ANALYSIS_TYPE_KEY);
-    }
-
-    /**
-     * 获取风机组编号
-     * @param batchCode
-     * @return
-     */
-    private List<WindEngineGroupVo> getWindEngineGroupByBatchCode(String batchCode){
-        return engineGroupMapper.selectWindEngineGroupByBatchCode(batchCode);
-//        if(CollectionUtils.isEmpty(engineGroupVos)){
-//            return new HashMap<>();
-//        }
-//        return engineGroupVos.parallelStream().collect(Collectors.toMap(WindEngineGroupVo::getEngineCode,WindEngineGroupVo::getEngineName, (k1, k2) -> k1, LinkedHashMap::new));
-    }
-
-    /**
-     * 获取所有分析类型总文件
-     * @param batchCode
-     * @param typeCodes
-     * @param isIntranet
-     * @return
-     */
-    private List<AnalysisGeneralFileVo> getAllGeneralFiles(String batchCode,Set<String> typeCodes, boolean isIntranet){
-        List<AnalysisGeneralFileVo> resultList = new ArrayList<>();
-        typeCodes.stream().forEach(typeCode -> resultList.addAll(getNewGeneralFiles(batchCode,typeCode,isIntranet)));
-        return resultList;
-    }
-
-    /**
-     * 获取总文件
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    private List<AnalysisGeneralFileVo> getNewGeneralFiles(String batchCode,String analysisTypeCode, boolean isIntranet){
-        //从数据库获取当前批次、当前分析类型的所有的分析总文件
-        List<AnalysisGeneralFileVo> generalFileVos = generalFileMapper.selectByCondition(batchCode,analysisTypeCode);
-        generalFileVos = generalFileVos.stream().filter(item-> StringUtils.isNotBlank(item.getEngineTypeCode())
-                        && !item.getFileAddr().endsWith(FILTER_PATTEN))
-                .collect(Collectors.groupingBy(
-                        AnalysisGeneralFileVo::getEngineTypeCode,
-                        Collectors.maxBy(Comparator.comparing(AnalysisGeneralFileVo::getCreateTime)))
-                ).values().stream().map(Optional::get).collect(Collectors.toList());
-                //添加内外网前缀
-        generalFileVos.forEach(item -> item.setFileAddr(NetUtils.getFilePath(isIntranet,item.getFileAddr())));
-        //当同一个批次、同一个分析类型下，存在多个总文件时，说明一定是按照机型分析，需过滤掉total机型的文件
-        if(generalFileVos.size() > 1){
-            generalFileVos = generalFileVos.stream().filter(item -> !item.getEngineTypeCode().equals(GENERAL_FILE_TYPE_CODE)).collect(Collectors.toList());
-        }
-        return generalFileVos;
-    }
-
-
-    /**
-     * 获取最新分析结果分文件
-     * @param batchCode
-     * @param analysisTypeCode
-     * @param fieldEngineCodes
-     * @return
-     */
-    private List<AnalysisDiagramRelationVo> getNewDiagramRelations(String batchCode,String analysisTypeCode,List<String> fieldEngineCodes, boolean intranet){
-        //获取当前批次、当前分析类型的所有分析结果文件
-        List<AnalysisDiagramRelationVo> diagramRelationVos = diagramRelationMapper.selectByCondition(batchCode,analysisTypeCode,fieldEngineCodes);
-        if(CollectionUtils.isEmpty(diagramRelationVos)){
-            return diagramRelationVos;
-        }
-        diagramRelationVos = diagramRelationVos.stream().filter(item -> !item.getFileAddr().endsWith(FILTER_PATTEN)).collect(Collectors.toList());
-        //根据机组分组获取每组最新文件
-        diagramRelationVos = diagramRelationVos.stream().collect(Collectors.groupingBy(
-                        AnalysisDiagramRelationVo::getFileAddr,
-                        Collectors.maxBy(Comparator.comparing(AnalysisDiagramRelationVo::getCreateTime)))
-                ).values().stream().map(Optional::get)
-                //对风机编号进行排序
-                .sorted(Comparator.comparing(AnalysisDiagramRelationVo::getFieldEngineCode)).collect(Collectors.toList());
-                //添加内外网前缀
-        diagramRelationVos.forEach(item -> item.setFileAddr(NetUtils.getFilePath(intranet,item.getFileAddr())));
-        return diagramRelationVos;
-    }
-
-    /**
-     * 去重
-     * @param keyExtractor
-     * @param <T>
-     * @return
-     */
-    public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
-        Set<Object> set = ConcurrentHashMap.newKeySet();
-        return t -> set.add(keyExtractor.apply(t));
-    }
-
-    /**
-     * 替换路径中的手动、自动文件夹名称
-     * @param fileAddr
-     * @return
-     */
-    private String replacePath(String fileAddr) {
-        //删除自动、手动 文件夹名称
-        for(String replaceStr : algorithmProperties.getAnalysisFileReplaceStr()){
-            fileAddr = fileAddr.replace(replaceStr, AnalysisConstants.PATH_SEPARATOR);
-        }
-        //删除文件后缀名
-        fileAddr = fileAddr.substring(0, fileAddr.lastIndexOf('.'));
-        //中文名字不一样机型编号一样
-        Matcher matcher = Pattern.compile(ENGINE_CODE_PATTEN).matcher(fileAddr);
-        String engineCode = matcher.find() ? matcher.group() : "";
-        return StringUtils.isNotBlank(engineCode) ? engineCode : fileAddr;
-    }
-
-
-    /**
-     * 如果列表中含有超过一个的地址链接 删除文件名称中没有机型编码的文件
-     * @param generalFileVos
-     */
-    private void filterDiffFileName(List<AnalysisGeneralFileVo> generalFileVos){
-        if(generalFileVos.size() > 1){
-            generalFileVos.stream().filter(item -> retainEngineCodeFile(item.getFileAddr())).collect(Collectors.toList());
-        }
-    }
-
-    private static boolean retainEngineCodeFile(String fileAddr){
-        Pattern pattern = Pattern.compile(ENGINE_CODE_PATTEN);
-        String fileName = fileAddr.substring(fileAddr.lastIndexOf(AnalysisConstants.PATH_SEPARATOR) + 1);
-        return pattern.matcher(fileName).find();
-    }
-
-    /**
-     * 设置分析结果
-     * @param analysisTypeVo
-     * @param newGeneralFileVos
-     * @param newDiagramRelationVos
-     * @param commentDescriptionVos
-     * @return
-     */
-    private AnalysisDetailVo getAnalysisDetailVo(AnalysisTypeVo analysisTypeVo,
-                                                 List<AnalysisGeneralFileVo> newGeneralFileVos,
-                                                 List<AnalysisDiagramRelationVo> newDiagramRelationVos,
-                                                 List<AnalysisCommentDescriptionVo> commentDescriptionVos){
-        List<AnalysisGeneralFileVo> generalFileVos = null;
-        if(CollectionUtils.isNotEmpty(newGeneralFileVos)) {
-            generalFileVos = newGeneralFileVos.stream().filter(analysisGeneralFileVo -> analysisGeneralFileVo.getAnalysisTypeCode().equals(analysisTypeVo.getTypeCode())).collect(Collectors.toList());
-        }
-        List<AnalysisDiagramRelationVo> diagramRelationVos = null;
-        if(CollectionUtils.isNotEmpty(newDiagramRelationVos)){
-            diagramRelationVos = newDiagramRelationVos.stream().filter(analysisDiagramRelationVo -> analysisDiagramRelationVo.getAnalysisTypeCode().equals(analysisTypeVo.getTypeCode())).collect(Collectors.toList());
-        }
-        if(CollectionUtils.isEmpty(generalFileVos) && CollectionUtils.isEmpty(diagramRelationVos)){
-            return null;
-        }
-        return new AnalysisDetailVo()
-                .setAnalysisTypeCode(analysisTypeVo.getTypeCode())
-                .setAnalysisTypeName(analysisTypeVo.getTypeName())
-                .setGeneralFiles(generalFileVos)
-                .setDiagramRelations(diagramRelationVos)
-                .setCommentDescriptionVos(commentDescriptionVos);
-    }
-
-    /**
-     * 根据分析类型code转换分析flag
-     * @param analysisDto
-     */
-    private void transferAnalysisFlagByCode(AnalysisDto analysisDto){
-        List<String> configAnalysisCodes = analysisDto.getConfigAnalysis();
-        if(CollectionUtils.isEmpty(configAnalysisCodes)){
-            return;
-        }
-        //去重处理
-        Set<String> flags = new HashSet<>();
-        configAnalysisCodes.stream().forEach(item -> {
-            String[] typeStrs = item.split("\\|");
-            String flag = analysisTypeMapper.selecFlagByCode(typeStrs[0]);
-            String dataSource;
-            if(StringUtils.isNotBlank(analysisDto.getScada())){
-                dataSource = analysisDto.getScada();
-            }else{
-                dataSource = typeStrs[1];
-            }
-            flag = flag.substring(0,flag.lastIndexOf("|") + 1) + dataSource;
-            flags.add(flag);
-        });
-        analysisDto.setConfigAnalysis(flags.stream().collect(Collectors.toList()));
-    }
-
-    /**
-     * 数据处理
-     * @param analysisDto 前端入参
-     * @param rootNode 根节点json
-     */
-    private void dataProccess(AnalysisDto analysisDto,JsonNode rootNode){
-        //前端入参类
-        Field[] analysisFields = analysisDto.getClass().getDeclaredFields();
-//        String scada = analysisDto.getScada();
-        Arrays.asList(analysisFields).stream().forEach(field -> {
-            field.setAccessible(true);
-            try {
-                //值不能为空且值为list的时候list长度不能为0
-                if(field.get(analysisDto) != null){
-                    updateNodesByPropertyName(rootNode, field.getName(), field.get(analysisDto));
-                }
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-
-    /**
-     * 根据属性修改json值
-     * @param parentNode 节点
-     * @param propertyName 属性名称
-     * @param newValue 新值
-     */
-    private void updateNodesByPropertyName(JsonNode parentNode, String propertyName, Object newValue) {
-        //遍历当前节点
-        for (Iterator<Map.Entry<String, JsonNode>> it = parentNode.fields(); it.hasNext(); ) {
-            Map.Entry<String, JsonNode> entry = it.next();
-            // 匹配到属性名称，进行值的修改
-            if (entry.getKey().equalsIgnoreCase(propertyName)) {
-                //分析类型及有子节点的处理
-                if(propertyName.equalsIgnoreCase(algorithmProperties.getConfigAnalysisProperties()) || entry.getValue().fields().hasNext()){
-                    assignmentByPropertyName(entry.getValue(), propertyName, newValue);
-                    return;
-                }
-                //数组属性得特殊处理
-                if(algorithmProperties.getAnalysisArrayProperties().contains(propertyName)){
-                    ArrayNode arrayNode = mapper.createArrayNode();
-                    ((List<String>)newValue).stream().forEach(item-> arrayNode.add(item));
-                    ((ObjectNode) parentNode).set(propertyName,arrayNode);
-                    return;
-                }
-                //普通单节点
-                ((ObjectNode) parentNode).put(propertyName, newValue.toString());
-                return;
-            }
-            // 递归搜索子节点
-            updateNodesByPropertyName(entry.getValue(), propertyName, newValue);
-        }
-
-    }
-
-    /**
-     * 处理特殊属性
-     * @param subNode
-     * @param propertyName
-     * @param newValue
-     */
-    private void assignmentByPropertyName(JsonNode subNode, String propertyName, Object newValue){
-        //scada数据筛选过滤 、图像设置特殊处理
-//        if(algorithmProperties.getGraphSetsProperties().contains(propertyName)||
-        if(algorithmProperties.getCustomFilterProperties().contains(propertyName)){
-            dealGraphSetsAndCustomFilter(subNode, newValue);
-            return ;
-        }
-        //分析类型特殊处理
-        if(algorithmProperties.getConfigAnalysisProperties().equals(propertyName)){
-            dealConfigAnalysis(subNode, newValue);
-            return;
-        }
-    }
-
-    /**
-     * scada数据筛选过滤 、图像设置特殊处理（图像设置特殊处理废弃）
-     * @param subNode
-     * @param newValue
-     */
-    private void dealGraphSetsAndCustomFilter(JsonNode subNode, Object newValue){
-        List<Double> list = (List) newValue;
-        if(list.size() == 0){
-            return;
-        }
-        AtomicInteger index = new AtomicInteger(0);
-        subNode.fields().forEachRemaining(entry -> {
-            if(index.get() <= list.size() -1 && list.get(index.get()) != null){
-                ((ObjectNode) subNode).put(entry.getKey(), list.get(index.get()));
-            }
-            index.incrementAndGet();
-        });
-    }
-
-    /**
-     * 分析类型处理
-     * @param subNode
-     * @param newValue
-     */
-    private void dealConfigAnalysis(JsonNode subNode, Object newValue){
-        try{
-            ArrayNode arrayNode = (ArrayNode) subNode;
-            List<String> analysisTypes = (List) newValue;
-            for(int i = 0 ; i < analysisTypes.size() ; i++){
-                JsonNode childNode = mapper.readTree(algorithmProperties.getAnalysisTypeJson());
-                //分析类型解析
-                String[] types = analysisTypes.get(i).split("\\|");
-                AtomicInteger index =  new AtomicInteger(0);
-                childNode.fields().forEachRemaining(entry-> {
-                    ((ObjectNode)childNode).put(entry.getKey(), types[index.get()]);
-                    index.incrementAndGet();
-                });
-                arrayNode.add(childNode);
-            }
-        }catch (JsonProcessingException jsonExcep){
-            log.error("分析类型解析失败：",jsonExcep);
-        }
-    }
-
-
-    /**
-     * 操作记录
-     * @param fieldCode
-     */
-    public static void addOptionRecords(String fieldCode,String batchCode,String optionContent){
-        try{
-            if(StringUtils.isBlank(fieldCode)){
-                AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
-                fieldCode = analysisResultPo.getFieldCode();
-            }
-            AnalysisOptionRecordsPo optionRecordsPo = new AnalysisOptionRecordsPo();
-            LoginUser user = LoginUserContextHolder.get();
-            optionRecordsPo.setOptionBy(user.getUserId());
-            optionRecordsPo.setOptionByName(user.getUserName());
-            optionRecordsPo.setOptionContent(optionContent);
-            optionRecordsPo.setFieldCode(fieldCode);
-            optionRecordsMapper.insertSelective(optionRecordsPo);
-        }catch (Exception e){
-            log.info("增加操作记录异常",e);
-            return;
-        }
-    }
-
-    /**
-     * 设置额定功率
-     * @param analysisDto
-     * @return
-     */
-//    public void setActivePower(AnalysisDto analysisDto){
-//        List<Double> targetList = AnalysisConstants.ACTIVITY_POWER;
-//        List<Double> sourceList = analysisDto.getActivePower();
-//        //替换值为空的元素
-//        replaceNullForList(sourceList,targetList);
-//        //当源列表长度与指定列表长度一样的话 源列表最后一个元素一定不是空，不需要替换值为最大功率*1.2
-//        if(sourceList != null && sourceList.size() == targetList.size()){
-//            analysisDto.setActivePower(targetList);
-//            return;
-//        }
-//        String rateCapacity = getRatedCapacity(analysisDto);
-//        if(StringUtils.isNotBlank(rateCapacity)){
-//            //设置额定功率（风场所有风机中最大功率*1.2）
-//            targetList.set(targetList.size() -1 ,new Double(rateCapacity));
-//        }
-//        analysisDto.setActivePower(targetList);
-//    }
-
-    /**
-     * 将源列表中非空元素替换到目标列表中且下标不变
-     * @param sourcelist
-     * @param targetList
-     * @return
-     */
-    private <T> void replaceNullForList(List<T> sourcelist ,List<T> targetList){
-        if(CollectionUtils.isEmpty(sourcelist)){
-            return;
-        }
-        sourcelist.stream().forEachOrdered(element -> {
-            if(element != null){
-                targetList.set(sourcelist.indexOf(element),element);
-            }
-        });
-    }
-
-    /**
-     * 获取 ratedCapacity 风机额定功率*1.2
-     * @param analysisDto
-     * @return
-     */
-    private String getRatedCapacity(AnalysisDto analysisDto){
-        //获取风机机组
-        List<String> engineCodes = analysisDto.getTurbines();
-        //获取风场编号
-        String fieldCode = analysisDto.getPowerFarmID();
-        if(StringUtils.isBlank(fieldCode)){
-            return null;
-        }
-        //查询最大功率
-       BigDecimal ratedCapacity = windEngineGroupMapper.selectMaxRatedCapacity(fieldCode,engineCodes);
-       //功率因数 1.2
-       BigDecimal powerFactorRated = new BigDecimal(algorithmProperties.getPowerFactorRated());
-       //返回功率
-       return ratedCapacity == null ? null : ratedCapacity.multiply(powerFactorRated).toString();
-    }
-
-    @Autowired
-    private void setAnalysisOptionRecordsMapper(AnalysisOptionRecordsMapper optionRecordsMapper) {
-        AnalysisServiceImpl.optionRecordsMapper = optionRecordsMapper;
-    }
-
-    @Autowired
-    private void setAnalysisResultMapper(AnalysisResultMapper analysisResultMapper) {
-        AnalysisServiceImpl.analysisResultMapper = analysisResultMapper;
-    }
-
-
-    /**
-     * 生成风场批次号
-     * @param fieldCode
-     * @return
-     */
-    @Override
-    public String createWindFieldBatchCode(String fieldCode){
-        String sequece = IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, fieldCode,IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode())),6));
-        return fieldCode + SEPARATOR + sequece;
-    }
-
-    /**
-     * 创建分析名称
-     * @param fieldName
-     * @return
-     */
-    public String createBatchName(String fieldName){
-        String fieldPYHeader = PinYinUtils.getPinYinHeadChar(fieldName);
-        return fieldPYHeader.concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, fieldPYHeader)),6));
-    }
-
-
-    /**
-     * 测试排序去重
-     * @param args
-     * @throws InterruptedException
-     */
-    public static void main(String[] args) throws InterruptedException, URISyntaxException {
-        AnalysisDto analysisDto = new AnalysisDto();
-        List<String> turbines = new ArrayList<>();
-        turbines.add("1");
-        turbines.add("2");
-        turbines.add("3");
-        analysisDto.setTurbines(turbines);
-        AnalysisDataRelationRecordsPo relationRecordsPo = new AnalysisDataRelationRecordsPo();
-        BeanUtils.copyProperties(analysisDto,relationRecordsPo);
-        relationRecordsPo.setTurbines(turbines.stream().collect(Collectors.joining(",")));
-        System.out.println(relationRecordsPo.getTurbines());
-    }
-
-}

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

@@ -1,183 +0,0 @@
-package com.energy.manage.service.service.analysis.impl;
-
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-import com.energy.manage.common.po.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsPo;
-import com.energy.manage.common.po.autoanalysisconfigrelations.AutoAnalysisConfigRelationsPo;
-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.AutoAnalysisConfigDetailDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisTypeVo;
-import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
-import com.energy.manage.service.mappers.analysis.AnalysisResultMapper;
-import com.energy.manage.service.mappers.analysis.AnalysisTypeMapper;
-import com.energy.manage.service.mappers.autoanalysisconfigdetail.AutoAnalysisConfigDetailMapper;
-import com.energy.manage.service.mappers.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsMapper;
-import com.energy.manage.service.mappers.autoanalysisconfigrelations.AutoAnalysisConfigRelationsMapper;
-import com.energy.manage.service.service.analysis.AnalysisService;
-import com.energy.manage.service.service.analysis.AutoAnalysisService;
-import com.energy.manage.service.util.DateUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.energy.manage.service.constant.analysis.AnalysisConstants.AUTO_ANALYSIS_NAME;
-
-/**
- * @author chy
- * @date 2025/3/31 15:43
- * @desc
- */
-@Slf4j
-@Service
-public class AutoAnalysisServiceImpl implements AutoAnalysisService {
-
-    @Autowired
-    private AutoAnalysisConfigDetailMapper autoAnalysisConfigDetailMapper;
-
-    @Autowired
-    private AutoAnalysisConfigDetailOptionRecordsMapper optionRecordsMapper;
-
-    @Autowired
-    private AnalysisService analysisService;
-
-    @Autowired
-    private AnalysisResultMapper analysisResultMapper;
-
-    @Autowired
-    private AutoAnalysisConfigRelationsMapper relationsMapper;
-
-    @Autowired
-    private AnalysisTypeMapper analysisTypeMapper;
-
-    /**
-     * 自动分析
-     */
-    @Override
-    public void autoAnalysis() {
-        log.info("触发自动分析定时任务开始。");
-        //查询所有风场启动中的自动分析配置
-        List<AutoAnalysisConfigDetailVo> detailVos = autoAnalysisConfigDetailMapper.selectByCondition(new AutoAnalysisConfigDetailDto().setStartupState(AnalysisConstants.ON_CALL));
-        if(CollectionUtils.isEmpty(detailVos)){
-            log.info("当前无自动分析配置，不执行自动分析。");
-            return;
-        }
-        detailVos.stream().forEachOrdered(item->{
-            //保存操作结果与关联关系
-            AutoAnalysisConfigRelationsPo relationsPo = saveAnalysisResult(item);
-            if(relationsPo == null){
-                log.info("任务id = {} 数据截止日期在当前时间之后，不执行自动分析。", item.getConfigUniqueId());
-                return;
-            }
-            //调用分析
-            analysis(relationsPo,item.getFieldCode());
-        });
-        log.info("触发自动分析定时任务结束");
-    }
-
-    /**
-     * 保存操作结果与关联关系（判断最后一次分析到目前为止有没有改动过配置，如果改动过则重新跑）
-     * @param vo
-     */
-    private AutoAnalysisConfigRelationsPo saveAnalysisResult(AutoAnalysisConfigDetailVo vo){
-        String configUniqueId = vo.getConfigUniqueId();
-        AutoAnalysisConfigRelationsPo relationsPo = relationsMapper.selectByConfigUniqueId(configUniqueId);
-        //如果当前配置一次自动分析没有执行 则起始时间按照配置时间 否则按照最后一次分析endTime（前提是没有修改配置）
-        Date startTime = relationsPo == null ? vo.getStartTime() : relationsPo.getEndTime();
-        //获取最后一次分析创建时间
-        Date relatonCreateTime = relationsPo == null ? null : relationsPo.getCreateTime();
-        //如果修改配置，则查询出该配置最后一次修改记录，判断修改时间在最后一次执行分析之后且在当前时间之前
-        AutoAnalysisConfigDetailOptionRecordsPo optionRecordsPo = optionRecordsMapper.selectEditByCreateTime(configUniqueId);
-        //获取最后一次修改配置时间
-        Date optionCreateTime = optionRecordsPo == null ? null : optionRecordsPo.getCreateTime();
-        //如果修改配置时间在最后一次分析之后，则重新计算开始时间，按照配置开始时间重新跑
-        startTime = optionCreateTime != null
-                && optionCreateTime.after(startTime)
-                && relatonCreateTime != null
-                && optionCreateTime.after(relatonCreateTime) ?  vo.getStartTime() : startTime;
-        //获取数据结束日期
-        Date endTime = DateUtils.addDays(startTime, vo.getIntervalDays());
-        //如果数据结束日期在当前时间之后则不需要执行分析
-        if(endTime.after(new Date())){
-            return null;
-        }
-        //创建并保存分析结果
-        AnalysisResultPo analysisResultPo = createAnalysisResultPo(vo.getFieldCode(),startTime,endTime);
-        analysisResultMapper.insertSelective(analysisResultPo);
-        //创建并保存关联关系
-        AutoAnalysisConfigRelationsPo saveRelationsPo = createRelationsPo(configUniqueId, analysisResultPo.getBatchCode(),
-                startTime, endTime);
-        relationsMapper.insertSelective(saveRelationsPo);
-        return saveRelationsPo;
-    }
-
-    /**
-     * 创建分析结果
-     * @param fieldCode
-     * @return
-     */
-    private AnalysisResultPo createAnalysisResultPo(String fieldCode ,Date startTime ,Date endTime){
-        //创建分析名称
-        String analysisName = AUTO_ANALYSIS_NAME + "(" + DateUtils.convertDate2StringYMD(startTime) + "--" + DateUtils.convertDate2StringYMD(endTime) + ")";
-        return new AnalysisResultPo().setAnalysisName(analysisName)
-                .setSketch(analysisName)
-                .setBatchCode(analysisService.createWindFieldBatchCode(fieldCode))
-                .setFieldCode(fieldCode)
-                .setOnOffCall(AnalysisConstants.ON_CALL)
-                .setAnalysisFlag(AnalysisConstants.ANALYSIS_AUTO);
-    }
-
-    /**
-     * 创建关联关系
-     * @param configUniqueId
-     * @param batchCode
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    private AutoAnalysisConfigRelationsPo createRelationsPo( String configUniqueId, String batchCode,Date startTime, Date endTime) {
-        return new AutoAnalysisConfigRelationsPo().setConfigUniqueId(configUniqueId)
-                .setBatchCode(batchCode)
-                .setStartTime(startTime)
-                .setEndTime(endTime);
-    }
-
-    /**
-     * 调用分析
-     * @param relationsPo
-     * @param fieldCode
-     */
-    private void analysis(AutoAnalysisConfigRelationsPo relationsPo,String fieldCode){
-        AnalysisDto analysisDto = new AnalysisDto();
-        //获取所有的分钟级/秒级分析类型
-        List<AnalysisTypeVo> analysisTypeVo = analysisTypeMapper.selectAllVo();
-        //构建分析类型标识
-        Set<String> configAnalysis = analysisTypeVo.stream().filter(item-> StringUtils.endsWithAny(item.getTypeFlag(), AnalysisConstants.MINUTE,AnalysisConstants.SECEND))
-                .map(item->constructTypeFlag(item)).collect(Collectors.toSet());
-
-        //创建分析dto
-        analysisDto.setAutoOrManual(AnalysisConstants.AUTO_ANALYSIS)
-                .setPowerFarmID(fieldCode)
-                .setDataBatchNum(relationsPo.getBatchCode())
-                .setConfigAnalysis(configAnalysis.stream().collect(Collectors.toList()))
-                .setBeginTime(DateUtils.convertDate2StringYMD(relationsPo.getStartTime()))
-                .setEndTime(DateUtils.convertDate2StringYMD(relationsPo.getEndTime()));
-        //调用分析
-        analysisService.analysis(analysisDto);
-    }
-
-    /**
-     * 构建分析类型标识
-     * @return
-     */
-    private String constructTypeFlag(AnalysisTypeVo vo){
-        String[] flags = vo.getTypeFlag().split(AnalysisConstants.CHAR_ESCAPE_SEPARATOR);
-        return vo.getTypeCode() + AnalysisConstants.CHAR_SEPARATOR + flags[flags.length-1];
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.energy.manage.service.service.analysiscomment;
-
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.domain.dto.analysis.AnalysisCommentDescriptionDto;
-import com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisCommentTypeRelationVo;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/24 17:11
- * @desc
- */
-public interface AnalysisCommentService {
-
-    /**
-     * 富文本类型查询
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    List<AnalysisCommentTypeRelationVo> analysisCommentTypeList(String batchCode,String analysisTypeCode);
-
-
-    /**
-     * 富文本内容添加
-     * @param typeRelationDto
-     * @return
-     */
-    ResultResp addAnalysisCommentType(AnalysisCommentTypeRelationDto typeRelationDto);
-
-    /**
-     * 删除富文本类型
-     * @param commentTypeCode
-     * @return
-     */
-    ResultResp delAnalysisCommentType(String commentTypeCode);
-
-
-    /**
-     * 富文本编辑
-     * @param commentDescriptionDto
-     * @return
-     */
-    int analysisCommentEdit(AnalysisCommentDescriptionDto commentDescriptionDto);
-
-
-    /**
-     * 富文本内容查询
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    List<AnalysisCommentDescriptionVo> analysisCommentDescList(String batchCode, String analysisTypeCode);
-}

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

@@ -1,169 +0,0 @@
-package com.energy.manage.service.service.analysiscomment.impl;
-
-import com.energy.manage.common.po.analysis.AnalysisCommentDescriptionPo;
-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.analysis.AnalysisCommentDescriptionDto;
-import com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto;
-import com.energy.manage.service.domain.dto.analysis.CommentDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisCommentTypeRelationVo;
-import com.energy.manage.service.mappers.analysis.AnalysisCommentDescriptionMapper;
-import com.energy.manage.service.mappers.analysis.AnalysisCommentTypeRelationMapper;
-import com.energy.manage.service.service.analysis.impl.AnalysisServiceImpl;
-import com.energy.manage.service.service.analysiscomment.AnalysisCommentService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-/**
- * @author chy
- * @date 2024/5/24 17:12
- * @desc
- */
-
-@Service
-public class AnalysisCommentServiceImpl implements AnalysisCommentService {
-
-    @Autowired
-    private AnalysisCommentTypeRelationMapper analysisCommentTypeRelationtMapper;
-
-    @Autowired
-    private AnalysisCommentDescriptionMapper commentDescriptionMapper;
-
-    /**
-     * 操作内容
-     */
-    private static final String OPTION_CONTENT = "评论编辑";
-
-    /**
-     * 富文本类型查询
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    @Override
-    public List<AnalysisCommentTypeRelationVo> analysisCommentTypeList(String batchCode,String analysisTypeCode) {
-        return analysisCommentTypeRelationtMapper.selectByAnalysisTypeCode(batchCode,analysisTypeCode);
-    }
-
-    /**
-     * 富文本类型添加
-     * @param typeRelationDto
-     * @return
-     */
-    @Override
-    public ResultResp addAnalysisCommentType(AnalysisCommentTypeRelationDto typeRelationDto){
-        String saveTypeName = StringUtils.trim(typeRelationDto.getCommentTypeName());
-        typeRelationDto.setCommentTypeName(saveTypeName);
-        if(duplicateCheckByTypeName(typeRelationDto)){
-            return ResultResp.FAIL(ConstVar.DUPLICATE_TYPE_NAME);
-        }
-        AnalysisCommentTypeRelationDto analysisCommentTypeRelationDto = new AnalysisCommentTypeRelationDto();
-        String typeCode = UUIDTools.getUUIDLowCase();
-        analysisCommentTypeRelationDto.setBatchCode(typeRelationDto.getBatchCode())
-                                      .setAnalysisTypeCode(typeRelationDto.getAnalysisTypeCode())
-                                      .setCommentTypeCode(typeCode)
-                                      .setCommentTypeName(saveTypeName)
-                                      .setCreateBy(typeRelationDto.getCreateBy());
-        return analysisCommentTypeRelationtMapper.insertPoSelective(analysisCommentTypeRelationDto) > 0 ? ResultResp.SUCCESS() : ResultResp.FAIL();
-    }
-
-
-    /**
-     * 富文本类型删除
-     * @param commentTypeCode
-     * @return
-     */
-    @Override
-    public ResultResp delAnalysisCommentType(String commentTypeCode){
-        AnalysisCommentTypeRelationVo analysisCommentTypeRelationVo = analysisCommentTypeRelationtMapper.selectByTypeCode(commentTypeCode);
-        if(analysisCommentTypeRelationVo == null){
-            return ResultResp.SUCCESS();
-        }
-        if(analysisCommentTypeRelationVo.getIsDefined() == 0){
-            return ResultResp.FAIL(ConstVar.NO_DIFINED_TYPE);
-        }
-        return analysisCommentTypeRelationtMapper.deleteByTypeCode(commentTypeCode) > 0 ? ResultResp.SUCCESS() : ResultResp.FAIL();
-    }
-
-    /**
-     * 富文本编辑
-     * @param dto
-     * @Param userId
-     * @return
-     */
-    @Override
-    public int analysisCommentEdit(AnalysisCommentDescriptionDto dto) {
-        AtomicInteger count = new AtomicInteger(0);
-        dto.getCommentList().parallelStream().forEach(item -> count.getAndAdd(saveCommentDescription(dto, item)));
-        AnalysisServiceImpl.addOptionRecords(null, dto.getBatchCode(),OPTION_CONTENT);
-        return count.get();
-    }
-
-    /**
-     * 富文本查询
-     * @param batchCode
-     * @param analysisTypeCode
-     * @return
-     */
-    @Override
-    public List<AnalysisCommentDescriptionVo> analysisCommentDescList(String batchCode, String analysisTypeCode) {
-        return commentDescriptionMapper.selecByBatchCodeAndAnalysisTypeCode(batchCode, analysisTypeCode);
-    }
-
-
-    /**
-     * 评论类型名称查重
-     * @param typeRelationDto
-     * @return
-     */
-    private boolean duplicateCheckByTypeName(AnalysisCommentTypeRelationDto typeRelationDto){
-        List<AnalysisCommentTypeRelationVo> voList = analysisCommentTypeRelationtMapper
-                                                        .selectByAnalysisTypeCode(typeRelationDto.getBatchCode(), typeRelationDto.getAnalysisTypeCode());
-        voList = voList.parallelStream().filter(vo -> vo.getCommentTypeName().equals(typeRelationDto.getCommentTypeName())).collect(Collectors.toList());
-        return voList.size() > 0;
-    }
-
-    /**
-     * 保存富文本
-     * @param commentDescriptionDto
-     */
-    private int saveCommentDescription(AnalysisCommentDescriptionDto commentDescriptionDto, CommentDto commentDto){
-        //批次编号
-        String batchCode = commentDescriptionDto.getBatchCode();
-        //分析类型编号
-        String analysisTypeCode = commentDescriptionDto.getAnalysisTypeCode();
-        //评论类型编号
-        String commentTypeCode = commentDto.getCommentTypeCode();
-        AnalysisCommentDescriptionPo commentDescriptionPo = new AnalysisCommentDescriptionPo();
-        //拷贝批次编号 分析类型编号
-        commentDescriptionPo.setBatchCode(batchCode)
-                            .setAnalysisTypeCode(analysisTypeCode)
-                            .setCommentTypeCode(commentTypeCode)
-                            .setComment(commentDto.getComment())
-                            .setCreateBy(commentDescriptionDto.getCreateBy())
-                            .setUpdateBy(commentDescriptionDto.getUpdateBy());
-//        int count =  commentDescriptionMapper.selectCountByAllCode(batchCode,analysisTypeCode,commentTypeCode);
-        if(StringUtils.isBlank(commentDto.getComment())){
-            return 0;
-        }
-        return commentDescriptionMapper.insertPoSelective(commentDescriptionPo);
-        //空则添加 非空则编辑
-//        if(count == 0){
-//            //如果评论内容为空则不添加
-//            if(StringUtils.isBlank(commentDto.getComment())){
-//                return 0;
-//            }
-//           return commentDescriptionMapper.insertPoSelective(commentDescriptionPo);
-//        }else{
-//           return commentDescriptionMapper.updatePoSelective(commentDescriptionPo);
-//        }
-    }
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiserr/AnalysisErrService.java

@@ -1,67 +0,0 @@
-package com.energy.manage.service.service.analysiserr;
-
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
-import com.energy.manage.service.domain.dto.windexceptioncount.WindExceptionCountDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisErrorCodeVo;
-import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
-import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionDescVo;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/23 17:25
- * @desc
- */
-public interface AnalysisErrService {
-
-
-    /**
-     * 根据批次号查询异常信息
-     * @param windExceptionCountDto
-     * @return
-     */
-    List<WindExceptionCountVo> analysisErrQuery(WindExceptionCountDto windExceptionCountDto);
-
-    /**
-     * 异常描述添加
-     * @param windExceptionCountDto
-     * @return
-     */
-    ResultResp analysisErrAdd(WindExceptionCountDto windExceptionCountDto);
-
-
-    /**
-     * 异常描述编辑
-     * @param windExceptionCountDto
-     * @return
-     */
-    int analysisErrEdit(WindExceptionCountDto windExceptionCountDto);
-
-
-    /**
-     * 删除异常描述
-     * @param windExceptionCountDto
-     * @return
-     */
-    int analysisErrDel(WindExceptionCountDto windExceptionCountDto);
-
-    /**
-     *通过批次查询有异常的风机信息
-     * @param batchCode
-     * @return
-     */
-    List<AnalysisErrorCodeVo> AnalysisErrorCodeQuery(String batchCode);
-
-
-    /**
-     * 查询风机异常信息
-     * @param batchCode
-     * @param engineCode
-     * @return
-     */
-    List<WindExceptionDescVo> queryErrDescByEngine(String batchCode, String engineCode);
-
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiserr/impl/AnalysisErrServiceImpl.java

@@ -1,94 +0,0 @@
-package com.energy.manage.service.service.analysiserr.impl;
-
-import com.energy.manage.common.reponse.ConstVar;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.domain.dto.windexceptioncount.WindExceptionCountDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisErrorCodeVo;
-import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
-import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionDescVo;
-import com.energy.manage.service.mappers.windexceptioncount.WindExceptionCountMapper;
-import com.energy.manage.service.service.analysiserr.AnalysisErrService;
-import com.github.pagehelper.PageHelper;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 分析异常数统计
- * @author chy
- * @date 2024/5/23 17:25
- * @desc
- */
-@Service
-public class AnalysisErrServiceImpl implements AnalysisErrService {
-
-    @Autowired
-    private WindExceptionCountMapper windExceptionCountMapper;
-
-
-    /**
-     * 分析异常数查询
-     * @param windExceptionCountDto
-     * @return
-     */
-    @Override
-    public List<WindExceptionCountVo> analysisErrQuery(WindExceptionCountDto windExceptionCountDto){
-        PageHelper.startPage(windExceptionCountDto.getPageNum(),windExceptionCountDto.getPageSize());
-        return windExceptionCountMapper.selectByCondition(windExceptionCountDto);
-    }
-
-    /**
-     * 异常描述添加
-     * @param windExceptionCountDto
-     * @return
-     */
-    @Override
-    public ResultResp analysisErrAdd(WindExceptionCountDto windExceptionCountDto) {
-        //根据批次号、分析类型、机组编号 查询异常描述是否已存在
-        List<WindExceptionCountVo> voList = windExceptionCountMapper.selectByCondition(windExceptionCountDto);
-        if(CollectionUtils.isNotEmpty(voList)){
-            return ResultResp.FAIL(ConstVar.SAME_WIND_ENGINE_ERR_INFO);
-        }
-        int count = windExceptionCountMapper.insertPoSelective(windExceptionCountDto);
-        return  count > 0 ? ResultResp.SUCCESS(count) : ResultResp.FAIL();
-    }
-
-    /**
-     * 异常描述编辑
-     * @param analysisResultDto
-     * @return
-     */
-    @Override
-    public int analysisErrEdit(WindExceptionCountDto analysisResultDto) {
-        return windExceptionCountMapper.updatePoSelecttive(analysisResultDto);
-    }
-
-    /**
-     * 删除异常描述
-     * @param windExceptionCountDto
-     * @return
-     */
-    @Override
-    public int analysisErrDel(WindExceptionCountDto windExceptionCountDto) {
-        windExceptionCountDto.setIsDelete(1);
-        return windExceptionCountMapper.updatePoSelecttive(windExceptionCountDto);
-    }
-
-    @Override
-    public List<AnalysisErrorCodeVo> AnalysisErrorCodeQuery(String batchCode) {
-        return windExceptionCountMapper.selectExceptionCountBybatchCode(batchCode);
-    }
-
-    /**
-     * 查询风机异常信息
-     * @param batchCode
-     * @param engineCode
-     * @return
-     */
-    @Override
-    public List<WindExceptionDescVo> queryErrDescByEngine(String batchCode, String engineCode){
-        return windExceptionCountMapper.selectByBatchAndEngine(batchCode,engineCode);
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/analysispriority/AnalysisPriorityService.java

@@ -1,17 +0,0 @@
-package com.energy.manage.service.service.analysispriority;
-
-/**
- * @author chy
- * @date 2025/2/12 15:40
- * @desc
- */
-public interface AnalysisPriorityService {
-
-    /**
-     * 插队
-     * @param batchCode
-     * @param priority
-     * @return
-     */
-    int editPriority(String batchCode, Integer priority);
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/analysispriority/impl/AnalysisPriorityServiceImpl.java

@@ -1,31 +0,0 @@
-package com.energy.manage.service.service.analysispriority.impl;
-
-import com.energy.manage.service.mappers.analysispriorityrecords.AnalysisPriorityRecordsMapper;
-import com.energy.manage.service.service.analysispriority.AnalysisPriorityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @author chy
- * @date 2025/2/12 15:41
- * @desc
- */
-@Service
-public class AnalysisPriorityServiceImpl implements AnalysisPriorityService {
-
-
-    @Autowired
-    private AnalysisPriorityRecordsMapper priorityRecordsMapper;
-
-
-    /**
-     * 插队
-     * @param batchCode
-     * @param priority
-     * @return
-     */
-    @Override
-    public int editPriority(String batchCode, Integer priority) {
-        return priorityRecordsMapper.updatePriotityByBatchCode(batchCode,priority);
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/anemometertower/impl/AnemometerTowerServiceImpl.java

@@ -22,7 +22,7 @@ import com.energy.manage.service.mappers.anemometertower.AnemometerTowerHeightMa
 import com.energy.manage.service.mappers.anemometertower.AnemometerTowerMapper;
 import com.energy.manage.service.mappers.anemometertower.AnemometerTowerRelationMapper;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;

energy-manage-service/src/main/java/com/energy/manage/service/service/autoanalysisconfig/AutoAnalysisConfigService.java

@@ -1,48 +0,0 @@
-package com.energy.manage.service.service.autoanalysisconfig;
-
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto;
-import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2025/3/27 09:49
- * @desc
- */
-
-public interface AutoAnalysisConfigService {
-
-
-    /**
-     *  查询列表
-     * @param autoAnalysisConfigDetailDto
-     * @return
-     */
-    List<AutoAnalysisConfigDetailVo> configList(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
-
-
-    /**
-     * 保存配置
-     * @param autoAnalysisConfigDetailDto
-     * @return
-     */
-    ResultResp configSave(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
-
-    /**
-     * 配置编辑
-     * @param autoAnalysisConfigDetailDto
-     * @return
-     */
-    ResultResp configEdit(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
-
-    /**
-     * 启动/关闭
-     * @param autoAnalysisConfigDetailDto
-     * @return
-     */
-    ResultResp onOff(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/autoanalysisconfig/impl/AutoAnalysisConfigServiceImpl.java

@@ -1,108 +0,0 @@
-package com.energy.manage.service.service.autoanalysisconfig.impl;
-
-import com.energy.manage.common.enums.OptionEnums;
-import com.energy.manage.common.po.autoanalysisconfigdetail.AutoAnalysisConfigDetailPo;
-import com.energy.manage.common.po.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsPo;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto;
-import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
-import com.energy.manage.service.mappers.autoanalysisconfigdetail.AutoAnalysisConfigDetailMapper;
-import com.energy.manage.service.mappers.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsMapper;
-import com.energy.manage.service.service.autoanalysisconfig.AutoAnalysisConfigService;
-import com.energy.manage.service.util.UUIDUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.energy.manage.common.reponse.ConstVar.EXSIT_ON_CONFIG;
-
-/**
- * @author chy
- * @date 2025/3/27 09:50
- * @desc
- */
-@Service
-public class AutoAnalysisConfigServiceImpl implements AutoAnalysisConfigService {
-
-    @Autowired
-    private AutoAnalysisConfigDetailMapper autoAnalysisConfigDetailMapper;
-
-    @Autowired
-    private AutoAnalysisConfigDetailOptionRecordsMapper optionRecordsMapper;
-
-    /**
-     * @param autoAnalysisConfigDetailDto
-     * @return
-     */
-    @Override
-    public List<AutoAnalysisConfigDetailVo> configList(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
-        return autoAnalysisConfigDetailMapper.selectByCondition(autoAnalysisConfigDetailDto);
-    }
-
-    @Override
-    public ResultResp configSave(AutoAnalysisConfigDetailDto detailDto) {
-        //同一个风场存在一个相同的配置（不论是否在启动状态）
-        int existConfigCount = autoAnalysisConfigDetailMapper.selectExistConfig(detailDto);
-        if(existConfigCount > 0){
-            return ResultResp.FAIL(EXSIT_ON_CONFIG);
-        }
-        String configUniqueId = UUIDUtil.getShortUUIDLowCase();
-        //保存操作记录
-        optionRecordsMapper.insertSelective(new AutoAnalysisConfigDetailOptionRecordsPo()
-                                                        .setFieldCode(detailDto.getFieldCode())
-                                                        .setConfigUniqueId(configUniqueId));
-        //保存配置
-        autoAnalysisConfigDetailMapper.insertConfig(detailDto.setConfigUniqueId(configUniqueId));
-        return ResultResp.SUCCESS();
-    }
-
-    @Override
-    public ResultResp configEdit(AutoAnalysisConfigDetailDto detailDto) {
-        //同一个风场存在一个相同的配置(不论是否在启动状态)
-        int existConfigCount = autoAnalysisConfigDetailMapper.selectExistConfig(detailDto);
-        if(existConfigCount > 0){
-            return ResultResp.FAIL(EXSIT_ON_CONFIG);
-        }
-        //保存操作记录(先保存原始值)
-        saveOptionRecords(detailDto.getConfigUniqueId(), OptionEnums.EDIT.getCode());
-        //更新配置
-        autoAnalysisConfigDetailMapper.updateConfigByCondition(detailDto);
-        return ResultResp.SUCCESS();
-    }
-
-    /**
-     * 启动/关闭
-     * @param detailDto
-     * @return
-     */
-    @Override
-    public ResultResp onOff(AutoAnalysisConfigDetailDto detailDto) {
-        //保存操作记录
-        int optionFlag = detailDto.getStartupState() == 1 ? OptionEnums.ON.getCode() : OptionEnums.OFF.getCode();
-        //保存操作记录(先保存操作记录，后更新)
-        saveOptionRecords(detailDto.getConfigUniqueId(), optionFlag);
-        //更新配置
-        autoAnalysisConfigDetailMapper.updateConfigByCondition(detailDto);
-        return ResultResp.SUCCESS();
-    }
-
-    /**
-     * 保存操作记录
-     * @param configUniqueId
-     * @param optionFlag
-     */
-    private void saveOptionRecords(String configUniqueId, Integer optionFlag){
-        //查询更新前的配置，为后续保存操作记录做准备
-        AutoAnalysisConfigDetailPo exist = autoAnalysisConfigDetailMapper.selectByUniqueId(configUniqueId);
-        //保存操作记录
-        AutoAnalysisConfigDetailOptionRecordsPo recordsPo = new AutoAnalysisConfigDetailOptionRecordsPo()
-                                                                    .setFieldCode(exist.getFieldCode())
-                                                                    .setConfigUniqueId(configUniqueId)
-                                                                    .setOptionFlag(optionFlag)
-                                                                    .setSourceStartupState(exist.getStartupState())
-                                                                    .setSourceIntevalDays(exist.getIntervalDays())
-                                                                    .setSourceStartTime(exist.getStartTime());
-        optionRecordsMapper.insertSelective(recordsPo);
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/cache/CacheService.java

@@ -1,21 +0,0 @@
-package com.energy.manage.service.service.cache;
-
-public interface CacheService {
-
-
-    boolean add(String key, String value);
-
-    boolean exists(String key);
-
-    String get(String key);
-
-    void setEx(String key, long expire, String value);
-
-    void updateExpire(String key, long expire);
-
-    void delete(String key);
-
-    Long incr(String key);
-
-    Long incrBy(String key,long value);
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/cache/impl/CacheServiceImpl.java

@@ -1,104 +0,0 @@
-package com.energy.manage.service.service.cache.impl;
-
-
-import com.energy.manage.service.service.cache.CacheService;
-import lombok.extern.java.Log;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-@Service
-@Log
-public class CacheServiceImpl implements CacheService {
-
-    @Autowired
-    protected RedisTemplate<String, Object> redisTemplate;
-
-
-    @Override
-    public boolean add(String key, String value) {
-
-
-        return Boolean.TRUE.equals(redisTemplate.execute(
-                (RedisCallback<Boolean>) connection -> connection.set(
-                        redisTemplate.getStringSerializer().serialize(key), redisTemplate.getStringSerializer().serialize(value))));
-    }
-
-    @Override
-    public boolean exists(String key) {
-
-
-        return Boolean.TRUE.equals(redisTemplate.execute(
-                (RedisCallback<Boolean>) connection -> connection.exists(Objects.requireNonNull(redisTemplate.getStringSerializer().serialize(key)))));
-    }
-
-    @Override
-    public String get(String key) {
-
-        String cacheValue = redisTemplate.execute(
-                (RedisCallback<String>) connection -> {
-                    byte[] keyByte = redisTemplate.getStringSerializer().serialize(key);
-                    if (Boolean.TRUE.equals(connection.exists(keyByte))) {
-                        byte[] value = connection.get(keyByte);
-                        return redisTemplate.getStringSerializer().deserialize(value);
-                    }
-                    return null;
-                });
-
-        return cacheValue;
-    }
-
-    @Override
-    public void setEx(String key, long expire, String value) {
-
-        redisTemplate.execute(
-                (RedisCallback<Object>) connection -> {
-                    connection.setEx(Objects.requireNonNull(redisTemplate.getStringSerializer().serialize(key)), expire,
-                            Objects.requireNonNull(redisTemplate.getStringSerializer().serialize(value)));
-                    return null;
-                });
-
-    }
-
-    @Override
-    public void updateExpire(String key, long expire) {
-
-        redisTemplate.execute(
-                (RedisCallback<Object>) connection -> {
-                    connection.expire(Objects.requireNonNull(redisTemplate.getStringSerializer().serialize(key)), expire);
-                    return null;
-                });
-    }
-
-    @Override
-    public void delete(String key) {
-
-        redisTemplate.execute(
-                (RedisCallback<Object>) connection -> {
-                    connection.del(redisTemplate.getStringSerializer().serialize(key));
-                    return null;
-                });
-
-    }
-
-    @Override
-    public Long incr(String key) {
-
-        return redisTemplate.execute(
-                (RedisCallback<Long>) connection -> connection.incr(redisTemplate.getStringSerializer().serialize(key)));
-
-    }
-
-    @Override
-    public Long incrBy(String key,long value) {
-
-        return redisTemplate.execute(
-                (RedisCallback<Long>) connection -> connection.incrBy(redisTemplate.getStringSerializer().serialize(key),value));
-
-    }
-
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/chartsdata/ChartsDataService.java

@@ -1,22 +0,0 @@
-package com.energy.manage.service.service.chartsdata;
-
-import com.energy.manage.service.domain.dto.analysis.PlotlyDataItem;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/8/15 10:24
- * @desc
- */
-public interface ChartsDataService {
-
-    Integer PAGE_SIZE = 100;
-
-    List<PlotlyDataItem> queryChartsData(Integer pageNum);
-
-    int getChartsDataCount();
-
-
-    List<PlotlyDataItem> queryChartsDataByTime(String timeStamp);
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/chartsdata/impl/ChartsDataServiceImpl.java

@@ -1,76 +0,0 @@
-package com.energy.manage.service.service.chartsdata.impl;
-
-import com.energy.manage.common.po.chartsdata.ChartsDataPo;
-import com.energy.manage.common.util.UUIDTools;
-import com.energy.manage.service.domain.dto.analysis.PlotlyDataItem;
-import com.energy.manage.service.mappers.chartsdata.ChartsDataMapper;
-import com.energy.manage.service.service.chartsdata.ChartsDataService;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/8/15 10:25
- * @desc
- */
-@Slf4j
-@Service
-public class ChartsDataServiceImpl implements ChartsDataService {
-
-    @Autowired
-    private ChartsDataMapper chartsDataMapper;
-
-    @Override
-    public List<PlotlyDataItem> queryChartsData(Integer pageNum) {
-        List<PlotlyDataItem> plotlyDataItems = new ArrayList<>();
-        long time = System.currentTimeMillis();
-        int startNum = (pageNum - 1) * PAGE_SIZE;
-        List<ChartsDataPo> chartsDataPos = chartsDataMapper.queryData(startNum,PAGE_SIZE);
-        log.info("数据库执行时间time = {}",System.currentTimeMillis() - time);
-        for(int i = 0 ; i < chartsDataPos.size();i++){
-            if(i % 10 == 0){
-                PlotlyDataItem plotlyDataItem = new PlotlyDataItem();
-                plotlyDataItem.setEngineCode(UUIDTools.getShortUUID())
-                        .setEngineName(UUIDTools.getShortUUID());
-                plotlyDataItems.add(plotlyDataItem);
-            }
-            PlotlyDataItem plotlyDataItem = plotlyDataItems.get(plotlyDataItems.size() -1);
-            plotlyDataItem.getXData().add(chartsDataPos.get(i).getActivePower());
-            plotlyDataItem.getYData().add(chartsDataPos.get(i).getTrueWindDirection());
-        }
-        return plotlyDataItems;
-    }
-
-    @Override
-    public int getChartsDataCount() {
-        int count = chartsDataMapper.selectAllCount();
-        return count / PAGE_SIZE;
-    }
-
-    @Override
-    public List<PlotlyDataItem> queryChartsDataByTime(String timeStamp) {
-        List<PlotlyDataItem> plotlyDataItems = new ArrayList<>();
-        long time = System.currentTimeMillis();
-        List<ChartsDataPo> chartsDataPos = chartsDataMapper.queryDataByTime(timeStamp, PAGE_SIZE);
-        log.info("数据库执行时间time = {}",System.currentTimeMillis() - time);
-        PageInfo<ChartsDataPo> pageInfo = new PageInfo<>(chartsDataPos);
-        pageInfo.setTotal(pageInfo.getTotal()/PAGE_SIZE);
-        for(int i = 0 ; i < chartsDataPos.size();i++){
-            if(i % 10 == 0){
-                PlotlyDataItem plotlyDataItem = new PlotlyDataItem();
-                plotlyDataItem.setEngineCode(UUIDTools.getShortUUID())
-                        .setEngineName(UUIDTools.getShortUUID());
-                plotlyDataItems.add(plotlyDataItem);
-            }
-            PlotlyDataItem plotlyDataItem = plotlyDataItems.get(plotlyDataItems.size() -1);
-            plotlyDataItem.getXData().add(chartsDataPos.get(i).getActivePower());
-            plotlyDataItem.getYData().add(chartsDataPos.get(i).getTrueWindDirection());
-        }
-        return plotlyDataItems;
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/company/impl/WindCompanyServiceImpl.java

@@ -23,7 +23,7 @@ import com.energy.manage.service.domain.vo.system.PermissionVo;
 import com.energy.manage.service.mappers.company.WindCompanyMapper;
 import com.energy.manage.service.mappers.system.SysPermissionMapper;
 import com.energy.manage.service.mappers.system.SysRolePermissionMapper;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.energy.manage.service.service.company.WindCompanyService;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import com.energy.manage.service.service.system.SysPermissionService;

energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfer/DataTransferService.java

@@ -1,85 +0,0 @@
-package com.energy.manage.service.service.datatransfer;
-
-import com.energy.manage.common.po.datatransfer.DataTransferPo;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.domain.dto.datatransfer.DataTransferDto;
-import com.energy.manage.service.domain.dto.datatransfer.EditDataTransferTypeDto;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferBatchShortVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferDataTimeVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferQueryAndAddVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/20 10:18
- * @desc
- */
-public interface DataTransferService {
-
-
-    /**
-     * 获取没有进行数据转换的风场批次列表
-     * @param roleId
-     * @return
-     */
-    DataTransferQueryAndAddVo fieldBatchListForDataTransfer(Integer roleId);
-
-    /**
-     * 转换数据组查询
-     * @param dataTransferDto
-     * @return
-     */
-    List<DataTransferBatchShortVo> queryDataTransferGroup(DataTransferDto dataTransferDto);
-
-    /**
-     * 查询批次下数据转换信息
-     * @param batchCode
-     * @return
-     */
-    List<DataTransferVo> queryDataTransferByBatchCode(String batchCode);
-
-
-    /**
-     * 查询数据转换列表
-     * @return
-     */
-    List<DataTransferVo> queryDataTransferList(DataTransferDto dataTransferDto);
-
-    /**
-     * 新增数据转换
-     * @return
-     */
-    ResultResp addDataTransfer(DataTransferDto dataTransferDto);
-
-
-    /**
-     * 数据转换（转换/重新转换）
-     * @param editDto
-     * @param updateBy
-     * @return
-     */
-    ResultResp dataTransfer(EditDataTransferTypeDto editDto, Integer updateBy);
-
-
-    /**
-     * 时间粒度编辑
-     * @param batchCode
-     * @param dataTransferType
-     * @param timeGranularity
-     * @param userId
-     * @return
-     */
-    ResultResp editTimeGranularity(String batchCode, String dataTransferType, Integer timeGranularity,Integer userId);
-
-    /**
-     * 转换数据时间范围查询
-     * @param batchCode
-     * @param dataTransferType
-     * @return
-     */
-    DataTransferDataTimeVo queryDataTime(String batchCode, String dataTransferType);
-
-
-}

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

@@ -1,311 +0,0 @@
-package com.energy.manage.service.service.datatransfer.impl;
-
-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;
-import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
-import com.energy.manage.service.domain.vo.datatransfer.*;
-import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
-import com.energy.manage.service.mappers.datatransfer.DataTransferMapper;
-import com.energy.manage.service.mappers.datatransferhistory.DataTransferHistoryMapper;
-import com.energy.manage.service.mappers.datatransfertype.DataTransferTypeMapper;
-import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
-import com.energy.manage.service.service.datatransfer.DataTransferService;
-import com.github.pagehelper.PageHelper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 数据转换服务
- * @author chy
- * @date 2024/5/20 10:19
- * @desc
- */
-@Slf4j
-@Service
-public class DataTransferServiceImpl implements DataTransferService {
-
-    @Autowired
-    private DataTransferMapper dataTransferMapper;
-
-    @Autowired
-    private DataTransferTypeMapper dataTransferTypeMapper;
-
-    @Autowired
-    private WindFieldBatchMapper windFieldBatchMapper;
-
-    @Autowired
-    private DataTransferHistoryMapper historyMapper;
-
-    @Autowired
-    private DataTransferTypeMapper typeMapper;
-
-    @Value("${download.url}")
-    private String downloadUrl;
-
-    /**
-     * 转换中状态
-     */
-    private final static Integer DATA_TRANSFERING_STATE = 0;
-
-    /**
-     * 获取没有进行数据转换的风场批次列表
-     * @param roleId
-     * @return
-     */
-    @Override
-    public DataTransferQueryAndAddVo fieldBatchListForDataTransfer(Integer roleId) {
-        DataTransferQueryAndAddVo queryAndAddVo = new DataTransferQueryAndAddVo();
-        List<WindFieldBatchVo> batchCodeList = getDataTransferBatchList(roleId);
-        if(CollectionUtils.isEmpty(batchCodeList)){
-            return queryAndAddVo;
-        }
-        queryAndAddVo.setBatchCodeList(batchCodeList);
-        List<DataTransferTypeVo> typeVos = typeMapper.selectAllInfo();
-        queryAndAddVo.setDataTransferTypeVoList(typeVos);
-        return queryAndAddVo;
-    }
-
-    /**
-     * 查询转换数据组
-     * @param dataTransferDto
-     * @return
-     */
-    @Override
-    public List<DataTransferBatchShortVo> queryDataTransferGroup(DataTransferDto dataTransferDto){
-        PageHelper.startPage(dataTransferDto.getPageNum(), dataTransferDto.getPageSize());
-        return dataTransferMapper.queryDataTransferGroup(dataTransferDto.getFieldName(),
-                                                        dataTransferDto.getBatchName(),
-                                                        dataTransferDto.getRoleId());
-    }
-
-    /**
-     * 查询批次下数据转换信息
-     * @param batchCode
-     * @return
-     */
-    @Override
-    public List<DataTransferVo> queryDataTransferByBatchCode(String batchCode){
-        List<DataTransferVo> dataTransferVos = dataTransferMapper.selectDataTransferListByBatchCode(batchCode);
-        if(CollectionUtils.isNotEmpty(dataTransferVos)){
-            //设置转换类型名称
-            dataTransferVos.parallelStream().forEach(item -> {
-                item.setDownloadUrl(downloadUrl);
-                item.setUniqueCode(UUIDTools.getShortUUIDLowCase());
-            });
-        }
-        return dataTransferVos;
-    }
-    /**
-     * 查询数据转换列表
-     * @return
-     */
-    @Override
-    public List<DataTransferVo> queryDataTransferList(DataTransferDto dataTransferDto) {
-        List<DataTransferVo> dataTransferVos = dataTransferMapper.selectDataTransferListByCondition(dataTransferDto);
-        if(CollectionUtils.isNotEmpty(dataTransferVos)){
-            //获取所有转换类型
-            List<DataTransferTypeVo> typeVos = dataTransferTypeMapper.selectAllInfo();
-            if(CollectionUtils.isNotEmpty(typeVos)){
-                //设置转换类型名称
-                dataTransferVos.parallelStream().forEach(item -> {
-                    item.setTransferTypeName(getDataTransferTypeName(typeVos,item.getTransferType()));
-                    item.setDownloadUrl(downloadUrl);
-                });
-            }
-        }
-        return dataTransferVos;
-    }
-
-    /**
-     * 新增数据转
-     * @param dataTransferDto
-     * @return
-     */
-    @Override
-    public ResultResp addDataTransfer(DataTransferDto dataTransferDto) {
-        log.info("新增转换开始，入参 dataTransferDto = {}",dataTransferDto.toString());
-        List<DataTransferTypeVo> typeList = dataTransferTypeMapper.selectAllInfo();
-        if(CollectionUtils.isEmpty(typeList)){
-            log.error("风场批次batchCode = {} 新增转换失败，转换类型初始化数据是空导致！！",dataTransferDto.getBatchCode());
-            return ResultResp.FAIL(ConstVar.DATA_TRANSFER_TYPE_EMPTY);
-        }
-        //设置风场编号
-        dataTransferDto.setFieldCode(getFieldCode(dataTransferDto.getBatchCode()));
-        List<DataTransferPo> dataTransferPos = new ArrayList<>();
-        typeList.stream().forEach(item -> dataTransferPos.add(getDataTransferPo(dataTransferDto,item.getTransferType())));
-        log.info("新增转换，批量添加的转换数据长度 = {}",dataTransferPos.size());
-        return ResultResp.SUCCESS(dataTransferMapper.addDataTransferBatch(dataTransferPos));
-    }
-
-
-    /**
-     * 数据转换（转换/重新转换）
-     * @param editDto
-     * @param updateBy
-     * @return
-     */
-    @Override
-    public ResultResp dataTransfer(EditDataTransferTypeDto editDto, Integer updateBy) {
-//        //检查转换状态是否有正在转换的数据 有的话 不转换
-//        if(checkTransferState()){
-//            return ResultResp.FAIL(ConstVar.DATA_TRANSFERING);
-//        }
-        DataTransferPo po = dataTransferMapper.selectByBatchCodeAndDataTransferType(editDto.getBatchCode(),editDto.getDataTransferType());
-        //如果数据库中存在的数据路径地址不为空的话 说明已经转换过了 需要重新转换 备份数据
-        if(po != null && StringUtils.isNotBlank(po.getTransferAddr())){
-            saveHistory(po);
-        }
-        //状态重新置换为转换中
-        po.setTransferState(DATA_TRANSFERING_STATE);
-        po.setTransferAddr(editDto.getDataTransferAddr());
-        po.setTimeGranularity(editDto.getTimeGranularity());
-        po.setUpdateBy(updateBy);
-        po.setTransferProgress(BigDecimal.ZERO);
-        return ResultResp.SUCCESS(dataTransferMapper.updateDataTransfer(po));
-    }
-
-
-    /**
-     * 时间粒度编辑
-     * @param batchCode
-     * @param dataTransferType
-     * @param timeGranularity
-     * @param userId
-     * @return
-     */
-    @Override
-    public ResultResp editTimeGranularity(String batchCode, String dataTransferType, Integer timeGranularity, Integer userId) {
-        DataTransferPo po = dataTransferMapper.selectByBatchCodeAndDataTransferType(batchCode,dataTransferType);
-        if(po != null){
-            po.setTimeGranularity(timeGranularity);
-            po.setUpdateBy(userId);
-            dataTransferMapper.updateDataTransfer(po);
-        }
-        return ResultResp.SUCCESS();
-    }
-
-    /**
-     * 转换数据时间范围查询
-     * @param batchCode
-     * @param dataTransferType
-     * @return
-     */
-    @Override
-    public DataTransferDataTimeVo queryDataTime(String batchCode, String dataTransferType){
-        return dataTransferMapper.selectDataTimeByBatchCodeAndType(batchCode,dataTransferType);
-    }
-
-
-    /**
-     * 根据角色获取批次编号
-     * @param roleId
-     * @return
-     */
-    private List<WindFieldBatchVo> getDataTransferBatchList(Integer roleId) {
-        //获取角色可以看到的风场批次信息
-        List<WindFieldBatchVo>  batchVoList = windFieldBatchMapper.selectWindFieldBatch(new WindFileBatchPageDto().setRoleId(roleId));
-        //获取已经进行过数据转换的批次号
-        List<String> dataTransferBatchList = dataTransferMapper.selectAllWindFieldBtach(roleId);
-        return batchVoList.parallelStream().filter(item -> !dataTransferBatchList.contains(item.getBatchCode())).collect(Collectors.toList());
-    }
-
-    /**
-     * 根据类型获取类型名称
-     * @param typeVos
-     * @param dataTransferType
-     * @return
-     */
-    private String getDataTransferTypeName(List<DataTransferTypeVo> typeVos,String dataTransferType){
-        return typeVos.parallelStream().filter(typeVo -> typeVo.getTransferType().equals(dataTransferType))
-                .map(DataTransferTypeVo::getTransferTypeName)
-                .findFirst()
-                .get();
-    }
-
-
-    /**
-     * 获取数据转换po
-     * @param dataTransferDto
-     * @param dataTransferType
-     * @return
-     */
-    private DataTransferPo getDataTransferPo(DataTransferDto dataTransferDto,String dataTransferType){
-        DataTransferPo dataTransferPo = new DataTransferPo();
-        dataTransferPo.setFieldCode(dataTransferDto.getFieldCode());
-        dataTransferPo.setBatchCode(dataTransferDto.getBatchCode());
-        dataTransferPo.setTransferType(dataTransferType);
-        Integer userId = dataTransferDto.getUserId();
-        dataTransferPo.setCreateBy(userId);
-        dataTransferPo.setUpdateBy(userId);
-        DataTransferTypePathDto pathDto = getTransferAddr(dataTransferDto,dataTransferType);
-        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());
-        }
-        return dataTransferPo;
-    }
-
-    /**
-     * 根据类型获取转换文件地址
-     * @param dataTransferDto
-     * @param dataTransferType
-     * @return
-     */
-    private DataTransferTypePathDto getTransferAddr(DataTransferDto dataTransferDto,String dataTransferType){
-        List<DataTransferTypePathDto>  pathDtoList = dataTransferDto.getDataTransferTypePathDtoList();
-        return pathDtoList.stream().filter(item -> item.getTransferType().equals(dataTransferType)).findFirst().orElse(null);
-    }
-
-
-    /**
-     * 获取风场编号
-     * @param batchCode
-     * @return
-     */
-    private String getFieldCode(String batchCode){
-        WindFieldBatchVo vo = windFieldBatchMapper.selectByBatchCode(batchCode);
-        return vo.getFieldCode();
-    }
-
-    /**
-     * 检查转换状态系统中是否有正在转换的数据
-     * @return
-     */
-//    private boolean checkTransferState(){
-//        return dataTransferMapper.selectCountByTransferState(DATA_TRANSFERING_STATE) > 0;
-//    }
-
-    /**
-     * 备份转换数据
-     * @param po
-     */
-    private void saveHistory(DataTransferPo po){
-        DataTransferHistoryPo historyPo = new DataTransferHistoryPo();
-        historyPo.setBatchCode(po.getBatchCode());
-        historyPo.setEngineCount(po.getEngineCount());
-        historyPo.setTransferAddr(po.getTransferAddr());
-        historyPo.setTransferType(po.getTransferType());
-        historyPo.setErrInfo(po.getErrInfo());
-        historyPo.setTransferFinishTime(po.getTransferFinishTime());
-        historyPo.setOptionBy(po.getUpdateBy());
-        historyMapper.addDataTransferHistory(historyPo);
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfertype/DataTransferTypeService.java

@@ -1,19 +0,0 @@
-package com.energy.manage.service.service.datatransfertype;
-
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferTypeVo;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2025/1/7 10:51
- * @desc
- */
-public interface DataTransferTypeService {
-
-    /**
-     * 查询所有数据转换类型
-     * @return
-     */
-    List<DataTransferTypeVo> queryAllType();
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfertype/impl/DataTransferTypeServiceImpl.java

@@ -1,33 +0,0 @@
-package com.energy.manage.service.service.datatransfertype.impl;
-
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferTypeVo;
-import com.energy.manage.service.mappers.datatransfertype.DataTransferTypeMapper;
-import com.energy.manage.service.service.datatransfertype.DataTransferTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2025/1/7 10:52
- * @desc
- */
-
-@Service
-public class DataTransferTypeServiceImpl implements DataTransferTypeService {
-
-    @Autowired
-    private DataTransferTypeMapper dataTransferTypeMapper;
-
-
-    /**
-     * 查询所有数据转换类型
-     *
-     * @return
-     */
-    @Override
-    public List<DataTransferTypeVo> queryAllType() {
-        return dataTransferTypeMapper.selectAllInfo();
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/dict/impl/DictConstantsServiceImpl.java

@@ -5,7 +5,7 @@ import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
 import com.energy.manage.common.po.dict.DictConstantsPO;
 import com.energy.manage.service.domain.vo.dict.DictParentVo;
 import com.energy.manage.service.mappers.dict.DictConstantsMapper;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.energy.manage.service.service.dict.DictConstantsService;
 import com.energy.manage.service.util.BeanMapUtils;
 import org.springframework.beans.factory.annotation.Autowired;

energy-manage-service/src/main/java/com/energy/manage/service/service/homepage/HomePageService.java

@@ -1,71 +0,0 @@
-package com.energy.manage.service.service.homepage;
-
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
-import com.energy.manage.service.domain.vo.homepage.FloatingWindowInfoVo;
-import com.energy.manage.service.domain.vo.homepage.HomePageVo;
-import com.energy.manage.service.domain.vo.homepage.WaitTaskVo;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/6/13 14:02
- * @desc
- */
-public interface HomePageService {
-
-    /**
-     * 驾驶舱首页查询
-     * @param codeNumber
-     * @param codeType
-     * @param startTime
-     * @param endTime
-     */
-    HomePageVo queryStatistics(Integer roleId,
-                               String codeNumber,
-                               String codeType,
-                               String startTime,
-                               String endTime);
-
-
-    /**
-     * 查询操作记录
-     * @param codeNumber
-     * @param codeType
-     * @return
-     */
-    List<AnalysisOptionRecordsVo> queryOptionRecords(Integer roleId,
-                                                     String codeNumber,
-                                                     String codeType,
-                                                     String startTime,
-                                                     String endTime);
-
-    /**
-     * 风机悬浮窗信息
-     * @param batchCode
-     * @return
-     */
-    FloatingWindowInfoVo queryFloatingWindowInfo(String  batchCode, String fieldCode);
-
-    /**
-     * 待办任务统计数量接口
-     * @param roleId
-     * @return
-     */
-    WaitTaskVo getWaitTask(Integer roleId);
-
-    /**
-     * 未关联数据集合
-     * @param roleId
-     * @return
-     */
-    List<AnalysisResultPo> getAnalysisResultStateList(Integer roleId);
-
-    /**
-     * 分析异常数
-     * @param roleId
-     * @return
-     */
-    List<AnalysisResultPo> getAnalysisResultErrStateList(Integer roleId);
-}

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

@@ -1,326 +0,0 @@
-package com.energy.manage.service.service.homepage.impl;
-
-import com.energy.manage.common.enums.TypeRelationEnum;
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-import com.energy.manage.common.po.windrelation.WindRelationPO;
-import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
-import com.energy.manage.service.domain.vo.analysis.AnalysisDiagramRelationVo;
-import com.energy.manage.service.domain.vo.analysis.AnalysisGeneralFileVo;
-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.FloatingWindowInfoVo;
-import com.energy.manage.service.domain.vo.homepage.HomePageVo;
-import com.energy.manage.service.domain.vo.homepage.WaitTaskVo;
-import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
-import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
-import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
-import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
-import com.energy.manage.service.mappers.analysis.AnalysisDiagramRelationMapper;
-import com.energy.manage.service.mappers.analysis.AnalysisGeneralFileMapper;
-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.windenginegroup.WindEngineGroupMapper;
-import com.energy.manage.service.mappers.windexceptioncount.WindExceptionCountMapper;
-import com.energy.manage.service.mappers.windfield.WindFieldMapper;
-import com.energy.manage.service.mappers.windrelation.WindRelationMapper;
-import com.energy.manage.service.service.homepage.HomePageService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-/**
- * @author chy
- * @date 2024/6/13 14:03
- * @desc
- */
-@Service
-public class HomePageServiceImpl implements HomePageService {
-
-
-    @Autowired
-    private WindRelationMapper relationMapper;
-
-    @Autowired
-    private AnalysisResultMapper analysisResultMapper;
-
-    @Autowired
-    private WindExceptionCountMapper exceptionCountMapper;
-
-    @Autowired
-    private AnalysisOptionRecordsMapper analysisOptionRecordsMapper;
-
-    @Autowired
-    private SysOrganizationAuthMapper authMapper;
-
-    @Autowired
-    private AnalysisGeneralFileMapper generalFileMapper;
-
-    @Autowired
-    private AnalysisDiagramRelationMapper diagramRelationMapper;
-
-    @Autowired
-    private WindFieldMapper windFieldMapper;
-
-    @Autowired
-    private WindEngineGroupMapper windEngineGroupMapper;
-
-
-    /**
-     * 驾驶舱首页查询
-     * @param codeNumber
-     * @param codeType
-     */
-    @Override
-    public HomePageVo queryStatistics(Integer roleId,
-                                      String codeNumber,
-                                      String codeType,
-                                      String startTime,
-                                      String endTime) {
-        //返回实体对象
-        HomePageVo homePageVo = new HomePageVo();
-        //风场
-        List<String> fieldCodes = new ArrayList<>();
-        //根据类型判断获取风场code
-        if(codeType.equals(TypeRelationEnum.COMPANY_NUMBER.getCode())){
-            filterAuthFieldCode(roleId,Arrays.asList(codeNumber), fieldCodes);
-        }else{
-            fieldCodes.add(codeNumber);
-        }
-        //如果风场code为空，则不设置
-        if(CollectionUtils.isEmpty(fieldCodes)){
-            return homePageVo;
-        }
-        //设置未分析、分析中、已分析数目
-        setAnalysisCount(homePageVo,fieldCodes,startTime,endTime);
-        //设置异常数、异常信息
-        setErrCountAndInfo(homePageVo,fieldCodes,startTime,endTime);
-        return homePageVo;
-    }
-
-    /**
-     * 获取操作记录
-     * @param codeNumber
-     * @param codeType
-     * @return
-     */
-    @Override
-    public List<AnalysisOptionRecordsVo> queryOptionRecords(Integer roleId,
-                                                            String codeNumber,
-                                                            String codeType,
-                                                            String startTime,
-                                                            String endTime){
-        List<AnalysisOptionRecordsVo> voList = new ArrayList<>();
-        //风场
-        List<String> fieldCodes = new ArrayList<>();
-        //根据类型判断获取风场code
-        if(codeType.equals(TypeRelationEnum.COMPANY_NUMBER.getCode())){
-            filterAuthFieldCode(roleId,Arrays.asList(codeNumber), fieldCodes);
-        }else{
-            fieldCodes.add(codeNumber);
-        }
-        //如果风场code为空，则不设置
-        if(CollectionUtils.isEmpty(fieldCodes)){
-            return voList;
-        }
-        return analysisOptionRecordsMapper.selectAllByTimeDesc(fieldCodes,startTime,endTime);
-    }
-
-
-    /**
-     * 获取悬浮窗信息
-     * @param batchCode
-     * @return
-     */
-    @Override
-    public FloatingWindowInfoVo queryFloatingWindowInfo(String batchCode, String fieldCode){
-        FloatingWindowInfoVo floatingWindowInfoVo = new FloatingWindowInfoVo();
-        //设置装机容量
-        WindFieldVo windFieldVo = windFieldMapper.selectByCodeNumber(fieldCode);
-        floatingWindowInfoVo.setRatedCapacityNumber(windFieldVo == null ? "0" : doubleDivide(windFieldVo.getRatedCapacityNumber(),1000D));
-        //设置风机数量
-        List<WindEngineGroupPageVo> windEngineGroupPageVos = windEngineGroupMapper.selectWindEngineGroupListByFieldCode(fieldCode);
-        floatingWindowInfoVo.setEngineTotalCount(windEngineGroupPageVos.size());
-        //设置分析信息
-        if(StringUtils.isNotBlank(batchCode)){
-            //设置分析时间 数据时间范围
-            AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
-            BeanUtils.copyProperties(analysisResultPo,floatingWindowInfoVo);
-            //设置分析类型数目
-            Set<String> analysisGeneralTypes = generalFileMapper.selectByBatchCode(batchCode).stream()
-                                                                        .map(AnalysisGeneralFileVo::getAnalysisTypeCode)
-                                                                        .collect(Collectors.toSet());
-            Set<String> analysisDeliayTypes = diagramRelationMapper.selectByBatchCode(batchCode).stream()
-                                                                        .map(AnalysisDiagramRelationVo :: getAnalysisTypeCode)
-                                                                        .collect(Collectors.toSet());
-            analysisGeneralTypes.addAll(analysisDeliayTypes);
-            floatingWindowInfoVo.setAnalysisTypeCount(analysisGeneralTypes.size());
-        }
-        return floatingWindowInfoVo;
-    }
-
-    /**
-     * double计算(四舍五入)
-     * @param dividend
-     * @param divisor
-     * @return
-     */
-    private String doubleDivide(Double dividend, Double divisor){
-        BigDecimal dividendBigDecimal = new BigDecimal(dividend);
-        BigDecimal divisorBigDecimal = new BigDecimal(divisor);
-        return dividendBigDecimal.divide(divisorBigDecimal,BigDecimal.ROUND_HALF_UP).toString();
-    }
-
-    @Override
-    public WaitTaskVo getWaitTask(Integer roleId) {
-        return authMapper.selectFieldAnalysisResultByroleId(roleId);
-    }
-
-    @Override
-    public List<AnalysisResultPo> getAnalysisResultStateList(Integer roleId) {
-        List<AnalysisResultPo> list = authMapper.selectWindRelationByAnalysisState(roleId);
-        return list;
-    }
-
-    @Override
-    public List<AnalysisResultPo> getAnalysisResultErrStateList(Integer roleId) {
-        List<AnalysisResultPo> list = authMapper.selectWindRelationByErrState(roleId);
-        return list;
-    }
-
-    /**
-     * 根据角色权限过滤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
-     */
-    private void getFieldCodeList(List<String> companyCodes, List<String> fieldCodes){
-        if(CollectionUtils.isEmpty(companyCodes)){
-            return;
-        }
-        List<WindRelationPO> relationPos = relationMapper.selectByCodeNumber(companyCodes);
-        List<String> companyCodeList = new ArrayList<>();
-        relationPos.stream().forEach(item -> {
-            if(TypeRelationEnum.WIND_FIELD_NUMBER.getCode().equals(item.getType())){
-                fieldCodes.add(item.getCodeNumber());
-            }
-            if(TypeRelationEnum.COMPANY_NUMBER.getCode().equals(item.getType())){
-                companyCodeList.add(item.getCodeNumber());
-            }
-        });
-        getFieldCodeList(companyCodeList,fieldCodes);
-    }
-
-    /**
-     * 分析数设置
-     * @param homePageVo
-     * @param fieldCodes
-     * @param startTime
-     * @param endTime
-     */
-    private void setAnalysisCount(HomePageVo homePageVo,List<String> fieldCodes,String startTime,String endTime){
-        List<AnalysisResultVo> resultVos = analysisResultMapper.selectLastBatchResultByFieldCode(fieldCodes,startTime,endTime);
-        Integer total = fieldCodes.size();
-        if(CollectionUtils.isEmpty(resultVos)){
-            //分析结果为空的时候证明没有风场没有进行分析
-            homePageVo.setNoAnalysisCount(total);
-            return ;
-        }
-        resultVos.stream().forEach(item -> {
-            Integer analysisState = item.getAnalysisState();
-            //分析中
-            if(analysisState.equals(AnalysisStatusConstants.ANALYSISING_STATE)){
-                homePageVo.analysisingCountAdd();
-            }
-            //分析完成
-            if(analysisState.equals(AnalysisStatusConstants.ANALYSISED_STATE)){
-                homePageVo.analysisedCountAdd();
-            }
-        });
-        //设置未分析
-        homePageVo.setNoAnalysisCount(total - homePageVo.getAnalysisedCount() - homePageVo.getAnalysisingCount());
-    }
-
-    /**
-     * 设置异常数
-     * @param homePageVo
-     * @param fieldCodes
-     * @param startTime
-     * @param endTime
-     */
-    public void setErrCountAndInfo(HomePageVo homePageVo, List<String> fieldCodes, String startTime, String endTime){
-        List<WindExceptionCountVo> exceptionCounts = exceptionCountMapper.selectByfieldCodes(fieldCodes, startTime, endTime);
-        //风机异常数
-        Set<String> engineCodes = new HashSet<>();
-        //处理异常数
-        AtomicInteger handleErrCount = new AtomicInteger(0);
-        //当月异常数
-        AtomicInteger errCountCurrentMonth = new AtomicInteger(0);
-        exceptionCounts.stream().forEach(item -> {
-            //设置总异常数
-            homePageVo.setErrCounrt(homePageVo.getErrCounrt() + item.getErrCount());
-            //异常处理数
-            handleErrCount.addAndGet(item.getHandleErrCount());
-            //设备异常数
-            engineCodes.add(item.getEngineCode());
-            //叠加当月异常数
-            if(isCurrentMonth(item.getCreateTime())){
-                errCountCurrentMonth.addAndGet(item.getErrCount());
-            }
-        });
-        //设置未处理异常数
-        homePageVo.setErrCountNotDeal(homePageVo.getErrCounrt() - handleErrCount.get());
-        //设置当月异常数
-        homePageVo.setErrCountInCurrentMonth(errCountCurrentMonth.get());
-        //设置异常设备数
-        homePageVo.setErrDeviceCount(engineCodes.size());
-        //过滤属性风机编号相同的元素
-        exceptionCounts = exceptionCounts.stream().distinct().filter(distinctByKey(WindExceptionCountVo :: getEngineCode)).collect(Collectors.toList());
-        homePageVo.setErrList(exceptionCounts);
-    }
-
-    /**
-     * 过滤器
-     * @param keyExtractor
-     * @param <T>
-     * @return
-     */
-    public static  <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor){
-        Map<Object,Boolean> seen = new ConcurrentHashMap<>();
-        return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
-    }
-
-    /**
-     * 判断是否是当月
-     * @param sourceTime
-     * @return
-     */
-    private Boolean isCurrentMonth(Date sourceTime){
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(sourceTime);
-        Calendar now = Calendar.getInstance();
-        return calendar.get(Calendar.MONTH) == now.get(Calendar.MONTH);
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/kafka/customer/KafkaListenerService.java

@@ -1,44 +0,0 @@
-package com.energy.manage.service.service.kafka.customer;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.kafka.support.Acknowledgment;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Slf4j
-//@Component
-public class KafkaListenerService {
-
-//    // 接收消息
-//    @KafkaListener(topics = "test",groupId = "${spring.kafka.consumer.groupId}",
-//            containerFactory = "kafkaListenerContainerFactory",
-//            concurrency = "1",
-//            properties = {"${spring.kafka.consumer.autoOffsetReset}"})
-//    public void processMessage1(List<ConsumerRecord<String, String>> records, Acknowledgment ack) {
-//        for (ConsumerRecord<String, String> record : records) {
-//            log.info("topic_test 消费了： Topic:" + record.topic() + ",Message:" + record.value());
-//            //手动提交偏移量
-//            ack.acknowledge();
-//        }
-//    }
-//
-//
-//    // 接收消息
-//    @KafkaListener(topics = "abc",groupId = "${spring.kafka.consumer.groupId}",
-//            containerFactory = "kafkaListenerContainerFactory",
-//            concurrency = "1",
-//            properties = {"${spring.kafka.consumer.autoOffsetReset}"})
-//    public void processMessage2(List<ConsumerRecord<String, String>> records, Acknowledgment ack) {
-//        for (ConsumerRecord<String, String> record : records) {
-//            log.info("topic_test 消费了： Topic:" + record.topic() + ",Message:" + record.value());
-//            //手动提交偏移量
-//            ack.acknowledge();
-//        }
-//    }
-
-
-
-}

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

@@ -2,8 +2,8 @@ package com.energy.manage.service.service.system.impl;
 
 import com.energy.manage.common.enums.TypeRelationEnum;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
-import com.energy.manage.service.constant.analysis.AnalysisConstants;
-import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
+import com.energy.manage.common.constant.analysis.AnalysisConstants;
+import com.energy.manage.common.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;

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitDictConstantsServiceImpl.java

@@ -15,7 +15,7 @@ import com.energy.manage.service.domain.vo.units.UnitDictBrandModelVo;
 import com.energy.manage.service.domain.vo.units.UnitDictConstantsVo;
 import com.energy.manage.service.mappers.units.UnitDictBrandModelMapper;
 import com.energy.manage.service.mappers.units.UnitDictConstantsMapper;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.energy.manage.service.service.dict.DictConstantsService;
 import com.energy.manage.service.service.units.UnitDictConstantsService;
 import com.github.pagehelper.PageHelper;

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitServiceImpl.java

@@ -18,7 +18,7 @@ import com.energy.manage.service.domain.vo.units.UnitDictConstantsVo;
 import com.energy.manage.service.domain.vo.units.UnitDictRoutineListVo;
 import com.energy.manage.service.domain.vo.units.UnitVo;
 import com.energy.manage.service.mappers.units.*;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.energy.manage.service.service.dict.DictConstantsService;
 import com.energy.manage.service.service.units.UnitDictConstantsService;
 import com.energy.manage.service.service.units.UnitService;

energy-manage-service/src/main/java/com/energy/manage/service/service/vibration/VibrationService.java

@@ -1,24 +0,0 @@
-package com.energy.manage.service.service.vibration;
-
-/**
- * skf接入测点数据
- */
-public interface VibrationService {
-
-    /**
-     * 抽取skf测点数据生成csv文件，子设备下测点数据
-     */
-     void extractSkfPointData();
-
-    /**
-     * 抽取skf测点数据生成csv文件，风机下测点数据
-     */
-    void extracTwindGeneratorSkfPointData(String yesterdayDate);
-
-    /**
-     * 抽取skf故障频率数据生成csv文件
-     */
-    void extracTwindGeneratorSkfMachinePart(String yesterdayDate);
-
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/vibration/impl/VibrationServiceImpl.java

@@ -1,610 +0,0 @@
-package com.energy.manage.service.service.vibration.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.text.StrFormatter;
-import cn.hutool.core.text.csv.CsvUtil;
-import cn.hutool.core.text.csv.CsvWriter;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
-import com.energy.manage.common.reponse.HttpResult;
-import com.energy.manage.service.client.skf.AuthClient;
-import com.energy.manage.service.client.skf.DynamicMeasurementsClient;
-import com.energy.manage.service.constant.client.skf.SkfClientConstants;
-import com.energy.manage.service.domain.client.skf.*;
-import com.energy.manage.service.service.cache.CacheService;
-import com.energy.manage.service.service.vibration.VibrationService;
-import com.energy.manage.service.util.HttpGetClient;
-import com.google.common.collect.Lists;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.time.*;
-import java.time.format.DateTimeFormatter;
-import java.time.format.TextStyle;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class VibrationServiceImpl implements VibrationService {
-
-    @Autowired
-    private AuthClient authClient;
-
-    @Autowired
-    private DynamicMeasurementsClient dynamicMeasurementsClient;
-
-    @Autowired
-    private CacheService cacheService;
-
-    // 定义时间格式
-    private final String dateTimeFormatter = "yyyy-MM-dd";
-
-    private final String dateFormatter = "MMdd";
-
-    @Value("${skf.data.url}")
-    private String dynamicMeasurementsUrl;
-
-    private ZoneId shanghaiZone = ZoneId.of("Asia/Shanghai");
-
-    // redis 过期时间
-    private final Long expire = 172800L;
-
-    private String yesterdayTime = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(dateFormatter));
-
-    @Value("${skf.data.path}")
-    private String skfDataPath;
-
-    @Value("${skf.data.condition}")
-    private String condition;
-
-
-    /**
-     * 通过skf接口获取树结构（带部件）
-     */
-    @Override
-    public void extractSkfPointData() {
-
-        // 获取组织结构
-        List<HierarchyListVo> hierarchyListVoList = getHierarchyLists();
-        log.info("获取SKF数据组织结构树 >>> " + JSON.toJSONString(hierarchyListVoList));
-
-        // 企业
-        company:
-        for (HierarchyListVo companyHierarchyListVo : hierarchyListVoList) {
-            // 风场
-            field:
-            for (HierarchyListVo fieldHierarchyListVo : companyHierarchyListVo.getChildren()) {
-                if (CollectionUtils.isEmpty(fieldHierarchyListVo.getChildren())) {
-                    continue;
-                }
-                //风机,特殊情况需要单独处理（风机到部件到具体测点有可能少一层部件）需要根据不同风场进行单独处理,风机直接获取测点id,跳过部件
-                engine:
-                for (HierarchyListVo engineHierarchyListVo : fieldHierarchyListVo.getChildren()) {
-                    if (CollectionUtils.isEmpty(engineHierarchyListVo.getChildren())) {
-                        continue;
-                    }
-                    //部件
-                    assembly:
-                    for (HierarchyListVo assemblyHierarchyListVo : engineHierarchyListVo.getChildren()) {
-                        if (CollectionUtils.isEmpty(assemblyHierarchyListVo.getChildren())) {
-                            continue;
-                        }
-                        // 具体测点
-                        for (HierarchyListVo pointHierarchyListVo : assemblyHierarchyListVo.getChildren()) {
-                            //获取测点id值，调用skf接口获取振动测点值
-                            log.info("部件测点路径：>>> " + companyHierarchyListVo.getName() + " -> " + fieldHierarchyListVo.getName() +
-                                    " -> " + engineHierarchyListVo.getName() + " -> " + assemblyHierarchyListVo.getName() + " -> " + pointHierarchyListVo.getName());
-                            // 测点id
-                            Integer pointId = pointHierarchyListVo.getId();
-                            log.info("测点id >>> " + pointId);
-
-                            List<DynamicMeasurementsVo> dynamicMeasurementsList = getDynamicMeasurementsList(pointId, null);
-                            if (CollectionUtil.isEmpty(dynamicMeasurementsList)) {
-                                continue;
-                            }
-                            // 拼接服务器地址
-                            String dataPath = skfDataPath + companyHierarchyListVo.getName() + "/" + fieldHierarchyListVo.getName() + "/"
-                                    + engineHierarchyListVo.getName() + "/" + getCurrentYearByTimeZone(this.shanghaiZone) + "/"
-                                    + yesterdayTime;
-
-                            String fileNamePrefix = fieldHierarchyListVo.getName() + "@" + engineHierarchyListVo.getName() + "@" + pointHierarchyListVo.getName();
-
-                            // 获取具体数据并生成csv
-                            dynamicMeasurementsConvertData(dynamicMeasurementsList, dataPath, fileNamePrefix);
-                        }
-                    }
-                }
-            }
-            log.info(" >>> skf接口处理完毕 <<<");
-        }
-    }
-
-    /**
-     * 通过skf接口获取树结构（不带部件，直接到测点）
-     */
-    @Override
-    public void extracTwindGeneratorSkfPointData(String yesterdayDate) {
-
-        String yesterdayTimeNew = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(dateFormatter));
-        // 获取组织结构
-        List<HierarchyListVo> hierarchyListVoList = getHierarchyLists();
-        log.info("获取SKF数据组织结构树 >>> " + JSON.toJSONString(hierarchyListVoList));
-
-        // 获取当前小时数
-//        int hour = ZonedDateTime.now(ZoneId.of("Asia/Shanghai")).minusHours(1).getHour();
-        // 企业
-        company:
-        for (HierarchyListVo companyHierarchyListVo : hierarchyListVoList) {
-            // 风场
-            field:
-            for (HierarchyListVo fieldHierarchyListVo : companyHierarchyListVo.getChildren()) {
-                if (CollectionUtils.isEmpty(fieldHierarchyListVo.getChildren())) {
-                    continue;
-                }
-                //风机,特殊情况需要单独处理（风机到部件到具体测点有可能少一层部件）需要根据不同风场进行单独处理,风机直接获取测点id,跳过部件
-                engine:
-                for (HierarchyListVo engineHierarchyListVo : fieldHierarchyListVo.getChildren()) {
-                    if (CollectionUtils.isEmpty(engineHierarchyListVo.getChildren())) {
-                        continue;
-                    }
-                    // 具体测点
-                    for (HierarchyListVo pointHierarchyListVo : engineHierarchyListVo.getChildren()) {
-                        //获取测点id值，调用skf接口获取振动测点值
-                        log.info("测点路径：>>> " + companyHierarchyListVo.getName() + " -> " + fieldHierarchyListVo.getName() +
-                                " -> " + engineHierarchyListVo.getName() + " -> " + pointHierarchyListVo.getName());
-                        // 测点id
-                        Integer pointId = pointHierarchyListVo.getId();
-                        log.info("测点id >>> " + pointId);
-
-                        // 时域幅值
-                        List<DynamicMeasurementsVo> shiftList = getDynamicMeasurementsList(pointId, 1);
-
-                        // 频谱幅值
-                        List<DynamicMeasurementsVo> frequencyList = getDynamicMeasurementsList(pointId, 2);
-
-                        // 频谱相位包络
-                        List<DynamicMeasurementsVo> envelopeList = getDynamicMeasurementsList(pointId, 4);
-
-                        // 拼接服务器地址
-                        String dataPath = null;
-
-                        dataPath = skfDataPath + "/" + companyHierarchyListVo.getName() + "/" + fieldHierarchyListVo.getName()
-                                + "/" + getCurrentYearByTimeZone(this.shanghaiZone) + "/" + yesterdayTimeNew + "/"
-                                + engineHierarchyListVo.getName();
-
-//                        dataPath = skfDataPath + "/" + companyHierarchyListVo.getName() + "/" + fieldHierarchyListVo.getName()
-//                                + "/" + getCurrentYearByTimeZone(this.shanghaiZone) + "/" + yesterdayTimeNew + "/" + hour
-//                                + "/"+ engineHierarchyListVo.getName();
-
-                        log.info(" dataPath 路径 ====>  " + dataPath);
-
-                        String fileName = null;
-                        if (!CollectionUtil.isEmpty(shiftList)) {
-                            fileName = dataPath + "/" + fieldHierarchyListVo.getName() + "@"
-                                    + engineHierarchyListVo.getName() + "@"
-                                    + pointId + "@"
-                                    + pointHierarchyListVo.getName() + "@1.json";
-                            for (DynamicMeasurementsVo dynamicMeasurementsVo : shiftList) {
-//                                dynamicMeasurementsVo.setIncludeMeasurements(1);
-                                dynamicMeasurementsVo.setPointName(pointHierarchyListVo.getName());
-                            }
-                            String json = JSON.toJSONString(shiftList);
-                            FileUtil.writeString(json, new File(fileName), StandardCharsets.UTF_8);
-                        }
-
-                        if (!CollectionUtil.isEmpty(frequencyList)) {
-                            fileName = dataPath + "/" + fieldHierarchyListVo.getName() + "@"
-                                    + engineHierarchyListVo.getName() + "@"
-                                    + pointId + "@"
-                                    + pointHierarchyListVo.getName() + "@2.json";
-                            for (DynamicMeasurementsVo dynamicMeasurementsVo : frequencyList) {
-//                                dynamicMeasurementsVo.setIncludeMeasurements(2);
-                                dynamicMeasurementsVo.setPointName(pointHierarchyListVo.getName());
-                            }
-                            String json = JSON.toJSONString(frequencyList);
-                            FileUtil.writeString(json, new File(fileName), StandardCharsets.UTF_8);
-                        }
-
-                        if (!CollectionUtil.isEmpty(envelopeList)) {
-                            fileName = dataPath + "/" + fieldHierarchyListVo.getName() + "@"
-                                    + engineHierarchyListVo.getName() + "@"
-                                    + pointId + "@"
-                                    + pointHierarchyListVo.getName() + "@4.json";
-                            for (DynamicMeasurementsVo dynamicMeasurementsVo : envelopeList) {
-//                                dynamicMeasurementsVo.setIncludeMeasurements(4);
-                                dynamicMeasurementsVo.setPointName(pointHierarchyListVo.getName());
-                            }
-                            String json = JSON.toJSONString(envelopeList);
-                            FileUtil.writeString(json, new File(fileName), StandardCharsets.UTF_8);
-                        }
-
-                        // 获取具体数据并生成csv
-                        // dynamicMeasurementsConvertData(shiftList, dataPath, fileNamePrefix);
-                    }
-
-                }
-            }
-        }
-
-        StringBuffer keyBuffer = new StringBuffer(ManagerRedisKeyConstant.SKF_SHAKE_KEY);
-        keyBuffer.append(ManagerRedisKeyConstant.PLACEHOLDER);
-        keyBuffer.append(yesterdayDate);
-//        keyBuffer.append(hour);
-        cacheService.add(keyBuffer.toString(), "1");
-
-        log.info(" >>> skf接口处理完毕 <<<");
-    }
-
-    @Override
-    public void extracTwindGeneratorSkfMachinePart(String yesterdayDate) {
-
-        log.info(" ========== 生成故障频率开始 ========== ");
-        List<MachineVO> machineList = getMachine();
-        log.info(" skf机器号 =====> " + machineList);
-
-        if (CollectionUtil.isEmpty(machineList)) {
-            log.info("=====>没有skf机器号<=====");
-        }
-
-        for (MachineVO machineVO : machineList) {
-            // 获取skf故障频率
-            MachinePartVO machinePart = getMachinePart(machineVO.getId());
-            String machinePartJson = JSON.toJSONString(machinePart);
-            log.info("机器号" + machineVO.getId() + "：故障频律 ====> " + machinePartJson);
-
-            if (StringUtils.isEmpty(machineVO.getPath())) {
-                log.error(" 机器号对应风场路径为空 ");
-                continue;
-            }
-            // 使用split方法，注意\\是转义字符
-            List<String> pathlist = Arrays.stream(machineVO.getPath().split("\\\\")).collect(Collectors.toList());
-            // 打印结果
-            System.out.println("分隔结果 ==== >" + pathlist);
-
-            StringBuffer skfPath = new StringBuffer();
-            for (String path : pathlist) {
-                skfPath.append(path).append("/");
-            }
-
-            //机器id@关联测点id@output.json
-            String fileName = machineVO.getName() + "@" + machinePart.getSpeedPointId() + "@output.json";
-
-            // 拼接服务器地址
-            StringBuffer dataPath = new StringBuffer(skfDataPath).append("/").
-                    append(skfPath).
-                    append(getCurrentYearByTimeZone(this.shanghaiZone)).append("/").
-                    append(yesterdayTime).append("/").append(fileName);
-
-            FileUtil.writeString(machinePartJson, new File(dataPath.toString()), StandardCharsets.UTF_8);
-        }
-
-        log.info(" ========== 生成故障频率结束 ========== ");
-    }
-
-
-    /**
-     * 通过测点id获取测点数据并生成csv文件
-     *
-     * @param poinIdhierarchyListVo
-     * @param companyName
-     * @param fieldName
-     * @param engineName
-     * @param assemblyName
-     */
-    private void getIointIdCreateDataCsv(HierarchyListVo poinIdhierarchyListVo, String companyName, String fieldName,
-                                         String engineName, String assemblyName) {
-        if (poinIdhierarchyListVo == null) {
-            return;
-        }
-        // 具体测点
-        for (HierarchyListVo pointHierarchyListVo : poinIdhierarchyListVo.getChildren()) {
-            //获取测点id值，调用skf接口获取振动测点值
-            log.info("部件测点路径：>>> " + companyName + " -> " + fieldName +
-                    " -> " + engineName + " -> " + assemblyName + " -> " + pointHierarchyListVo.getName());
-            // 测点id
-            Integer pointId = pointHierarchyListVo.getId();
-            log.info("测点id >>> " + pointId);
-
-            List<DynamicMeasurementsVo> dynamicMeasurementsList = getDynamicMeasurementsList(pointId, null);
-            if (CollectionUtil.isEmpty(dynamicMeasurementsList)) {
-                continue;
-            }
-            // 拼接服务器地址
-            String dataPath = skfDataPath + companyName + "/" + fieldName + "/"
-                    + engineName + "/" + getCurrentYearByTimeZone(this.shanghaiZone) + "/"
-                    + yesterdayTime;
-
-            String fileNamePrefix = fieldName + "_" + engineName + "_" +
-                    pointHierarchyListVo.getName();
-
-            // 获取具体数据并生成csv
-            dynamicMeasurementsConvertData(dynamicMeasurementsList, dataPath, fileNamePrefix);
-        }
-    }
-
-
-    /**
-     * 将测点数据转换抽取文件
-     *
-     * @param dynamicMeasurementsList
-     * @return
-     */
-    private void dynamicMeasurementsConvertData(List<DynamicMeasurementsVo> dynamicMeasurementsList, String dataPath, String fileNamePrefix) {
-        dynamic:
-        for (DynamicMeasurementsVo dynamicMeasurementsVo : dynamicMeasurementsList) {
-            List<Double> doubleList = Lists.newLinkedList();
-            List<DynamicMeasurementsVo.MeasurementsDTO> dynamicMeasurementsVoMeasurements = dynamicMeasurementsVo.getMeasurements();
-            for (DynamicMeasurementsVo.MeasurementsDTO dto : dynamicMeasurementsVoMeasurements) {
-                CollectionUtil.addAll(doubleList, dto.getValues());
-            }
-            if (CollectionUtils.isEmpty(doubleList)) {
-                break dynamic;
-            }
-
-            // 风场名称@风机名称@测点id@测点名称@转速@采样频率@测点工程单位@频谱的工程单位@频谱开始时间@频谱结束时间@普线数@震动类型时间_cms.csv
-            StringBuffer fileName = new StringBuffer();
-            fileName.append(fileNamePrefix).append("@")
-                    .append(dynamicMeasurementsVo.getSpeed()).append("@")
-                    .append(dynamicMeasurementsVo.getSampleRate()).append("@")
-                    .append(dynamicMeasurementsVo.getEUType()).append("@")
-                    .append(dynamicMeasurementsVo.getEUSpectrum()).append("@")
-                    .append(dynamicMeasurementsVo.getStartFrequency()).append("@")
-                    .append(dynamicMeasurementsVo.getEndFrequency()).append("@")
-                    .append(dynamicMeasurementsVo.getSamples()).append("@")
-                    .append(utctolocal(dynamicMeasurementsVo.getReadingTimeUTC())).append("@").append("_cms.csv");
-
-            //生成csv文件
-            createCsvFile(doubleList, dataPath, fileName.toString());
-            log.info("抽取skf数据并生成csv文件 >>>> " + fileName);
-        }
-    }
-
-    /**
-     * 通过测点id获取数据
-     *
-     * @param pointId
-     * @return
-     */
-    private List<DynamicMeasurementsVo> getDynamicMeasurementsList(Integer pointId, Integer includeMeasurements) {
-        // 获取开始的时间
-        String fromDateUTC = null;
-        // 获取结束的时间,当前时间
-        String toDateUTC = null;
-
-        // 获取结束的时间,当前时间 now(ZoneId.of("UTC"))
-         fromDateUTC = "2026-04-15"; //LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(dateTimeFormatter));
-         toDateUTC =  "2026-04-16"; //LocalDate.now().format(DateTimeFormatter.ofPattern(dateTimeFormatter));
-
-//        // 带时区（中国时区）
-//        LocalDate now = LocalDate.now();
-//        // 获取上一个小时数
-//        int lastHour = ZonedDateTime.now(ZoneId.of("Asia/Shanghai")).minusHours(1).getHour();
-//        // 定义格式化规则：年-月-日
-//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-//        // 格式化日期
-//        String currentDate = now.format(formatter);
-//
-//        fromDateUTC = currentDate + " " + lastHour+":00:00";
-//        toDateUTC = currentDate + " " + lastHour+":59:59";
-
-        String skfToken = getSkfAutoToken();
-        if (StringUtils.isEmpty(skfToken)) {
-            log.info(" >>>>>> 获取skftoken失败 <<<<<< ");
-            return null;
-        }
-        log.info(" >>>>>> 获取skftoken成功 <<<<<< " + skfToken);
-        List<DynamicMeasurementsVo> lists = Lists.newArrayList();
-        String url = StrFormatter.format(dynamicMeasurementsUrl, pointId);
-        // 动态参数
-        Map<String, Object> params = new HashMap<>();
-        params.put("fromDateUTC", fromDateUTC);
-        params.put("toDateUTC", toDateUTC);
-        if (includeMeasurements != null) {
-            params.put("includeMeasurements", includeMeasurements);
-        }
-        params.put("includeMeasurements", includeMeasurements);
-        params.put("descending", true);
-
-        //发送请求
-        HttpResult result = HttpGetClient.sendWithAuthAndParams(url, skfToken, params);
-
-        // 处理响应结果
-        if (result.isSuccess()) {
-            log.info("请求成功，状态码: " + result.getStatusCode());
-            result.getData().ifPresent(data -> log.info("测点振动数据响应内容: " + data));
-            lists = JSONArray.parseArray(result.getData().get(), DynamicMeasurementsVo.class);
-            return lists;
-        } else {
-            log.error("请求失败: " + result.getMessage());
-            if (result.getStatusCode() != -1) {
-                log.error("状态码: " + result.getStatusCode() + " >>>>>> 无测点数据");
-            }
-            return null;
-        }
-    }
-
-
-    /**
-     * 通过接口获取SKF数据组织结构树
-     *
-     * @return
-     */
-    private List<HierarchyListVo> getHierarchyLists() {
-        String skfToken = getSkfAutoToken();
-        if (StringUtils.isEmpty(skfToken)) {
-            log.info(" >>>>>> 获取skftoken失败 <<<<<< ");
-            return null;
-        }
-        List<HierarchyListVo> list = dynamicMeasurementsClient.getSkfHierarchy(skfToken);
-        return CollectionUtils.isEmpty(list) ? null : list;
-    }
-
-
-    /**
-     * 获取skf机器信息
-     *
-     * @return
-     */
-    private List<MachineVO> getMachine() {
-
-        String skfToken = getSkfAutoToken();
-        if (StringUtils.isEmpty(skfToken)) {
-            log.info(" >>>>>> 获取skftoken失败 <<<<<< ");
-            return null;
-        }
-        List<MachineVO> list = dynamicMeasurementsClient.getMachine(skfToken);
-        return CollectionUtils.isEmpty(list) ? null : list;
-    }
-
-
-    /**
-     * 获取skf故障频率
-     *
-     * @return
-     */
-    private MachinePartVO getMachinePart(int machineId) {
-
-        String skfToken = getSkfAutoToken();
-        if (StringUtils.isEmpty(skfToken)) {
-            log.info(" >>>>>> 获取skftoken失败 <<<<<< ");
-            return null;
-        }
-        MachinePartVO machinePart = dynamicMeasurementsClient.getMachinePart(skfToken, machineId);
-        return machinePart;
-    }
-
-
-    /**
-     * 获取token
-     *
-     * @return
-     */
-    private String getSkfAutoToken() {
-        // 获取token
-        AutoTokenVO autoTokenVO = authClient.getSkfToken(SkfClientConstants.SKF_TOKEN_GRANT_TYPE,
-                SkfClientConstants.SKF_TOKEN_USERNAME, SkfClientConstants.SKF_TOKEN_PASSWORD);
-        return "Bearer " + autoTokenVO.getAccess_token();
-    }
-
-
-    /**
-     * 导出csv格式工具类
-     *
-     * @param result   导出数据
-     * @param fileName 文件名
-     */
-    private void createCsvFile(List result, String path, String fileName) {
-        try {
-            // 输出的文件流保存到本地文件
-            File tempFile = new File(path);
-            if (!tempFile.exists()) {
-                tempFile.mkdirs();
-            }
-            //构造文件
-            String fullPath = path + "/" + fileName;
-
-            log.info("fullPath 路径 ====>" + fullPath);
-
-            File csvFile = new File(fullPath);
-            //导入HuTool中CSV工具包的CsvWriter类，设置导出字符类型, CHARSET_UTF_8
-            CsvWriter writer = CsvUtil.getWriter(csvFile, CharsetUtil.CHARSET_UTF_8);
-            //通过CsvWriter中的write方法写入数据
-            writer.write(result);
-            writer.close();   //关闭CsvWriter
-            log.info("CSV 文件生成成功！路径：" + fullPath);
-        } catch (Exception e) {
-            log.error("CSV 文件生成失：" + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 获取指定时区的当前年份（解决跨时区年份偏差问题）
-     * 适用场景：服务器时区与业务时区不一致（如服务器用UTC，业务用北京时区）
-     *
-     * @param zoneId 时区（如 ZoneId.of("Asia/Shanghai") 北京时区，ZoneId.of("UTC") 世界标准时间）
-     * @return 4位年份整数（如 2025）
-     * @throws IllegalArgumentException 若传入无效时区ID
-     */
-    public static int getCurrentYearByTimeZone(ZoneId zoneId) {
-        if (zoneId == null) {
-            throw new IllegalArgumentException("时区不能为空，请传入有效的ZoneId（如ZoneId.of(\"Asia/Shanghai\")）");
-        }
-        // 指定时区获取当前日期，再提取年份
-        return LocalDate.now(zoneId).getYear();
-    }
-
-    /**
-     * 获取“M月d日”格式（中文口语化格式，如 9月8日、12月31日）
-     * 适用场景：中文展示（前端页面、通知文案）
-     *
-     * @param zoneId 时区（可为null，默认系统时区）
-     * @return M月d日 格式的月日字符串
-     */
-    public static String getMonthDayAsChinese(ZoneId zoneId) {
-        ZoneId actualZone = (zoneId == null) ? ZoneId.systemDefault() : zoneId;
-        // 格式模板：M=一位/两位数月，d=一位/两位数日（自动省略前导0，更符合中文习惯）
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M月d日");
-        return LocalDate.now(actualZone).format(formatter);
-    }
-
-    /**
-     * 适用场景：月份名称展示（如“当前月份：九月”）、枚举判断等
-     *
-     * @param zoneId 时区
-     * @param locale 语言地区（如 Locale.CHINA 中文，Locale.ENGLISH 英文）
-     * @return 本地化的月份名称（如“九月”“September”）
-     */
-    private String getCurrentMonthAsName(ZoneId zoneId, Locale locale) {
-        ZoneId actualZone = (zoneId == null) ? ZoneId.systemDefault() : zoneId;
-        Locale actualLocale = (locale == null) ? Locale.getDefault() : locale;
-
-        // 1. 获取Month枚举（如 SEPTEMBER）
-        Month currentMonth = LocalDate.now(actualZone).getMonth();
-        // 2. 转换为本地化完整名称（TextStyle.FULL 表示完整名称，如“九月”而非“九”）
-        return currentMonth.getDisplayName(TextStyle.FULL, actualLocale);
-    }
-
-    /**
-     * 获取当前月份（数字形式，1-12）
-     * 适用场景：数值判断（如“当前月份是否为12月”）、数据库存储等
-     *
-     * @param zoneId 时区（如 ZoneId.of("Asia/Shanghai")，默认系统时区）
-     * @return 月份数字（1=1月，12=12月）
-     */
-    public static int getCurrentMonthAsNumber(ZoneId zoneId) {
-        // 若未指定时区，使用系统默认时区
-        ZoneId actualZone = (zoneId == null) ? ZoneId.systemDefault() : zoneId;
-        // LocalDate.now(时区) 获取指定时区的当前日期，getMonthValue() 提取1-12的月份
-        return LocalDate.now(actualZone).getMonthValue();
-    }
-
-
-    /**
-     * 时间转换
-     *
-     * @param utcTime
-     * @return
-     */
-    private String utctolocal(String utcTime) {
-        DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
-        LocalDateTime dateTime = LocalDateTime.parse(utcTime, formatter);
-        return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-    }
-
-
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedatatransfer/WaveDatatransferServce.java

@@ -1,55 +0,0 @@
-package com.energy.manage.service.service.wavedatatransfer;
-
-import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/11/7 16:23
- * @desc
- */
-public interface WaveDatatransferServce {
-
-
-    /**
-     * 转换查询列表
-     * @param waveDatatransferDto
-     * @return
-     */
-    List<WaveDataTransferVo> queryDataTransfer(WaveDataTransferDto waveDatatransferDto);
-
-    /**
-     * 新增之前查重
-     * @param waveDatatransferDto
-     * @return
-     */
-    Boolean beforAddDataTransferQuery(WaveDataTransferDto waveDatatransferDto);
-
-    /**
-     * 新增数据转换
-     * @param waveDatatransferPo
-     * @return
-     */
-    int addDataTransfer(WaveDataTransferPo waveDatatransferPo, Integer loginUserId);
-
-
-    /**
-     * 编辑数据转换
-     * @param waveDatatransferPo
-     * @return
-     */
-    int editDataTransfer(WaveDataTransferPo waveDatatransferPo,Integer loginUserId);
-
-
-    /**
-     * 数据转换、重新转换
-     * @param waveDataTransferDto
-     * @return
-     */
-    int dataTransfer(@RequestBody WaveDataTransferDto waveDataTransferDto);
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedatatransfer/impl/WaveDatatransferServceImpl.java

@@ -1,108 +0,0 @@
-package com.energy.manage.service.service.wavedatatransfer.impl;
-
-import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
-import com.energy.manage.common.po.wavetransferhistory.WaveDataTransferHistoryPo;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
-import com.energy.manage.service.mappers.wavedatatransfer.WaveDataTransferMapper;
-import com.energy.manage.service.mappers.wavedatatransferhistory.WaveDataTransferHistoryMapper;
-import com.energy.manage.service.service.wavedatatransfer.WaveDatatransferServce;
-import com.github.pagehelper.PageHelper;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/11/7 16:23
- * @desc
- */
-@Service
-public class WaveDatatransferServceImpl implements WaveDatatransferServce {
-
-    @Autowired
-    private WaveDataTransferMapper waveDataTransferMapper;
-
-    @Autowired
-    private WaveDataTransferHistoryMapper waveDataTransferHistoryMapper;
-
-    /**
-     * 查询数据转换列表
-     * @param waveDatatransferDto
-     * @return
-     */
-    @Override
-    public List<WaveDataTransferVo> queryDataTransfer(WaveDataTransferDto waveDatatransferDto) {
-        PageHelper.startPage(waveDatatransferDto.getPageNum(), waveDatatransferDto.getPageSize());
-        return waveDataTransferMapper.selectByCondition(waveDatatransferDto);
-    }
-
-    /**
-     * 新增之前查重
-     * @param waveDatatransferDto
-     * @return
-     */
-    @Override
-    public Boolean beforAddDataTransferQuery(WaveDataTransferDto waveDatatransferDto) {
-        return waveDataTransferMapper.selectCountByCondition(waveDatatransferDto) > 0;
-    }
-
-    /**
-     * 新增/覆盖数据转换
-     * @param waveDatatransferPo
-     * @return
-     */
-    @Override
-    public int addDataTransfer(WaveDataTransferPo waveDatatransferPo, Integer loginUserId){
-        WaveDataTransferPo exsitPo = waveDataTransferMapper.selectOne(waveDatatransferPo.setTransferStatus(-1));
-        //设置更新人
-        waveDatatransferPo.setUpdateBy(loginUserId);
-        if(exsitPo != null){
-            waveDatatransferPo.setUpdateTime(new Date());
-            return waveDataTransferMapper.update(waveDatatransferPo.setId(exsitPo.getId()));
-        }
-        //设置创建人
-        waveDatatransferPo.setCreateBy(loginUserId);
-        return waveDataTransferMapper.insertSelective(waveDatatransferPo);
-    }
-
-    /**
-     * 编辑数据转换
-     *
-     * @param waveDatatransferPo
-     * @param loginUserId
-     * @return
-     */
-    @Override
-    public int editDataTransfer(WaveDataTransferPo waveDatatransferPo, Integer loginUserId) {
-//        waveDatatransferPo.setUpdateBy(loginUserId);
-//        return waveDataTransferMapper.updateByPrimaryKeySelective(waveDatatransferPo);
-        return 0;
-    }
-
-    /**
-     * 数据转换、重新转换
-     * @param waveDatatransferDto
-     * @return
-     */
-    @Override
-    public int dataTransfer(WaveDataTransferDto waveDatatransferDto) {
-        WaveDataTransferPo po = new WaveDataTransferPo();
-        po.setId(waveDatatransferDto.getId());
-        WaveDataTransferPo exsitPo = waveDataTransferMapper.selectOne(po);
-        if(waveDatatransferDto.getRetransfer() == 1){
-            WaveDataTransferHistoryPo historyPo = new WaveDataTransferHistoryPo();
-            BeanUtils.copyProperties(exsitPo,historyPo);
-            historyPo.setId(null);
-            waveDataTransferHistoryMapper.insertSelective(historyPo);
-        }
-        exsitPo.setTransferStatus(0);
-        exsitPo.setTransferAddr(waveDatatransferDto.getTransferAddr());
-        exsitPo.setTransferStartTime(new Date());
-        return waveDataTransferMapper.update(exsitPo);
-    }
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedic/WaveDicService.java

@@ -1,22 +0,0 @@
-package com.energy.manage.service.service.wavedic;
-
-import com.energy.manage.service.domain.vo.detectionpointdic.DetectionPointDicVo;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author chy
- * @date 2024/11/21 09:27
- * @desc
- */
-public interface WaveDicService {
-
-    /**
-     * 根据风机编号查询测点
-     * @param engineCodes
-     * @return
-     */
-    Set<DetectionPointDicVo> queryWaveDic( List<String> engineCodes);
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedic/impl/WaveDicServiceImpl.java

@@ -1,42 +0,0 @@
-package com.energy.manage.service.service.wavedic.impl;
-
-import com.energy.manage.service.domain.vo.detectionpointdic.DetectionPointDicVo;
-import com.energy.manage.service.mappers.detectionpointdic.DetectionPointDicMapper;
-import com.energy.manage.service.mappers.windenginemill.WindEngineMillMapper;
-import com.energy.manage.service.service.wavedic.WaveDicService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author chy
- * @date 2024/11/21 09:28
- * @desc
- */
-@Service
-public class WaveDicServiceImpl implements WaveDicService {
-
-    @Autowired
-    private WindEngineMillMapper windEngineMillMapper;
-
-
-    @Autowired
-    private DetectionPointDicMapper detectionPointDicMapper;
-
-    /**
-     * 根据风机编号查询测点
-     *
-     * @param engineCodes
-     * @return
-     */
-    @Override
-    public Set<DetectionPointDicVo> queryWaveDic(List<String> engineCodes) {
-        List<Integer> driveMode = windEngineMillMapper.selectCurvedMotionTypeByEngineCode(engineCodes);
-        Set<DetectionPointDicVo> detectionPointDicVos = new HashSet<>();
-        driveMode.stream().forEach(item-> detectionPointDicVos.addAll(detectionPointDicMapper.selectByCondition(item.toString())));
-        return detectionPointDicVos;
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/impl/WindEngineGroupServiceImpl.java

@@ -28,9 +28,9 @@ import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.mappers.windenginegroup.WindEngineGroupMapper;
-import com.energy.manage.service.service.analysiserr.AnalysisErrService;
+import com.energy.manage.service.mappers.windexceptioncount.WindExceptionCountMapper;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.energy.manage.service.service.windenginegroup.WindEngineGroupService;
 import com.energy.manage.service.service.windenginemill.WindEngineMillService;
 import com.energy.manage.service.service.windfield.WindFieldService;
@@ -75,7 +75,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     private WindEngineMillService windEngineMillService;
 
     @Autowired
-    private AnalysisErrService analysisErrService;
+    private WindExceptionCountMapper windExceptionCountMapper;
 
     /**
      * 手动创建风机机组信息
@@ -392,7 +392,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         }
 
         // 处理批次异常状体
-        List<AnalysisErrorCodeVo> analysisErrorCodeVoList = analysisErrService.AnalysisErrorCodeQuery(batchCode);
+        List<AnalysisErrorCodeVo> analysisErrorCodeVoList = windExceptionCountMapper.selectExceptionCountBybatchCode(batchCode);
         if (!CollectionUtils.isEmpty(analysisErrorCodeVoList)) {
             for (WindEngineGroupVo wgVo : windFieldGroupTowerVo.getWindEngineGroupVoList()) {
                 for (AnalysisErrorCodeVo errorCodeVo : analysisErrorCodeVoList) {

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginemill/impl/WindEngineMillServiceImpl.java

@@ -19,7 +19,7 @@ import com.energy.manage.service.domain.vo.excel.WindEngineMillExcelVo;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillPageVo;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillVo;
 import com.energy.manage.service.mappers.windenginemill.WindEngineMillMapper;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.energy.manage.service.service.windenginemill.WindEngineMillService;
 import com.energy.manage.service.util.MinioUtils;
 import com.energy.manage.service.util.UUIDUtil;

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -39,7 +39,7 @@ import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
 import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import com.energy.manage.service.service.area.AreaApiService;
-import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.common.service.cache.CacheService;
 import com.energy.manage.service.service.company.WindCompanyService;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import com.energy.manage.service.service.system.SysPermissionService;

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

@@ -1,55 +0,0 @@
-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;
-
-/**
- * 风场批次操作
- * @author chy
- * @date 2024/5/21 10:50
- * @desc
- */
-public interface WindFieldBatchService {
-
-    /**
-     * 批次号新增
-     * @param windEgineBatchDto
-     */
-    int addWindFieldBatch(WindFieldBatchDto windEgineBatchDto);
-
-    /**
-     * 批次更新
-     * @param windEgineBatchDto
-     */
-    int updateWindFieldBatch(WindFieldBatchDto windEgineBatchDto);
-
-    /**
-     * 批次启用或停用
-     * @param windEgineBatchDto
-     */
-    int onOrOffFieldBatch(WindFieldBatchDto windEgineBatchDto);
-
-    /**
-     * 批次号新增
-     * @param windEgineBatchDto
-     */
-    int deleteWindFieldBatch(WindFieldBatchDto windEgineBatchDto);
-
-    /**
-     * 查询批次列表
-     * @param windFieldBatchDto
-     * @return
-     */
-    List<WindFieldBatchVo> queryWindFieldBatch(WindFileBatchPageDto windFieldBatchDto);
-
-    /**
-     * 生成风场名称
-     * @param fieldName
-     * @return
-     */
-    String createBatchName(String fieldName);
-
-}

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

@@ -1,124 +0,0 @@
-package com.energy.manage.service.service.windfieldbatch.impl;
-
-import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
-import com.energy.manage.common.enums.IdPrefixEnum;
-import com.energy.manage.common.po.analysis.AnalysisResultPo;
-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.analysis.AnalysisResultMapper;
-import com.energy.manage.service.mappers.windfield.WindFieldMapper;
-import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
-import com.energy.manage.service.service.cache.CacheService;
-import com.energy.manage.service.service.windfieldbatch.WindFieldBatchService;
-import com.energy.manage.service.util.PinYinUtils;
-import com.github.pagehelper.PageHelper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/21 10:51
- * @desc
- */
-@Service
-public class WindFieldBatchServiceImpl implements WindFieldBatchService {
-
-    private final static String SEPARATOR = "-";
-
-     @Autowired
-     private WindFieldBatchMapper windFieldBatchMapper;
-
-     @Autowired
-     private WindFieldMapper windFieldMapper;
-
-    @Autowired
-    private AnalysisResultMapper analysisResultMapper;
-
-     @Autowired
-     private CacheService cacheService;
-
-    /**
-     * 批次号新增
-     * @param windEgineBatchDto
-     */
-    @Override
-    public int addWindFieldBatch(WindFieldBatchDto windEgineBatchDto) {
-        WindFieldBatchVo exsitBatchVo = windFieldBatchMapper.selectByBatchName(windEgineBatchDto.getBatchName());
-        if(exsitBatchVo != null){
-            return -1;
-        }
-        windEgineBatchDto.setBatchCode(createWindFieldBatchCode(windEgineBatchDto.getFieldCode()));
-        WindFieldVo windFieldVo = windFieldMapper.selectByCodeNumber(windEgineBatchDto.getFieldCode());
-        windEgineBatchDto.setFieldName(windFieldVo.getFieldName());
-        windFieldBatchMapper.addWindFieldBatch(windEgineBatchDto);
-        //添加风场批次后，添加分析结果初始数据
-        AnalysisResultPo analysisResultPo = new AnalysisResultPo();
-        analysisResultPo.setBatchCode(windEgineBatchDto.getBatchCode());
-        return analysisResultMapper.insertSelective(analysisResultPo);
-    }
-
-    /**
-     * 批次号更新
-     * @param windEgineBatchDto
-     */
-    @Override
-    public int updateWindFieldBatch(WindFieldBatchDto windEgineBatchDto) {
-        return windFieldBatchMapper.updateWindFieldBatch(windEgineBatchDto);
-    }
-
-    /**
-     * 批次启用或停用
-     * @param windEgineBatchDto
-     */
-    @Override
-    public int onOrOffFieldBatch(WindFieldBatchDto windEgineBatchDto) {
-        return windFieldBatchMapper.updateWindFieldBatch(windEgineBatchDto);
-    }
-
-    /**
-     * 批次号删除
-     * @param windFieldBatchDto
-     */
-    @Override
-    public int deleteWindFieldBatch(WindFieldBatchDto windFieldBatchDto) {
-        windFieldBatchDto.setIsDelete(1);
-        return windFieldBatchMapper.updateWindFieldBatch(windFieldBatchDto);
-    }
-
-    /**
-     * 查询批次列表
-     * @param windFieldBatchDto
-     * @return
-     */
-    @Override
-    public List<WindFieldBatchVo> queryWindFieldBatch(WindFileBatchPageDto windFieldBatchDto) {
-        PageHelper.startPage(windFieldBatchDto);
-        return windFieldBatchMapper.selectWindFieldBatch(windFieldBatchDto);
-    }
-
-    /**
-     * 生成批次名称
-     * @param fieldName
-     * @return
-     */
-    @Override
-    public String createBatchName(String fieldName){
-        String fieldPYHeader = PinYinUtils.getPinYinHeadChar(fieldName);
-        return fieldPYHeader.concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, fieldPYHeader)),6));
-    }
-
-    /**
-     * 生成风场批次号
-     * @param fieldCode
-     * @return
-     */
-    public String createWindFieldBatchCode(String fieldCode){
-        String sequece = IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, fieldCode,IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode())),6));
-        return fieldCode + SEPARATOR + sequece;
-    }
-}

energy-manage-service/src/main/java/com/energy/manage/service/task/AnalysisTask.java

@@ -1,115 +0,0 @@
-package com.energy.manage.service.task;
-
-import com.energy.manage.common.po.analysisdatarelationrecords.AnalysisDataRelationRecordsPo;
-import com.energy.manage.common.po.analysispriorityrecords.AnalysisPriorityRecordsPo;
-import com.energy.manage.service.constant.analysis.AnalysisConstants;
-import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
-import com.energy.manage.service.mappers.analysis.AnalysisResultMapper;
-import com.energy.manage.service.mappers.analysisdatarelationrecords.AnalysisDataRelationRecordsMapper;
-import com.energy.manage.service.mappers.analysispriorityrecords.AnalysisPriorityRecordsMapper;
-import com.energy.manage.service.service.analysis.AnalysisService;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 分析排队任务执行
- * @author chy
- * @date 2025/2/11 16:18
- * @desc 分析任务执行
- */
-
-@Slf4j
-@Component
-public class AnalysisTask {
-
-    @Autowired
-    private AnalysisService analysisService;
-
-    @Autowired
-    private AnalysisPriorityRecordsMapper priorityRecordsMapper;
-
-    @Autowired
-    private AnalysisResultMapper resultMapper;
-
-    @Autowired
-    private AnalysisDataRelationRecordsMapper dataRelationRecordsMapper;
-
-    @XxlJob(value = "analysisTaskExecute")
-    public void analysisTaskExecute() {
-        log.info("排队分析定时任务开始");
-        try{
-            int analysisingCount = resultMapper.selectAnalysisProcessingCount();
-            if (analysisingCount > 0){
-                log.info("当前有正在分析的数据，排队分析返回");
-                return;
-            }
-            //获取要执行的分析任务
-            AnalysisPriorityRecordsPo priorityRecordsPo = priorityRecordsMapper.queryFirstPriority();
-            if (priorityRecordsPo == null){
-                log.info("当前没有要分析的任务在排队中，分析返回");
-                return;
-            }
-            //调用分析
-            analysisService.callAnalysis(getAnalysisDto(priorityRecordsPo));
-            //更新任务优先级状态为已执行
-            priorityRecordsMapper.updateExecuteStatus(priorityRecordsPo.getTaskId(), AnalysisConstants.ON_CALL);
-        }catch (Exception e){
-            log.error("排队分析定时任务异常",e);
-        }
-
-        log.info("排队分析定时任务结束");
-    }
-
-
-    /**
-     * 获取要执行的分析任务参数
-     * @return
-     */
-    private AnalysisDto getAnalysisDto(AnalysisPriorityRecordsPo priorityRecordsPo){
-        AnalysisDataRelationRecordsPo dataRelationRecordsPo = dataRelationRecordsMapper.selectByTaskId(priorityRecordsPo.getTaskId());
-        AnalysisDto returnDto = new AnalysisDto();
-        BeanUtils.copyProperties(dataRelationRecordsPo,returnDto);
-        //设置分析类型
-        returnDto.setConfigAnalysis(Arrays.asList(dataRelationRecordsPo.getConfigAnalysis().split(",")));
-        //设置风机
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getTurbines())){
-            returnDto.setTurbines(Arrays.asList(dataRelationRecordsPo.getTurbines().split(",")));
-        }
-        //设置排除月份
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getExcludingMonths())) {
-            returnDto.setExcludingMonths(Arrays.asList(dataRelationRecordsPo.getExcludingMonths().split(",")));
-        }
-        //设置有功功率
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValueActivePower())) {
-            returnDto.setValueActivePower(getDoubleList(dataRelationRecordsPo.getValueActivePower()));
-        }
-        //设置风机转速
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValueGeneratorSpeed())) {
-            returnDto.setValueGeneratorSpeed(getDoubleList(dataRelationRecordsPo.getValueGeneratorSpeed()));
-        }
-        //设置桨距角
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValuePitchAngle())) {
-            returnDto.setValuePitchAngle(getDoubleList(dataRelationRecordsPo.getValuePitchAngle()));
-        }
-        //设置风速
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValueWindSpeed())) {
-            returnDto.setValueWindSpeed(getDoubleList(dataRelationRecordsPo.getValueWindSpeed()));
-        }
-        return returnDto;
-     }
-
-     private List<Double> getDoubleList(String value){
-         if(StringUtils.isNotEmpty(value)){
-             return Arrays.asList(value.split(",")).stream().map(Double::parseDouble).collect(Collectors.toList());
-         }
-         return null;
-     }
-}

energy-manage-service/src/main/java/com/energy/manage/service/task/AutoAnalysisTask.java

@@ -1,30 +0,0 @@
-package com.energy.manage.service.task;
-
-import com.energy.manage.service.service.analysis.AutoAnalysisService;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 自动分析定时任务(在线数据自动分析)
- * @author chy
- * @date 2024/6/2 21:35
- * @desc
- */
-@Slf4j
-@Component
-public class AutoAnalysisTask {
-
-    @Autowired
-    private AutoAnalysisService autoAnalysisService;
-
-    /**
-     * 自动分析
-     */
-    @XxlJob(value = "autoAnalysis")
-    void autoAnalysis() {
-        autoAnalysisService.autoAnalysis();
-    }
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/task/SkfVibrationDataTask.java

@@ -1,56 +0,0 @@
-package com.energy.manage.service.task;
-
-import com.energy.manage.service.service.vibration.VibrationService;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-@Slf4j
-@Component
-public class SkfVibrationDataTask {
-
-    @Autowired
-    private VibrationService vibrationService;
-
-    // 定义时间格式
-    private final String dateTimeFormatter = "yyyyMMdd";
-
-    /**
-     * 开始定时器
-     */
-    @XxlJob(value = "skfVibrationData")
-    public void skfVibrationData() {
-
-        log.info(getCurrentDateTim() + "开始抽取skf测点数据 ");
-
-        // 获取昨天的时间
-        String yesterdayDate = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(dateTimeFormatter));
-        // vibrationService.extractSkfPointData();
-
-        // 故障频率
-//        vibrationService.extracTwindGeneratorSkfMachinePart(yesterdayDate);
-
-        // 振动测点
-        vibrationService.extracTwindGeneratorSkfPointData(yesterdayDate);
-
-        log.info(getCurrentDateTim() + "结束抽取skf测点数据 ");
-    }
-
-
-    private String getCurrentDateTim() {
-        // 1. 获取当前系统的日期时间（不含时区，适用于本地时间场景）
-        LocalDateTime now = LocalDateTime.now();
-        System.out.println("当前原始时间：" + now);
-        // 2. 定义常用的日期时间格式器（可根据需求自定义格式）
-        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        // 3. 格式化日期时间
-        return now.format(formatter1);
-    }
-
-
-}

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

@@ -1,96 +0,0 @@
-package com.energy.manage.service.test;
-
-import com.energy.manage.common.util.UUIDTools;
-import com.energy.manage.service.domain.dto.analysis.AnalysisAlgorithmDto;
-import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
-
-import java.lang.reflect.Field;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author chy
- * @date 2024/5/31 10:26
- * @desc
- */
-public class TestClass {
-
-    public static void main(String[] args) {
-        // 本地时间
-//        int lastHour = LocalDateTime.now().minusHours(1).getHour();
-
-// 带时区（中国时区）
-        int lastHour = ZonedDateTime.now(ZoneId.of("Asia/Shanghai")).minusHours(1).getHour();
-        System.out.println(lastHour);
-    }
-
-    /**
-     * 递归处理引用类型
-     * @param analysis
-     * @param algorithm
-     * @param analysisField
-     * @param algorithmFields
-     * @throws IllegalAccessException
-     */
-    private static void setValue(AnalysisDto analysis,AnalysisAlgorithmDto algorithm,Field analysisField,Field[] algorithmFields) throws IllegalAccessException, NoSuchFieldException {
-        analysisField.setAccessible(true);
-        String fieldName = analysisField.getName();
-        for(Field algorithmField : algorithmFields){
-            if(!fieldName.equals(algorithmField.getName()) && !isBaseType(algorithmField.getType())){
-                algorithmField.setAccessible(true);
-                Object algorithmObj = algorithmField.get(algorithm);
-                algorithmObj = algorithmObj == null ? algorithmField.getClass().getInterfaces() : algorithmObj;
-                inspectReferenceType(analysis,algorithmField,fieldName,analysisField,algorithmObj);
-            }
-        }
-    }
-
-    /**
-     * 递归检查引用类型属性
-     * @param algorithmField
-     * @param fieldName
-     */
-    private static void inspectReferenceType(AnalysisDto analysis,Field algorithmField,String fieldName,Field analysisField,Object algorithmObj) throws IllegalAccessException, NoSuchFieldException {
-        Class<?> algorithmClazz = algorithmField.getType();
-        Field[] fields = algorithmClazz.getDeclaredFields();
-        for (Field field : fields) {
-            field.setAccessible(true);
-            Class<?> fieldType = field.getType();
-            String algorithmFieldName = field.getName();
-            if(fieldName.equals(field.getName())){
-                Object value = analysisField.get(analysis);
-//                String fieldTypeName = field.getDeclaringClass().getName();
-
-//                setFieldValue(algorithmObj,fieldTypeName,value);
-                field.set(field.get(algorithmObj),value);
-            }
-            if (!isBaseType(fieldType)) {
-                algorithmObj = algorithmObj == null ? fieldType.getInterfaces() : algorithmObj;
-                // 递归检查嵌套引用类型的属性
-                 inspectReferenceType(analysis,field,fieldName,analysisField,algorithmObj);
-            }
-        }
-    }
-
-
-    public static void setFieldValue(Object obj, String fieldPath, Object value) throws NoSuchFieldException, IllegalAccessException {
-        String[] fields = fieldPath.split("\\.");
-        for (int i = 0; i < fields.length - 1; i++) {
-            Field field = obj.getClass().getDeclaredField(fields[i]);
-            field.setAccessible(true);
-            obj = field.get(obj); // 移动到下一层引用
-        }
-        // 最后一个字段，设置值
-        Field lastField = obj.getClass().getDeclaredField(fields[fields.length - 1]);
-        lastField.setAccessible(true);
-        lastField.set(obj, value);
-    }
-
-    private static boolean isBaseType(Class<?> clazz) {
-        return clazz.isPrimitive() || clazz == String.class || clazz == Integer.class || clazz == List.class;
-    }
-
-
-}

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

@@ -1,182 +0,0 @@
-package com.energy.manage.service.test;
-
-import com.alibaba.fastjson.JSONArray;
-import com.energy.manage.common.po.analysisdatarelationrecords.AnalysisDataRelationRecordsPo;
-import com.energy.manage.common.po.analysispriorityrecords.AnalysisPriorityRecordsPo;
-import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.config.AnalysisTypeConfig;
-import com.energy.manage.service.config.annotations.UserLoginToken;
-import com.energy.manage.service.constant.analysis.AnalysisConstants;
-import com.energy.manage.service.controller.base.BaseServiceController;
-import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
-import com.energy.manage.service.domain.vo.analysis.AnalysisTypeVo;
-import com.energy.manage.service.domain.vo.datatransfer.DataTransferVo;
-import com.energy.manage.service.mappers.analysis.AnalysisResultMapper;
-import com.energy.manage.service.mappers.analysis.AnalysisTypeMapper;
-import com.energy.manage.service.mappers.analysisdatarelationrecords.AnalysisDataRelationRecordsMapper;
-import com.energy.manage.service.mappers.analysispriorityrecords.AnalysisPriorityRecordsMapper;
-import com.energy.manage.service.mappers.datatransfer.DataTransferMapper;
-import com.energy.manage.service.service.analysis.AnalysisService;
-import com.energy.manage.service.service.analysis.AutoAnalysisService;
-import com.energy.manage.service.util.IPUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author chy
- * @date 2024/6/19 11:22
- * @desc
- */
-@Slf4j
-@RestController
-@RequestMapping("/test")
-@RefreshScope
-public class TestController extends BaseServiceController {
-
-    @Autowired
-    private AnalysisService analysisService;
-
-    @Autowired
-    private AutoAnalysisService autoAnalysisService;
-
-    @Autowired
-    private AnalysisTypeMapper typeMapper;
-
-
-    @Autowired
-    private AnalysisPriorityRecordsMapper priorityRecordsMapper;
-
-    @Autowired
-    private AnalysisResultMapper resultMapper;
-
-    @Autowired
-    private AnalysisDataRelationRecordsMapper dataRelationRecordsMapper;
-
-    @Autowired
-    private AnalysisTypeConfig analysisTypeConfig;
-
-    @Value("${download.url}")
-    private String downloadUrl;
-
-    @UserLoginToken
-    @PostMapping("/testAutoAnalysis")
-    public ResultResp autoAnalysis() {
-        log.info("触发自动分析定时任务开始");
-        autoAnalysisService.autoAnalysis();
-        log.info("触发自动分析定时任务结束");
-        return success();
-    }
-
-    @UserLoginToken
-    @PostMapping("/testRefresh")
-    public ResultResp testRefresh() {
-        return success(JSONArray.parseArray(analysisTypeConfig.getAnalysisTypeConfig()));
-    }
-
-    @UserLoginToken
-    @PostMapping("/testIpUtils")
-    public ResultResp testIpUtils(HttpServletRequest request) {
-        return success(IPUtils.getIpAddr(request));
-    }
-
-    @PostMapping("/testAnalysisTask")
-    public ResultResp testIpUtils() {
-        log.info("触发自动分析定时任务开始");
-        try{
-            int analysisingCount = resultMapper.selectAnalysisProcessingCount();
-            if (analysisingCount > 0){
-                log.info("当前有正在分析的数据，排队分析返回");
-                return success(111);
-            }
-            //获取要执行的分析任务
-            AnalysisPriorityRecordsPo priorityRecordsPo = priorityRecordsMapper.queryFirstPriority();
-            if (priorityRecordsPo == null){
-                log.info("当前没有要分析的任务在排队中，分析返回");
-                return success(222);
-            }
-            //调用分析
-            analysisService.callAnalysis(getAnalysisDto(priorityRecordsPo));
-            //更新任务优先级状态为已执行
-            priorityRecordsMapper.updateExecuteStatus(priorityRecordsPo.getTaskId(), AnalysisConstants.ON_CALL);
-        }catch (Exception e){
-            log.error("触发自动分析定时任务异常",e);
-        }
-        log.info("触发自动分析定时任务结束");
-        return success();
-    }
-
-
-    /**
-     * 获取要执行的分析任务参数
-     * @return
-     */
-    private AnalysisDto getAnalysisDto(AnalysisPriorityRecordsPo priorityRecordsPo){
-        AnalysisDataRelationRecordsPo dataRelationRecordsPo = dataRelationRecordsMapper.selectByTaskId(priorityRecordsPo.getTaskId());
-        AnalysisDto returnDto = new AnalysisDto();
-        BeanUtils.copyProperties(dataRelationRecordsPo,returnDto);
-        //设置分析类型
-        returnDto.setConfigAnalysis(Arrays.asList(dataRelationRecordsPo.getConfigAnalysis().split(",")));
-        //设置风机
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getTurbines())){
-            returnDto.setTurbines(Arrays.asList(dataRelationRecordsPo.getTurbines().split(",")));
-        }
-        //设置排除月份
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getExcludingMonths())) {
-            returnDto.setExcludingMonths(Arrays.asList(dataRelationRecordsPo.getExcludingMonths().split(",")));
-        }
-        //设置有功功率
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValueActivePower())) {
-            returnDto.setValueActivePower(getDoubleList(dataRelationRecordsPo.getValueActivePower()));
-        }
-        //设置风机转速
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValueGeneratorSpeed())) {
-            returnDto.setValueGeneratorSpeed(getDoubleList(dataRelationRecordsPo.getValueGeneratorSpeed()));
-        }
-        //设置桨距角
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValuePitchAngle())) {
-            returnDto.setValuePitchAngle(getDoubleList(dataRelationRecordsPo.getValuePitchAngle()));
-        }
-        //设置风速
-        if(StringUtils.isNotEmpty(dataRelationRecordsPo.getValueWindSpeed())) {
-            returnDto.setValueWindSpeed(getDoubleList(dataRelationRecordsPo.getValueWindSpeed()));
-        }
-        return returnDto;
-    }
-
-    private List<Double> getDoubleList(String value){
-        if(StringUtils.isNotEmpty(value)){
-            return Arrays.asList(value.split(",")).stream().map(Double::parseDouble).collect(Collectors.toList());
-        }
-        return null;
-    }
-
-
-    /**
-     * 设置分析参数
-     * @param dataTransferVo
-     * @return
-     */
-    private AnalysisDto assignmentAnalysisDto(DataTransferVo dataTransferVo){
-        AnalysisDto analysisDto = new AnalysisDto();
-        analysisDto.setAutoOrManual(AnalysisConstants.AUTO_ANALYSIS);
-        analysisDto.setDataBatchNum(dataTransferVo.getBatchCode());
-        analysisDto.setPowerFarmID(dataTransferVo.getFieldCode());
-        List<String> typeCodeList = typeMapper.selectAllVo().parallelStream().map(AnalysisTypeVo::getTypeFlag).collect(Collectors.toList());
-        analysisDto.setConfigAnalysis(typeCodeList);
-        return analysisDto;
-    }
-
-
-}

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

@@ -1,273 +0,0 @@
-package com.energy.manage.service.test;
-
-import com.energy.manage.service.domain.dto.analysis.AnalysisDto;
-import com.energy.manage.service.property.analysis.AlgorithmProperties;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.IntNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.util.Json;
-import org.apache.commons.lang3.StringUtils;
-
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-/**
- * @author chy
- * @date 2024/6/2 19:06
- * @desc
- */
-public class TestJson {
-
-    private static  ObjectMapper mapper = new ObjectMapper();
-
-
-    public static void main(String[] args) throws JsonProcessingException {
-        String jsonString = "{\n" +
-                "    \"dataContractType\": {\n" +
-                "        \"type\": \"analysisExecuteOrder\",\n" +
-                "        \"version\": \"1.2.0\"\n" +
-                "    },\n" +
-                "    \"dataContract\": {\n" +
-                "        \"autoOrManual\": \"automatic\",\n" +
-                "        \"dataFilter\": {\n" +
-                "            \"powerFarmID\": \"010-00001\",\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\": null,\n" +
-                "            \"customFilter\": {\n" +
-                "                \"valueWindSpeed\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                },\n" +
-                "                \"valuePitchAngle\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                },\n" +
-                "                \"valueActivePower\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                },\n" +
-                "                \"valueGeneratorSpeed\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                }\n" +
-                "            }\n" +
-                "        },\n" +
-                "        \"configAnalysis\": [],\n" +
-                "        \"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" +
-                "            },\n" +
-                "            \"cp\": {\n" +
-                "                \"step\": 0.5,\n" +
-                "                \"min\": 0,\n" +
-                "                \"max\": 2\n" +
-                "            },\n" +
-                "            \"tsr\": {\n" +
-                "                \"step\": 5,\n" +
-                "                \"min\": 0,\n" +
-                "                \"max\": 30\n" +
-                "            },\n" +
-                "            \"pitchAngle\": {\n" +
-                "                \"step\": 1,\n" +
-                "                \"min\": -1,\n" +
-                "                \"max\": 20\n" +
-                "            },\n" +
-                "            \"activePower\": {\n" +
-                "                \"step\": 250,\n" +
-                "                \"min\": 0,\n" +
-                "                \"max\": 2000\n" +
-                "            }\n" +
-                "        }\n" +
-                "    }\n" +
-                "}";
-        JsonNode rootNode = mapper.readTree(jsonString);
-//        AnalysisDto dto = new AnalysisDto();
-//        dto.setBeginTime("1234-12-12 00:00:12");
-//        updateNodesByPropertyName(rootNode, "beginTime", dto);
-//        String propertyNameToFind = "beginTime";
-//        List<JsonNode> matchingNodes = findNodesByPropertyName(rootNode, propertyNameToFind);
-//
-//        for (JsonNode node : matchingNodes) {
-//            System.out.println("Found matching node: " + mapper.writerWithDefaultPrettyPrinter().writeValueAsString(node));
-//        }
-
-        AnalysisDto dto = new AnalysisDto();
-        dto.setScada("all");
-        dto.setAutoOrManual("manual");
-        dto.setBeginTime("1234-12-12 00:00:12");
-        dto.setExcludingMonths(Arrays.asList("1","2","3"));
-        dto.setTurbines(Arrays.asList("456","789"));
-        dto.setValueActivePower(Arrays.asList(1.2,2.3));
-        dto.setConfigAnalysis(Arrays.asList("algorithm.powerOscillationAnalyst|PowerOscillationAnalyst|executeAnalysis|minute","algorithm.pitchTSRCpAnalyst|PitchTSRCpAnalyst|executeAnalysis|second"));
-        setValue(dto,rootNode);
-        for (JsonNode node : rootNode) {
-            System.out.println("Found matching node: " + mapper.writerWithDefaultPrettyPrinter().writeValueAsString(node));
-        }
-
-    }
-
-    public static List<JsonNode> findNodesByPropertyName(JsonNode node, String propertyName) {
-        List<JsonNode> result = new ArrayList<>();
-        findNodesByPropertyNameRecursive(node, propertyName, result);
-        return result;
-    }
-
-    private static void findNodesByPropertyNameRecursive(JsonNode node, String propertyName, List<JsonNode> result) {
-        if (node.isObject()) {
-            node.fields().forEachRemaining(entry -> {
-                if (entry.getKey().equals(propertyName)) {
-                    // 匹配到属性名称，添加节点到结果列表
-                    result.add(entry.getValue());
-                }
-                // 递归搜索子节点
-                findNodesByPropertyNameRecursive(entry.getValue(), propertyName, result);
-            });
-        }
-    }
-
-    private static void updateNodesByPropertyName(JsonNode rootNode, String propertyName,Object value,String scada) {
-        if (rootNode.isObject()) {
-            rootNode.fields().forEachRemaining(entry -> {
-                // 匹配到属性名称，进行值的修改
-                if (entry.getKey().equals(propertyName)) {
-                    //如果当前节点没有子节点直接复制
-                    if(!entry.getValue().fields().hasNext() && !propertyName.equals("configAnalysis")){
-                        if(StringUtils.endsWithAny(propertyName,"turbines","excludingMonths")){
-                            ArrayNode arrayNode = mapper.createArrayNode();
-                            ((List<String>)value).stream().forEach(item-> arrayNode.add(item));
-                            ((ObjectNode) rootNode).set(propertyName,arrayNode);
-                        }else{
-                            ((ObjectNode) rootNode).put(propertyName, value.toString());
-                        }
-                    }else {
-                        try {
-                            assignmentByPropertyName(entry.getValue(), propertyName, value,scada);
-                        } catch (JsonProcessingException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-                // 递归搜索子节点
-                updateNodesByPropertyName(entry.getValue(), propertyName, value,scada);
-            });
-        }
-    }
-
-    /**
-     * 获取前端参数
-     * @param analysisDto
-     * @return
-     */
-    private static void setValue(AnalysisDto analysisDto,JsonNode rootNode) {
-        //前端入参类
-        Field[] analysisFields = analysisDto.getClass().getDeclaredFields();
-        Arrays.asList(analysisFields).stream().forEach(field -> {
-            field.setAccessible(true);
-            try {
-                if(field.get(analysisDto) != null){
-                    updateNodesByPropertyName(rootNode, field.getName(), field.get(analysisDto),analysisDto.getScada());
-                }
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-
-    private static void  assignmentByPropertyName(JsonNode subNode, String propertyName, Object newValue,String scada) throws JsonProcessingException {
-        //图像设置特殊处理
-        if("valueActivePower".contains(propertyName)){
-//        if(AlgorithmProperties.graphSetsProperties.contains(propertyName)){
-            List<Integer> list = (List) newValue;
-            AtomicInteger index = new AtomicInteger(0);
-            subNode.fields().forEachRemaining(entry -> {
-                System.out.println(entry.getKey() + "======");
-                ((ObjectNode) subNode).put(entry.getKey(), list.get(index.get()));
-                index.incrementAndGet();
-            });
-            return ;
-        }
-        //分析类型特殊处理
-//        if("turbines".equals(propertyName)){
-//            dealArrayNode(subNode, newValue);
-//            return;
-//        }
-        //分析类型特殊处理
-        if("configAnalysis".equals(propertyName)){
-            dealConfigAnalysis(subNode, newValue,scada);
-            return;
-        }
-
-    }
-
-
-    private static String json = "{\n" +
-            "    \"package\": \"\",\n" +
-            "    \"className\": \"\",\n" +
-            "    \"methodName\": \"\",\n" +
-            "    \"scada\": \"\"\n" +
-            "}";
-
-
-
-    /**
-     * 数组类型处理
-     * @param subNode
-     * @param newValue
-     */
-    private static void dealArrayNode(JsonNode subNode, Object newValue) throws JsonProcessingException {
-        ArrayNode arrayNode = (ArrayNode) subNode;
-        List<String> tu = (List) newValue;
-        tu.stream().forEach(item -> arrayNode.add(item));
-    }
-
-    /**
-     * 分析类型处理
-     * @param subNode
-     * @param newValue
-     */
-    private static void dealConfigAnalysis(JsonNode subNode, Object newValue,String scada) throws JsonProcessingException {
-        ArrayNode arrayNode = (ArrayNode) subNode;
-        List<String> analysisTypes = (List) newValue;
-        for(int i = 0 ; i < analysisTypes.size() ; i++){
-            JsonNode childNode = mapper.readTree(json);
-            //分析类型解析
-            String[] types = analysisTypes.get(i).split("\\|");
-            AtomicInteger index =  new AtomicInteger(0);
-            childNode.fields().forEachRemaining(entry-> {
-                if(StringUtils.isNotBlank(scada) && entry.getKey().equals("scada")){
-                    ((ObjectNode)childNode).put(entry.getKey(), scada);
-                }else{
-                    ((ObjectNode)childNode).put(entry.getKey(), types[index.get()]);
-                }
-                index.incrementAndGet();
-            });
-            arrayNode.add(childNode);
-        }
-    }
-}

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

@@ -1,119 +0,0 @@
-package com.energy.manage.service.test;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-/**
- * @author chy
- * @date 2024/7/10 14:24
- * @desc
- */
-public class TestJson2 {
-
-    public static void main(String[] args) {
-        String jsonString = "{\n" +
-                "    \"dataContractType\": {\n" +
-                "        \"type\": \"analysisExecuteOrder\",\n" +
-                "        \"version\": \"1.2.0\"\n" +
-                "    },\n" +
-                "    \"dataContract\": {\n" +
-                "        \"autoOrManual\": \"automatic\",\n" +
-                "        \"dataFilter\": {\n" +
-                "            \"powerFarmID\": \"010-00001\",\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\": null,\n" +
-                "            \"customFilter\": {\n" +
-                "                \"valueWindSpeed\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                },\n" +
-                "                \"valuePitchAngle\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                },\n" +
-                "                \"valueActivePower\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                },\n" +
-                "                \"valueGeneratorSpeed\": {\n" +
-                "                    \"min\": null,\n" +
-                "                    \"max\": null\n" +
-                "                }\n" +
-                "            }\n" +
-                "        },\n" +
-                "        \"configAnalysis\": [],\n" +
-                "        \"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" +
-                "            },\n" +
-                "            \"cp\": {\n" +
-                "                \"step\": 0.5,\n" +
-                "                \"min\": 0,\n" +
-                "                \"max\": 2\n" +
-                "            },\n" +
-                "            \"tsr\": {\n" +
-                "                \"step\": 5,\n" +
-                "                \"min\": 0,\n" +
-                "                \"max\": 30\n" +
-                "            },\n" +
-                "            \"pitchAngle\": {\n" +
-                "                \"step\": 1,\n" +
-                "                \"min\": -1,\n" +
-                "                \"max\": 20\n" +
-                "            },\n" +
-                "            \"activePower\": {\n" +
-                "                \"step\": 250,\n" +
-                "                \"min\": 0,\n" +
-                "                \"max\": 2000\n" +
-                "            }\n" +
-                "        }\n" +
-                "    }\n" +
-                "}";
-        JSONObject jsonObject = JSONObject.parseObject(jsonString);
-//        updateJsonByPropertyName(jsonObject, "autoOrManual", "123");
-        System.out.println(jsonObject.toJSONString());
-
-    }
-
-    public static void updateJsonByPropertyName(JSONObject jsonObject, String propertyName, String propertyValue) {
-        if (jsonObject.containsKey(propertyName)) {
-            jsonObject.put(propertyName, propertyValue);
-        } else {
-            jsonObject.keySet().forEach(key -> {
-                Object v = jsonObject.get(key);
-                if (v instanceof JSONObject) {
-                    updateJsonByPropertyName((JSONObject) v, key, propertyValue);
-                } else if (v instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) v;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Object item = jsonArray.get(i);
-                        if (item instanceof JSONObject) {
-                            updateJsonByPropertyName((JSONObject) item, key, propertyValue);
-                        }
-                    }
-                }
-            });
-        }
-
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.energy.manage.service.test;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.stereotype.Component;
-
-/**
- * @author chy
- * @date 2024/6/26 10:45
- * @desc
- */
-@Component
-@RefreshScope
-@Data
-@Accessors(chain = true)
-public class TestProperties {
-
-
-    public static String downloadUrl;
-
-
-    @Value("${test.download.url:123}")
-    private void setDownloadUrl(String downloadUrl){
-        TestProperties.downloadUrl = downloadUrl;
-    }
-
-}

energy-manage-service/src/main/java/com/energy/manage/service/util/NetUtils.java

@@ -1,6 +1,6 @@
 package com.energy.manage.service.util;
 
-import com.energy.manage.service.property.analysis.AlgorithmProperties;
+import com.energy.manage.common.property.analysis.AlgorithmProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -3,8 +3,8 @@
 spring.profiles.active = @profiles.active@
 # 应用名称
 spring.application.name = energy-manage-service
-# 服务端口(同台服务器，配置到nacos)
-#server.port = 16200
+# 服务端口（本地默认；如需改端口可由 Nacos 配置分组中的 application.properties 覆盖）
+server.port = 16200
 # 上下文路径
 server.servlet.context-path = /energy-manage-service/
 

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

@@ -1,6 +1,6 @@
 #============================nacos配置=========================================
-# spring.cloud.nacos.config.server-addr = 106.120.102.238:28488
 spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
+# spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
 # spring.cloud.nacos.config.server-addr = 10.172.12.211:8848
 spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191
 spring.cloud.nacos.config.name=application.properties

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

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.energy.manage.service.mappers.analysis.AnalysisCommentDescriptionMapper">
-    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisCommentDescriptionPo">
-        <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="batch_code" property="batchCode" jdbcType="VARCHAR"/>
-        <result column="analysis_type_code" property="analysisTypeCode" jdbcType="VARCHAR"/>
-        <result column="comment_type_code" property="commentTypeCode" jdbcType="VARCHAR"/>
-        <result column="comment" property="comment" jdbcType="VARCHAR"/>
-        <result column="create_by" property="createBy" jdbcType="INTEGER"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="update_by" property="updateBy" jdbcType="INTEGER"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <select id="selectCountByAllCode" parameterType="java.lang.String" resultType="int">
-        select count(*)
-        from analysis_comment_description
-        where
-              batch_code = #{batchCode,jdbcType=VARCHAR}
-        and   analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
-        and   comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
-    </select>
-
-    <select id="selecByBatchCodeAndAnalysisTypeCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo">
-        select acd.batch_code,
-               ar.analysis_name,
-               acd.analysis_type_code,
-               acd.comment_type_code,
-               actr.comment_type_name,
-               acd.comment,
-               acd.create_time
-        from analysis_comment_description as acd
-        left join analysis_comment_type_relation as actr
-        on acd.comment_type_code = actr.comment_type_code
-        left join analysis_result ar
-        on acd.batch_code = ar.batch_code
-        <where>
-            <if test="batchCode != null and batchCode != ''">
-                acd.batch_code = #{batchCode,jdbcType=VARCHAR}
-            </if>
-            <if test="analysisTypeCode != null and analysisTypeCode != ''">
-                and acd.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
-            </if>
-        </where>
-        order by acd.update_time , acd.batch_code desc
-    </select>
-
-    <insert id="insertPoSelective" parameterType="com.energy.manage.common.po.analysis.AnalysisCommentDescriptionPo">
-        insert into analysis_comment_description
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="batchCode != null">
-                batch_code,
-            </if>
-            <if test="analysisTypeCode != null">
-                analysis_type_code,
-            </if>
-            <if test="commentTypeCode != null">
-                comment_type_code,
-            </if>
-            <if test="comment != null">
-                comment,
-            </if>
-            <if test="createBy != null">
-                create_by,
-            </if>
-            <if test="updateBy != null">
-                update_by
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="batchCode != null">
-                #{batchCode,jdbcType=VARCHAR},
-            </if>
-            <if test="analysisTypeCode != null">
-                #{analysisTypeCode,jdbcType=VARCHAR},
-            </if>
-            <if test="commentTypeCode != null">
-                #{commentTypeCode,jdbcType=VARCHAR},
-            </if>
-            <if test="comment !=null">
-                #{comment,jdbcType=VARCHAR},
-            </if>
-            <if test="createBy != null">
-                #{createBy,jdbcType=INTEGER},
-            </if>
-            <if test="updateBy != null">
-                #{updateBy,jdbcType=INTEGER}
-            </if>
-        </trim>
-    </insert>
-    <update id="updatePoSelective" parameterType="com.energy.manage.common.po.analysis.AnalysisCommentDescriptionPo">
-        update analysis_comment_description
-        <set>
-            <if test="comment != null">
-                comment = #{comment,jdbcType=VARCHAR},
-            </if>
-            <if test="updateBy != null">
-                update_by = #{updateBy,jdbcType=INTEGER}
-            </if>
-        </set>
-        where batch_code = #{batchCode,jdbcType=VARCHAR}
-        and   analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
-        and   comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
-    </update>
-</mapper>

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

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.energy.manage.service.mappers.analysis.AnalysisCommentTypeRelationMapper">
-    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisCommentTypeRelationPo">
-        <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="batch_code" property="batchCode" jdbcType="VARCHAR"/>
-        <result column="analysis_type_code" property="analysisTypeCode" jdbcType="VARCHAR"/>
-        <result column="comment_type_code" property="commentTypeCode" jdbcType="VARCHAR"/>
-        <result column="comment_type_name" property="commentTypeName" jdbcType="VARCHAR"/>
-        <result column="is_defined" property="isDefined" jdbcType="INTEGER"/>
-        <result column="is_delete" property="isDelete" jdbcType="INTEGER"/>
-        <result column="create_by" property="createBy" jdbcType="INTEGER"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <select id="selectByAnalysisTypeCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisCommentTypeRelationVo">
-        select
-            comment_type_code,
-            comment_type_name,
-            is_defined
-        from analysis_comment_type_relation
-        where is_delete = 0
-          and ((batch_code = #{batchCode,jdbcType=VARCHAR}
-                and analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR})
-                or is_defined = 0
-              )
-    </select>
-
-    <select id="selectByTypeCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisCommentTypeRelationVo">
-        select
-            comment_type_code,
-            comment_type_name,
-            is_defined
-        from analysis_comment_type_relation
-        where is_delete = 0
-        and is_defined = 1
-        and comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
-    </select>
-
-    <insert id="insertPoSelective" parameterType="com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto">
-        insert into analysis_comment_type_relation
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="batchCode != null and batchCode != ''">
-                batch_code,
-            </if>
-            <if test="analysisTypeCode != null and analysisTypeCode != ''">
-                analysis_type_code,
-            </if>
-            <if test="commentTypeCode != null and commentTypeCode != ''">
-                comment_type_code,
-            </if>
-            <if test="commentTypeName != null and commentTypeName != ''">
-                comment_type_name,
-            </if>
-            <if test="createBy != null">
-                create_by
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="batchCode != null and batchCode != ''">
-                #{batchCode,jdbcType=VARCHAR},
-            </if>
-            <if test="analysisTypeCode != null and analysisTypeCode != ''">
-                #{analysisTypeCode,jdbcType=VARCHAR},
-            </if>
-            <if test="commentTypeCode != null and commentTypeCode != ''">
-                #{commentTypeCode,jdbcType=VARCHAR},
-            </if>
-            <if test="commentTypeName != null and commentTypeName != ''">
-                #{commentTypeName,jdbcType=VARCHAR},
-            </if>
-           <if test="createBy != null">
-                #{createBy,jdbcType=INTEGER}
-            </if>
-        </trim>
-    </insert>
-
-    <update id="deleteByTypeCode" parameterType="java.lang.String">
-        update analysis_comment_type_relation
-        set is_delete = 1
-        where comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
-    </update>
-</mapper>

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

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.energy.manage.service.mappers.analysis.AnalysisDiagramRelationMapper">
-    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisDiagramRelationPo">
-        <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="batch_code" property="batchCode" jdbcType="VARCHAR"/>
-        <result column="field_engine_code" property="fieldEngineCode" jdbcType="VARCHAR"/>
-        <result column="analysis_type_code" property="analysisTypeCode" jdbcType="VARCHAR"/>
-        <result column="file_addr" property="fileAddr" jdbcType="VARCHAR"/>
-        <result column="auto_analysis" property="autoAnalysis" jdbcType="INTEGER"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <select id="selectByCondition" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisDiagramRelationVo">
-        select
-            adr.batch_code,
-            adr.field_engine_code,
-            weg.engine_name as field_engine_name,
-            adr.analysis_type_code,
-            adr.file_addr,
-            adr.create_time
-        from analysis_diagram_relation adr
-        left join wind_engine_group weg
-        on adr.field_engine_code = weg.engine_code
-        where adr.batch_code = #{batchCode,jdbcType=VARCHAR}
-        <if test="analysisTypeCode != null and analysisTypeCode != ''">
-              and adr.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
-        </if>
-        <if test="fieldEngineCode != null and fieldEngineCode.size != 0">
-            and adr.field_engine_code in
-          <foreach collection="fieldEngineCode" item="item" separator="," open="("  close=")">
-             #{item,jdbcType=VARCHAR}
-          </foreach>
-        </if>
-    </select>
-    <select id="selectByBatchCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisDiagramRelationVo">
-        select
-            relations.analysis_type_code,
-            types.type_name as analysis_type_name
-        from analysis_diagram_relation relations
-        left join analysis_type types
-        on types.type_code = relations.analysis_type_code
-        where relations.batch_code = #{batchCode,jdbcType=VARCHAR}
-    </select>
-
-    <select id="selectByBatchCodeAndAnalysisTypeCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupShortVo">
-        select
-            relations.field_engine_code as engine_code,
-            engine.engine_name
-        from analysis_diagram_relation relations
-        left join wind_engine_group engine
-        on relations.field_engine_code = engine.engine_code
-        <where>
-            <if test="batchCode != null and batchCode != ''">
-                relations.batch_code = #{batchCode,jdbcType=VARCHAR}
-            </if>
-            <if test="analysisTypeCode != null and analysisTypeCode != ''">
-                and relations.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
-            </if>
-        </where>
-    </select>
-</mapper>

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

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.energy.manage.service.mappers.analysis.AnalysisGeneralFileMapper">
-    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisGeneralFilePo">
-        <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="batch_code" property="batchCode" jdbcType="VARCHAR"/>
-        <result column="analysis_type_code" property="analysisTypeCode" jdbcType="VARCHAR"/>
-        <result column="file_addr" property="fileAddr" jdbcType="VARCHAR"/>
-        <result column="auto_analysis" property="createBy" jdbcType="INTEGER"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="engine_type_code" property="engineTypeCode" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <select id="selectByCondition" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisGeneralFileVo">
-        select
-        general.batch_code,
-        general.analysis_type_code,
-        type.type_name as analysis_type_name,
-        general.file_addr,
-        general.engine_type_code,
-        general.create_time,
-        mill.machine_type_code
-        from analysis_general_file general
-        left join analysis_type type
-        on type.type_code = general.analysis_type_code
-        left join wind_engine_mill mill
-        on mill.mill_type_code = general.engine_type_code
-        where general.batch_code = #{batchCode,jdbcType=VARCHAR}
-        <if test="analysisTypeCode != null and analysisTypeCode != ''">
-            and general.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
-        </if>
-    </select>
-
-    <select id="selectByBatchCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisGeneralFileVo">
-        select
-        general.batch_code,
-        general.analysis_type_code,
-        type.type_name as analysis_type_name
-        from analysis_general_file general
-        left join analysis_type type
-        on general.analysis_type_code = type.type_code
-        where general.batch_code = #{batchCode,jdbcType=VARCHAR}
-    </select>
-</mapper>

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

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.energy.manage.service.mappers.analysis.AnalysisOptionRecordsMapper">
-    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo">
-        <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="option_content" property="optionContent" jdbcType="VARCHAR"/>
-        <result column="option_by" property="optionBy" jdbcType="INTEGER"/>
-        <result column="option_by_name" property="optionByName" jdbcType="VARCHAR"/>
-        <result column="field_code" property="fieldCode" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <select id="selectAllByTimeDesc" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo">
-        select
-               option_by_name,
-               option_content,
-               create_time
-        from analysis_option_records
-        where field_code in
-        <foreach collection="fieldCodes" item="fieldCode" separator="," open="(" close=")">
-            #{fieldCode,jdbcType=VARCHAR}
-        </foreach>
-        <if test="startTime != null and startTime != ''">
-            and create_time &gt;= #{startTime,jdbcType=VARCHAR}
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and create_time &lt;= #{endTime,jdbcType=VARCHAR}
-        </if>
-        order by create_time desc
-    </select>
-</mapper>