From 16772c5dc27772c2eee57d2eab061ad15e8ad87e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 11:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/resources/application.yml | 2 +-
server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java | 11 +++++------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java | 2 +-
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 2 +-
server/dmvisit_service/src/main/resources/application-test.yml | 7 ++++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 7 +++++++
server/dmvisit_service/src/main/resources/application-testYL.yml | 7 ++++++-
server/dmvisit_service/src/main/resources/application-pro.yml | 7 ++++++-
server/dmvisit_service/src/main/resources/application-dev.yml | 7 ++++++-
server/dmvisit_service/src/main/resources/application-devYL.yml | 7 ++++++-
10 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index b947a79..a0a3527 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -64,7 +64,7 @@
* 姣忓垎閽熸媺鍙栦竴娆′粖鏃ョ殑璁垮棰勭害鏁版嵁
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedDelay= 30*1000)
public void syncVistAppointData() throws Exception {
if(Constants.DEALING_FROM_HK_VISIT){
return ;
diff --git a/server/dmvisit_admin/src/main/resources/application.yml b/server/dmvisit_admin/src/main/resources/application.yml
index e051fda..2153ee8 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -67,7 +67,7 @@
compression:
enabled: true
mime-types: application/json
- port: 10028
+ port: 10033
tomcat:
max-swallow-size: -1
servlet:
diff --git a/server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java b/server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
index 67275b3..b42f62c 100644
--- a/server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
+++ b/server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
@@ -38,11 +38,11 @@
public CountDataResponse countData(BaseRequest param){
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.select("count(1) as applyTotalNum");
- queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status not in(1,4,9)) as applyPassNum");
- queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status=8) as visitInNum");
- queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status=6) as visitOutNum");
+ queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status not in(5,6,8)) as applyPassNum");
+ queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status in (5)) as visitInNum");
+ queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status in (6,8)) as visitOutNum");
queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and inout_type=0 and event_type="+ HKConstants.EventTypes.PARK_PASS_IN.getKey() +") as carInNum");
- queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and inout_type=1 and event_type="+ HKConstants.EventTypes.PARK_PASS_OUT.getKey() +") as carOutNum");
+ queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and (inout_type !=0 ) and event_type="+ HKConstants.EventTypes.PARK_PASS_OUT.getKey() +") as carOutNum");
queryWrapper.eq(Visits::getIsdeleted, Constants.ZERO );
queryWrapper.apply("TO_DAYS(create_date)=TO_DAYS(now())" );
queryWrapper.last("limit 1");
@@ -84,7 +84,7 @@
model.setCreateDate(event.getCreateDate());
model.setCompanyName(event.getCompanyName());
model.setMemberName(event.getMemberName());
- model.setType(event.getMemberType());
+ model.setType(Constants.formatIntegerNum(event.getMemberType()) !=2?1:2);
model.setVisitCompanyName(event.getVisitCompanyName());
list.add(model);
}
@@ -98,7 +98,6 @@
MPJLambdaWrapper<VisitEvent> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(VisitEvent.class) ;
wrapper.apply("TO_DAYS(create_date)=TO_DAYS(now())" );
- wrapper.in(CarEvent::getEventType, Arrays.asList(new Integer[]{HKConstants.EventTypes.PARK_PASS_IN.getKey(),HKConstants.EventTypes.PARK_PASS_OUT.getKey()}));
wrapper.last("limit 50");
wrapper.orderByDesc(VisitEvent::getCreateDate);
List<VisitEvent> result =visitEventMapper.selectList( wrapper);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 9b98e60..8246bb1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.config.DataSyncConfig;
import com.doumee.config.SpringContextUtil;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest;
@@ -55,6 +56,8 @@
private DeviceEventMapper deviceEventMapper;
@Autowired
private MemberMapper memberMapper;
+ @Autowired
+ private DataSyncConfig dataSyncConfig;
@Autowired
private CarEventMapper carEventMapper;
@Autowired
@@ -317,6 +320,10 @@
if(visits !=null){
//濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
+ if(dataSyncConfig.getOrgUserDataOrigin() == DataSyncConfig.origin.hk){
+ //濡傛灉鏄紛鍒╁ぇ灞忛」鐩紝涓嶅仛澶勭悊
+ return;
+ }
Visits updateVistis = new Visits();
updateVistis.setId(visits.getId());
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
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 08c8874..d92e58f 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
@@ -101,7 +101,7 @@
curPage++;
}
if(allHkList .size() == 0){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍缁勭粐淇℃伅锛�");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍淇℃伅锛�");
}
//娓呯┖鍘熸湁褰撳ぉ鐨勬暟鎹�
visitsMapper.delete(new UpdateWrapper<Visits>().lambda()
diff --git a/server/dmvisit_service/src/main/resources/application-dev.yml b/server/dmvisit_service/src/main/resources/application-dev.yml
index baf95dd..634648b 100644
--- a/server/dmvisit_service/src/main/resources/application-dev.yml
+++ b/server/dmvisit_service/src/main/resources/application-dev.yml
@@ -6,7 +6,12 @@
password: rtjgfEr@&0c0m
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
-
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
diff --git a/server/dmvisit_service/src/main/resources/application-devYL.yml b/server/dmvisit_service/src/main/resources/application-devYL.yml
index 929847b..9ed5843 100644
--- a/server/dmvisit_service/src/main/resources/application-devYL.yml
+++ b/server/dmvisit_service/src/main/resources/application-devYL.yml
@@ -6,7 +6,12 @@
password: rtjgfEr@&0c0m
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
-
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
diff --git a/server/dmvisit_service/src/main/resources/application-pro.yml b/server/dmvisit_service/src/main/resources/application-pro.yml
index 75623af..2e4cbd2 100644
--- a/server/dmvisit_service/src/main/resources/application-pro.yml
+++ b/server/dmvisit_service/src/main/resources/application-pro.yml
@@ -7,7 +7,12 @@
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
-
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
knife4j:
enable: true
basic:
diff --git a/server/dmvisit_service/src/main/resources/application-test.yml b/server/dmvisit_service/src/main/resources/application-test.yml
index fd8f9db..988f053 100644
--- a/server/dmvisit_service/src/main/resources/application-test.yml
+++ b/server/dmvisit_service/src/main/resources/application-test.yml
@@ -10,7 +10,12 @@
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
-
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
#rocketmq:
# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
# groupId: GID-wakatest
diff --git a/server/dmvisit_service/src/main/resources/application-testYL.yml b/server/dmvisit_service/src/main/resources/application-testYL.yml
index 3339b3c..e76e605 100644
--- a/server/dmvisit_service/src/main/resources/application-testYL.yml
+++ b/server/dmvisit_service/src/main/resources/application-testYL.yml
@@ -6,7 +6,12 @@
password: rtjgfEr@&0c0m
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
-
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
--
Gitblit v1.9.3