修改同步用户

smart-office-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java

@@ -76,8 +76,6 @@ public class DeviceCallbackController {
         if (!ObjectUtils.isEmpty(deviceEntity)) {
             throw new AppException(DEVICE_CODE_IS_EXIST, DEVICE_CODE_IS_EXIST_CONTENT);
         }
-
-
         deviceEntity = new DeviceEntity();
         deviceEntity.initAttrValue();
         deviceEntity.setDeviceName(req.getDeviceName());
@@ -87,7 +85,6 @@ public class DeviceCallbackController {
         deviceEntity.setSiteCode(req.getSiteCode());
         deviceEntity.setSiteName(req.getSiteName());
         deviceEntity.setProductCode(req.getProductCode());
-
         deviceEntity.setIp(req.getIp());
         deviceEntity.setCenternum(req.getCenternum());
         deviceEntity.setPort(req.getPort());
@@ -101,31 +98,35 @@ public class DeviceCallbackController {
     }
 
     private void deviceUpdate(DeviceReq req) throws AppException {
-        log.info("【设备更新】【请求体】-->  " + JSONObject.toJSONString(req));
+        log.info("【设备更新或新增】【请求体】-->  " + JSONObject.toJSONString(req));
         //根据设备编码查询设备
         DeviceEntity deviceEntity = deviceService.selectOne(new DeviceQuery().deviceCode(req.getDeviceCode()));
 
         if (ObjectUtils.isEmpty(deviceEntity)) {
-            throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT);
+            //不存在设备 则新增
+            this.deviceAdd(req);
+        }else{
+            log.info("设备更新~");
+            deviceEntity.setDeviceName(req.getDeviceName());
+            deviceEntity.setDeviceCode(req.getDeviceCode());
+            deviceEntity.setDeviceMac(req.getDeviceCode());
+            deviceEntity.setSiteId(req.getSiteId());
+            deviceEntity.setSiteCode(req.getSiteCode());
+            deviceEntity.setSiteName(req.getSiteName());
+
+            deviceEntity.setProductCode(req.getProductCode());
+            deviceEntity.setIp(req.getIp());
+            deviceEntity.setCenternum(req.getCenternum());
+            deviceEntity.setPort(req.getPort());
+            deviceEntity.setDeviceRemark(req.getDeviceRemark());
+            deviceEntity.setUpdateUserId(1L);
+            deviceEntity.setUpdateTime(new Date());
+            deviceEntity.setLeadingOfficial(req.getLeadingOfficial());
+            deviceEntity.setDeviceInFloor(req.getDeviceInFloor());
+            deviceEntity.setDeviceInBuilding(req.getDeviceInBuilding());
+            deviceService.update(deviceEntity);
         }
-        deviceEntity.setDeviceName(req.getDeviceName());
-        deviceEntity.setDeviceCode(req.getDeviceCode());
-        deviceEntity.setDeviceMac(req.getDeviceCode());
-        deviceEntity.setSiteId(req.getSiteId());
-        deviceEntity.setSiteCode(req.getSiteCode());
-        deviceEntity.setSiteName(req.getSiteName());
 
-        deviceEntity.setProductCode(req.getProductCode());
-        deviceEntity.setIp(req.getIp());
-        deviceEntity.setCenternum(req.getCenternum());
-        deviceEntity.setPort(req.getPort());
-        deviceEntity.setDeviceRemark(req.getDeviceRemark());
-        deviceEntity.setUpdateUserId(1L);
-        deviceEntity.setUpdateTime(new Date());
-        deviceEntity.setLeadingOfficial(req.getLeadingOfficial());
-        deviceEntity.setDeviceInFloor(req.getDeviceInFloor());
-        deviceEntity.setDeviceInBuilding(req.getDeviceInBuilding());
-        deviceService.update(deviceEntity);
 
     }
 

smart-office-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -65,14 +65,20 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
     @Override
     protected void saveAfter(DeviceEntity entity, Context context) throws AppException {
         super.saveAfter(entity, context);
-        RoomDeviceEntity roomDeviceEntity = new RoomDeviceEntity();
-        roomDeviceEntity.initAttrValue();
-        roomDeviceEntity.setRoomId(entity.getRoomId());
-        roomDeviceEntity.setRoomName(entity.getRoomName());
-        roomDeviceEntity.setDeviceId(entity.getId());
-        roomDeviceEntity.setDeviceCode(entity.getDeviceCode());
-        roomDeviceEntity.setDeviceName(entity.getDeviceName());
-        roomDeviceService.save(roomDeviceEntity, context);
+
+        if(!ObjectUtils.isEmpty(entity.getRoomId())){
+            RoomDeviceEntity roomDeviceEntity = new RoomDeviceEntity();
+            roomDeviceEntity.initAttrValue();
+            roomDeviceEntity.setRoomId(entity.getRoomId());
+            roomDeviceEntity.setRoomName(entity.getRoomName());
+            roomDeviceEntity.setDeviceId(entity.getId());
+            roomDeviceEntity.setDeviceCode(entity.getDeviceCode());
+            roomDeviceEntity.setDeviceName(entity.getDeviceName());
+            roomDeviceEntity.setCreateTime(new Date());
+            roomDeviceEntity.setCreateUserId(this.getContextUserId(context));
+            roomDeviceService.save(roomDeviceEntity, context);
+        }
+
     }
 
     @Override