From d042b8ec4197c6f2f1052138dddea37adc2c9bfb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 14:56:37 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 3 ++-
admin/src/components/business/OperaWarningRuleWindow.vue | 28 +++++++++++++---------------
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 4 ++--
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/admin/src/components/business/OperaWarningRuleWindow.vue b/admin/src/components/business/OperaWarningRuleWindow.vue
index 179993b..53869f3 100644
--- a/admin/src/components/business/OperaWarningRuleWindow.vue
+++ b/admin/src/components/business/OperaWarningRuleWindow.vue
@@ -165,22 +165,20 @@
}
},
changeSel (opt) {
- this.$nextTick(() => {
- console.log('=================changeSel',opt,this.form.detailList)
- var item = this.form.detailList[opt]
- this.form.detailList[opt].regionCode = null
- this.form.detailList[opt].regionName = null
- this.form.detailList[opt].carmeraList = []
- // this.form.detailList[opt].deviceId = null
- // this.form.detailList[opt].deviceName = null
- if (item.regionId) {
- var reg = this.getSelectedObject(item.regionId)
- if (reg) {
- this.form.detailList[opt].regionCode = reg.indexCode
- this.form.detailList[opt].regionName = reg.name
- this.form.detailList[opt].carmeraList = reg.carmeraList
- }
+ console.log('=================changeSel',opt,this.form.detailList)
+ var item = this.form.detailList[opt]
+ this.form.detailList[opt].regionCode = null
+ this.form.detailList[opt].regionName = null
+ this.form.detailList[opt].carmeraList = []
+ if (item.regionId) {
+ var reg = this.getSelectedObject(item.regionId)
+ if (reg) {
+ this.form.detailList[opt].regionCode = reg.indexCode
+ this.form.detailList[opt].regionName = reg.name
+ this.form.detailList[opt].carmeraList = reg.carmeraList
}
+ }
+ this.$nextTick(() => {
console.log('=================changeSel1' , this.form.detailList[opt].carmeraList,this.form.detailList[opt].deviceId)
if(this.notInCarmeraList( this.form.detailList[opt].carmeraList,this.form.detailList[opt].deviceId) ){
this.form.detailList[opt].deviceId = null
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 50f1434..7be6fdf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -328,7 +328,7 @@
}catch (Exception e){
}
- if(result.size()==0){
+ /*if(result.size()==0){
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----start-----
for (int i = 0; i < 5; i++) {
PageRegionInfoResponse t = new PageRegionInfoResponse();
@@ -363,7 +363,7 @@
result.add(t);
}
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----end-----
- }
+ }*/
return ApiResponse.success(result);
}
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 9dc10e9..2df12af 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 43142cd..7896abe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -156,8 +156,9 @@
}
if(delRetentionLis.size()>0){
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
+ //@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 ")
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
-// .eq(Retention::getType,Constants.memberType.internal)
+ .ne(Retention::getType,Constants.THREE)
.in(Retention::getMemberId,delRetentionLis));
}
if(retentionList.size()>0){
--
Gitblit v1.9.3