From ad5af00b7ae7af3c5e6375ccff237df8254d3c3f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 19:03:52 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 adf320c..10e2a89 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
@@ -105,7 +102,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 +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{
//濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹�
@@ -183,13 +182,13 @@
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());
d.setPlatformId(model.getId());
d.setIsdeleted(Constants.ZERO);
- d.setDeviceId(param.getCameraIdompan());
+ d.setDeviceId(param.getCameraId());
d.setName(param.getCameraName());
d.setType(Constants.ONE);
list.add(d);
@@ -255,7 +254,6 @@
}
}
return true;
-
}
}
--
Gitblit v1.9.3