1.解决pms概览告警占比Bug
2.解决pms用户无法添加问题
This commit is contained in:
@@ -138,7 +138,7 @@ public class OverviewServiceImpl implements OverviewService {
|
|||||||
//数据统计(配网监测点)
|
//数据统计(配网监测点)
|
||||||
List<DistributionMonitorVO> distributionMonitors = overviewMapper.selectListAll(deptListCode);
|
List<DistributionMonitorVO> distributionMonitors = overviewMapper.selectListAll(deptListCode);
|
||||||
Map<String, DistributionMonitorVO> distributionMonitorMap =
|
Map<String, DistributionMonitorVO> distributionMonitorMap =
|
||||||
distributionMonitors.stream().collect(Collectors.toMap(DistributionMonitorVO::getMonitorId, Function.identity()));
|
distributionMonitors.stream().collect(Collectors.toMap(DistributionMonitorVO::getMonitorId, Function.identity(),(key1,key2)->key2));
|
||||||
|
|
||||||
//数据 key:监测点类别 value:数量
|
//数据 key:监测点类别 value:数量
|
||||||
Map<String, Long> map = distributionMonitors.stream().collect(Collectors.groupingBy(dm -> dm.getMonitorSort(), Collectors.counting()));
|
Map<String, Long> map = distributionMonitors.stream().collect(Collectors.groupingBy(dm -> dm.getMonitorSort(), Collectors.counting()));
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|||||||
|
|
||||||
private final DicDataFeignClient dicDataFeignClient;
|
private final DicDataFeignClient dicDataFeignClient;
|
||||||
|
|
||||||
private final PqsTerminalLogsClient pqsTerminalLogsClient;
|
// private final PqsTerminalLogsClient pqsTerminalLogsClient;
|
||||||
|
|
||||||
private final AreaFeignClient areaFeignClient;
|
private final AreaFeignClient areaFeignClient;
|
||||||
|
|
||||||
@@ -196,7 +196,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|||||||
terminalLogsNew.setCreateTime(LocalDateTime.now());
|
terminalLogsNew.setCreateTime(LocalDateTime.now());
|
||||||
terminalLogsNew.setTerminalType(data.getId());
|
terminalLogsNew.setTerminalType(data.getId());
|
||||||
terminalLogsNew.setState(1);
|
terminalLogsNew.setState(1);
|
||||||
pqsTerminalLogsClient.saveLogs(terminalLogsNew);
|
// pqsTerminalLogsClient.saveLogs(terminalLogsNew);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user