Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-17 e573fe7a74e7801fe3ec101e9ef720b103cdaace

Merge remote-tracking branch 'origin/master'

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java

@@ -139,7 +139,7 @@
                + "，登录IP地址：" + IPUtils.getPublicIp()
                + "，操作系统：" + os
                + "，浏览器：" + browser;
        StoreOperationRecordsUtils.storeOperationData(null, null, "用户登录", content);
        StoreOperationRecordsUtils.storeOperationLoginData(admin.getId(), admin.getUsername(), "管理员登录", content);
        /**
         * 登录信息日志记录结束
         */

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -178,7 +178,7 @@
            return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
        }
        String s = RedisUtils.getBean().get(loginParam.getKey());
        System.out.println(s+"===========================");
        System.out.println(s + "===========================");
        if (!loginParam.getVlue().equals(s)) {
            return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
        }
@@ -223,7 +223,7 @@
                + "，登录IP地址：" + IPUtils.getPublicIp()
                + "，操作系统：" + os
                + "，浏览器：" + browser;
        StoreOperationRecordsUtils.storeOperationData(null, null, "用户登录", content);
        StoreOperationRecordsUtils.storeOperationLoginData(client.getId(), client.getClientName(), "用户登录", content);
        return ResponseUtil.success(authInfo);
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java

@@ -41,4 +41,23 @@
        }
        this.save(deviceOperationLog);
    }

    /**
     * 登录专属
     *
     * @param userId
     * @param UserName
     * @param operation
     * @param content
     */
    public void storeOperationLoginData(Long userId, String UserName, String operation, String content) {
        DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
        deviceOperationLog.setUserId(userId);
        deviceOperationLog.setUserName(UserName);
        deviceOperationLog.setOperation(operation);
        deviceOperationLog.setContent(content);
        this.save(deviceOperationLog);
    }


}

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java

@@ -63,4 +63,17 @@
        SpringContextHolder.getBean(DeviceOperationLogService.class)
                .saveDeviceOperationLog(deviceCodeList.toString(), deviceName, operation, content, poleCodeList.toString());
    }

    /**
     * 登录专属
     *
     * @param userId
     * @param UserName
     * @param operation
     * @param content
     */
    public static void storeOperationLoginData(Long userId, String UserName, String operation, String content) {
        SpringContextHolder.getBean(DeviceOperationLogService.class)
                .storeOperationLoginData(userId, UserName, operation, content);
    }
}