From 77cda9ae6e0237ad3fa7f0d856cfaf1de39ae243 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 27 Jul 2023 11:22:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=97=E6=B3=95=E3=80=81=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/po/LineDetail.java | 2 +- .../pq/service/impl/LineServiceImpl.java | 2 +- .../service/impl/TerminalBaseServiceImpl.java | 26 +++++++++---------- .../line/RmpPassRateController.java | 1 + .../mysql/Impl/area/RStatOrgServiceImpl.java | 11 ++++---- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java index abc5154cf..ecb9b7a6b 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java @@ -163,7 +163,7 @@ public class LineDetail{ /** * 接线图 */ - private String wireDiagram; + private String wiringDiagram; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index 0f18a108a..3c89b6fb3 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -145,7 +145,7 @@ public class LineServiceImpl extends ServiceImpl implements Li lineDetailDataVO.setOwner(lineDetail.getOwner()); lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty()); lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel()); - lineDetailDataVO.setWiringDiagram(lineDetail.getWireDiagram()); + lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram()); return lineDetailDataVO; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 4c5c9ca7a..cfeaf51db 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -1678,8 +1678,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple throw new BusinessException(DeviceResponseEnum.LINE_NO); } String[] urls = new String[0]; - if(StrUtil.isNotBlank(lineDetailValid.getWireDiagram())){ - urls = lineDetailValid.getWireDiagram().split(StrUtil.COMMA); + if(StrUtil.isNotBlank(lineDetailValid.getWiringDiagram())){ + urls = lineDetailValid.getWiringDiagram().split(StrUtil.COMMA); } if (urls.length + files.length > 2) { @@ -1699,7 +1699,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple } LineDetail lineDetail = new LineDetail(); - lineDetail.setWireDiagram(strBuilder.toString()); + lineDetail.setWiringDiagram(strBuilder.toString()); lineDetail.setId(lineId); lineDetailMapper.updateById(lineDetail); return true; @@ -1712,11 +1712,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple if (Objects.isNull(detail)) { throw new BusinessException(DeviceResponseEnum.LINE_NO); } - if (StrUtil.isBlank(detail.getWireDiagram())) { + if (StrUtil.isBlank(detail.getWiringDiagram())) { return result; } - String[] urlStr = detail.getWireDiagram().split(StrUtil.COMMA); + String[] urlStr = detail.getWiringDiagram().split(StrUtil.COMMA); for (String url : urlStr) { LineWiringDiagramVO lineWiringDiagramVO = new LineWiringDiagramVO(); String realUrl = fileStorageUtil.getFileUrl(url); @@ -1734,14 +1734,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple if (Objects.isNull(detail)) { throw new BusinessException(DeviceResponseEnum.LINE_NO); } - if (StrUtil.isBlank(detail.getWireDiagram())) { + if (StrUtil.isBlank(detail.getWiringDiagram())) { throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL); } - if (!detail.getWireDiagram().contains(wiringDiagramName)) { + if (!detail.getWiringDiagram().contains(wiringDiagramName)) { throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO); } - String[] urlArr = detail.getWireDiagram().split(StrUtil.COMMA); + String[] urlArr = detail.getWiringDiagram().split(StrUtil.COMMA); List newUrlList = Arrays.stream(urlArr).filter(s -> !s.equalsIgnoreCase(wiringDiagramName)).collect(Collectors.toList()); if (newUrlList.size() > 1) { @@ -1763,7 +1763,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple LineDetail lineDetail = new LineDetail(); lineDetail.setId(detail.getId()); - lineDetail.setWireDiagram(strBuilder.toString()); + lineDetail.setWiringDiagram(strBuilder.toString()); lineDetailMapper.updateById(lineDetail); return true; } @@ -1774,15 +1774,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple if (Objects.isNull(detail)) { throw new BusinessException(DeviceResponseEnum.LINE_NO); } - if (StrUtil.isBlank(detail.getWireDiagram())) { + if (StrUtil.isBlank(detail.getWiringDiagram())) { throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL); } - if (!detail.getWireDiagram().contains(wiringDiagramName)) { + if (!detail.getWiringDiagram().contains(wiringDiagramName)) { throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO); } fileStorageUtil.deleteFile(wiringDiagramName); - String[] urlArr = detail.getWireDiagram().split(StrUtil.COMMA); + String[] urlArr = detail.getWiringDiagram().split(StrUtil.COMMA); List newUrlList = Arrays.stream(urlArr).filter(s -> !s.equalsIgnoreCase(wiringDiagramName)).collect(Collectors.toList()); StrBuilder strBuilder = new StrBuilder(); for (int i = 0; i < newUrlList.size(); i++) { @@ -1794,7 +1794,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple } LineDetail lineDetail = new LineDetail(); lineDetail.setId(detail.getId()); - lineDetail.setWireDiagram(strBuilder.toString()); + lineDetail.setWiringDiagram(strBuilder.toString()); lineDetailMapper.updateById(lineDetail); return true; } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java index da423ad8f..5ab469525 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java @@ -37,6 +37,7 @@ import java.util.List; @RequestMapping("/RmpPassRate") @Api(tags = "监测点稳态指标合格率") @AllArgsConstructor +@Deprecated public class RmpPassRateController extends BaseController { private final LineFeignClient lineFeignClient; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java index 32dd3dfd8..02272aef4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java @@ -728,11 +728,12 @@ public class RStatOrgServiceImpl implements RStatOrgService { in("measurement_point_id",collect1). eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring(0, 7)); RMpPassRateMPO rMpPassRateMPO = rMpPassRateMMapper.selectOne(rMpPassRateMPOQueryWrapper); - rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate()); - rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate()); - rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getvDevPassRate()); - - + //todo 这边有点问题,每日监测点信息从公共接口获取，当日监测点应该都一样，不存在表数据不一致的情况 + if (!Objects.isNull(rMpPassRateMPO)){ + rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate()); + rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate()); + rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getvDevPassRate()); + } /*11、日均监测到暂态指标的监测点数*/ rMpEventDetailDPOQueryWrapper.clear(); From ecb099f12a9bf2a746611aeb08d1d1822072e7ce Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 27 Jul 2023 14:08:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=89=8B=E5=8A=A8=E5=A1=AB=E5=86=99=E7=94=A8?= =?UTF-8?q?=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/user/pojo/param/UserParam.java | 5 +++++ .../com/njcn/user/service/impl/UserSetServiceImpl.java | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java index 4a7f22454..1fea2ec95 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java @@ -98,6 +98,11 @@ public class UserParam { @NotBlank(message = UserValidMessage.LOGIN_NAME_NOT_BLANK) @Pattern(regexp = PatternRegex.LOGIN_NAME_REGEX, message = UserValidMessage.LOGIN_NAME_FORMAT_ERROR) private String loginName; + + @ApiModelProperty("用户表Id") + @NotBlank(message = UserValidMessage.ID_NOT_BLANK) + @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR) + private String id; } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java index 6728bca4f..eb3ebb5a7 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java @@ -21,6 +21,7 @@ import com.njcn.user.pojo.po.UserSet; import com.njcn.user.service.IUserSetService; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import java.util.Objects; @@ -45,8 +46,13 @@ public class UserSetServiceImpl extends ServiceImpl impl @Override public UserSet addUserSet(UserParam.UserAddParam addUserParam) { + String userId; UserSet userSet = new UserSet(); - String userId = IdUtil.simpleUUID(); + if (StringUtils.isBlank(addUserParam.getId()) || Objects.isNull(addUserParam.getId())){ + userId = IdUtil.simpleUUID(); + } else { + userId = addUserParam.getId(); + } userSet.setUserId(userId); String secretKey = PubUtils.randomCode(16); userSet.setSecretKey(secretKey);