lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

歧义值管理 站点规则记录表新增区域编码和来源字段

master
徐杰盟 2023-09-15 16:07:50 +08:00
parent ac7e31bc23
commit 57ac9d44f0
5 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/whdc/model/entity/EStationRules.java
View File

@ -51,6 +51,23 @@ public class EStationRules extends Model<EStationRules> {
@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
*/

15
src/main/java/com/whdc/valid/component/RuleRedisService.java
View File

@ -26,12 +26,23 @@ public class RuleRedisService {
private RedisTemplate<String, String> ruleRedisTemplate;
public List<ValidateVo> getRule(String stcd,ValidateMapper validateMapper) {
return getRule(null,null,stcd,validateMapper);
}
public List<ValidateVo> getRule(String source,String countycode,String stcd,ValidateMapper validateMapper) {
List<ValidateVo> 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());

4
src/main/java/com/whdc/valid/mapper/ValidateMapper.java
View File

@ -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<ValidateVo> 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<ValidateVo> getRuleByStcd(String source,String countycode, String stcd);

5
src/main/java/com/whdc/valid/model/ValidateDto.java
View File

@ -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;

8
src/main/java/com/whdc/valid/service/ValidateServiceImpl.java
View File

@ -67,7 +67,7 @@ public class ValidateServiceImpl implements ValidateService {
return false;
}
List<ValidateVo> rule = ruleRedis.getRule(dto.getStcd(), validateMapper);
List<ValidateVo> rule = ruleRedis.getRule(dto.getStcd(), validateMapper); // 弃用
if (CollectionUtils.isEmpty(rule)) {
return true;
}
@ -226,7 +226,7 @@ public class ValidateServiceImpl implements ValidateService {
return false;
}
List<ValidateVo> rule = ruleRedis.getRule(dto.getStcd(), validateMapper);
List<ValidateVo> 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<ValidateVo> rule = ruleRedis.getRule(dto.getStcd(), validateMapper);
List<ValidateVo> 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<ValidateVo> rule = ruleRedis.getRule(dto.getStcd(), validateMapper);
List<ValidateVo> rule = ruleRedis.getRule(dto.getSource(),dto.getCountycode(),dto.getStcd(), validateMapper);
if (CollectionUtils.isEmpty(rule)) {