From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 02 九月 2024 10:52:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java index 4008597..5811b1b 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java @@ -2,9 +2,12 @@ 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.business.PlatformLogMapper; import com.doumee.dao.business.model.PlatformLog; +import com.doumee.dao.openapi.request.CarLogsListRequest; +import com.doumee.dao.openapi.response.CarLogsListResponse; import com.doumee.service.business.PlatformLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -14,7 +17,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Objects; /** * 鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛⊿ervice瀹炵幇 @@ -126,4 +132,30 @@ QueryWrapper<PlatformLog> wrapper = new QueryWrapper<>(platformLog); return platformLogMapper.selectCount(wrapper); } + + + + @Override + public List<CarLogsListResponse> getCarLogsListResponse(CarLogsListRequest carLogsListRequest){ + List<CarLogsListResponse> carLogsListResponseList = new ArrayList<>(); + + List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda() + .notIn(PlatformLog::getObjType, + Constants.PlatformJobLogType.CREATE.getKey(), + Constants.PlatformJobLogType.CONFIRM_TASK.getKey() + ) + .orderByDesc(PlatformLog::getCreateDate) + .last(Objects.nonNull(carLogsListRequest)&&Objects.nonNull(carLogsListRequest.getLimitNum())," limit " +carLogsListRequest.getLimitNum()) + ); + for (PlatformLog platformLog:platformLogList) { + CarLogsListResponse carLogsListResponse = new CarLogsListResponse(); + carLogsListResponse.setCarCode(platformLog.getParam4()); + carLogsListResponse.setContent(platformLog.getContent()); + carLogsListResponse.setCreateDate(new Date()); + carLogsListResponseList.add(carLogsListResponse); + } + return carLogsListResponseList; + } + + } -- Gitblit v1.9.3