Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
雨木c
2023-06-08 16:33:53 +08:00
parent ec6e27a4eb
commit 91df5cb181
20 changed files with 279 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/AreaCountServiceImpl.java
View File

@@ -129,13 +129,13 @@ public class AreaCountServiceImpl implements AreaCountService {
/*在运的字典表id，配网1，2，3类监测点字典表id用于for循环中过滤*/
String lineTypeOneId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_ONE.getCode ( ));
SPLIT_SIGN + DicDataEnum.ONE_LINE.getCode ( ));
String lineTypeTwoId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_TWO.getCode ( ));
SPLIT_SIGN + DicDataEnum.TWO_LINE.getCode ( ));
String lineTypeThreeId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_THREE.getCode ( ));
SPLIT_SIGN + DicDataEnum.THREE_LINE.getCode ( ));
if (
StringUtils.isEmpty (lineTypeOneId) ||
StringUtils.isEmpty (lineTypeTwoId) ||
@@ -194,13 +194,13 @@ public class AreaCountServiceImpl implements AreaCountService {
/*在运的字典表id，配网1，2，3类监测点字典表id用于for循环中过滤*/
String lineTypeOneId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_ONE.getCode ( ));
SPLIT_SIGN + DicDataEnum.ONE_LINE.getCode ( ));
String lineTypeTwoId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_TWO.getCode ( ));
SPLIT_SIGN + DicDataEnum.TWO_LINE.getCode ( ));
String lineTypeThreeId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_THREE.getCode ( ));
SPLIT_SIGN + DicDataEnum.THREE_LINE.getCode ( ));
if (
StringUtils.isEmpty (lineTypeOneId) ||
StringUtils.isEmpty (lineTypeTwoId) ||