From 0e35f7cdaecc1c05f6a28784c2d66ce623ff77f1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 09 十月 2024 10:23:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java | 8 +++-----
1 files changed, 3 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 4935818..b418e56 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
@@ -12,7 +12,6 @@
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.business.DeviceMapper;
import com.doumee.dao.business.PlatformDeviceMapper;
import com.doumee.dao.business.PlatformMapper;
import com.doumee.dao.business.model.Device;
@@ -24,7 +23,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -35,7 +33,6 @@
*/
@Service
public class HkSyncPlatformsServiceImpl extends HkSyncBaseServiceImpl {
-
@Autowired
private PlatformMapper platformMapper;
@Autowired
@@ -165,7 +162,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{
//濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹�
@@ -255,7 +254,6 @@
}
}
return true;
-
}
}
--
Gitblit v1.9.3