From 7c3e8f29bee540ee362ce59bde78cae84a58be84 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 26 Sep 2024 14:06:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/advance/api/EventWaveAnalysisFeignClient.java | 9 ++++++--- .../EventWaveAnalysisFeignClientFallbackFactory.java | 4 +++- .../com/njcn/advance/enums/CarryingCapacityEnum.java | 2 -- .../src/main/java/com/njcn/advance/enums/EnumEvt.java | 1 - .../advance/pojo/param/ResponsibilityCalculateParam.java | 6 +++--- .../src/main/java/com/njcn/advance/utils/WaveUtils.java | 4 +--- .../carrycapacity/CarryCapacityController.java | 8 -------- .../govern/voltage/SagGovernSchemeController.java | 3 +++ .../service/impl/EventWaveAnalysisServiceImpl.java | 2 +- .../java/com/njcn/common/pojo/constant/PatternRegex.java | 3 ++- .../src/main/java/com/njcn/system/pojo/po/Area.java | 4 +++- .../src/main/java/com/njcn/system/pojo/po/Config.java | 3 ++- 12 files changed, 24 insertions(+), 25 deletions(-) diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/EventWaveAnalysisFeignClient.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/EventWaveAnalysisFeignClient.java index 941038297..161ec8542 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/EventWaveAnalysisFeignClient.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/EventWaveAnalysisFeignClient.java @@ -9,6 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +/** + * @author wr + */ @FeignClient(value = ServerInfo.ADVANCE_BOOT,path = "/waveAnalysis", fallbackFactory = EventWaveAnalysisFeignClientFallbackFactory.class, contextId = "waveAnalysis" ) @@ -16,9 +19,9 @@ public interface EventWaveAnalysisFeignClient { /** - * @Description: 波形高级分析 - * @param eventIndex - * @return: com.njcn.common.pojo.response.HttpResult + * 波形高级分析 + * @param eventIndex 事件索引 + * @return com.njcn.common.pojo.response.HttpResult * @Author: wr * @Date: 2023/11/1 14:23 */ diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/fallback/EventWaveAnalysisFeignClientFallbackFactory.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/fallback/EventWaveAnalysisFeignClientFallbackFactory.java index e8020d381..3450d35be 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/fallback/EventWaveAnalysisFeignClientFallbackFactory.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/api/fallback/EventWaveAnalysisFeignClientFallbackFactory.java @@ -11,6 +11,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +/** + * @author wr + */ @Slf4j @Component public class EventWaveAnalysisFeignClientFallbackFactory implements FallbackFactory { @@ -24,7 +27,6 @@ public class EventWaveAnalysisFeignClientFallbackFactory implements FallbackFact } Enum finalExceptionEnum = exceptionEnum; return new EventWaveAnalysisFeignClient() { - @Override public HttpResult analysis(String eventIndex) { log.error("{}异常，降级处理，异常为：{}", "波形高级分析", throwable.toString()); diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/CarryingCapacityEnum.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/CarryingCapacityEnum.java index 388e36ad3..1a9d69fef 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/CarryingCapacityEnum.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/CarryingCapacityEnum.java @@ -4,8 +4,6 @@ import lombok.Getter; /** * @Description: 承载能力评估相关枚举 -* @Param: -* @return: * @Author: clam * @Date: 2024/1/31 */ diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/EnumEvt.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/EnumEvt.java index 96bcc9dfa..58008ab1c 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/EnumEvt.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/EnumEvt.java @@ -4,7 +4,6 @@ package com.njcn.advance.enums; * @Author: Sunwei 【sunW2016@163.com】 * @Description: 高级分析返回结果 * @Date: Create in 9:02 2018/3/6 - * @Modified By: */ public enum EnumEvt { EVT_NUM("evt_num", "高级算法返回事件个数"), EVT_BUF("evt_buf", "高级算法返回数据"), QVVR_TYPE("qvvr_type", "暂降类型"), POW_A("POW_a", diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/param/ResponsibilityCalculateParam.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/param/ResponsibilityCalculateParam.java index f624a72aa..27321eb46 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/param/ResponsibilityCalculateParam.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/param/ResponsibilityCalculateParam.java @@ -16,7 +16,7 @@ import java.io.Serializable; * @date 2023年07月21日 10:20 */ @Data -public class ResponsibilityCalculateParam implements Serializable { +public class ResponsibilityCalculateParam implements Serializable { @ApiModelProperty("开始时间") @@ -40,11 +40,11 @@ public class ResponsibilityCalculateParam implements Serializable { @Min(0) @Max(1) @ApiModelProperty("0-电流 1-电压") - private int type; + private int type; @Min(2) @Max(50) @ApiModelProperty("谐波次数") - private Integer time; + private Integer time; } diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/WaveUtils.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/WaveUtils.java index 680c8f3bc..951a1756a 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/WaveUtils.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/WaveUtils.java @@ -1,7 +1,6 @@ package com.njcn.advance.utils; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.CharsetUtil; import com.njcn.oss.utils.FileStorageUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -33,8 +32,7 @@ public class WaveUtils { public String getFile(String filePath){ String temJson = null; try(InputStream inputStream = fileStorageUtil.getFileStream(filePath)){ - temJson = IoUtil.read(inputStream, CharsetUtil.UTF_8); - + temJson = IoUtil.readUtf8(inputStream); } catch (IOException e) { e.printStackTrace(); } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java index c0d665362..b2694ebc7 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java @@ -109,9 +109,6 @@ public class CarryCapacityController extends BaseController { @ApiOperation("导出数据集模板") @GetMapping(value = "getExcelTemplate") public HttpResult getExcelTemplate(HttpServletResponse response) throws IOException { - - - String sheetName = "数据集模版"; List excels = new ArrayList<>(); CarryCapcityDataEexcel exportHeadersExcel = new CarryCapcityDataEexcel(); @@ -120,10 +117,6 @@ public class CarryCapacityController extends BaseController { .sheet(sheetName) .doWrite(excels); EasyExcelUtil.writeWithSheetsWeb(response, "数据集模版.xlsx"); - - - - return null; } @@ -132,7 +125,6 @@ public class CarryCapacityController extends BaseController { @ApiOperation("上传数据集") public HttpResult uploadExcel(@Validated ExcelDataParam excelDataParam) throws Exception { String methodDescribe = getMethodDescribe("uploadExcel"); - boolean flag = carryCapcityService.uploadExcel(excelDataParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SagGovernSchemeController.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SagGovernSchemeController.java index 72b4dd7c9..0649ab12f 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SagGovernSchemeController.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SagGovernSchemeController.java @@ -28,6 +28,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * @author hongawen + */ @Slf4j @Validated @RestController diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java index ab9ad676b..69537824d 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java @@ -81,7 +81,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService { TimeInterval timeInterval = new TimeInterval(); //调用方法获取暂降事件详情 RmpEventDetailPO rmpEventDetailPO = rmpEventAdvanceMapper.selectById(eventIndex); - EntityAdvancedData entityAdvancedData = null; + EntityAdvancedData entityAdvancedData ; //获取PT变比 LineDetailDataVO lineDetailDataVO = lineFeignClient.getLineDetailData(rmpEventDetailPO.getLineId()).getData(); diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java index 8cf9a80bb..ce543c705 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java @@ -15,7 +15,8 @@ public interface PatternRegex { /** * 密码需要包含特殊字符字母数字，长度为8-16 */ - String PASSWORD_REGEX = "^(?=.*[a-zA-Z])(?=.*\\d)(?=.*[\\=\\[\\]\\{\\}\\.\\,\\。\\、\\@\\#\\_\\!\\$\\%\\^\\&\\*\\(\\)\\?\\<\\>\\/\\|\\~,\\-\\+]).{8,16}$"; + String PASSWORD_REGEX = "^(?=.*[a-zA-Z])(?=.*\\d)(?=.*[\\=\\[\\]\\{\\}\\.\\,\\。\\@\\#\\_\\!\\$\\%\\^\\&\\*\\(\\)\\?\\<\\>\\/\\|\\~,\\-\\+]).{8,16}$"; + /** * APP密码，长度为8-16 diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Area.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Area.java index 593350077..339c7022a 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Area.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Area.java @@ -2,6 +2,8 @@ package com.njcn.system.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; + +import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; @@ -15,7 +17,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_area") -public class Area extends BaseEntity { +public class Area extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java index 15be38794..903753258 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java @@ -5,6 +5,7 @@ import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -15,7 +16,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_config") -public class Config extends BaseEntity { +public class Config extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L;