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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
雨木c
2023-07-27 15:17:28 +08:00
parent 3c2e10ee96 ecb099f12a
commit a08ad10385
7 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java
View File

@@ -163,7 +163,7 @@ public class LineDetail{
/** /**
* 接线图 * 接线图
*/ */
private String wireDiagram; private String wiringDiagram;
} }

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -145,7 +145,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
lineDetailDataVO.setOwner(lineDetail.getOwner()); lineDetailDataVO.setOwner(lineDetail.getOwner());
lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty()); lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty());
lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel()); lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel());
lineDetailDataVO.setWiringDiagram(lineDetail.getWireDiagram()); lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram());
return lineDetailDataVO; return lineDetailDataVO;
} }

26
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -1678,8 +1678,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
throw new BusinessException(DeviceResponseEnum.LINE_NO); throw new BusinessException(DeviceResponseEnum.LINE_NO);
} }
String[] urls = new String[0]; String[] urls = new String[0];
if(StrUtil.isNotBlank(lineDetailValid.getWireDiagram())){ if(StrUtil.isNotBlank(lineDetailValid.getWiringDiagram())){
urls = lineDetailValid.getWireDiagram().split(StrUtil.COMMA); urls = lineDetailValid.getWiringDiagram().split(StrUtil.COMMA);
} }
if (urls.length + files.length > 2) { if (urls.length + files.length > 2) {
@@ -1699,7 +1699,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
LineDetail lineDetail = new LineDetail(); LineDetail lineDetail = new LineDetail();
lineDetail.setWireDiagram(strBuilder.toString()); lineDetail.setWiringDiagram(strBuilder.toString());
lineDetail.setId(lineId); lineDetail.setId(lineId);
lineDetailMapper.updateById(lineDetail); lineDetailMapper.updateById(lineDetail);
return true; return true;
@@ -1712,11 +1712,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(detail)) { if (Objects.isNull(detail)) {
throw new BusinessException(DeviceResponseEnum.LINE_NO); throw new BusinessException(DeviceResponseEnum.LINE_NO);
} }
if (StrUtil.isBlank(detail.getWireDiagram())) { if (StrUtil.isBlank(detail.getWiringDiagram())) {
return result; return result;
} }
String[] urlStr = detail.getWireDiagram().split(StrUtil.COMMA); String[] urlStr = detail.getWiringDiagram().split(StrUtil.COMMA);
for (String url : urlStr) { for (String url : urlStr) {
LineWiringDiagramVO lineWiringDiagramVO = new LineWiringDiagramVO(); LineWiringDiagramVO lineWiringDiagramVO = new LineWiringDiagramVO();
String realUrl = fileStorageUtil.getFileUrl(url); String realUrl = fileStorageUtil.getFileUrl(url);
@@ -1734,14 +1734,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(detail)) { if (Objects.isNull(detail)) {
throw new BusinessException(DeviceResponseEnum.LINE_NO); throw new BusinessException(DeviceResponseEnum.LINE_NO);
} }
if (StrUtil.isBlank(detail.getWireDiagram())) { if (StrUtil.isBlank(detail.getWiringDiagram())) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL); throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL);
} }
if (!detail.getWireDiagram().contains(wiringDiagramName)) { if (!detail.getWiringDiagram().contains(wiringDiagramName)) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO); throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO);
} }
String[] urlArr = detail.getWireDiagram().split(StrUtil.COMMA); String[] urlArr = detail.getWiringDiagram().split(StrUtil.COMMA);
List<String> newUrlList = Arrays.stream(urlArr).filter(s -> !s.equalsIgnoreCase(wiringDiagramName)).collect(Collectors.toList()); List<String> newUrlList = Arrays.stream(urlArr).filter(s -> !s.equalsIgnoreCase(wiringDiagramName)).collect(Collectors.toList());
if (newUrlList.size() > 1) { if (newUrlList.size() > 1) {
@@ -1763,7 +1763,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
LineDetail lineDetail = new LineDetail(); LineDetail lineDetail = new LineDetail();
lineDetail.setId(detail.getId()); lineDetail.setId(detail.getId());
lineDetail.setWireDiagram(strBuilder.toString()); lineDetail.setWiringDiagram(strBuilder.toString());
lineDetailMapper.updateById(lineDetail); lineDetailMapper.updateById(lineDetail);
return true; return true;
} }
@@ -1774,15 +1774,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(detail)) { if (Objects.isNull(detail)) {
throw new BusinessException(DeviceResponseEnum.LINE_NO); throw new BusinessException(DeviceResponseEnum.LINE_NO);
} }
if (StrUtil.isBlank(detail.getWireDiagram())) { if (StrUtil.isBlank(detail.getWiringDiagram())) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL); throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL);
} }
if (!detail.getWireDiagram().contains(wiringDiagramName)) { if (!detail.getWiringDiagram().contains(wiringDiagramName)) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO); throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO);
} }
fileStorageUtil.deleteFile(wiringDiagramName); fileStorageUtil.deleteFile(wiringDiagramName);
String[] urlArr = detail.getWireDiagram().split(StrUtil.COMMA); String[] urlArr = detail.getWiringDiagram().split(StrUtil.COMMA);
List<String> newUrlList = Arrays.stream(urlArr).filter(s -> !s.equalsIgnoreCase(wiringDiagramName)).collect(Collectors.toList()); List<String> newUrlList = Arrays.stream(urlArr).filter(s -> !s.equalsIgnoreCase(wiringDiagramName)).collect(Collectors.toList());
StrBuilder strBuilder = new StrBuilder(); StrBuilder strBuilder = new StrBuilder();
for (int i = 0; i < newUrlList.size(); i++) { for (int i = 0; i < newUrlList.size(); i++) {
@@ -1794,7 +1794,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
LineDetail lineDetail = new LineDetail(); LineDetail lineDetail = new LineDetail();
lineDetail.setId(detail.getId()); lineDetail.setId(detail.getId());
lineDetail.setWireDiagram(strBuilder.toString()); lineDetail.setWiringDiagram(strBuilder.toString());
lineDetailMapper.updateById(lineDetail); lineDetailMapper.updateById(lineDetail);
return true; return true;
} }

