From 57ac9d44f052f19549b864b09408632c2842f342 Mon Sep 17 00:00:00 2001 From: xjm Date: Fri, 15 Sep 2023 16:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A7=E4=B9=89=E5=80=BC=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E7=AB=99=E7=82=B9=E8=A7=84=E5=88=99=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9F=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E6=9D=A5=E6=BA=90=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/whdc/model/entity/EStationRules.java | 17 +++++++++++++++++ .../whdc/valid/component/RuleRedisService.java | 15 +++++++++++++-- .../com/whdc/valid/mapper/ValidateMapper.java | 4 ++-- .../java/com/whdc/valid/model/ValidateDto.java | 5 ++++- .../whdc/valid/service/ValidateServiceImpl.java | 8 ++++---- 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/whdc/model/entity/EStationRules.java b/src/main/java/com/whdc/model/entity/EStationRules.java index dbd606d..3e3f908 100644 --- a/src/main/java/com/whdc/model/entity/EStationRules.java +++ b/src/main/java/com/whdc/model/entity/EStationRules.java @@ -51,6 +51,23 @@ public class EStationRules extends Model { @Max(50) private String stcd; + /** + * 测站编码 + */ + @ApiParam(value = "区域编码", required = false) + @ApiModelProperty(value = "区域编码", required = false, dataType = "String", example = "") + @TableField(value = "COUNTYCODE", updateStrategy = FieldStrategy.IGNORED) + private String countycode; + + /** + * 测站编码 + */ + @ApiParam(value = "来源", required = true) + @ApiModelProperty(value = "来源", required = false, dataType = "String", example = "") + @TableField(value = "SOURCE") + @NotNull(message = "来源不能为空",groups = {Insert.class,Update.class}) + private String source; + /** * 规则id */ diff --git a/src/main/java/com/whdc/valid/component/RuleRedisService.java b/src/main/java/com/whdc/valid/component/RuleRedisService.java index 15b3292..4bfcc7e 100644 --- a/src/main/java/com/whdc/valid/component/RuleRedisService.java +++ b/src/main/java/com/whdc/valid/component/RuleRedisService.java @@ -26,12 +26,23 @@ public class RuleRedisService { private RedisTemplate ruleRedisTemplate; public List getRule(String stcd,ValidateMapper validateMapper) { + return getRule(null,null,stcd,validateMapper); + } + + public List getRule(String source,String countycode,String stcd,ValidateMapper validateMapper) { List rules = null; log.info("获取规则: {}" , stcd); - String key = VALIDATE_REDIS_KEY + stcd; + if (StringUtils.isBlank(source)) { + source = "0"; + } + if (StringUtils.isBlank(countycode)) { + countycode = "0"; + } + + String key = VALIDATE_REDIS_KEY + source +":"+ countycode + ":" + stcd; if (Boolean.TRUE.equals(ruleRedisTemplate.hasKey(key))) { @@ -47,7 +58,7 @@ public class RuleRedisService { } }else{ - rules = validateMapper.getRuleByStcd(stcd); + rules = validateMapper.getRuleByStcd(source,countycode,stcd); log.info("保存规则: " + rules.size()); diff --git a/src/main/java/com/whdc/valid/mapper/ValidateMapper.java b/src/main/java/com/whdc/valid/mapper/ValidateMapper.java index 8065e03..0b3210a 100644 --- a/src/main/java/com/whdc/valid/mapper/ValidateMapper.java +++ b/src/main/java/com/whdc/valid/mapper/ValidateMapper.java @@ -17,8 +17,8 @@ public interface ValidateMapper { * @param stcd * @return */ - @Select("SELECT E.ITEM,E.MIN,E.MAX,E.DIFF_MAX,E.DURATION,E.LEADING_TIME,E.LAG_TIME,T.SORT FROM SHZH_IOT.E_STATION_RULES T LEFT JOIN SHZH_IOT.E_RULE E ON T.RULE_ID = E.ID WHERE T.DEL = 1 AND E.DEL = 1 AND T.STCD = #{stcd} ORDER BY T.SORT ASC;") - List getRuleByStcd(String stcd); + @Select("SELECT E.ITEM,E.MIN,E.MAX,E.DIFF_MAX,E.DURATION,E.LEADING_TIME,E.LAG_TIME,T.SORT FROM SHZH_IOT.E_STATION_RULES T LEFT JOIN SHZH_IOT.E_RULE E ON T.RULE_ID = E.ID WHERE T.DEL = 1 AND E.DEL = 1 AND T.SOURCE = #{source} AND T.COUNTYCODE = #{countycode} AND T.STCD = #{stcd} ORDER BY T.SORT ASC;") + List getRuleByStcd(String source,String countycode, String stcd); diff --git a/src/main/java/com/whdc/valid/model/ValidateDto.java b/src/main/java/com/whdc/valid/model/ValidateDto.java index ef34d11..f2d042f 100644 --- a/src/main/java/com/whdc/valid/model/ValidateDto.java +++ b/src/main/java/com/whdc/valid/model/ValidateDto.java @@ -20,7 +20,10 @@ public class ValidateDto implements Serializable { private String stcd; @ApiModelProperty(value = "所在区域", dataType = "java.lang.String") - private String countyCode; + private String countycode; + + @ApiModelProperty(value = "所在区域", dataType = "java.lang.String") + private String source; @ApiModelProperty(value = "监测时间", dataType = "java.lang.Date") private Date tm; diff --git a/src/main/java/com/whdc/valid/service/ValidateServiceImpl.java b/src/main/java/com/whdc/valid/service/ValidateServiceImpl.java index 1921fc8..84129a2 100644 --- a/src/main/java/com/whdc/valid/service/ValidateServiceImpl.java +++ b/src/main/java/com/whdc/valid/service/ValidateServiceImpl.java @@ -67,7 +67,7 @@ public class ValidateServiceImpl implements ValidateService { return false; } - List rule = ruleRedis.getRule(dto.getStcd(), validateMapper); + List rule = ruleRedis.getRule(dto.getStcd(), validateMapper); // 弃用 if (CollectionUtils.isEmpty(rule)) { return true; } @@ -226,7 +226,7 @@ public class ValidateServiceImpl implements ValidateService { return false; } - List rule = ruleRedis.getRule(dto.getStcd(), validateMapper); + List rule = ruleRedis.getRule(dto.getSource(),dto.getCountycode(),dto.getStcd(), validateMapper); if (CollectionUtils.isEmpty(rule)) { log.info("规则为空: {}", rule); return true; @@ -404,7 +404,7 @@ public class ValidateServiceImpl implements ValidateService { ValidateDto dto = getValidateDto(json); // 差值 - List rule = ruleRedis.getRule(dto.getStcd(), validateMapper); + List rule = ruleRedis.getRule(dto.getStcd(), validateMapper); // 弃用 if (CollectionUtils.isEmpty(rule)) { return true; } @@ -480,7 +480,7 @@ public class ValidateServiceImpl implements ValidateService { ValidateDto dto = getValidateDto(json); // 多个值 - List rule = ruleRedis.getRule(dto.getStcd(), validateMapper); + List rule = ruleRedis.getRule(dto.getSource(),dto.getCountycode(),dto.getStcd(), validateMapper); if (CollectionUtils.isEmpty(rule)) {