From 8328d6c06e2982b54530d74f9c4d28db37978a14 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Tue, 1 Jul 2025 19:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transientes/filter/JwtRequestFilter.java | 6 +- .../transientes/pojo/po/PqsEventdetail.java | 2 +- .../transientes/security/SecurityConfig.java | 4 +- .../impl/LargeScreenCountServiceImpl.java | 80 +++++++++++-------- .../impl/MsgEventConfigServiceImpl.java | 4 +- 5 files changed, 55 insertions(+), 41 deletions(-) diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java index f1b1563f..9d990640 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java @@ -36,8 +36,8 @@ public class JwtRequestFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { - System.out.println("请求路径"+request.getRequestURI()); - /* final String authorizationHeader = request.getHeader("Authorization"); + + final String authorizationHeader = request.getHeader("Authorization"); String username = null; String jwt = null; if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { @@ -65,7 +65,7 @@ public class JwtRequestFilter extends OncePerRequestFilter { usernamePasswordAuthenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken); } - }*/ + } chain.doFilter(request, response); } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java index 61338589..9689e4a6 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java @@ -40,7 +40,7 @@ public class PqsEventdetail { private String describe; @TableField(value = "WAVETYPE") - private Short wavetype; + private Integer wavetype; @TableField(value = "PERSISTTIME") private Double persisttime; diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java index 8e4cbe65..be891523 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java @@ -34,8 +34,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { http.csrf().disable() .authorizeRequests() - // .antMatchers("/cn_authenticate","/ws/**").permitAll() // 允许访问认证接口 - .antMatchers("/**").permitAll() // 允许访问认证接口 + .antMatchers("/cn_authenticate","/ws/**").permitAll() // 允许访问认证接口 + //.antMatchers("/**").permitAll() // 允许访问认证接口 .anyRequest().authenticated() .and() .sessionManagement() diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index e8b47527..1aae5be4 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -84,16 +84,9 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { private final PqsUserService pqsUserService; private final PqLinedetailMapper pqLinedetailMapper; - private List WAVETYPE_LIST = new ArrayList<>(); @Value("${SYS_TYPE_ZT}") private String sysTypeZt; - @PostConstruct - public void init() { - MsgEventConfig one = msgEventConfigService.queryConfig(); - this.WAVETYPE_LIST = one.getEventTypeList(); - } - @Override public LedgerCountVO scaleStatistics(LargeScreenCountParam largeScreenCountParam) { @@ -194,7 +187,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { for(List itemIds : listIds){ List temp = pqsEventdetailService.lambdaQuery() .between(PqsEventdetail::getTimeid,startTime, endTime) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .in(PqsEventdetail::getLineid,listIds) .orderByDesc(PqsEventdetail::getTimeid).list() ; @@ -203,7 +196,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { }else { List temp = pqsEventdetailService.lambdaQuery() .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .in(PqsEventdetail::getLineid,deptslineIds) .orderByDesc(PqsEventdetail::getTimeid).list(); eventdetails.addAll(temp); @@ -302,7 +295,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { for(List itemIds : listIds){ List temp = pqsEventdetailService.lambdaQuery() .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .in(PqsEventdetail::getLineid,listIds) .orderByDesc(PqsEventdetail::getTimeid).list(); eventdetails.addAll(temp); @@ -310,7 +303,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { }else { List temp = pqsEventdetailService.lambdaQuery() .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .in(PqsEventdetail::getLineid,deptslineIds) .orderByDesc(PqsEventdetail::getTimeid).list(); eventdetails.addAll(temp); @@ -397,12 +390,11 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { QueryWrapper queryWrapper = new QueryWrapper<>(); if (deptslineIds.size()>1000) { - ; List> idPartitions = CollUtil.split(deptslineIds,1000); queryWrapper.lambda() .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .and(ew->{ for(List pList: idPartitions){ ew.or(w->w.in(PqsEventdetail::getLineid, pList)); @@ -414,7 +406,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { queryWrapper.lambda() .between(PqsEventdetail::getTimeid, startTime, endTime) .in(PqsEventdetail::getLineid, deptslineIds) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .orderByDesc(PqsEventdetail::getTimeid); } //查询需要发送短息处理的部门反推监测点 @@ -485,31 +477,52 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { throw new BusinessException("统计类型有误类型"); } //根据用户获取当前部门及子部门id - List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); - //获取对应监测点id - List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).distinct().collect(Collectors.toList()); + List deptslineIds = commGeneralService.getLineIdsByDept(largeScreenCountParam); if (CollUtil.isEmpty(deptslineIds)) { return result; } + List allList = new ArrayList<>(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getLineid, deptslineIds) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) - .and(wrapper -> wrapper.eq(PqsEventdetail::getLookFlag, 0).or().isNull(PqsEventdetail::getLookFlag)); - if (Objects.nonNull(largeScreenCountParam.getEventDeep())) { - if (largeScreenCountParam.getEventDeep() == 0) { - lambdaQueryWrapper.ge(PqsEventdetail::getEventvalue, 0.5).lt(PqsEventdetail::getEventtype, 0.9); - } else if (largeScreenCountParam.getEventDeep() == 1) { - lambdaQueryWrapper.lt(PqsEventdetail::getEventvalue, 0.5); + if(deptslineIds.size()>1000){ + List> idList = CollUtil.split(deptslineIds,1000); + for(List ids:idList){ + lambdaQueryWrapper.clear(); + lambdaQueryWrapper.between(PqsEventdetail::getTimeid, startTime, endTime) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) + .in(PqsEventdetail::getLineid, ids) + .and(wrapper -> wrapper.eq(PqsEventdetail::getLookFlag, 0).or().isNull(PqsEventdetail::getLookFlag)); + if (Objects.nonNull(largeScreenCountParam.getEventDeep())) { + if (largeScreenCountParam.getEventDeep() == 0) { + lambdaQueryWrapper.ge(PqsEventdetail::getEventvalue, 0.5).lt(PqsEventdetail::getEventtype, 0.9); + } else if (largeScreenCountParam.getEventDeep() == 1) { + lambdaQueryWrapper.lt(PqsEventdetail::getEventvalue, 0.5); + } + } + List eventList = pqsEventdetailService.list(lambdaQueryWrapper); + allList.addAll(eventList); } + }else { + lambdaQueryWrapper.between(PqsEventdetail::getTimeid, startTime, endTime) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) + .in(PqsEventdetail::getLineid, deptslineIds) + .and(wrapper -> wrapper.eq(PqsEventdetail::getLookFlag, 0).or().isNull(PqsEventdetail::getLookFlag)); + if (Objects.nonNull(largeScreenCountParam.getEventDeep())) { + if (largeScreenCountParam.getEventDeep() == 0) { + lambdaQueryWrapper.ge(PqsEventdetail::getEventvalue, 0.5).lt(PqsEventdetail::getEventtype, 0.9); + } else if (largeScreenCountParam.getEventDeep() == 1) { + lambdaQueryWrapper.lt(PqsEventdetail::getEventvalue, 0.5); + } + } + List eventList = pqsEventdetailService.list(lambdaQueryWrapper); + allList.addAll(eventList); } - List eventList = pqsEventdetailService.list(lambdaQueryWrapper); - if (CollUtil.isNotEmpty(eventList)) { - List ids = eventList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); + + + if (CollUtil.isNotEmpty(allList)) { + List ids = allList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); List pqLineList = pqLineMapper.getBaseLineInfo(ids); Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - eventList.forEach(it -> { + for(PqsEventdetail it : allList){ EventDetailVO eventDetailVO = new EventDetailVO(); eventDetailVO.setEventdetail_index(it.getEventdetailIndex()); eventDetailVO.setTimeid(it.getTimeid()); @@ -524,8 +537,9 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); } result.add(eventDetailVO); - }); + } } + result = result.stream().sorted(Comparator.comparing(EventDetailVO::getTimeid)).collect(Collectors.toList()); return result; } @@ -579,7 +593,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { List deptslineIds = v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); List eventdetails = pqsEventdetailService.lambdaQuery() .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,WAVETYPE_LIST) + .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .in(PqsEventdetail::getLineid, deptslineIds).list(); mapCountVO.setEventCount(eventdetails.size()); List change = change(eventdetails); diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java index 55707855..68202560 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java @@ -36,7 +36,7 @@ public class MsgEventConfigServiceImpl extends ServiceImpl()); msgEventConfig.setId(IdUtil.simpleUUID()); - String tem = String.join(", ", msgEventConfig.getEventTypeList()); + String tem = String.join(StrUtil.COMMA, msgEventConfig.getEventTypeList()); msgEventConfig.setEventType(tem); this.save(msgEventConfig); eventType = msgEventConfig.getEventTypeList(); @@ -63,7 +63,7 @@ public class MsgEventConfigServiceImpl extends ServiceImpl getEventType() { return eventType;