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:22:01 +08:00
parent 412e4b1bdb
commit 2f909e100c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
View File

@@ -97,8 +97,8 @@ public interface DeptLineService extends IService<DeptLine> {
/**
* 获取根据单位分组的监测点集合信息
* param devType 装置类型 0暂态 1稳态 2 双类型
* param type 装置类型 1监测点 2母线 3 装置
* param 系统类型 0暂态 1稳态 2 双类型
* param type 台账类型 1监测点 2母线 3 装置
* @author cdf
* @date 2023/5/10
*/

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

@@ -102,7 +102,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
List<LineDevGetDTO> lineList = new ArrayList<>();
deptIds.forEach(i -> {
if (map.containsKey(i)) {
map.get(i).stream().forEach(x->{
map.get(i).forEach(x->{
if(deptMap.containsKey(x.getUnitId())){
x.setUnitName(deptMap.get(x.getUnitId()));
}

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

@@ -1003,7 +1003,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
terminalLogsNew.setTerminalType(LineBaseEnum.LINE_LEVEL.getCode());
terminalLogsNew.setLogsType(data.getId());
terminalLogsNew.setState(DataStateEnum.ENABLE.getCode());
terminalLogsNew.setIsPush(DataStateEnum.ENABLE.getCode());
terminalLogsNew.setIsPush(0);
terminalLogsNew.setOperateType(Param.UPDATE);
pqsTerminalLogsMapper.insert(terminalLogsNew);
}
@@ -3772,7 +3772,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
String tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"_"+line.getName());
pqsTerminalLogs.setTerminalDescribe(tem);
pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode());
pqsTerminalLogs.setIsPush(DataStateEnum.ENABLE.getCode());
pqsTerminalLogs.setIsPush(0);
pqsTerminalLogs.setOperateType(operate);
pqsTerminalLogs.setObjIndex(line.getId());
pqsTerminalLogsMapper.insert(pqsTerminalLogs);
@@ -3812,7 +3812,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
pqsTerminalLogs.setTerminalType(DEVICE_LEVEL.getCode());
pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode());
pqsTerminalLogs.setObjIndex(devicePO.getId());
pqsTerminalLogs.setIsPush(DataStateEnum.ENABLE.getCode());
pqsTerminalLogs.setIsPush(0);
pqsTerminalLogs.setLogsType(dicDataByCode.getId());
pqsTerminalLogs.setTerminalDescribe(stringBuilder.toString());
pqsTerminalLogsList.add(pqsTerminalLogs);

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

@@ -192,7 +192,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
PqsTerminalLogs terminalLogsNew = new PqsTerminalLogs();
terminalLogsNew.setObjIndex(device.getId());
terminalLogsNew.setTerminalDescribe(sb.toString());
terminalLogsNew.setIsPush(DataStateEnum.ENABLE.getCode());
terminalLogsNew.setIsPush(0);
terminalLogsNew.setOperateType("update");
terminalLogsNew.setLogsType(data.getId());
terminalLogsNew.setTerminalType(LineBaseEnum.DEVICE_LEVEL.getCode());