配置信息对接调整提交

lishuai

2023-12-26 1293d3dba10c4e291dfbce4c936f952875557edb

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java

@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.DeviceEventQuery;
import com.doumee.dao.admin.response.DeviceEventDTO;
@@ -32,6 +33,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -369,7 +372,12 @@
            }else if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()){
                dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName());
            }
           newDeviceEventDTOS.add(dto);
            try {
                dto.setHappenTime(DateUtil.timeEscape(dto.getHappenTime()));
            } catch (ParseException e) {
                e.printStackTrace();
            }
            newDeviceEventDTOS.add(dto);
        }
        return newDeviceEventDTOS;
    }