fix

zhanzhiqin

2022-05-18 f8416eb8d3674b3f388b3d015c30ec7cc6450ad3

fix

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

@@ -25,21 +25,25 @@
     * @param poleCode
     */
    public void saveDeviceOperationLog(String deviceCode, String deviceName, String operation, String content, String poleCode) {
        DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
        deviceOperationLog.setUserId(SecurityUtils.getUserId());
        deviceOperationLog.setUserName(SecurityUtils.getUsername());
        if (deviceCode != null && !"[]".equals(deviceCode)) {
            deviceOperationLog.setDeviceCode(deviceCode);
        try {
            DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
            deviceOperationLog.setUserId(SecurityUtils.getUserId());
            deviceOperationLog.setUserName(SecurityUtils.getUsername());
            if (deviceCode != null && !"[]".equals(deviceCode)) {
                deviceOperationLog.setDeviceCode(deviceCode);
            }
            if (deviceName != null) {
                deviceOperationLog.setDeviceName(deviceName);
            }
            deviceOperationLog.setOperation(operation);
            deviceOperationLog.setContent(content);
            if (poleCode != null && !"[]".equals(poleCode)) {
                deviceOperationLog.setPoleCode(poleCode);
            }
            this.save(deviceOperationLog);
        } catch (Exception e) {
            System.out.println("存储操作帧失败，数据异常");
        }
        if (deviceName != null) {
            deviceOperationLog.setDeviceName(deviceName);
        }
        deviceOperationLog.setOperation(operation);
        deviceOperationLog.setContent(content);
        if (poleCode != null && !"[]".equals(poleCode)) {
            deviceOperationLog.setPoleCode(poleCode);
        }
        this.save(deviceOperationLog);
    }

    /**
@@ -51,12 +55,16 @@
     * @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);
        try {
            DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
            deviceOperationLog.setUserId(userId);
            deviceOperationLog.setUserName(UserName);
            deviceOperationLog.setOperation(operation);
            deviceOperationLog.setContent(content);
            this.save(deviceOperationLog);
        } catch (Exception e) {
            System.out.println("存储操作帧失败，数据异常");
        }
    }



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

@@ -25,14 +25,18 @@
     */
    public void storeInnerFrameData(String deviceCode, String operation, String syncType, String frame, String frameResult) {

        InnerFrameData innerFrameData = new InnerFrameData();
        innerFrameData.setDeviceCode(deviceCode);
        innerFrameData.setOperation(operation);
        innerFrameData.setSyncType(syncType);
        innerFrameData.setFrame(frame);
        innerFrameData.setFrameResult(frameResult);
        try {
            InnerFrameData innerFrameData = new InnerFrameData();
            innerFrameData.setDeviceCode(deviceCode);
            innerFrameData.setOperation(operation);
            innerFrameData.setSyncType(syncType);
            innerFrameData.setFrame(frame);
            innerFrameData.setFrameResult(frameResult);

        save(innerFrameData);
            save(innerFrameData);
        } catch (Exception e) {
            System.out.println("存储操作帧失败，数据异常");
        }
    }