1.app返回结构由CommonResponseUtil.success()-》ResponseHelper.buildResponse

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -528,19 +528,19 @@ public class CheckController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "维保记录排序条件列表", notes = "维保记录排序条件列表")
     @RequestMapping(value = "/orderBy/list", method = RequestMethod.GET)
-    public CommonResponse getOrderByList() {
-        return CommonResponseUtil.success(CheckRecordOrderByEnum.getEnumList());
+    public ResponseModel getOrderByList() {
+        return ResponseHelper.buildResponse(CheckRecordOrderByEnum.getEnumList());
     }
 
     @ApiOperation(value = "/设备设施维保记录分页列表",notes = "外部接口装备和者水源使用")
     @GetMapping(value = "page/{originalId}/list")
-    public CommonResponse getCheckListByOriginalId(
+    public ResponseModel getCheckListByOriginalId(
             @PathVariable String originalId,
             @RequestParam(value = "current") int pageNum,
             @RequestParam(value = "size") int pageSize
             ){
         CommonPageable pageable = new CommonPageable(pageNum,pageSize);
-        return CommonResponseUtil.success(checkService.getCheckListByOriginalId(originalId,pageable));
+        return ResponseHelper.buildResponse(checkService.getCheckListByOriginalId(originalId,pageable));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

@@ -27,6 +27,8 @@ import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
@@ -47,6 +49,7 @@ public class PlanTaskController extends AbstractBaseController {
 
     /**
      * 计划执行查询
+     *
      * @param queryRequests
      * @param commonPageable
      * @return
@@ -196,10 +199,10 @@ public class PlanTaskController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保任务查询-mobile", notes = "根据用户条件查询所有计划任务-mobile")
     @RequestMapping(value = "/queryPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse qryLoginUserPlanTask(
+    public ResponseModel<Page<Map<String, Object>>> qryLoginUserPlanTask(
             @ApiParam(value = "人员") @RequestParam(value = "userId", required = false) Long userId,
-            @ApiParam(value = "开始日期") @RequestParam(value = "startDate",required = false) String startTime,
-            @ApiParam(value = "结束日期") @RequestParam(value = "endDate",required = false) String endTime,
+            @ApiParam(value = "开始日期") @RequestParam(value = "startDate", required = false) String startTime,
+            @ApiParam(value = "结束日期") @RequestParam(value = "endDate", required = false) String endTime,
             @ApiParam(value = "维保状态") @RequestParam(value = "finishStatus", required = false) Integer finishStatus,
             @ApiParam(value = "排序条件") @RequestParam(value = "orderBy", defaultValue = "1") String orderBy,
             @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
@@ -218,13 +221,13 @@ public class PlanTaskController extends AbstractBaseController {
         params.put("finishStatus", finishStatus);
         params.put("orderBy", PlanTaskOrderByEnum.getEumByCode(orderBy).getOderBy());
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
-        return CommonResponseUtil.success(planTaskService.getPlanTasks(params, pageable));
+        return ResponseHelper.buildResponse(planTaskService.getPlanTasks(params, pageable));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保设施分页列表-mobile", notes = "维保设施分页列表-mobile")
     @RequestMapping(value = "/point/{planTaskId}/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse qryPlanTaskById(
+    public ResponseModel qryPlanTaskById(
             @ApiParam(value = "巡检计划任务ID", required = true) @PathVariable Long planTaskId,
             @ApiParam(value = "建筑id", required = true) @RequestParam(value = "buildingId", required = false) String buildingId,
             @ApiParam(value = "维保状态", required = true) @RequestParam(value = "isFinish", required = false) String isFinish,
@@ -239,39 +242,37 @@ public class PlanTaskController extends AbstractBaseController {
         param.put("systemId", systemId);
         param.put("pointNo", pointNo);
         param.put("pointName", pointName);
-        return CommonResponseUtil.success(planTaskService.getPlanTaskPoints(param));
+        return ResponseHelper.buildResponse(planTaskService.getPlanTaskPoints(param));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "查询维保设施，检查内容详情")
     @GetMapping(value = "/task-point-detail")
-    public CommonResponse planTaskPointDetail(
+    public ResponseModel planTaskPointDetail(
             @RequestParam(value = "routePointId") String routePointId,
             @RequestParam(value = "id") String planTaskDetailId
     ) {
-        return CommonResponseUtil.success(planTaskService.planTaskPointDetail(planTaskDetailId, routePointId));
+        return ResponseHelper.buildResponse(planTaskService.planTaskPointDetail(planTaskDetailId, routePointId));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保设施完成状态下拉列表")
     @GetMapping(value = "/taskDetail/finishStatus/list")
-    public CommonResponse planTaskPointDetail() {
-        return CommonResponseUtil.success(PlanTaskDetailIsFinishEnum.getEnumList());
+    public ResponseModel planTaskPointDetail() {
+        return ResponseHelper.buildResponse(PlanTaskDetailIsFinishEnum.getEnumList());
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "计划任务完成状态列表", notes = "计划任务完成状态列表")
     @RequestMapping(value = "/finishStatus/list", method = RequestMethod.GET)
-    public CommonResponse getPlanTaskFinishStatus() {
-        return CommonResponseUtil.success(PlanTaskFinishStatusEnum.getEnumList());
+    public ResponseModel getPlanTaskFinishStatus() {
+        return ResponseHelper.buildResponse(PlanTaskFinishStatusEnum.getEnumList());
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "维保任务排序条件", notes = "维保任务排序条件")
     @RequestMapping(value = "/orderBy/list", method = RequestMethod.GET)
-    public CommonResponse getOrderByList() {
-        return CommonResponseUtil.success(PlanTaskOrderByEnum.getEnumList());
+    public ResponseModel getOrderByList() {
+        return ResponseHelper.buildResponse(PlanTaskOrderByEnum.getEnumList());
     }
-
-
 }
\ No newline at end of file