Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-17 e573fe7a74e7801fe3ec101e9ef720b103cdaace

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

@@ -28,11 +28,36 @@
        DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
        deviceOperationLog.setUserId(SecurityUtils.getUserId());
        deviceOperationLog.setUserName(SecurityUtils.getUsername());
        deviceOperationLog.setDeviceCode(deviceCode);
        deviceOperationLog.setDeviceName(deviceName);
        if (deviceCode != null) {
            deviceOperationLog.setDeviceCode(deviceCode);
        }
        if (deviceName != null) {
            deviceOperationLog.setDeviceName(deviceName);
        }
        deviceOperationLog.setOperation(operation);
        deviceOperationLog.setContent(content);
        deviceOperationLog.setPoleCode(poleCode);
        if (poleCode != null) {
            deviceOperationLog.setPoleCode(poleCode);
        }
        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);
    }


}