sql兼容达梦调整

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

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

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

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

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

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

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

@@ -109,7 +109,7 @@ public class VoltageRideThroughEventServiceImpl implements VoltageRideThroughEve
                 //过滤掉不符合的事件(eventIds为有效事件ID)
                 eventNewStationVos = eventNewStationVos.stream().filter(item -> eventIds.contains(item.getEventId())).collect(Collectors.toList());
                 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();
                 Map<String, String> userReportMap = userReportVOS.stream().collect(Collectors.toMap(NewUserReportVO::getId, NewUserReportVO::getProjectName));