From cf549247904da2b8f5e1fe112011305c51c19857 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 29 二月 2024 16:13:27 +0800
Subject: [PATCH] mrshi
---
admin/src/views/login.vue | 3
admin/src/views/business/visits_hk.vue | 11 ---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java | 1
server/dmvisit_web/src/main/resources/application.yml | 2
server/dmvisit_service/src/main/resources/application-testHS.yml | 81 +++++++++++++++++++++++++++
server/openapi/src/main/resources/application.yml | 2
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/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/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 5 +
server/dmvisit_service/src/main/resources/application-pro.yml | 7 ++
server/dmvisit_service/src/main/resources/application-devYL.yml | 7 ++
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/resources/application-test.yml | 7 ++
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 9 +++
server/dmvisit_service/src/main/resources/application-dev.yml | 7 ++
18 files changed, 145 insertions(+), 28 deletions(-)
diff --git a/admin/src/views/business/visits_hk.vue b/admin/src/views/business/visits_hk.vue
index 194d556..1dcc3c4 100644
--- a/admin/src/views/business/visits_hk.vue
+++ b/admin/src/views/business/visits_hk.vue
@@ -68,17 +68,6 @@
</el-table-column>
<el-table-column prop="status" fixed="right" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <el-option label="寰呭鏍�" value="1"></el-option>
- <el-option label="姝ｅ父" value="2"></el-option>
- <el-option label="杩熷埌" value="3"></el-option>
- <el-option label="瀹℃牳閫�鍥�" value="4"></el-option>
- <el-option label="瓒呮湡鑷姩绛剧" value="5"></el-option>
- <el-option label="宸茬绂�" value="6"></el-option>
- <el-option label="瓒呮湡鏈绂�" value="7"></el-option>
- <el-option label="宸插埌杈�" value="8"></el-option>
- <el-option label="瀹℃牳澶辨晥" value="9"></el-option>
- <el-option label="閭�绾︿腑" value="10"></el-option>
- <el-option label="閭�绾﹀け鏁�" value="11"></el-option>
<span v-if="row.status === 1">寰呭鏍�</span>
<span v-if="row.status === 2">姝ｅ父</span>
<span v-if="row.status === 3">杩熷埌</span>
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index c67c4a7..5d27534 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -58,7 +58,8 @@
uuid: this.captcha.uuid
})
.then(() => {
- window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ // window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ window.location.reload()
})
.catch(e => {
this.refreshCaptcha()
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index fd3e382..b075d7d 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -120,4 +120,5 @@
return ApiResponse.success(memberCardService.findList(card));
}
+
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 0929320..9311b3f 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -236,4 +236,13 @@
return ApiResponse.success("鍚屾鎴愬姛");
}
+
+
+ @ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
+ @PostMapping("/testFreeFz")
+ public ApiResponse testFreeFz() {
+ memberService.memberFreeze();
+ return ApiResponse.success(null);
+ }
+
}
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 07c8e2d..2153ee8 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: testHS
# JSON杩斿洖閰嶇疆
jackson:
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/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index abe363f..126cbfd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1070,6 +1070,11 @@
@Override
public void approveApply(ApproveNoticeRequest param){
try{
+ if(!Objects.isNull(param)
+ ){
+
+ }
+
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||Objects.isNull(param.getStatus())){
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-testHS.yml b/server/dmvisit_service/src/main/resources/application-testHS.yml
new file mode 100644
index 0000000..5ff9fb2
--- /dev/null
+++ b/server/dmvisit_service/src/main/resources/application-testHS.yml
@@ -0,0 +1,81 @@
+spring:
+ # 鏁版嵁婧愰厤缃�
+ datasource:
+ url: jdbc:mysql://127.0.0.1:3306/visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: root
+ password: HS!20240227
+ 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: huasun618
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
+#rocketmq:
+# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
+# groupId: GID-wakatest
+# topic: waka-test
+# username: 4derRb4Sw5EkqUMI
+# password: v50N97wf4av8Q8I4
+
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: 111111
+
+debug_model: true
+
+# Swagger閰嶇疆
+swagger:
+ host: dmtest.ahapp.net
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ context-path: /erp_api
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
+
+########################鍚屾鏁版嵁妯″紡 ########################
+data-sync:
+ org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
+ visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
+ need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+wx:
+ pay:
+ appId: wxfab6da18632e28de
+ appSecret: 4ee3b22afa90287834319fc3c1635271
+ mchId: 1229817002
+ mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+ notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
+ keyPath: /usr/local/apiclient_cert.p12
+
+tencent:
+ map:
+ remoteHost: https://apis.map.qq.com
+ appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
+
+
+des_pwd: 123456SDFKDJF
+
+## MQTT##
+mqtt:
+ host: tcp://192.168.10.198:1883
+ userName: root
+ passWord: 123456
+ qos: 1
+ clientId: ClientId_local #ClientId_local蹇呴』鍞竴 姣斿浣犲凡缁忓畾浜嗗彨ABC 閭ｄ綘灏变竴鐩村彨ABC 鍏朵粬鍦版柟灏变笉瑕佷娇鐢ˋBC浜�
+ timeout: 10
+ keepalive: 20
+ topic1: A/pick/warn/# #绗﹀彿鏄唬琛ㄦ暣涓獁arn涓嬮潰鐨勫叏閮ㄥ瓙涓婚 娌℃湁鐞嗚В鐨勮瘽 鍙互鐧惧害浠旂粏鐞嗚В涓�涓�
+ topic2: A/cmd/resp
+ topic3: ABCF
+ topic4: ABCH
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
diff --git a/server/dmvisit_web/src/main/resources/application.yml b/server/dmvisit_web/src/main/resources/application.yml
index cc7d5b6..7c97108 100644
--- a/server/dmvisit_web/src/main/resources/application.yml
+++ b/server/dmvisit_web/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: testHS
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/openapi/src/main/resources/application.yml b/server/openapi/src/main/resources/application.yml
index 1a26401..bb74450 100644
--- a/server/openapi/src/main/resources/application.yml
+++ b/server/openapi/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: test
+ active: testHS
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3