完善设备管理模块代码开发

iot-platform-manager/src/main/java/com/platform/controller/IotDeviceGroupController.java

@@ -1,5 +1,7 @@
 package com.platform.controller;
 
+import com.platform.exception.BaseResult;
+import com.platform.exception.PageResult;
 import com.platform.manage.IotDeviceGroupManage;
 import com.platform.request.deviceGroup.DeviceGroupDetailReq;
 import com.platform.request.deviceGroup.IotDeviceGroupRequest;
@@ -22,28 +24,36 @@ public class IotDeviceGroupController {
 
     private final IotDeviceGroupManage iotDeviceGroupManage;
 
+    /**
+     * 分页查询物联设备
+     */
+    @PostMapping("/pageGroupDevice")
+    public PageResult<DeviceGroupPageResp> pageGroupDevice(@RequestBody DeviceGroupDetailReq req) {
+        return iotDeviceGroupManage.pageGroupDevice(req);
+    }
+
     /**
      * 添加物联网设备
      */
     @PostMapping("/addDeviceGroup")
-    public HttpResult<Boolean> addDeviceGroup(@RequestBody IotDeviceGroupRequest request) {
-        return HttpResult.success(iotDeviceGroupManage.addDeviceGroup(request));
+    public BaseResult<Boolean> addDeviceGroup(@RequestBody IotDeviceGroupRequest request) {
+        return BaseResult.success(iotDeviceGroupManage.addDeviceGroup(request));
     }
 
     /**
      * 修改物联网设备
      */
     @PostMapping("/updateDeviceGroup")
-    public HttpResult<Boolean> updateDeviceGroup(@RequestBody IotDeviceGroupRequest request) {
-        return HttpResult.success(iotDeviceGroupManage.updateDeviceGroup(request));
+    public BaseResult<Boolean> updateDeviceGroup(@RequestBody IotDeviceGroupRequest request) {
+        return BaseResult.success(iotDeviceGroupManage.updateDeviceGroup(request));
     }
 
     /**
      * 删除物联网设备
      */
     @GetMapping("/delDeviceGroup")
-    public HttpResult<Boolean> delDeviceGroup(@RequestParam("deviceGroupCode") String deviceGroupCode) {
-        return HttpResult.success(iotDeviceGroupManage.delDeviceGroup(deviceGroupCode));
+    public BaseResult<Boolean> delDeviceGroup(@RequestParam("deviceGroupCode") String deviceGroupCode) {
+        return BaseResult.success(iotDeviceGroupManage.delDeviceGroup(deviceGroupCode));
     }
 
 
@@ -51,14 +61,8 @@ public class IotDeviceGroupController {
      * 物联设备详情查询
      */
     @PostMapping("/getDeviceGroupDetail")
-    public HttpResult<DeviceGroupDetailResp> getDeviceGroupDetail(@RequestBody DeviceGroupDetailReq req) {
-        return HttpResult.success(iotDeviceGroupManage.getDeviceGroupDetail(req));
-    }
-    /**
-     * 分页查询物联设备
-     */
-    @PostMapping("/pageGroupDevice")
-    public HttpResult<DeviceGroupPageResp> pageGroupDevice(@RequestBody DeviceGroupDetailReq req) {
-        return HttpResult.success(iotDeviceGroupManage.pageGroupDevice(req));
+    public BaseResult<DeviceGroupDetailResp> getDeviceGroupDetail(@RequestBody DeviceGroupDetailReq req) {
+        return BaseResult.success(iotDeviceGroupManage.getDeviceGroupDetail(req));
     }
+
 }

iot-platform-manager/src/main/java/com/platform/manage/IotDeviceGroupManage.java

@@ -3,6 +3,7 @@ package com.platform.manage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.platform.entity.IotDeviceGroup;
 import com.platform.exception.BusinessException;
+import com.platform.exception.PageResult;
 import com.platform.request.deviceGroup.DeviceGroupDetailReq;
 import com.platform.request.deviceGroup.IotDeviceGroupRequest;
 import com.platform.response.deviceGroup.DeviceGroupPageResp;
@@ -21,7 +22,16 @@ import java.util.Objects;
 @Service
 @RequiredArgsConstructor
 public class IotDeviceGroupManage {
+
     private final IotDeviceGroupService iotDeviceGroupService;
+
+    public PageResult<DeviceGroupPageResp> pageGroupDevice(DeviceGroupDetailReq req) {
+        //todo 设置参数
+        IotDeviceGroup iotDeviceGroup = new IotDeviceGroup();
+        Page page = iotDeviceGroupService.pageGroupDevice(req.getPageNum(),req.getPageSize(),iotDeviceGroup);
+        return null;
+    }
+
     public Boolean addDeviceGroup(IotDeviceGroupRequest request) {
         IotDeviceGroup oneByName = iotDeviceGroupService.getOneByTitle(request.getTitle());
         if (Objects.nonNull(oneByName)){
@@ -56,10 +66,4 @@ public class IotDeviceGroupManage {
         return DeviceGroupDetailResp.getInstance();
     }
 
-    public DeviceGroupPageResp pageGroupDevice(DeviceGroupDetailReq req) {
-        //todo 设置参数
-        IotDeviceGroup iotDeviceGroup = new IotDeviceGroup();
-        Page page = iotDeviceGroupService.pageGroupDevice(req.getPageNum(),req.getPageSize(),iotDeviceGroup);
-        return null;
-    }
 }