整理

jiangping

2024-02-21 39739e34af928aae204c55db7974213c9b938c5a

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

@@ -14,10 +14,7 @@
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.DeviceEventMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.DeviceEventVo;
@@ -343,11 +340,7 @@
                }else {
                    eventVo.setExtEventInOutName("");
                }
                if (Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()) {
                    eventVo.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getName());
                } else if (Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()) {
                    eventVo.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName());
                }
                eventVo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
                try {
                    eventVo.setHappenTime(DateUtil.timeEscape(obj.getHappenTime()));
                } catch (ParseException e) {
@@ -393,7 +386,8 @@
                        pageWrap.getModel().getStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                        DeviceEvent::getCreateDate,
                        pageWrap.getModel().getEndTime());
                        pageWrap.getModel().getEndTime())
                .orderByDesc(DeviceEvent::getCreateDate);
        queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
        IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
        return deviceEventDTOIPage;
@@ -402,31 +396,22 @@
    // 对图片进行判断处理
    private List<DeviceEventDTO> newDeviceEvent(List<DeviceEventDTO> DeviceEventDTOList) {
        List<DeviceEventDTO> newDeviceEventDTOS = new ArrayList<>();
        for (DeviceEventDTO dto:DeviceEventDTOList) {
           if(StringUtils.isNotBlank(dto.getExtEventPictureURL())) {
               String extEventPictureURL = dto.getExtEventPictureURL();
               // 使用split("/")将URL按照"/"进行分割成多个部分
               String[] parts = extEventPictureURL.split("\\\\");
               String newStr = parts[0];
               boolean number = Validator.isNumber(newStr);
               if(number) {
                   List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.DEVICE_EVENT_IMG);
                   List<SystemDictData> list = systemDictDataMapper.list(codes);
        for (DeviceEventDTO dto:DeviceEventDTOList) {
           if(StringUtils.isNotBlank(dto.getExtEventPictureURL())
                   && !dto.getExtEventPictureURL().startsWith(HKConstants.IMG_INDEX)
                   && !dto.getExtEventPictureURL().startsWith(HKConstants.IMG_INDEX_ERROR)) {
                   if(null != list && list.size() > 0) {
                       Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
                       if(StringUtils.isNotBlank(dto.getExtEventPictureURL())){
                       dto.setExtEventPictureURL(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
                                                 +dataMap.get(Constants.DEVICE_EVENT_IMG).getCode()
                                                 +dto.getExtEventPictureURL());
                   }
               }else {
                   dto.setExtEventPictureURL(null);
               }
           }
            if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()){
                dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getName());
            }else if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()){
                dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName());
            }
            dto.setEventTypeName(HKConstants.EventTypes.getName(dto.getEventType())) ;
            try {
                dto.setHappenTime(DateUtil.timeEscape(dto.getHappenTime()));
            } catch (ParseException e) {