Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-17 26d8dda66a3225a74e3ce1cf6517636c81cb007e

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

@@ -6,7 +6,6 @@
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.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;

import java.util.ArrayList;
@@ -48,13 +47,13 @@
     * @param operation
     * @param content
     */
    public static void storeOperationData(List<String> deviceCodeList, String deviceName, String operation, String content) {
    public static void storeOperationData(List deviceCodeList, String deviceName, String operation, String content) {
        if (deviceCodeList == null) {
            deviceCodeList = new ArrayList<>();
        }
        List<String> poleCodeList = new ArrayList<>();
        for (String str : deviceCodeList) {
            Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, str, null);
        for (Object str : deviceCodeList) {
            Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, String.valueOf(str), null);
            if (pole != null) {
                poleCodeList.add(pole.getDeviceCode());
            } else {