2021与蓝度共同重构项目,服务端
liuhaonan
2022-05-17 383b33fdfb1a01b27b8ecda7a46fd8e5e5d4d0f2
Merge remote-tracking branch 'origin/master'
已修改4个文件
39 ■■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -125,13 +125,24 @@
            put("token", properties.getTokenStartWith() + token);
            put("user", admin);
        }};
        //保存登录信息到日志
        /**
         * 登录信息日志记录开始
         */
        UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
        Browser browser = userAgent.getBrowser();
        OperatingSystem os = userAgent.getOperatingSystem();
        String content = "登录IP地址:" + IPUtils.getPublicIp() + ",操作系统:" + os + ",浏览器:" + browser;
        String content = "用户ID:" + admin.getId()
                + ",用户名:" + admin.getUsername()
                + ",用户类型:管理员"
                + ",登录IP地址:" + IPUtils.getPublicIp()
                + ",操作系统:" + os
                + ",浏览器:" + browser;
        StoreOperationRecordsUtils.storeOperationData(null, null, "用户登录", content);
        /**
         * 登录信息日志记录结束
         */
        return ResponseUtil.success(authInfo);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -86,6 +86,7 @@
     */
    @PostMapping("/QrCode")
    public ResponseVO<Object> QrCode(@RequestBody C3ChargingParam c3ChargingParam) {
        //String testUrl = "http://www.ximonsmart.com/charge/#/charge/" +streetlightId+"/"+System.currentTimeMillis();
        String result = c3ChargingService.QrCode(c3ChargingParam.getC3Mac(), c3ChargingParam.getQrCodeData());
        if ("操作成功".equals(result)) {
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -25,11 +25,16 @@
import com.sandu.ximon.admin.service.ClientRoleRelationService;
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.admin.service.RoleService;
import com.sandu.ximon.admin.utils.IPUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
import eu.bitwalker.useragentutils.Browser;
import eu.bitwalker.useragentutils.OperatingSystem;
import eu.bitwalker.useragentutils.UserAgent;
import lombok.AllArgsConstructor;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -205,6 +210,20 @@
            put("token", properties.getTokenStartWith() + token);
            put("user", client);
        }};
        /**
         * 登录信息日志记录开始
         */
        UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
        Browser browser = userAgent.getBrowser();
        OperatingSystem os = userAgent.getOperatingSystem();
        String content = "用户ID:" + client.getId()
                + ",用户名:" + client.getClientName()
                + ",用户类型:管理员"
                + ",登录IP地址:" + IPUtils.getPublicIp()
                + ",操作系统:" + os
                + ",浏览器:" + browser;
        StoreOperationRecordsUtils.storeOperationData(null, null, "用户登录", content);
        return ResponseUtil.success(authInfo);
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -230,7 +230,9 @@
                map.put("deviceCode", param.getDeviceCode());
                WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame
                        = MainBoardInvokeSyncService.getInstance().sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
                //存储控制帧指令
                StoreOperationRecordsUtils.storeInnerFrameData(param.getDeviceCode(), "单灯帧-亮度控制", a5Frame, frame);
                if (frame == null) {
                    map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    resultList.add(map);