From 6f42ab38a7752193aacd49cc1b301e2f106bff34 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 15 八月 2024 16:01:00 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/business/deviceBroadcast.vue | 33 +++-------------
admin/src/views/business/deviceLed.vue | 20 +--------
admin/src/views/business/device.vue | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java | 23 +++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 13 ++++--
5 files changed, 43 insertions(+), 49 deletions(-)
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 0ffb767..1377701 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -35,7 +35,8 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
+ <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
+ <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
<el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�"></el-table-column>
<el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
<el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index f5a4e65..c5d62e2 100644
--- a/admin/src/views/business/deviceBroadcast.vue
+++ b/admin/src/views/business/deviceBroadcast.vue
@@ -20,32 +20,13 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�"></el-table-column>
- <el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
- <el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
- <el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
- <el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
- <template slot-scope="{row}">
- <span v-if="row.online == 0">绂荤嚎</span>
- <span v-if="row.online == 1">鍦ㄧ嚎</span>
- </template>
- </el-table-column>
- <el-table-column prop="ip" label="璁惧ip"></el-table-column>
- <el-table-column prop="port" label="璁惧绔彛"></el-table-column>
- <el-table-column label="鏄惁鍥尯鍏ュ彛">
- <template slot-scope="{row}">
- <el-switch
- @change="changeManufature($event, row)"
- v-model="row.isEntrance"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="1"
- :inactive-value="0">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column prop="no" label="璁惧鍙�"></el-table-column>
+ <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
+ <el-table-column prop="name" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="hkId" label="骞挎挱鐐瑰敮涓�鏍囪瘑"></el-table-column>
+ <el-table-column prop="channelInfo" label="骞挎挱鐐圭被鍨�"></el-table-column>
+ <el-table-column prop="channelNo" label="閫氶亾鍙�"></el-table-column>
+ <el-table-column prop="regionName" label="鍖哄煙鍚嶇О"></el-table-column>
+ <el-table-column prop="hkDate" label="鍚屾鏃堕棿"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/admin/src/views/business/deviceLed.vue b/admin/src/views/business/deviceLed.vue
index 05737ca..b8173fc 100644
--- a/admin/src/views/business/deviceLed.vue
+++ b/admin/src/views/business/deviceLed.vue
@@ -20,11 +20,10 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�"></el-table-column>
- <el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
- <el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
+ <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
+ <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
<el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
+ <el-table-column prop="no" label="璁惧缂栧彿"></el-table-column>
<el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
<template slot-scope="{row}">
<span v-if="row.online == 0">绂荤嚎</span>
@@ -33,19 +32,6 @@
</el-table-column>
<el-table-column prop="ip" label="璁惧ip"></el-table-column>
<el-table-column prop="port" label="璁惧绔彛"></el-table-column>
- <el-table-column label="鏄惁鍥尯鍏ュ彛">
- <template slot-scope="{row}">
- <el-switch
- @change="changeManufature($event, row)"
- v-model="row.isEntrance"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="1"
- :inactive-value="0">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column prop="no" label="璁惧鍙�"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java
index 84197ed..296b362 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java
@@ -7,5 +7,26 @@
@Data
public class LedRecordsInfoResponse {
- private String indexCode;
+
+ private String region_id;// String false 鍖哄煙缂栫爜
+ private String device_config_attr ;//String false 璁惧灞炴�у�艰缃�
+ private String model_data_id ;//String false 鏁版嵁鍞竴鏍囪瘑
+ private String index_code;// String false 璁惧缂栧彿
+ private String device_index_code;// String false 涓诲姩璁惧缂栧彿
+ private String device_category;// String false 璁惧涓�绾у垎绫�
+ private String device_type;// String false 璁惧绫诲瀷
+ private String port;// Number false 绔彛鍙�
+ private String manufacturer ;//String false 璁惧鍘傚晢
+ private String net_zone_id;// Number false 缃戝煙id
+ private String resource_id;// String false ldap璧勬簮id
+ private String screen_width;// Number false Led灞忓搴�
+ private String treaty_type;// String false 鎺ュ叆鍗忚
+ private String addr_type;// String false 鎺ュ叆鍦板潃绫诲瀷
+ private String addr ;//String false ip鍦板潃
+ private String screen_name;// String false led鍚嶇О
+ private String device_key_version ;//String false 椹卞姩鐗堟湰鍙�
+ private String create_time ;//String false 鍒涘缓鏃堕棿
+ private String update_time;// String false 鏇存柊鏃堕棿
+ private String screen_height ;//Number false led灞忛珮搴�
+ private String device_key;// String false 椹卞姩鍞竴鏍囪瘑
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index bf185ed..33ea271 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -444,12 +444,17 @@
private Device initLedDataByHkData(Device model, LedRecordsInfoResponse door, Date date) {
model.setIsdeleted(Constants.ZERO);
- model.setHkId(door.getIndexCode());
+ model.setHkId(door.getModel_data_id());
model.setHkDate(date);
model.setHkStatus(Constants.ONE);
+ model.setNo(door.getIndex_code());
model.setType(Constants.TWO);
+ model.setManufature(door.getManufacturer());
+ model.setPort(door.getPort());
+ model.setIp(door.getAddr());
+ model.setResourceType(door.getDevice_type());
+ model.setName(door.getScreen_name());
model.setRemark(JSONObject.toJSONString(door));
- model.setDoorId(door.getIndexCode());
return model;
}
private Device initBroadcastDataByHkData(Device model, FetchAudioChannelInfoResponse device, Date date) {
@@ -596,7 +601,7 @@
private Device getExistedLed(LedRecordsInfoResponse device, List<Device> allList) {
if(allList.size()>0){
for(Device r : allList){
- if(StringUtils.equals(r.getHkId(), device.getIndexCode())){
+ if(StringUtils.equals(r.getHkId(), device.getModel_data_id())){
//琛ㄧず鏈垹闄�
return r;
}
@@ -687,7 +692,7 @@
private boolean isDeletedLedDevice(Device device, List<LedRecordsInfoResponse> allHkList) {
if(allHkList.size()>0){
for(LedRecordsInfoResponse r : allHkList){
- if(StringUtils.equals(device.getDoorId(), r.getIndexCode())){
+ if(StringUtils.equals(device.getDoorId(), r.getModel_data_id())){
//琛ㄧず鏈垹闄�
return false;
}
--
Gitblit v1.9.3