From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 24 九月 2024 09:15:08 +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 | 6 ++---- 1 files changed, 2 insertions(+), 4 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..4935818 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())); } @@ -183,7 +183,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 +221,6 @@ model.setRemark(JSONObject.toJSONString(device)); return model; } - - private Platform getExistedDevice(PlatformListInfoResponse device, List<Platform> allList) { if(allList.size()>0){ -- Gitblit v1.9.3