瀏覽代碼

代码优化

donglang 2 月之前
父節點
當前提交
0fa3e36834

+ 2 - 2
iot-platform-manager/src/main/java/com/platform/controller/IotModController.java

@@ -31,8 +31,8 @@ public class IotModController {
      * 分页查询物理模型
      */
     @PostMapping("/pageModList")
-    public PageResult<IotModResp> pageModList(@RequestBody IotModRequest request) {
-        return iotModManage.pageModList(request);
+    public BaseResult<PageResult<IotModResp>> pageModList(@RequestBody IotModRequest request) {
+        return BaseResult.success(iotModManage.pageModList(request));
     }
 
     /**

+ 2 - 2
iot-platform-manager/src/main/java/com/platform/controller/IotModGroupController.java

@@ -29,8 +29,8 @@ public class IotModGroupController {
      * 分页查询物理模型分组
      */
     @PostMapping("/pageModGroupList")
-    public PageResult<IotModGroupPageResp> pageModList(@RequestBody IotModGroupRequest request) {
-        return iotModGroupManage.pageModGroupList(request);
+    public BaseResult<PageResult<IotModGroupPageResp>> pageModList(@RequestBody IotModGroupRequest request) {
+        return BaseResult.success(iotModGroupManage.pageModGroupList(request));
     }
 
     /**

+ 2 - 2
iot-platform-manager/src/main/java/com/platform/response/modGroup/IotModGroupPageResp.java

@@ -53,9 +53,9 @@ public class IotModGroupPageResp {
         IotModGroupPageResp iotModDetailResp = IotModGroupPageResp.getInstance();
         iotModDetailResp.setId(iotModGroup.getId());
         iotModDetailResp.setCompanyId(iotModGroup.getCompanyId());
-        iotModDetailResp.setTenantId(iotModDetailResp.getTenantId());
+        iotModDetailResp.setTenantId(null);
         iotModDetailResp.setModeGroupCode(iotModGroup.getModeGroupCode());
-        iotModDetailResp.setName(iotModDetailResp.getName());
+        iotModDetailResp.setName(iotModGroup.getName());
         return iotModDetailResp;
 
     }