1.新增判断第三方免登录接口河北专用

2.处理审计日志

pqs-auth/src/main/java/com/njcn/auth/controller/JudgeThirdToken.java

@@ -76,4 +76,44 @@ public class JudgeThirdToken extends BaseController {
         }
     }
 
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/heBei")
+    @ApiOperation("校验河北token有效性")
+    @ApiImplicitParam(name = "token", required = true)
+    public HttpResult<Object> heBei(String token) {
+        RestTemplate restTemplate = new RestTemplate();
+        String methodDescribe = getMethodDescribe("heBei");
+        LogUtil.njcnDebug(log, "{}，token：{}", methodDescribe, token);
+
+     /*   // 请求地址
+        String url = "http://dwzyywzt-test.com/baseCenter/oauth2/user/token";
+
+        // 请求头设置,x-www-form-urlencoded格式的数据
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+        //提交参数设置
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("token", token);
+
+        // 组装请求体
+        HttpEntity<MultiValueMap<String, String>> request =
+                new HttpEntity<>(map, headers);
+
+        // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+        String result = restTemplate.postForObject(url, request, String.class);
+        JSONObject resultJson = new JSONObject(result);
+        if (Objects.equals(resultJson.getInt("status"), DataStateEnum.ENABLE.getCode())) {
+            //成功
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }*/
+
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "HE_DNZLJCYW", methodDescribe);
+
+    }
+
 }

pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java

@@ -58,18 +58,25 @@ public class MqttMessageHandler {
             jsonObject = (JSONObject) redisUtil.getObjectByKey(RedisKeyEnum.USER_ROLE_TYPE_KEY.getKey());
             if(Objects.isNull(jsonObject)){
                 userFeignClient.userRoleList();
+                jsonObject = (JSONObject) redisUtil.getObjectByKey(RedisKeyEnum.USER_ROLE_TYPE_KEY.getKey());
             }
         }
+
         LogInfoDTO logInfoDTO = PubUtils.json2obj(new String(message.getPayload(), StandardCharsets.UTF_8),LogInfoDTO.class);
-        String loginName = logInfoDTO.getLoginName();
+
-        if(StrUtil.isNotBlank(loginName) && jsonObject.containsKey(loginName)){
+        if("注销".equals(logInfoDTO.getOperateType()) || "认证".equals(logInfoDTO.getOperateType())){
-            if((Integer) jsonObject.get(loginName)==2){
+            logInfoDTO.setType(1);
-                logInfoDTO.setType(0);
+        }else {
+            String loginName = logInfoDTO.getLoginName();
+            if(StrUtil.isNotBlank(loginName) && jsonObject.containsKey(loginName)){
+                if((Integer) jsonObject.get(loginName)==2){
+                    logInfoDTO.setType(0);
+                }else {
+                    logInfoDTO.setType(1);
+                };
             }else {
                 logInfoDTO.setType(1);
-            };
+            }
-        }else {
-            logInfoDTO.setType(1);
         }
         userLogService.addUserLog(logInfoDTO);
     }

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/CheckDeviceTaskRunner.java

@@ -1,5 +1,6 @@
 package com.njcn.system.timer.tasks;
 
+import com.njcn.csdevice.api.WlRecordFeignClient;
 import com.njcn.supervision.api.CheckDeviceFeignClient;
 import com.njcn.system.timer.TimerTaskRunner;
 import lombok.RequiredArgsConstructor;
@@ -12,10 +13,10 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 public class CheckDeviceTaskRunner implements TimerTaskRunner {
 
-    private final CheckDeviceFeignClient checkDeviceFeignClient;
+    private final WlRecordFeignClient wlRecordFeignClient;
 
     @Override
     public void action(String date) {
-        checkDeviceFeignClient.add();
+        wlRecordFeignClient.dayDealNoEndTimeEvent(date);
     }
 }

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/csdevice/WlRecordTaskRunner.java

@@ -0,0 +1,9 @@
+package com.njcn.system.timer.tasks.csdevice;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class WlRecordTaskRunner {
+}