Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java

@@ -93,6 +93,8 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
 
                         List<DeviceEntity> oldDeviceList = deviceService.find(new DeviceQuery().siteId(site.getId()));
                         Map<String, DeviceEntity> oldDeviceMap = oldDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
+                        Map<String, DeviceEntity> newDeviceMap = newDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
+
                         List<DeviceEntity> updateDeviceLsit = newDeviceList.stream().map(item -> {
                             if (oldDeviceMap.containsKey(item.getDeviceCode())) {
                                 item.setId(oldDeviceMap.get(item.getDeviceCode()).getId());
@@ -116,6 +118,14 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
                             return null;
                         }).filter(f -> f != null).collect(Collectors.toList());
 
+                        //做差集
+                        List<Long> delDeviceList = oldDeviceList.stream().map(item -> {
+                            if (!newDeviceMap.containsKey(item.getDeviceCode())) {
+                                return item.getId();
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
                         if (!ObjectUtils.isEmpty(updateDeviceLsit)) {
                             log.info("设备更新，size:{}", updateDeviceLsit.size());
                             deviceService.update(updateDeviceLsit);
@@ -125,6 +135,11 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
                             log.info("设备新增，size:{}", saveDeviceList.size());
                             deviceService.save(saveDeviceList);
                         }
+
+                        if (!ObjectUtils.isEmpty(delDeviceList)) {
+                            log.info("设备删除，size:{}", delDeviceList.size());
+                            deviceService.remove(delDeviceList,null);
+                        }
                     }
                 } else {
                     log.info("设备列表查询异常，{}", JSON.toJSONString(deviceRest));