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

达梦数据库兼容调整

Browse Source
This commit is contained in:
chendaofei
2025-04-10 13:15:29 +08:00
parent f7fb8d036a
commit 6793da251c
9 changed files with 124 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,24 +27,27 @@
manufacturerId.name as manufacturer,
dev.name as devName,
device.IP as ip,
case linedetail.Run_Flag when 0 then "投运"
when 1 then "检修"
when 2 then "停运"
when 3 then "调试"
when 4 then "退运"
case linedetail.Run_Flag
when 0 then '投运'
when 1 then '检修'
when 2 then '停运'
when 3 then '调试'
when 4 then '退运'
end as runFlag,
case device.Com_Flag when 0 then "中断"
when 1 then "正常"
case device.Com_Flag
when 0 then '中断'
when 1 then '正常'
end as comFlag,
loadtypeId.Name as loadType,
businesstypeId.name as businessType,
IFNULL(linedetail.Obj_Name,"/") as objName,
case linedetail.PT_Type when 0 then "星型接线"
when 1 then "三角型接线"
when 2 then "开口三角型接线"
IFNULL(linedetail.Obj_Name,'/') as objName,
case linedetail.PT_Type
when 0 then '星型接线'
when 1 then '三角型接线'
when 2 then '开口三角型接线'
end as ptType,
CONCAT(linedetail.PT1,"/", linedetail.PT2) as pt,
CONCAT(linedetail.CT1,"/", linedetail.CT2) as ct,
CONCAT(linedetail.PT1,'/', linedetail.PT2) as pt,
CONCAT(linedetail.CT1,'/', linedetail.CT2) as ct,
linedetail.Standard_Capacity as standardCapacity,
linedetail.Short_Capacity as shortCapacity,
linedetail.Dev_Capacity as devCapacity,
@@ -143,18 +146,18 @@
CASE
device.Run_Flag
WHEN 0 THEN
"投运"
'投运'
WHEN 1 THEN
"热备用"
'热备用'
WHEN 2 THEN
"停运"
'停运'
END AS runFlag,
CASE
device.Com_Flag
WHEN 0 THEN
"中断"
'中断'
WHEN 1 THEN
"正常"
'正常'
END AS comFlag,
device.Update_Time AS updateTime
FROM

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

@@ -1490,7 +1490,7 @@
<select id="getCustomDetailByLineId" resultType="map">
SELECT
line.id AS lineId,
concat(sub.name,"_",vo.name,"_",line.name) as lineName,
concat(sub.name,'_',vo.name,'_',line.name) as lineName,
concat(round(detail.pt1,0),concat(':',round(detail.pt2,0))) as pt,
concat(round(detail.ct1,0),concat(':',round(detail.ct2,0))) as ct,
detail.Dev_Capacity as Dev_Capacity,

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

@@ -127,8 +127,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
@Override
public List<DetailAbnormalVO> monitorAbnormalTable(MonitorBaseParam monitorBaseParam) {
List<DetailAbnormalVO> result = new ArrayList<>();
LambdaQueryWrapper<LineDetail> lineDetailQuery = new LambdaQueryWrapper<>();
lineDetailQuery.select(LineDetail::getId, LineDetail::getTimeInterval).in(LineDetail::getId, monitorBaseParam.getMonitorIds());
List<LineDevGetDTO> lineDetailList = lineMapper.getMonitorListDetail(monitorBaseParam.getMonitorIds());
Map<String, LineDevGetDTO> lineDetailMap = lineDetailList.stream().collect(Collectors.toMap(LineDevGetDTO::getPointId, Function.identity()));
@@ -180,7 +178,7 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
Map<String, List<DataVerify>> indexMap = timeList.stream().collect(Collectors.groupingBy(it -> it.getIndexCode() + SEPARATOR + it.getIndexTable() + SEPARATOR + it.getIndexName()));
indexMap.forEach((target, list) -> {
String[] temKey = target.split(SEPARATOR);
PqReasonableRangeDto pqReasonableRangeDto = dtoMap.get(temKey[0] + temKey[1]);
PqReasonableRangeDto pqReasonableRangeDto = dtoMap.get(temKey[0] +SEPARATOR+ temKey[1]);
String unit;
if(StrUtil.isNotBlank(pqReasonableRangeDto.getUnit())){
unit = pqReasonableRangeDto.getUnit();
@@ -256,8 +254,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
@Override
public List<DetailAbnormalVO> monitorLimitTable(MonitorBaseParam monitorBaseParam) {
List<DetailAbnormalVO> result = new ArrayList<>();
LambdaQueryWrapper<LineDetail> lineDetailQuery = new LambdaQueryWrapper<>();
lineDetailQuery.select(LineDetail::getId, LineDetail::getTimeInterval).in(LineDetail::getId, monitorBaseParam.getMonitorIds());
List<LineDevGetDTO> lineDetailList = lineMapper.getMonitorListDetail(monitorBaseParam.getMonitorIds());
Map<String, LineDevGetDTO> lineDetailMap = lineDetailList.stream().collect(Collectors.toMap(LineDevGetDTO::getPointId, Function.identity()));
@@ -622,7 +618,7 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
*/
public List<VerifyTargetVO> getAbnormalTarget(List<DataVerify> dataVerifyList) {
Map<String, Set<String>> dataMap = dataVerifyList.stream().collect(Collectors.groupingBy(it ->
it.getIndexCode() + it.getIndexTable(), Collectors.mapping(DataVerify::getLineId, Collectors.toSet())));
it.getIndexCode() +SEPARATOR+ it.getIndexTable(), Collectors.mapping(DataVerify::getLineId, Collectors.toSet())));
Map<String,PqReasonableRangeDto> rangeMap = getStandRange();
//正序、负序和零序电压
List<VerifyTargetVO> result = new ArrayList<>();
@@ -672,7 +668,7 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
DataCleanParam dataCleanParam = new DataCleanParam();
dataCleanParam.setSystemType(DataCleanEnum.Pqs.getCode());
List<PqReasonableRangeDto> pqReasonableRangeDtoList = pqReasonableRangeFeignClient.getData(dataCleanParam).getData();
return pqReasonableRangeDtoList.stream().collect(Collectors.toMap(it -> it.getIndexCode() + it.getInfluxdbTableName(), Function.identity()));
return pqReasonableRangeDtoList.stream().collect(Collectors.toMap(it -> it.getIndexCode() +SEPARATOR+ it.getInfluxdbTableName(), Function.identity()));
}