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

sql兼容达梦调整

Browse Source
This commit is contained in:
chendaofei
2025-04-23 15:49:10 +08:00
parent b8ea00c47d
commit f565d90421
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,8 +122,8 @@ public class LineDetailDataVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime; private LocalDateTime updateTime;
@ApiModelProperty(name = "新能源场站信息ID") @ApiModelProperty(name = "监测对象信息ID")
private String obyId; private String objId;
@ApiModelProperty(name = "对象类型大类") @ApiModelProperty(name = "对象类型大类")
private String bigObjType; private String bigObjType;

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

@@ -31,6 +31,7 @@
device.com_flag comFlag, device.com_flag comFlag,
1 as lineType, 1 as lineType,
0 as type, 0 as type,
lineDetail.obj_id,
lineDetail.monitor_flag as isUpToGrid, lineDetail.monitor_flag as isUpToGrid,
point.name pointName point.name pointName
</if> </if>

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

@@ -7,7 +7,7 @@
line.NAME srbName, line.NAME srbName,
sub.Lng coordY, sub.Lng coordY,
sub.Lat coordX, sub.Lat coordX,
"blue" color, 'blue' color,
dic.name scale dic.name scale
FROM FROM
pq_line line, pq_line line,

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java
View File

@@ -109,7 +109,7 @@ public class VoltageRideThroughEventServiceImpl implements VoltageRideThroughEve
//过滤掉不符合的事件(eventIds为有效事件ID) //过滤掉不符合的事件(eventIds为有效事件ID)
eventNewStationVos = eventNewStationVos.stream().filter(item -> eventIds.contains(item.getEventId())).collect(Collectors.toList()); eventNewStationVos = eventNewStationVos.stream().filter(item -> eventIds.contains(item.getEventId())).collect(Collectors.toList());
List<LineDetailDataVO> lineDetailDataVOS = lineFeignClient.getLineDetailList(lineIds).getData(); List<LineDetailDataVO> lineDetailDataVOS = lineFeignClient.getLineDetailList(lineIds).getData();
Map<String, String> lineDetailDataMap = lineDetailDataVOS.stream().collect(Collectors.toMap(LineDetailDataVO::getLineId, LineDetailDataVO::getObyId)); Map<String, String> lineDetailDataMap = lineDetailDataVOS.stream().collect(Collectors.toMap(LineDetailDataVO::getLineId, LineDetailDataVO::getObjId));
//特殊处理事件集合中新能源场站名称 //特殊处理事件集合中新能源场站名称
List<NewUserReportVO> userReportVOS = userLedgerFeignClient.getUserReportByIds(new ArrayList<>(lineDetailDataMap.values())).getData(); List<NewUserReportVO> userReportVOS = userLedgerFeignClient.getUserReportByIds(new ArrayList<>(lineDetailDataMap.values())).getData();
Map<String, String> userReportMap = userReportVOS.stream().collect(Collectors.toMap(NewUserReportVO::getId, NewUserReportVO::getProjectName)); Map<String, String> userReportMap = userReportVOS.stream().collect(Collectors.toMap(NewUserReportVO::getId, NewUserReportVO::getProjectName));