From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 11 十二月 2024 18:21:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java | 29 +++++++++++++++++++++-------- 1 files changed, 21 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 cbd7cb7..9bfa3ee 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,11 +2,12 @@ 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; @@ -24,7 +25,8 @@ * @param param * @return */ - String syncHkDevices(AcsDeviceListRequest param); + String syncHkDevices(Device param); + String syncHkNotices(String username); /** * 鍚屾娴峰悍鍋滆溅搴� @@ -55,11 +57,14 @@ String dealParkEvent(EventParkRequest param, HttpServletResponse response); String downHKImgs(int type); + void startDealPlatformEventImg(); + void startDealMemberImg(); 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); @@ -86,7 +91,15 @@ 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); + + String syncHkUserOpenid(Integer id); } -- Gitblit v1.9.3