From b2a3663fd0ff21d09ad46343083394472c3604d1 Mon Sep 17 00:00:00 2001
From: "W.Y" <343887809@qq.com>
Date: Mon, 25 Sep 2023 16:46:53 +0800
Subject: [PATCH] =?UTF-8?q?[select]=20=E6=88=BF=E9=97=B4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/RoomAdminController.java   | 38 +++----------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
index f30969a..d86a850 100644
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
@@ -1,11 +1,9 @@
 package com.qiuguo.iot.user.api.controller;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.qiuguo.iot.data.entity.user.UserRoomEntity;
 import com.qiuguo.iot.data.request.user.UserRoomRequest;
 import com.qiuguo.iot.data.service.user.UserRoomService;
-import com.qiuguo.iot.user.api.service.TuyaDeviceConnector;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.web.api.crud.entity.PagerResult;
 import org.springframework.web.bind.annotation.*;
@@ -25,45 +23,26 @@ public class RoomAdminController {
     @Resource
     private UserRoomService roomService;
 
-    @Resource
-    private TuyaDeviceConnector deviceConnector;
-
     //新增
     @PostMapping("/save/room")
-    public Mono<Void> roomSave(@RequestBody JSONObject jsonObject) {
-        if (ObjectUtil.isNull(jsonObject)){
-            return null;
-        }
-        UserRoomEntity room = jsonObject.toJavaObject(UserRoomEntity.class);
-        if (ObjectUtil.isNull(room)){
-            //todo:解析json为空
-        }
+    public Mono<Void> roomSave(@RequestBody UserRoomEntity room) {
         room.setCreateTime(new Date());
         room.setIsDelete(1);
         room.setModifyTime(new Date());
-        roomService.insertUserRoom(room);
-        return Mono.empty();
+        return roomService.insertUserRoom(room).thenEmpty(Mono.empty());
     }
 
     //更新
     @PostMapping("/edit/room")
-    public Mono<JSONObject> editRoom(@RequestBody JSONObject jsonObject) {
-        if (ObjectUtil.isNull(jsonObject)){
-            return null;
-        }
-        UserRoomEntity room = jsonObject.toJavaObject(UserRoomEntity.class);
-        if (ObjectUtil.isNull(room)){
-            //todo:解析json为空
-        }
-        roomService.updateUserRoomById(room);
-        return Mono.empty();
+    public Mono<Integer> editRoom(@RequestBody UserRoomEntity room) {
+        return roomService.updateUserRoomById(room).map( integer -> integer);
     }
 
     //删除
     @GetMapping("/del/room")
     public Mono<Integer> delFamily(@RequestParam Long id) {
         if (ObjectUtil.isNull(id)){
-            //todo:为空
+            throw new RuntimeException("传入id为空");
         }
        return roomService.deleteUserRoomById(id);
     }
@@ -72,12 +51,5 @@ public class RoomAdminController {
     @PostMapping("/get/room")
     public Mono<PagerResult<UserRoomEntity>> getFamily(@RequestBody UserRoomRequest resp) {
        return roomService.selectUserRoomsByRequest(resp);
-        /**
-         * 判空
-         * 查询对应设备id
-         * 调用TuyaDeviceConnector.getByid接口
-         * 返回
-         */
-        //return Mono.just(aa);
     }
 }