From 2bfdc2261e19b02b53d02e8ebe8f36ab92b3de75 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:01:45 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java | 4 ++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 11 +++++++++--
admin/src/views/business/regionDevice.vue | 5 +----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/business/regionDevice.vue b/admin/src/views/business/regionDevice.vue
index 0d74ec8..4cc8669 100644
--- a/admin/src/views/business/regionDevice.vue
+++ b/admin/src/views/business/regionDevice.vue
@@ -10,9 +10,6 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <p class="tip-warn" style="margin-bottom: 10px;"><i class="el-icon-info"></i>璇存槑锛�
- 鍖哄煙璁惧淇℃伅琛ㄧず鍚屾娴峰悍瀹夐槻骞冲彴淇℃伅鏁版嵁锛屽綋瀹夐槻骞冲彴鐩稿叧鏁版嵁鍙戠敓鍙樺姩鏃讹紝璇枫�愬埛鏂扮紦瀛樸�戝悓姝ユ湰绯荤粺涓暟鎹俊鎭�
- </p>
<ul class="toolbar" >
<li><el-button type="primary" icon="el-icon-refresh" :loading="isWorking.sort" @click="refreshRegionData()">鍒锋柊缂撳瓨</el-button></li>
</ul>
@@ -114,7 +111,7 @@
}) .catch(e => {
})
.finally(() => {
- this.isWorking.loading = falsex
+ this.isWorking.loading = false
})
},
getDepartmentTree (tree) {
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 866a8f4..05774d8 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
@@ -327,7 +327,8 @@
}catch (Exception e){
}
- /* if(result.size()==0){
+ boolean debug =false;
+ if(debug && result.size()==0){
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----start-----
for (int i = 0; i < 5; i++) {
PageRegionInfoResponse t = new PageRegionInfoResponse();
@@ -388,9 +389,15 @@
result.add(t);
}
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----end-----
- }*/
+ }
return ApiResponse.success(result);
}
+ @ApiOperation("銆愭捣搴枫�戝己鍒跺埛鏂板尯鍩熴�佺洃鎺с�佹秷闃茶澶囩紦瀛�")
+ @PostMapping("/refreshRegionData")
+ public ApiResponse<String > refreshRegionData(HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ){
+ boardService.cacheRegionAndDeviceData( );
+ return ApiResponse.success(null);
+ }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
index 981013a..382c4cc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
@@ -21,8 +21,8 @@
private List<PageRegionInfoResponse> childList;
@ApiModelProperty(value = "鐩戞帶鐐归泦鍚�")
private List<CarmeraListVO> carmeraList;
- @ApiModelProperty(value = "娑堥槻浼犳劅鍣ㄩ泦鍚�")
- private List<CarmeraListVO> deviceList;
@ApiModelProperty(value = "娑堥槻璁惧闆嗗悎")
+ private List<CarmeraListVO> deviceList;
+ @ApiModelProperty(value = "娑堥槻浼犳劅鍣ㄩ泦鍚�")
private List<CarmeraListVO> sensorList;
}
--
Gitblit v1.9.3