1.谐波溯源算法

2.北京暂降平台

event_smart/src/main/java/com/njcn/product/event/transientes/controller/LargeScreenCountController.java

@@ -242,6 +242,19 @@ public class LargeScreenCountController extends BaseController {
         Page<EventDetailVO> result = largeScreenCountService.eventPage(largeScreenCountParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
+
+
+    @OperateInfo
+    @PostMapping("/eventPageExport")
+    @ApiOperation("导出暂降事件报告")
+    @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true)
+    public HttpResult<List<EventDetailVO>> eventPageExport(@RequestBody LargeScreenCountParam largeScreenCountParam) {
+        String methodDescribe = getMethodDescribe("eventPageExport");
+        List<EventDetailVO> result = largeScreenCountService.eventPageExport(largeScreenCountParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
     @OperateInfo
     @PostMapping("/devicePage")
     @ApiOperation("终端分页查询")

event_smart/src/main/java/com/njcn/product/event/transientes/filter/JwtRequestFilter.java

@@ -35,7 +35,6 @@ public class JwtRequestFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException {
-        System.out.println(55);
 
         final String authorizationHeader = request.getHeader("Authorization");
         String username = null;

event_smart/src/main/java/com/njcn/product/event/transientes/pojo/vo/EventDetailVO.java

@@ -36,6 +36,8 @@ public class EventDetailVO {
     private String pointname;
     private String gdName;
     private String busName;
+    private String busVoltageLevel;
+
     private String devName;
 
     private String persisttime;

event_smart/src/main/java/com/njcn/product/event/transientes/security/AuthController.java

@@ -36,21 +36,27 @@ public class AuthController extends BaseController {
     private final RedisUtil redisUtil;
 
 
-
-
-
     @PostMapping("/cn_authenticate")
     @ApiOperation("登录认证")
     public HttpResult<AuthResponse> createAuthenticationToken(@RequestBody @Validated AuthRequest authRequest) {
         String methodDescribe = getMethodDescribe("createAuthenticationToken");
         //log.info("Authentication request - username: {}, password: {}",authRequest.getUsername(),authRequest.getPassword());
         try {
-            boolean hasFlag = redisUtil.hasKey(eventRedisKey+authRequest.getUsername());
-            if(hasFlag){
-               String pass = redisUtil.getRawValue(eventRedisKey+authRequest.getUsername());
-
+            boolean hasFlag;
+            String pass;
+            //针对系统推送的认证特殊处理
+            if ("system_event".equals(authRequest.getUsername())) {
+                pass = authRequest.getPassword();
+            } else {
+                hasFlag = redisUtil.hasKey(eventRedisKey + authRequest.getUsername());
+                if (hasFlag) {
+                    pass = redisUtil.getRawValue(eventRedisKey + authRequest.getUsername());
+                } else {
+                    return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+                }
+            }
             // 执行认证，内部会调用 UserDetailsService 加载用户信息
-            Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(authRequest.getUsername(),pass));
+            Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(authRequest.getUsername(), pass));
 
             // 将认证信息存入 SecurityContext
             SecurityContextHolder.getContext().setAuthentication(authentication);
@@ -67,9 +73,7 @@ public class AuthController extends BaseController {
             authResponse.setToken(jwt);
             authResponse.setDeptId(department);
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, authResponse, methodDescribe);
-            }else {
-                return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-            }
+
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);

event_smart/src/main/java/com/njcn/product/event/transientes/security/MyUserDetailsService.java

@@ -33,7 +33,9 @@ public class MyUserDetailsService implements UserDetailsService {
 
 
         if("system_event".equals(username)){
-            return new MyUserDetails("12345678910","system_event", "@#001njcnpqs","10001",
+            PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+            String encodedPassword = passwordEncoder.encode("@#001njcnpqs");
+            return new MyUserDetails("12345678910","system_event",encodedPassword,"10001",
                     new ArrayList<>());
         }
 

event_smart/src/main/java/com/njcn/product/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/**","/accept/testEvent","/accept/eventMsg").permitAll() // 允许访问认证接口
-                .antMatchers("/**").permitAll() // 允许访问认证接口
+                .antMatchers("/cn_authenticate","/ws/**","/accept/testEvent","/accept/eventMsg").permitAll() // 允许访问认证接口
+                //.antMatchers("/**").permitAll() // 允许访问认证接口
                 .anyRequest().authenticated()
                 .and()
                 .sessionManagement()

event_smart/src/main/java/com/njcn/product/event/transientes/service/LargeScreenCountService.java

@@ -58,6 +58,9 @@ public interface LargeScreenCountService {
 
     Page<EventDetailVO> eventPage(LargeScreenCountParam largeScreenCountParam);
 
+    List<EventDetailVO> eventPageExport(LargeScreenCountParam largeScreenCountParam);
+
+
     Page<DeviceDTO> devicePage(LargeScreenCountParam largeScreenCountParam);
 
     Page<EventDetailVO> userEventList(LargeScreenCountParam largeScreenCountParam);