From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
index c098f52..dcadef0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
@@ -1,9 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformWarnEventMapper;
@@ -109,6 +107,7 @@
.selectAs(Platform::getName,PlatformWarnEvent::getPlatformName)
.selectAs(Platform::getHkId,PlatformWarnEvent::getPlatfromHkId)
.leftJoin(Platform.class,Platform::getId,PlatformWarnEvent::getPlatformId)
+ .orderByDesc(PlatformWarnEvent::getCreateDate)
.last(" limit 20 ")
);
List<PlatformWarnEventListResponse> list = new ArrayList<PlatformWarnEventListResponse>();
@@ -120,6 +119,7 @@
platformWarnEventListResponse.setContent(event.getEventContent());
platformWarnEventListResponse.setTitle(event.getTitle());
platformWarnEventListResponse.setPlatfromHkId(event.getPlatfromHkId());
+ platformWarnEventListResponse.setCarCode(event.getCarCode());
list.add(platformWarnEventListResponse);
}
}
@@ -201,6 +201,7 @@
platformWarnEvent.setCreateDate(new Date());
platformWarnEvent.setIsdeleted(Constants.ZERO);
platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformId());
+ platformWarnEvent.setCarCode(savePlatformWarnEventDTO.getCarCode());
Constants.PlatformWarnEvent cPl = Constants.PlatformWarnEvent.STOP_TIMEOUT;
if(Constants.equalsInteger(savePlatformWarnEventDTO.getEventType(),Constants.ZERO)){
if(Objects.isNull(savePlatformWarnEventDTO.getPlatformJobId())){
--
Gitblit v1.9.3