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

zbj//1.台账信息只有修改台账重要参数才需要记录日志 代码修改

Browse Source
This commit is contained in:
zhangbaojian
2023-05-04 11:08:13 +08:00
parent 6c4ed4ad15
commit 46179beb54
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,7 +424,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
overlimitMapper.insert(overlimit);
}
}
@@ -719,10 +718,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
overlimit.setUvoltageDev(updateLineBO.getUvoltageDev());
overlimitMapper.insert(overlimit);
}
//获取用户信息
String userName = RequestUtil.getUsername();
String index = RequestUtil.getUserIndex();
queryUpdateAndInsertLog(userName, index, lineDetail, lineDetailRes);
if (!Objects.equals(lineDetail.getCt1(), lineDetailRes.getCt1()) || !Objects.equals(lineDetail.getCt2(), lineDetailRes.getCt2())
|| !Objects.equals(lineDetail.getPt1(), lineDetailRes.getPt1()) || !Objects.equals(lineDetail.getPt2(), lineDetailRes.getPt2())
|| !Objects.equals(lineDetail.getDevCapacity(), lineDetailRes.getDevCapacity()) || !Objects.equals(lineDetail.getShortCapacity(), lineDetailRes.getShortCapacity())
|| !Objects.equals(lineDetail.getStandardCapacity(), lineDetailRes.getStandardCapacity()) || !Objects.equals(lineDetail.getDealCapacity(), lineDetailRes.getDealCapacity())) {
//获取用户信息
String userName = RequestUtil.getUsername();
String index = RequestUtil.getUserIndex();
queryUpdateAndInsertLog(userName, index, lineDetail, lineDetailRes);
}
}
}
}
@@ -762,9 +766,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
sbOld.append("ct变比: ").append(oldLine.getCt1()).append(" : ").append(oldLine.getCt2()).append(";");
}
//设备容量
if (!Objects.equals(newLine.getDealCapacity(), oldLine.getDealCapacity())) {
sbNew.append("设备容量: ").append(newLine.getDealCapacity()).append(";");
sbOld.append("设备容量: ").append(oldLine.getDealCapacity()).append(";");
if (!Objects.equals(newLine.getDevCapacity(), oldLine.getDevCapacity())) {
sbNew.append("设备容量: ").append(newLine.getDevCapacity()).append(";");
sbOld.append("设备容量: ").append(oldLine.getDevCapacity()).append(";");
}
//短路容量
if (!Objects.equals(newLine.getShortCapacity(), oldLine.getShortCapacity())) {
@@ -1940,7 +1944,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(temp)) {
temp = assembleLine(substationName, LineBaseEnum.SUB_LEVEL.getCode(), pids.get(LineBaseEnum.GD_LEVEL.getCode()), pids);
//处理电压等级字典表
DictData substationScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubStationScale(),DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
DictData substationScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubStationScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
if (Objects.isNull(substationScale)) {
terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典电压等级不存在"));
continue;
@@ -2043,7 +2047,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
}
}
//处理电压等级字典表
DictData subvScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(),DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
DictData subvScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
if (Objects.isNull(subvScale)) {
terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典电压等级：" + terminalBaseExcel.getSubStationScale() + "不存在"));
continue;