From 6a3b848dc0424f58476ac4ad105d926239a28fd3 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 2 Dec 2024 19:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/web/constant/ValidMessage.java | 4 +--- .../main/java/com/njcn/web/pojo/param/BaseParam.java | 2 +- .../supervision/pojo/po/user/UserReportProjectPO.java | 6 +++++- .../pojo/po/user/UserReportSensitivePO.java | 7 +++++++ .../pojo/po/user/UserReportSubstationPO.java | 9 +++++++++ .../service/user/impl/UserReportPOServiceImpl.java | 10 ++++++++-- 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java b/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java index c31c9d043..e3441e3ac 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java @@ -7,10 +7,8 @@ package com.njcn.web.constant; */ public interface ValidMessage { - String MISS_PREFIX="字段不能为空，请检查"; - String ID_NOT_BLANK = "id不能为空，请检查id参数"; String ID_FORMAT_ERROR = "id格式错误，请检查id参数"; @@ -69,7 +67,7 @@ public interface ValidMessage { String DEVICE_VERSION_NOT_BLANK = "装置版本json文件不能为空，请检查deviceVersionFile参数"; - String SEARCH_DATA_ERROR = "搜索值有特殊字符或者过长,请检查搜索参数"; + String SEARCH_DATA_ERROR = "搜索值过长,请检查搜索参数"; String DATA_TOO_LONG = "参数过长,请检查参数"; diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/pojo/param/BaseParam.java b/pqs-common/common-web/src/main/java/com/njcn/web/pojo/param/BaseParam.java index 88810c405..5103bb22e 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/pojo/param/BaseParam.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/pojo/param/BaseParam.java @@ -19,7 +19,7 @@ public class BaseParam implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("搜索值") - @Pattern(regexp = PatternRegex.ALL_CHAR_1_20, message = ValidMessage.SEARCH_DATA_ERROR) + @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.SEARCH_DATA_ERROR) private String searchValue; @ApiModelProperty("开始时间") diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java index 10c689ebf..1af437847 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java @@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.db.bo.BaseEntity; +import com.njcn.web.constant.ValidMessage; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.Pattern; + /** * * Description: @@ -32,7 +36,7 @@ public class UserReportProjectPO extends BaseEntity { * 用户协议容量 */ @TableField(value = "agreement_capacity") - + @Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR) private Double agreementCapacity; /** diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java index fe0f41cd7..e969e4ceb 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java @@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.db.bo.BaseEntity; +import com.njcn.web.constant.ValidMessage; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.Pattern; + /** * * Description: @@ -32,6 +36,7 @@ public class UserReportSensitivePO extends BaseEntity { * PCC点 */ @TableField(value = "pcc_point") + @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) private String pccPoint; /** @@ -44,6 +49,7 @@ public class UserReportSensitivePO extends BaseEntity { * 敏感装置名称 */ @TableField(value = "device_name") + @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) private String deviceName; /** @@ -74,6 +80,7 @@ public class UserReportSensitivePO extends BaseEntity { * 预测评估审核单位 */ @TableField(value = "evaluation_chek_dept") + @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) private String evaluationChekDept; /** diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java index 5ebc7d47b..bba9dcbf2 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.db.bo.BaseEntity; +import com.njcn.web.constant.ValidMessage; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.Pattern; import java.math.BigDecimal; /** @@ -31,30 +34,35 @@ public class UserReportSubstationPO extends BaseEntity { * PCC点 */ @TableField(value = "pcc_point") + @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) private String pccPoint; /** * 基准短路容量（MVA） */ @TableField(value = "base_short_circuit_capacity") + @Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR) private BigDecimal baseShortCircuitCapacity; /** * 系统最小短路容量（MVA） */ @TableField(value = "min_short_circuit_capacity") + @Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR) private BigDecimal minShortCircuitCapacity; /** * PCC供电设备容量（MVA） */ @TableField(value = "pcc_equipment_capacity") + @Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR) private BigDecimal pccEquipmentCapacity; /** * 用户用电协议容量（MVA） */ @TableField(value = "user_agreement_capacity") + @Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR) private BigDecimal userAgreementCapacity; /** @@ -73,6 +81,7 @@ public class UserReportSubstationPO extends BaseEntity { * 预测评估审核单位 */ @TableField(value = "evaluation_chek_dept") + @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) private String evaluationChekDept; /** diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 75466bc97..33c61086d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -298,9 +298,9 @@ public class UserReportPOServiceImpl extends ServiceImpl getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) { //正则校验 - Pattern pattern = Pattern.compile(PatternRegex.ALL_CHAR_1_20); + Pattern pattern = Pattern.compile(PatternRegex.DES32_REGEX); Matcher matcher = pattern.matcher(userReportQueryParam.getProjectName()); - if (!Objects.equals(userReportQueryParam.getProjectName(),"") && !matcher.matches()) { + if (StringUtils.isNotBlank(userReportQueryParam.getProjectName()) && !matcher.matches()) { throw new BusinessException(ValidMessage.SEARCH_DATA_ERROR); } QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); @@ -471,6 +471,12 @@ public class UserReportPOServiceImpl extends ServiceImpl getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam, Boolean allDataFlag) { + //正则校验 + Pattern pattern = Pattern.compile(PatternRegex.ALL_CHAR_1_20); + Matcher matcher = pattern.matcher(userReportQueryParam.getProjectName()); + if (StringUtils.isNotBlank(userReportQueryParam.getProjectName()) && !matcher.matches()) { + throw new BusinessException(ValidMessage.SEARCH_DATA_ERROR); + } QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); List data = deptFeignClient.getDepSonIdtByDeptId(userReportQueryParam.getOrgId()).getData();