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-11 10:41:27 +08:00
parent 6793da251c
commit 95ffc9e46e
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,15 +236,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
//装置 //装置
if (Objects.nonNull(addTerminalParam.getDeviceParam())) { if (Objects.nonNull(addTerminalParam.getDeviceParam())) {
List<Line> logsList = new ArrayList<>(); List<Line> logsList = new ArrayList<>();
LambdaQueryWrapper<Line> lineLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Line> lineLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (CollectionUtil.isNotEmpty(addTerminalParam.getDeviceParam()) && StrUtil.isNotBlank(subIndex)) { if (CollectionUtil.isNotEmpty(addTerminalParam.getDeviceParam()) && StrUtil.isNotBlank(subIndex)) {
//校验变电站下的装置名称ip是否重复 //校验变电站下的装置名称ip是否重复
checkDevNameAndIp(addTerminalParam, subIndex, lineLambdaQueryWrapper); checkDevNameAndIp(addTerminalParam, subIndex, lineLambdaQueryWrapper);
for (DeviceParam deviceParam : addTerminalParam.getDeviceParam()) { for (DeviceParam deviceParam : addTerminalParam.getDeviceParam()) {
//用于记录装置id //用于记录装置id
String devIdIndex; String devIdIndex;
@@ -287,7 +282,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
deviceDetail.setCheckFlag(1); deviceDetail.setCheckFlag(1);
deviceDetail.setThisTimeCheck(PubUtils.localDateFormat(deviceParam.getThisTimeCheck())); deviceDetail.setThisTimeCheck(PubUtils.localDateFormat(deviceParam.getThisTimeCheck()));
deviceDetail.setNextTimeCheck(PubUtils.localDateFormat(deviceParam.getNextTimeCheck())); deviceDetail.setNextTimeCheck(PubUtils.localDateFormat(deviceParam.getNextTimeCheck()));
deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getNextTimeCheck())); deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getLoginTime()));
deviceDetail.setUpdateTime(LocalDateTime.now()); deviceDetail.setUpdateTime(LocalDateTime.now());
//处理装置识别码秘钥 //处理装置识别码秘钥
@@ -1529,12 +1524,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
lineDetailMapper.deleteById(point.getId()); lineDetailMapper.deleteById(point.getId());
overlimitMapper.deleteById(point.getId()); overlimitMapper.deleteById(point.getId());
deptLineMapper.deleteById(point.getId()); deptLineMapper.deleteById(point.getId());
// 通知设备重启
String[] pids = point.getPids().split(",");
if (pids.length > 4) {
askRestartDevice(pids[4], DeviceRebootType.LEDGER_MODIFY);
}
} }
private List<Line> findChildren(String pid) { private List<Line> findChildren(String pid) {
@@ -1554,11 +1543,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean delTerminal(String id) { public Boolean delTerminal(String id) {
List<Line> logsList = new ArrayList<>(); List<Line> logsList = new ArrayList<>();
Line obj = this.getById(id); Line obj = this.getById(id);
if (Objects.isNull(obj)) { if (Objects.isNull(obj)) {
throw new BusinessException(CommonResponseEnum.FAIL); throw new BusinessException(CommonResponseEnum.FAIL);
} }
logsList.add(obj);
LineBaseEnum lineBaseEnum = LineBaseEnum.getLineBaseEnumByCode(obj.getLevel()); LineBaseEnum lineBaseEnum = LineBaseEnum.getLineBaseEnumByCode(obj.getLevel());
// 根据层级选择删除策略 // 根据层级选择删除策略
switch (lineBaseEnum) { switch (lineBaseEnum) {
@@ -1590,7 +1579,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if(CollUtil.isNotEmpty(logsList)){ if(CollUtil.isNotEmpty(logsList)){
terminalLogsCat(logsList,2); terminalLogsCat(logsList,2);
} }
return true; return true;
} }