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

完成责任量化功能

Browse Source
This commit is contained in:
hongawen
2023-07-26 11:20:12 +08:00
parent ae00d7671d
commit c3f8592160
104 changed files with 4709 additions and 1670 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 wiringDiagram;
private String wireDiagram;
}

6
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java
View File

@@ -18,6 +18,12 @@ public class LineDetailVO implements Serializable {
@ApiModelProperty("变电站名称")
private String subName;
@ApiModelProperty("终端名称")
private String devName;
@ApiModelProperty("网络参数")
private String ip;
@ApiModelProperty("监测点名称")
private String lineName;
}

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -612,16 +612,20 @@
<select id="getLineSubGdDetail" resultType="com.njcn.device.pq.pojo.vo.LineDetailVO">
SELECT DISTINCT gd.NAME gdName,
substation.NAME subName,
device.NAME devName,
deviceDetail.ip ip,
line.NAME lineName
FROM pq_line line,
pq_line voltage,
pq_line device,
pq_device deviceDetail,
pq_line substation,
pq_line gd
WHERE line.pid = voltage.id
AND voltage.pid = device.id
AND device.pid = substation.id
AND substation.pid = gd.id
AND device.id = deviceDetail.id
AND line.id = #{id}
</select>

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.setOwnerDuty(lineDetail.getOwnerDuty());
lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel());
lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram());
lineDetailDataVO.setWiringDiagram(lineDetail.getWireDiagram());
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);
}
String[] urls = new String[0];
if(StrUtil.isNotBlank(lineDetailValid.getWiringDiagram())){
urls = lineDetailValid.getWiringDiagram().split(StrUtil.COMMA);
if(StrUtil.isNotBlank(lineDetailValid.getWireDiagram())){
urls = lineDetailValid.getWireDiagram().split(StrUtil.COMMA);
}
if (urls.length + files.length > 2) {
@@ -1699,7 +1699,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
}
LineDetail lineDetail = new LineDetail();
lineDetail.setWiringDiagram(strBuilder.toString());
lineDetail.setWireDiagram(strBuilder.toString());
lineDetail.setId(lineId);
lineDetailMapper.updateById(lineDetail);
return true;
@@ -1712,11 +1712,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(detail)) {
throw new BusinessException(DeviceResponseEnum.LINE_NO);
}
if (StrUtil.isBlank(detail.getWiringDiagram())) {
if (StrUtil.isBlank(detail.getWireDiagram())) {
return result;
}
String[] urlStr = detail.getWiringDiagram().split(StrUtil.COMMA);
String[] urlStr = detail.getWireDiagram().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<LineMapper, Line> imple
if (Objects.isNull(detail)) {
throw new BusinessException(DeviceResponseEnum.LINE_NO);
}
if (StrUtil.isBlank(detail.getWiringDiagram())) {
if (StrUtil.isBlank(detail.getWireDiagram())) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL);
}
if (!detail.getWiringDiagram().contains(wiringDiagramName)) {
if (!detail.getWireDiagram().contains(wiringDiagramName)) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO);
}
String[] urlArr = detail.getWiringDiagram().split(StrUtil.COMMA);
String[] urlArr = detail.getWireDiagram().split(StrUtil.COMMA);
List<String> 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<LineMapper, Line> imple
LineDetail lineDetail = new LineDetail();
lineDetail.setId(detail.getId());
lineDetail.setWiringDiagram(strBuilder.toString());
lineDetail.setWireDiagram(strBuilder.toString());
lineDetailMapper.updateById(lineDetail);
return true;
}
@@ -1774,15 +1774,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(detail)) {
throw new BusinessException(DeviceResponseEnum.LINE_NO);
}
if (StrUtil.isBlank(detail.getWiringDiagram())) {
if (StrUtil.isBlank(detail.getWireDiagram())) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_DEL);
}
if (!detail.getWiringDiagram().contains(wiringDiagramName)) {
if (!detail.getWireDiagram().contains(wiringDiagramName)) {
throw new BusinessException(DeviceResponseEnum.LINE_WIRING_NO);
}
fileStorageUtil.deleteFile(wiringDiagramName);
String[] urlArr = detail.getWiringDiagram().split(StrUtil.COMMA);
String[] urlArr = detail.getWireDiagram().split(StrUtil.COMMA);
List<String> 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<LineMapper, Line> imple
}
LineDetail lineDetail = new LineDetail();
lineDetail.setId(detail.getId());
lineDetail.setWiringDiagram(strBuilder.toString());
lineDetail.setWireDiagram(strBuilder.toString());
lineDetailMapper.updateById(lineDetail);
return true;
}