From fad0704afaf4ed07963d267142cc6f625a09909d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 六月 2026 18:32:05 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_timer/src/main/resources/bootstrap-dev.yml | 6
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 4
server/system_timer/src/main/resources/bootstrap-pro.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml | 2
server/visits/admin_timer/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java | 2
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java | 1
server/visits/admin_timer/src/main/resources/bootstrap-test.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 32 ++++++
server/system_gateway/src/main/resources/bootstrap-dev.yml | 4
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java | 19 +++
server/system_gateway/src/main/resources/bootstrap-self.yml | 4
keyCabinet-android/app/build.gradle | 4
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java | 3
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 26 +++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java | 4
server/system_timer/src/main/resources/bootstrap-test.yml | 6
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 4
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 21 +++
server/visits/admin_timer/src/main/resources/bootstrap-self.yml | 6
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/system_timer/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml | 6
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java | 2
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml | 2
server/system_gateway/src/main/resources/bootstrap-test.yml | 4
server/system_timer/src/main/resources/bootstrap-self.yml | 6
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/OfflineActivationActivity.java | 13 +
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 14 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 6 +
server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml | 6
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java | 11 ++
38 files changed, 187 insertions(+), 73 deletions(-)
diff --git a/keyCabinet-android/app/build.gradle b/keyCabinet-android/app/build.gradle
index 3058d27..a2e8a7e 100644
--- a/keyCabinet-android/app/build.gradle
+++ b/keyCabinet-android/app/build.gradle
@@ -10,8 +10,8 @@
applicationId "com.doumee.keyCabinet"
minSdkVersion build_versions.min_sdk
targetSdkVersion build_versions.target_sdk
- versionCode 2
- versionName "1.0.2"
+ versionCode 3
+ versionName "1.0.3"
//鏀寔vectorDrawables鐭㈤噺鍥�
vectorDrawables.useSupportLibrary = true
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java
index 97830f9..6ecb295 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java
@@ -16,6 +16,9 @@
//鏄惁鍙岄噸楠岃瘉 0鍚� 1鏄�
private int doubleAuth;
+ //褰掕繕閽ュ寵鍙岄噸楠岃瘉 0鍚� 1鏄�
+ private int returnDoubleAuth;
+
//閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴
private int alcoholStatus;
@@ -126,4 +129,12 @@
public void setAlcoholStatus(int alcoholStatus) {
this.alcoholStatus = alcoholStatus;
}
+
+ public int getReturnDoubleAuth() {
+ return returnDoubleAuth;
+ }
+
+ public void setReturnDoubleAuth(int returnDoubleAuth) {
+ this.returnDoubleAuth = returnDoubleAuth;
+ }
}
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
index 471c2cd..4d159ce 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
@@ -99,7 +99,11 @@
statusFsm(2);
}
}else {
- statusFsm(7);
+ if(MApplication.getConfigBean().getReturnDoubleAuth()==1){
+ statusFsm(0);
+ }else {
+ statusFsm(7);
+ }
}
getDB().tvDjs.setOnClickListener(new View.OnClickListener() {
@Override
@@ -213,6 +217,7 @@
getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
getDB().clCard.setVisibility(View.GONE);
getDB().clFace.setVisibility(View.VISIBLE);
+ getDB().clSjXuan.setVisibility(View.GONE);
setFaceModel(1);
break;
case 8:
@@ -268,11 +273,19 @@
break;
case 2:
//鍒囨崲鍙告満鍒峰崱
- statusFsm(3);
+ if(flag==0) {
+ statusFsm(3);
+ }else {
+ statusFsm(8);
+ }
break;
case 3:
//鍒囨崲鍙告満浜鸿劯
- statusFsm(2);
+ if(flag==0) {
+ statusFsm(2);
+ }else {
+ statusFsm(7);
+ }
break;
case 4:
//鍒囨崲鍒颁汉鑴�
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/OfflineActivationActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/OfflineActivationActivity.java
index 4f52855..690e3e4 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/OfflineActivationActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/OfflineActivationActivity.java
@@ -113,14 +113,17 @@
getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
}
}else {
- //鍒犻櫎婵�娲绘枃浠�
- FileUtils.deleteFile(filePath);
getDB().btnDown.setText("寰呭悗鍙颁笂浼犳縺娲绘枃浠�");
getDB().btnDown.setClickable(false);
getDB().btnDown.setBackgroundResource(R.mipmap.btn_less_normal);
- getDB().accreditOffBtn.setClickable(false);
- getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
+ if(FileUtil.FileIsExist(filePath)) {
+ getDB().accreditOffBtn.setClickable(true);
+ getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_main_normal);
+ }else {
+ getDB().accreditOffBtn.setClickable(false);
+ getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
+ }
}
}
@@ -133,6 +136,8 @@
ToastView.show(MApplication.mContext,"涓嬭浇涓�...");
return;
}
+ //鍒犻櫎婵�娲绘枃浠�
+ FileUtils.deleteFile(filePath);
if(!TextUtils.isEmpty(MApplication.getConfigBean().getActivateFileUrl())){
isDownLoad = true;
startDownload(MApplication.getConfigBean().getActivateFileUrl());
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
index 0366822..8818ef8 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
@@ -367,7 +367,7 @@
}
//鑾峰彇鍗″彿
EventBus.getDefault().post(new GetKeyStatusEvent());
- keyTime = new Date().getTime()+300;
+ keyTime = new Date().getTime()+500;
if(handler.hasMessages(0)){
handler.removeMessages(0);
}
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
index bfb13b8..4024dd4 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
@@ -570,7 +570,7 @@
}
//鍙戦�佹煡璇㈤挜鍖欏彿
EventBus.getDefault().post(new GetKeyStatusEvent());
- keyTime = new Date().getTime()+300;
+ keyTime = new Date().getTime()+500;
if(handler.hasMessages(0)){
handler.removeMessages(0);
}
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
index 6562451..d64ece9 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
@@ -339,6 +339,9 @@
if(devConfigBean.getBannerList()!=null) {
setBanner(devConfigBean.getBannerList());
}
+ if(!isFaceOk) {
+ initLicense();
+ }
setJiuConfig();
initPort();
}
@@ -398,6 +401,10 @@
switch (type){
case 2:
case 3: {
+ if(!isFaceOk) {
+ initLicense();
+ return;
+ }
//鏍￠獙鏄惁鐧诲綍
if(MApplication.getConfigBean().getId()==null){
Toast.makeText(mContext, "璁惧鏈坊鍔狅紝鏃犳硶鎿嶄綔", Toast.LENGTH_SHORT).show();
@@ -482,9 +489,6 @@
mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
mAPI.setBootLaunchApk("com.doumee.keyCabinet", true);
showTime = System.currentTimeMillis();
- if(!isFaceOk) {
- initLicense();
- }
if(isHavePermission) {
checkUpdate();
}
@@ -1294,9 +1298,6 @@
if(bytes.length==0){
return;
}
- runOnUiThread(() -> {
- getVM().addInfo("鑾峰彇鍒伴棬鏁版嵁:"+StringUtil.DateToStrSS(new Date())+"==>"+ SportUtils.bytesToHexSimple(bytes));
- });
EventBus.getDefault().post(new CLGridEvent(SportUtils.bytesToHexSimple(bytes)));
}
};
@@ -1314,6 +1315,7 @@
String data = e.getData();
data = data.toUpperCase();
data = data.replaceAll("\\s+", "");
+ String finalData = data;
if(data.startsWith("8A")){
//寮�閿佸弽棣�
String bh = data.substring(2,4);
@@ -1374,6 +1376,9 @@
}
}
}else if(data.startsWith("81")){
+ runOnUiThread(() -> {
+ getVM().addInfo(">>>>>>>>>>>>>>>鑾峰彇鍒板叧闂ㄦ暟鎹�:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
+ });
//涓诲姩鍏抽棬 81 01 01 11 90
String bh = data.substring(2,4);
String tdh = data.substring(4,6);
@@ -1394,6 +1399,9 @@
}
}else if(data.startsWith("80")){
//鏌ヨ鎵�鏈夐棬鐘舵��
+ runOnUiThread(() -> {
+ getVM().addInfo("<<<<<<<<<<<<<<<<<<<<鑾峰彇鍒版墍鏈夐棬鐘舵�佹暟鎹�:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
+ });
//80 01 00 00 FF FF 33 B2
//80 02 00 00 00 F7 33 46
if(data.length()>=14){
@@ -1767,9 +1775,9 @@
private boolean isInitPort;
//鍒濆鍖栦覆鍙�
private void initPort(){
- //SpUtil.setString("port_grid","/dev/ttyS7");
- //SpUtil.setString("port_key","/dev/ttyS1");
- //SpUtil.setString("port_jiu","/dev/ttyS2");
+ SpUtil.setString("port_grid","/dev/ttyS7");
+ SpUtil.setString("port_key","/dev/ttyS1");
+ SpUtil.setString("port_jiu","/dev/ttyS2");
gridPath = SpUtil.getString("port_grid");
getVM().addInfo("闂ㄤ覆鍙ｉ摼鎺ワ細"+gridPath);
keyPath = SpUtil.getString("port_key");
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
index 14830a4..f67f09c 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
# namespace: dev_renkang
username: nacos
@@ -23,7 +23,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dev_renkang
namespace: dmvisit
username: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
index d1178ca..cde3b9e 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: Atwl@2024
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
index 2c5332f..7b6e26f 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
# namespace: dev_renkang
username: nacos
@@ -23,7 +23,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: wuhu_visit_dev
namespace: dmvisit_dev
username: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
index f201cd7..953fc75 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index a375799..dc33362 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-self.yml b/server/system_gateway/src/main/resources/bootstrap-self.yml
index a375799..dc33362 100644
--- a/server/system_gateway/src/main/resources/bootstrap-self.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-self.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-test.yml b/server/system_gateway/src/main/resources/bootstrap-test.yml
index 033273f..31e99a1 100644
--- a/server/system_gateway/src/main/resources/bootstrap-test.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-test.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_test
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 3d2cb09..02ca26f 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index 35d5149..249db47 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -157,6 +157,20 @@
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
private Date fsDate;
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴缁勭粐")
+ private Integer relationCompanyId;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴浜哄憳")
+ private Integer relationUserId;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String relationCompanyName;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴浜哄憳鍚嶇О")
+ @TableField(exist = false)
+ private String relationUserName;
+
@ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
@TableField(exist = false)
private String categoryName;
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
index 2553983..53d7859 100644
--- a/server/system_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/system_timer/src/main/resources/bootstrap-dev.yml
@@ -12,11 +12,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -24,7 +24,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-pro.yml b/server/system_timer/src/main/resources/bootstrap-pro.yml
index caac07c..acbfbc6 100644
--- a/server/system_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/system_timer/src/main/resources/bootstrap-pro.yml
@@ -16,7 +16,7 @@
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/system_timer/src/main/resources/bootstrap-self.yml b/server/system_timer/src/main/resources/bootstrap-self.yml
index d9a7b7c..1bd02a6 100644
--- a/server/system_timer/src/main/resources/bootstrap-self.yml
+++ b/server/system_timer/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-test.yml b/server/system_timer/src/main/resources/bootstrap-test.yml
index 284ae5b..f26e380 100644
--- a/server/system_timer/src/main/resources/bootstrap-test.yml
+++ b/server/system_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap.yml b/server/system_timer/src/main/resources/bootstrap.yml
index 05a83ce..107b53b 100644
--- a/server/system_timer/src/main/resources/bootstrap.yml
+++ b/server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: systemTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
index f2e0425..fe9206b 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
index c8032c1..5de140f 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-self.yml b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
index a9e0f19..6a5b70a 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-test.yml b/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
index 86e309f..406209d 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap.yml b/server/visits/admin_timer/src/main/resources/bootstrap.yml
index b5b65b7..efae338 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: visitsTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index 3be58d6..6f0c886 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
username: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
index f0af774..3e22c6f 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
index 3ac195f..cd47c67 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
username: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
index daac276..8bd85ef 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
index f8d889a..3aeab35 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -151,6 +151,10 @@
@ApiModelProperty(value = "閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴", example = "1")
private Integer alcoholStatus;
+
+ @ApiModelProperty(value = "褰掕繕閽ュ寵鍙岄噸楠岃瘉 0鍚� 1鏄�", example = "1")
+ private Integer returnDoubleAuth;
+
@ApiModelProperty(value = "缁忕含搴︿俊鎭� 鍙傛暟鍊硷細缁忓害,绾害")
@TableField(exist = false)
private String jwd;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
index dca9101..57d3c67 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
@@ -67,6 +67,9 @@
@ApiModelProperty(value = "閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴", example = "1")
private Integer alcoholStatus;
+ @ApiModelProperty(value = "褰掕繕閽ュ寵鍙岄噸楠岃瘉 0鍚� 1鏄�", example = "1")
+ private Integer returnDoubleAuth;
+
@ApiModelProperty(value = "杞挱鍥惧湴鍧�", example = "1")
private List<String> bannerList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 5678c61..7db147e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -597,13 +597,13 @@
queryWrapper.ge(Company::getFsDate, Utils.Date.getStart(pageWrap.getModel().getFsDate()));
queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
}
- queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
/* .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
/* queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
queryWrapper.selectAll(Company.class)
.select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
+ queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
@@ -713,9 +713,13 @@
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
queryWrapper.select("t1.type",Company::getParentType);
+ queryWrapper.select("c1.NAME",Company::getRelationCompanyName);
+ queryWrapper.select("s1.NAME",Company::getRelationUserName);
queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
+ queryWrapper.leftJoin("company c1 on t.RELATION_COMPANY_ID = c1.id");
+ queryWrapper.leftJoin("member s1 on t.RELATION_USER_ID = s1.id");
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
// queryWrapper.eq(type!=null,Company::getType,type);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
index cc8b29e..a4d1e82 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -7,9 +7,11 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CategoryMapper;
+import com.doumee.dao.business.InoutDayCountMapper;
import com.doumee.dao.business.InoutRecordMapper;
import com.doumee.dao.business.dto.InParkDataDTO;
import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.model.InoutDayCount;
import com.doumee.dao.business.model.InoutRecord;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.GeneralDataVO;
@@ -56,6 +58,9 @@
@Autowired
private CategoryMapper categoryMapper;
+
+ @Autowired
+ private InoutDayCountMapper inoutDayCountMapper;
@Override
public Integer create(InoutRecord inoutRecord) {
@@ -556,7 +561,19 @@
TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO();
telecomInParkDataVO.setInCarNum(Constants.ZERO);
telecomInParkDataVO.setInUserNum(Constants.ZERO);
- List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
+
+ InoutDayCount inoutDayCount = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>()
+ .lambda()
+ .apply(" DATE(TIME_INFO) = CURDATE() ")
+ .last(" limit 1 ")
+ );
+
+ if(Objects.nonNull(inoutDayCount)){
+ telecomInParkDataVO.setInUserNum(inoutDayCount.getInMemberNum());
+ telecomInParkDataVO.setInCarNum(inoutDayCount.getInCarNum());
+ }
+
+ /* List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
.eq(InoutRecord::getIsdeleted,Constants.ZERO)
.eq(InoutRecord::getInOrOut,Constants.ZERO)
.isNotNull(InoutRecord::getCarCode)
@@ -577,7 +594,7 @@
telecomInParkDataVO.setInUserNum(
new HashSet<>(listUser.stream().map(i->i.getMemberPhone()).collect(Collectors.toList())).size()
);
- }
+ }*/
return telecomInParkDataVO;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 1afb5ca..993bdae 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -4,7 +4,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
-import com.doumee.core.dingTalk.DingTalkStream;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.jiandaoyun.api.arch.DeptApiClient;
@@ -1189,6 +1188,7 @@
.selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
.selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
.selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
+ .selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
.leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
.leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
.eq(JkCabinet::getCode,dto.getCode())
@@ -1219,6 +1219,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
+ cabinetLog.setGridId(jkCabinetGrid.getId());
+ cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
+ cabinetLog.setCarId(jkCabinetGrid.getCarId());
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ cabinetLog.setType(Constants.ONE);
+ cabinetLog.setStatus(Constants.ZERO);
+ cabinetLog.setAuthType(3);
+ cabinetLog.setKeyStatus(Constants.TWO);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵涓嶅湪浣�");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}else{
if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
@@ -1227,6 +1242,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
+ cabinetLog.setGridId(jkCabinetGrid.getId());
+ cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
+ cabinetLog.setCarId(jkCabinetGrid.getCarId());
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ cabinetLog.setType(Constants.ONE);
+ cabinetLog.setStatus(Constants.ZERO);
+ cabinetLog.setAuthType(3);
+ cabinetLog.setKeyStatus(Constants.ONE);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵鍦ㄤ綅");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}
// if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
index 98d9ae1..74ede31 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -88,6 +88,8 @@
|| Objects.isNull(jkCabinet.getColumnNum())
|| jkCabinet.getColumnNum() <= Constants.ZERO
|| Objects.isNull(jkCabinet.getNoType())
+ || Objects.isNull(jkCabinet.getDoubleAuth())
+ || Objects.isNull(jkCabinet.getReturnDoubleAuth())
|| Objects.isNull(jkCabinet.getSortType())
|| (
Constants.equalsInteger(jkCabinet.getNoType(),Constants.ONE)
@@ -216,6 +218,8 @@
|| Objects.isNull(jkCabinet.getPort())
|| Objects.isNull(jkCabinet.getDoubleAuth())
|| Objects.isNull(jkCabinet.getAlcoholStatus())
+ || Objects.isNull(jkCabinet.getDoubleAuth())
+ || Objects.isNull(jkCabinet.getReturnDoubleAuth())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java
index a4372cf..2c2acbe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java
@@ -27,7 +27,7 @@
/**
* @author T14
*/
-@Service
+@Service("deviceMqttPushCallback")
@Slf4j
public class MqttPushCallback implements MqttCallback {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java
index a3a9859..0ccac6a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java
@@ -17,6 +17,7 @@
@Slf4j
public class MqttSubServiceImpl implements MqttBizService {
@Autowired
+ @org.springframework.beans.factory.annotation.Qualifier("deviceMqttPushCallback")
private MqttPushCallback callBack ;
@Override
public MqttClient subscribe(MqttClient client,MqttConfig config,String[] topics){
--
Gitblit v1.9.3