fix

zhanzhiqin

2022-05-18 da602743da69e28a23601b1890bc43917fcd019a

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

@@ -2,9 +2,15 @@

import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.service.DeviceOperationLogService;
import com.sandu.ximon.admin.service.InnerFrameDataService;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;

import java.util.ArrayList;
import java.util.List;

/**
 * @author ZZQ
@@ -19,7 +25,7 @@
     * @param a5Frame
     * @param commonFrame
     */
    public static void storeInnerFrameData(String mac, String innerFrameTpye, A5Frame a5Frame, CommonFrame commonFrame) {
    public static void storeInnerFrameData(String mac, String innerFrameTpye, IRequestFrame a5Frame, CommonFrame commonFrame) {
        String reportInnerFrame = "";
        if (commonFrame != null) {
            reportInnerFrame = commonFrame.getConnectType() + commonFrame.getFunctionCode() + commonFrame.getOrderType() + commonFrame.getPayloadLength() + commonFrame.getPayload();
@@ -37,13 +43,38 @@
    /**
     * 保存操作数据
     *
     * @param deviceCode
     * @param deviceCodeList
     * @param deviceName
     * @param operation
     * @param content
     * @param poleCode
     */
    public static void storeOperationData(String deviceCode, String deviceName, String operation, String content, String poleCode) {
        SpringContextHolder.getBean(DeviceOperationLogService.class).saveDeviceOperationLog(deviceCode, deviceName, operation, content, poleCode);
    public static void storeOperationData(List deviceCodeList, String deviceName, String operation, String content) {
        if (deviceCodeList == null) {
            deviceCodeList = new ArrayList<>();
        }
        List<String> poleCodeList = new ArrayList<>();
        for (Object str : deviceCodeList) {
            Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, String.valueOf(str), null);
            if (pole != null) {
                poleCodeList.add(pole.getDeviceCode());
            } else {
                poleCodeList.add("");
            }
        }
        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);
    }
}