From 1a9da0b5ef171300a5f7968a8ce09b30f9d2f793 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 29 九月 2024 15:50:12 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
index c0fceca..aee048b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
@@ -105,7 +105,7 @@
//鏇存柊鐘舵�� (鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬)
for(PlatformStatusInfoResponse d : allHkList){
platformMapper.update(null,new UpdateWrapper<Platform>().lambda()
- .set(Platform::getStatus,d.getStatus())
+ .set(Platform::getPlatformStatus,d.getStatus())
.set(Platform::getEditDate,date)
.eq(Platform::getHkId,d.getPlatformId()));
}
@@ -165,7 +165,9 @@
editList.add(model);
//娓呯┖鐩戞帶鐐规暟鎹�
platformDeviceMapper.delete(new UpdateWrapper<PlatformDevice>().lambda()
- .eq(PlatformDevice::getPlatformId,model.getId()));
+ .eq(PlatformDevice::getPlatformId,model.getId())
+ .eq(PlatformDevice::getType,Constants.ONE)
+ );
deviceList.addAll(getCameraList(device.getCameras(),model));
}else{
//濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹�
@@ -183,7 +185,7 @@
private List<PlatformDevice> getCameraList(List<PlatformCameraInfoResponse> cameras, Platform model) {
List<PlatformDevice> list = new ArrayList<>();
- if(cameras!=null || cameras.size()>0){
+ if(cameras!=null && cameras.size()>0){
for(PlatformCameraInfoResponse param :cameras){
PlatformDevice d = new PlatformDevice();
d.setCreateDate(model.getCreateDate());
@@ -221,8 +223,6 @@
model.setRemark(JSONObject.toJSONString(device));
return model;
}
-
-
private Platform getExistedDevice(PlatformListInfoResponse device, List<Platform> allList) {
if(allList.size()>0){
--
Gitblit v1.9.3