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

优化异常数据和稳态告警接口信息

Browse Source
This commit is contained in:
wr
2025-12-25 15:32:21 +08:00
parent 917e3fb2d5
commit 778f689b3e
8 changed files with 120 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
View File

@@ -224,7 +224,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
queryWrapper.in("supervision_temp_line_report.org_id", data);
}
queryWrapper
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()), w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
.and(CollUtil.isNotEmpty(InstanceUtil.filterTempLineTaskStatus()), w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTempLineTaskStatus())
.or()
.eq("supervision_temp_line_debug.create_by", RequestUtil.getUserIndex())
);
@@ -265,7 +265,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
queryWrapper.in("supervision_temp_line_report.org_id", data);
}
queryWrapper
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()), w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
.and(CollUtil.isNotEmpty(InstanceUtil.filterTempLineTaskStatus()), w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTempLineTaskStatus())
.or()
.eq("supervision_temp_line_debug.create_by", RequestUtil.getUserIndex())
);

30
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java
View File

@@ -69,10 +69,7 @@ public class InstanceUtil {
throw new BusinessException(SupervisionResponseEnum.EXISTENCE_OR_NOT);
}
//先判断是否是删除管理员，如果是就有全部删除权限，否则就只能删除带提交审批的
String userRole = RequestUtil.getUserRole();
String trimmedString = userRole.substring(1, userRole.length() - 1).replace("\"", "");
List<String> list = Arrays.asList(trimmedString.split(","));
List<String> delete = list.stream().filter(x -> "delete_info".equals(x)).collect(Collectors.toList());
List<String> delete = deleteUser();
//如果为空则需要判断信息，先判断全部数据是否都是自己创建的，然后判断是否是都是带提交数据
if (CollUtil.isEmpty(delete)) {
long count = createBy.stream().filter(x -> !userId.equals(x)).count();
@@ -91,10 +88,7 @@ public class InstanceUtil {
List<Integer> info =new ArrayList<>();
info.add(BpmTaskStatusEnum.RUNNING.getStatus());
info.add(BpmTaskStatusEnum.APPROVE.getStatus());
String userRole = RequestUtil.getUserRole();
String trimmedString = userRole.substring(1, userRole.length() - 1).replace("\"", "");
List<String> list = Arrays.asList(trimmedString.split(","));
List<String> delete = list.stream().filter(x -> "delete_info".equals(x)).collect(Collectors.toList());
List<String> delete = deleteUser();
//删除管理员默认能删除全部数据
if (CollUtil.isNotEmpty(delete)) {
info.clear();
@@ -102,4 +96,24 @@ public class InstanceUtil {
return info;
}
public static List<Integer> filterTempLineTaskStatus() {
List<Integer> info =new ArrayList<>();
info.add(BpmTaskStatusEnum.RUNNING.getStatus());
info.add(BpmTaskStatusEnum.APPROVE.getStatus());
info.add(BpmTaskStatusEnum.RETURN.getStatus());
List<String> delete = deleteUser();
//删除管理员默认能删除全部数据
if (CollUtil.isNotEmpty(delete)) {
info.clear();
}
return info;
}
private static List<String> deleteUser() {
String userRole = RequestUtil.getUserRole();
String trimmedString = userRole.substring(1, userRole.length() - 1).replace("\"", "");
List<String> list = Arrays.asList(trimmedString.split(","));
return list.stream().filter(x -> "delete_info".equals(x)).collect(Collectors.toList());
}
}