第二版

src/main/java/com/care/bms/service/DeviceService.java

@@ -172,12 +172,6 @@ public class DeviceService {
     @Transactional(rollbackFor = Exception.class)
     public void updateDevice(DeviceVO vo) {
 
-        List<OrderOlderVO> orderOlderVOList = vo.getOrderOlderVOList();
-        List<OrderContactorVO> orderContactorVOList = vo.getOrderContactorVOList();
-
-        if(CollUtil.isEmpty(orderOlderVOList) || CollUtil.isEmpty(orderContactorVOList)) {
-            return;
-        }
 
         //保存设备
         CareDevice device = this.careDeviceService.getById(vo.getId());
@@ -217,8 +211,8 @@ public class DeviceService {
 
         if (careMemberInfo != null) { //关联,
             device.setMemberId(careMemberInfo.getId());
-        } else { //置空
-            device.setMemberId(null);//TODO,是否生效？
+        } else { //todo 置空,null 不生效，暂时置为0
+            device.setMemberId(0L);
         }
 
 
@@ -230,42 +224,50 @@ public class DeviceService {
             Long time = System.currentTimeMillis();
             device.setClientId(HexUtil.toHex(time));
         }
-
         device.setModifyTime(new Date());
         this.careDeviceService.updateById(device);
 
+        //被监护人
+        List<OrderOlderVO> orderOlderVOList = vo.getOrderOlderVOList();
         List<Long> olderIdUpdates = new ArrayList<>();
-        orderOlderVOList.forEach(item -> {
-            CareOlder careOlder = new CareOlder();
-            BeanUtil.copyProperties(item, careOlder);
-            if(careOlder.getId() != null) {//修改
-                careOlder.setModifyTime(new Date());
-                olderIdUpdates.add(careOlder.getId());
-                careOlderService.updateById(careOlder);
-            } else { //新增
-                careOlder.setOrgId(device.getOrgId());
-                careOlder.setStationId(device.getStationId());
-                careOlder.setCreateTime(new Date());
-                careOlderService.save(careOlder);
-            }
+        if(CollUtil.isNotEmpty(orderOlderVOList)){
+            orderOlderVOList.forEach(item -> {
+                CareOlder careOlder = new CareOlder();
+                BeanUtil.copyProperties(item, careOlder);
+                if(careOlder.getId() != null) {//修改
+                    careOlder.setModifyTime(new Date());
+                    olderIdUpdates.add(careOlder.getId());
+                    careOlderService.updateById(careOlder);
+                } else { //新增
+                    careOlder.setOrgId(device.getOrgId());
+                    careOlder.setStationId(device.getStationId());
+                    careOlder.setCreateTime(new Date());
+                    careOlderService.save(careOlder);
+                }
 
-        });
+            });
+        }
 
+        //联系人
+        List<OrderContactorVO> orderContactorVOList = vo.getOrderContactorVOList();
         List<Long> contactIdUpdates = new ArrayList<>();
-        orderContactorVOList.forEach(item -> {
-            CareHouseContact careHouseContact = new CareHouseContact();
-            BeanUtil.copyProperties(item, careHouseContact);
-            if(careHouseContact.getId() != null) {//修改
-                careHouseContact.setModifyTime(new Date());
-                contactIdUpdates.add(careHouseContact.getId());
-                careHouseContactService.updateById(careHouseContact);
-            } else { //新增
-                careHouseContact.setOrgId(device.getOrgId());
-                careHouseContact.setStationId(device.getStationId());
-                careHouseContact.setCreateTime(new Date());
-                careHouseContactService.save(careHouseContact);
-            }
-        });
+        if(CollUtil.isNotEmpty(orderContactorVOList)){
+            orderContactorVOList.forEach(item -> {
+                CareHouseContact careHouseContact = new CareHouseContact();
+                BeanUtil.copyProperties(item, careHouseContact);
+                if(careHouseContact.getId() != null) {//修改
+                    careHouseContact.setModifyTime(new Date());
+                    contactIdUpdates.add(careHouseContact.getId());
+                    careHouseContactService.updateById(careHouseContact);
+                } else { //新增
+                    careHouseContact.setOrgId(device.getOrgId());
+                    careHouseContact.setStationId(device.getStationId());
+                    careHouseContact.setCreateTime(new Date());
+                    careHouseContactService.save(careHouseContact);
+                }
+            });
+
+        }
 
         //处理删除部分
         //查询出来数据库里已经有的