1
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java
View File

@@ -37,6 +37,7 @@ import java.util.List;
@RequestMapping("/RmpPassRate") @RequestMapping("/RmpPassRate")
@Api(tags = "监测点稳态指标合格率") @Api(tags = "监测点稳态指标合格率")
@AllArgsConstructor @AllArgsConstructor
@Deprecated
public class RmpPassRateController extends BaseController { public class RmpPassRateController extends BaseController {
private final LineFeignClient lineFeignClient; private final LineFeignClient lineFeignClient;

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

@@ -728,11 +728,12 @@ public class RStatOrgServiceImpl implements RStatOrgService {
in("measurement_point_id",collect1). in("measurement_point_id",collect1).
eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring(0, 7)); eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring(0, 7));
RMpPassRateMPO rMpPassRateMPO = rMpPassRateMMapper.selectOne(rMpPassRateMPOQueryWrapper); RMpPassRateMPO rMpPassRateMPO = rMpPassRateMMapper.selectOne(rMpPassRateMPOQueryWrapper);
rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate()); //todo 这边有点问题,每日监测点信息从公共接口获取，当日监测点应该都一样，不存在表数据不一致的情况
rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate()); if (!Objects.isNull(rMpPassRateMPO)){
rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getvDevPassRate()); rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate());
rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate());
rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getvDevPassRate());
}
/*11、日均监测到暂态指标的监测点数*/ /*11、日均监测到暂态指标的监测点数*/
rMpEventDetailDPOQueryWrapper.clear(); rMpEventDetailDPOQueryWrapper.clear();

5
pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java
View File

@@ -98,6 +98,11 @@ public class UserParam {
@NotBlank(message = UserValidMessage.LOGIN_NAME_NOT_BLANK) @NotBlank(message = UserValidMessage.LOGIN_NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.LOGIN_NAME_REGEX, message = UserValidMessage.LOGIN_NAME_FORMAT_ERROR) @Pattern(regexp = PatternRegex.LOGIN_NAME_REGEX, message = UserValidMessage.LOGIN_NAME_FORMAT_ERROR)
private String loginName; private String loginName;
@ApiModelProperty("用户表Id")
@NotBlank(message = UserValidMessage.ID_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
private String id;
} }

8
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.njcn.user.pojo.po.UserSet;
import com.njcn.user.service.IUserSetService; import com.njcn.user.service.IUserSetService;
import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Objects; import java.util.Objects;
@@ -45,8 +46,13 @@ public class UserSetServiceImpl extends ServiceImpl<UserSetMapper, UserSet> impl
@Override @Override
public UserSet addUserSet(UserParam.UserAddParam addUserParam) { public UserSet addUserSet(UserParam.UserAddParam addUserParam) {
String userId;
UserSet userSet = new UserSet(); 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); userSet.setUserId(userId);
String secretKey = PubUtils.randomCode(16); String secretKey = PubUtils.randomCode(16);
userSet.setSecretKey(secretKey); userSet.setSecretKey(secretKey);