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

2.处理审计日志
This commit is contained in:
2024-10-09 16:08:19 +08:00
parent 33a0ddc6f9
commit da814e4bdc
4 changed files with 66 additions and 9 deletions

View File

@@ -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);
}

View File

@@ -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);
}
}

View File

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