From cd2d3c65b9af62cbafa57a835b237a9f193148f2 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 20 九月 2024 14:22:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java index 9d6623e..1bbc12c 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java @@ -2,12 +2,11 @@ import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; -import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; -import com.doumee.core.haikang.model.param.request.event.parks.EventPlatCarstatusRequest; -import com.doumee.core.haikang.model.param.request.event.parks.EventPlatWorkstatusRequest; +import com.doumee.core.haikang.model.param.request.event.parks.*; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest; import com.doumee.core.haikang.model.param.respose.AppointmentInfoResponse; +import com.doumee.core.model.LoginUserInfo; import com.doumee.dao.business.model.Device; import com.doumee.dao.business.model.ParkBook; import io.swagger.models.auth.In; @@ -59,10 +58,10 @@ String downHKImgs(int type); void cancelEventSub(); - void syncOrgData(); + void syncOrgData(LoginUserInfo user); void getOutTimeVisitRecordIccm(); - void syncUserData(); + void syncUserData(LoginUserInfo user); void syncVistAppointData(Date date); void syncVehicleData(); String syncPlatforms(PlatformsListRequest param); @@ -89,13 +88,13 @@ void syncMemberDelData(); String getServiceUrl(HKGetServiceLoginUrlRequest param); - void dealWorkstatusEvent(EventPlatWorkstatusRequest param, HttpServletResponse response); - - void dealCarstatusEvent(EventPlatCarstatusRequest param, HttpServletResponse response); String syncHkLed(Device param); String syncHkBroadcast(Device param); String dealVisitEventIccm(EventVisitIccmRequest param, HttpServletResponse response); + String dealPlatformStatusEvent(EventPlatformRequest param, HttpServletResponse response); + + String dealPlatformCarsEvent(EventPlatformCarsRequest param, HttpServletResponse response); } -- Gitblit v1.9.3