From 7cf64c097673916e035170e15344079247356d98 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 13:56:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
index 9ed642b..f3fb6ea 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -6,11 +6,12 @@
import com.doumee.core.haikang.model.param.BaseResponse;
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.*;
+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.haikang.model.param.respose.TaskAdditionResponse;
import com.doumee.core.haikang.service.HKService;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.ParkBook;
import com.doumee.service.business.ext.HkSyncService;
@@ -42,8 +43,14 @@
}
@Override
// @Async
+ public String getServiceUrl(HKGetServiceLoginUrlRequest param){
+ return null;
+ }
+ @Override
+// @Async
public void syncParkRecords(Date date){
}
+
@Override
// @Async
public String syncDoors(DoorsListRequest param){
@@ -55,8 +62,17 @@
* @return
*/
@Override
-// @Async
- public String syncHkDevices(AcsDeviceListRequest param){
+ public String syncHkDevices(Device param){
+
+ return null;
+ }
+ @Override
+ public String syncHkLed(Device param){
+
+ return null;
+ }
+ @Override
+ public String syncHkBroadcast(Device param){
return null;
}
@@ -66,7 +82,19 @@
return null;
}
+ @Override
+ public String dealVisitEventIccm(EventVisitIccmRequest param, HttpServletResponse response){
+ return null;
+ }
+ @Override
+ public String dealPlatformStatusEvent(EventPlatformRequest param, HttpServletResponse response){
+ return null;
+ }
+ @Override
+ public String dealPlatformCarsEvent(EventPlatformCarsRequest param, HttpServletResponse response){
+ return null;
+ }
@Override
public String dealAcsEvent(EventAcsRequest param, HttpServletResponse response){
return null;
@@ -88,7 +116,7 @@
return null;
}
@Override
- public void syncUserData(){
+ public void syncUserData(LoginUserInfo user){
}
@Override
public void syncUserUpdateData(Date start, Date end){
@@ -98,11 +126,17 @@
}
public void syncVehicleData(){
}
+ public String syncPlatforms(PlatformsListRequest param){
+ return null;
+ }
+ public String getPlatformStatus(PlatformStatusRequest param){
+ return null;
+ }
@Override
public void syncVehicleUpdateData(Date date){
}
@Override
- public void syncOrgData( ){
+ public void syncOrgData( LoginUserInfo user){
}
@Override
public void syncOrgUpdateData( Date start, Date end){
@@ -113,6 +147,9 @@
}
@Override
public void getOutTimeVisitRecord(){
+ }
+ @Override
+ public void getOutTimeVisitRecordIccm(){
}
@Override
public Integer syncEmpowerData(Integer startPage) {
@@ -166,7 +203,7 @@
param.setPersonInfos(personInfos);
BaseResponse response = HKService.taskDataAddition(param);
if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
return true;
}else{
return false;
--
Gitblit v1.9.3