From 07bac29912221490de32a7d79c5d8acd98c5b367 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 23 九月 2024 11:07:08 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
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..20c3a9f 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.getHkId(), r.getModel_data_id())){
//琛ㄧず鏈垹闄�
return false;
}
@@ -699,7 +704,7 @@
private boolean isDeletedBroadcastDevice(Device device, List<FetchAudioChannelInfoResponse> allHkList) {
if(allHkList.size()>0){
for(FetchAudioChannelInfoResponse r : allHkList){
- if(StringUtils.equals(device.getDoorId(), r.getAudioChannelIndexCode())){
+ if(StringUtils.equals(device.getHkId(), r.getAudioChannelIndexCode())){
//琛ㄧず鏈垹闄�
return false;
}
--
Gitblit v1.9.3