From 39739e34af928aae204c55db7974213c9b938c5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 二月 2024 18:33:14 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
index d8251d0..08c8874 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
@@ -10,12 +10,8 @@
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.AppointmentListRequest;
-import com.doumee.core.haikang.model.param.request.OrgUserListRequest;
import com.doumee.core.haikang.model.param.respose.AppointmentInfoResponse;
-import com.doumee.core.haikang.model.param.respose.OrgInfoResponse;
-import com.doumee.core.haikang.model.param.respose.UserInfoResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
@@ -23,15 +19,12 @@
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
-import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Visits;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -46,7 +39,7 @@
*/
@Service
@Slf4j
-public class HkSyncVistFromHKServiceImpl extends HkSyncBaseServiceImpl {
+public class HkSyncVisitFromHKServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private CompanyMapper companyMapper;
@Autowired
@@ -64,11 +57,7 @@
*/
@Override
@Transactional
- public void syncVistAppointData(){
- if(Constants.DEALING_FROM_HK_VISIT){
- return ;
- }
- Constants.DEALING_FROM_HK_VISIT =true;
+ public void syncVistAppointData(Date date){
try {
if( Constants.formatIntegerNum(dataSyncConfig.getVisitorDataOrigin()) != DataSyncConfig.origin.hk){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佹捣搴锋暟鎹悓姝ユ搷浣渵");
@@ -79,7 +68,13 @@
int curTotal = 0;
int curPage = 1;
//鏌ヨ浠婂ぉ鐨�
- param.setVisitStartTimeBegin(DateUtil.getISO8601Timestamp( Utils.Date.getStart(new Date())));
+ Date start =Utils.Date.getStart(date);
+ Date end = new Date();
+ if(DateUtil.daysBetweenDates(end,start) >1){
+ end = Utils.Date.getEnd(date);
+ }
+ param.setVisitStartTimeBegin(DateUtil.getISO8601Timestamp2( start));
+ param.setVisitStartTimeEnd(DateUtil.getISO8601Timestamp2( end));
List<Visits> allHkList = new ArrayList<>();
while (hasNext){
@@ -87,8 +82,11 @@
param.setPageNo(curPage);
param.setPageSize(100);
BaseResponse<BaseListPageResponse<AppointmentInfoResponse>> response = HKService.appointmentRecords(param);
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ if(response.getData() == null || response.getData().getTotal() ==0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍淇℃伅锛�");
}
BaseListPageResponse<AppointmentInfoResponse> r = response.getData();
curTotal += 100;
@@ -105,15 +103,14 @@
if(allHkList .size() == 0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍缁勭粐淇℃伅锛�");
}
- //娓呯┖鍘熸湁鏁版嵁
- visitsMapper.delete(new UpdateWrapper<Visits>().lambda().apply("to_days(create_date)=to_days(now())" ));
+ //娓呯┖鍘熸湁褰撳ぉ鐨勬暟鎹�
+ visitsMapper.delete(new UpdateWrapper<Visits>().lambda()
+ .ge(Visits::getStarttime,start)
+ .eq(Visits::getType,Constants.ONE)
+ .le(Visits::getStarttime,end));
visitsMapper.insertBatchSomeColumn(allHkList);//鎻掑叆鏂版暟鎹�
}catch (BusinessException e){
throw e;
- }catch (Exception e){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
- }finally {
- Constants.DEALING_FROM_HK_VISIT =false;
}
}
@@ -131,8 +128,8 @@
c.setHkDate(new Date());
c.setIsdeleted(Constants.ZERO);
c.setCreateDate(c.getHkDate());
- c.setStarttime(DateUtil.getISO8601DateByStr(model.getVisitStartTime()));
- c.setEndtime(DateUtil.getISO8601DateByStr(model.getVisitEndTime()));
+ c.setStarttime(DateUtil.getISO8601DateByStr2(model.getVisitStartTime()));
+ c.setEndtime(DateUtil.getISO8601DateByStr2(model.getVisitEndTime()));
c.setReason(model.getVisitPurpose());
c.setStatus(model.getVisitorStatus());
c.setType(Constants.ONE);
--
Gitblit v1.9.3