wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期

Browse Source 
# Conflicts:
#	iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
This commit is contained in:
weiyachao 2023-09-25 16:53:24 +08:00
commit 7a18f92d6e
1 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
View File

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