From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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..be1567d 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
@@ -1,8 +1,6 @@
package com.doumee.service.business.impl.hksync;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.aliyun.tea.TeaException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.core.constants.ResponseStatus;
@@ -16,9 +14,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.DeviceMapper;
-import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.model.Device;
-import com.doumee.dao.business.model.Parks;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,10 +30,8 @@
*/
@Service
public class HkSyncDeviceServiceImpl extends HkSyncBaseServiceImpl {
-
@Autowired
private DeviceMapper deviceMapper;
-
/**
* 鍚屾娴峰悍闂ㄧ璁惧鏁版嵁
* @param param
@@ -444,12 +438,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 +595,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 +686,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 +698,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