From 18923f94dd3117aa6232e351abf7be79b365513a Mon Sep 17 00:00:00 2001 From: lishuai <260038442@qq.com> Date: 星期三, 20 十二月 2023 15:12:23 +0800 Subject: [PATCH] 前后端联调,接口字段回显调整 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java index 460c1d2..0ebafb6 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java @@ -3,14 +3,18 @@ import cn.hutool.core.lang.PatternPool; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ReUtil; +import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.admin.request.VisitEventQuery; import com.doumee.dao.admin.response.CarEventDTO; import com.doumee.dao.business.CarEventMapper; import com.doumee.dao.business.join.CarEventJoinMapper; import com.doumee.dao.business.model.*; +import com.doumee.dao.system.SystemDictDataMapper; +import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.CarEventService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -22,8 +26,12 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹炵幇 @@ -38,6 +46,9 @@ @Autowired private CarEventJoinMapper carEventJoinMapper; + + @Autowired + private SystemDictDataMapper systemDictDataMapper; @Override public Integer create(CarEvent carEvent) { @@ -308,7 +319,25 @@ .le(Objects.nonNull(pageWrap.getModel().getEndTime()), CarEvent::getCreateDate, pageWrap.getModel().getEndTime()); IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper); - + if(null != carEventDTOIPage && carEventDTOIPage.getRecords().size() > 0) { + List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.CAR_EVENT_IMG); + List<SystemDictData> list = systemDictDataMapper.list(codes); + Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity())); + carEventDTOIPage.getRecords().stream().forEach(obj->{ + obj.setVehiclePicUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode() + +dataMap.get(Constants.CAR_EVENT_IMG).getCode() + +obj.getVehiclePicUrl()); + if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_IN.getKey()){ + obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_IN.getName()); + }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){ + obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_IN.getName()); + }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_OUT.getKey()){ + obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_OUT.getName()); + }else{ + obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_OUT.getName()); + } + }); + } return PageData.from(carEventDTOIPage); } } -- Gitblit v1.9.3