From da814e4bdc6bb1ed87e3c984475104e976139b42 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 9 Oct 2024 16:08:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=85=8D=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B2=B3=E5=8C=97=E4=B8=93=E7=94=A8=202.=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/auth/controller/JudgeThirdToken.java | 40 +++++++++++++++++++ .../system/handler/MqttMessageHandler.java | 21 ++++++---- .../timer/tasks/CheckDeviceTaskRunner.java | 5 ++- .../tasks/csdevice/WlRecordTaskRunner.java | 9 +++++ 4 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/csdevice/WlRecordTaskRunner.java diff --git a/pqs-auth/src/main/java/com/njcn/auth/controller/JudgeThirdToken.java b/pqs-auth/src/main/java/com/njcn/auth/controller/JudgeThirdToken.java index a36ef79ef..798ebc837 100644 --- a/pqs-auth/src/main/java/com/njcn/auth/controller/JudgeThirdToken.java +++ b/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 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 map = new LinkedMultiValueMap<>(); + map.add("token", token); + + // 组装请求体 + HttpEntity> 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); + + } + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java b/pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java index 8d7b2c153..da74baac4 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java +++ b/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((Integer) jsonObject.get(loginName)==2){ - logInfoDTO.setType(0); + + if("注销".equals(logInfoDTO.getOperateType()) || "认证".equals(logInfoDTO.getOperateType())){ + logInfoDTO.setType(1); + }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); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/CheckDeviceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/CheckDeviceTaskRunner.java index 1278b0542..d5309dbdd 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/CheckDeviceTaskRunner.java +++ b/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); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/csdevice/WlRecordTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/csdevice/WlRecordTaskRunner.java new file mode 100644 index 000000000..9f2e3cddd --- /dev/null +++ b/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 { +}