fix

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeController.java

@@ -1,13 +1,11 @@
 package com.ym.mec.web.controller.degree;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.microsvc.toolkit.common.response.template.R;
-import com.ym.mec.biz.dal.entity.Degree;
-import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
-import com.ym.mec.biz.service.DegreeService;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -21,13 +19,18 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.ym.mec.biz.service.DegreeService;
+import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
+import com.ym.mec.biz.dal.entity.Degree;
 
 @Slf4j
 @Validated
 @RestController
 @RequestMapping("/degree")
 @Api(tags = "考级信息")
-public class DegreeController {
+public class DegreeController extends BaseController {
 
     @Autowired
     private DegreeService degreeService;
@@ -35,50 +38,50 @@ public class DegreeController {
 	@ApiOperation(value = "详情", notes = "考级信息-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('degree/detail')")
     @GetMapping("/detail/{id}")
-    public R<Degree> detail(@PathVariable("id") Long id) {
+    public HttpResponseResult<Degree> detail(@PathVariable("id") Long id) {
     
     	Degree wrapper = degreeService.detail(id);
         
-        return R.from(wrapper);
+        return succeed(wrapper);
 	}
     
-    @ApiOperation(value = "查询分页", notes = "考级信息- 传入 DegreeWrapper.DegreeQuery")
+    @ApiOperation(value = "查询分页", notes = "考级信息- 传入 DegreeWrapper.DegreeQuery") 
     @PreAuthorize("@pcs.hasPermissions('degree/page')")
     @PostMapping("/page")
-    public R<PageInfo<Degree>> page(@RequestBody DegreeWrapper.DegreeQuery query) {
+    public HttpResponseResult<PageInfo<Degree>> page(@RequestBody DegreeWrapper.DegreeQuery query) {
         
         IPage<Degree> pages = degreeService.selectPage(QueryInfo.getPage(query), query);
         
-        return R.from(QueryInfo.pageInfo(pages));
+        return succeed(QueryInfo.pageInfo(pages));
 	}
     
     @ApiOperation(value = "新增", notes = "考级信息- 传入 DegreeWrapper.Degree")
     @PreAuthorize("@pcs.hasPermissions('degree/save')")
 	@PostMapping("/save")
-	public R<JSONObject> add(@Validated @RequestBody Degree degree) {
+	public HttpResponseResult<JSONObject> add(@Validated @RequestBody Degree degree) {
         
         // 新增数据
         degreeService.save(degree);
         
-        return R.defaultR();
+        return succeed();
 	}
     
     @ApiOperation(value = "修改", notes = "考级信息- 传入 DegreeWrapper.Degree")
     @PreAuthorize("@pcs.hasPermissions('degree/update')")
 	@PostMapping("/update")
-	public R<JSONObject> update(@Validated @RequestBody Degree degree) {
+	public HttpResponseResult<JSONObject> update(@Validated @RequestBody Degree degree) {
         
         // 更新数据
         degreeService.updateById(degree);
         
-        return R.defaultR();
+        return succeed();
 	}
 
 	@ApiOperation(value = "删除", notes = "考级信息- 传入id")
     @PreAuthorize("@pcs.hasPermissions('degree/remove')")
-	@PostMapping("/remove")
-	public R<Boolean> remove(@RequestParam Long id) {
+	@PostMapping("/remove")    
+	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
     
-		return R.from(degreeService.removeById(id));
+		return succeed(degreeService.removeById(id));
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeLevelFeeController.java

@@ -1,13 +1,12 @@
 package com.ym.mec.web.controller.degree;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.microsvc.toolkit.common.response.template.R;
+
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
-import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
-import com.ym.mec.biz.service.DegreeLevelFeeService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -21,13 +20,17 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.ym.mec.biz.service.DegreeLevelFeeService;
+import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
 
 @Slf4j
 @Validated
 @RestController
 @RequestMapping("/degreeLevelFee")
 @Api(tags = "考级等级费用配置")
-public class DegreeLevelFeeController {
+public class DegreeLevelFeeController extends BaseController {
 
     @Autowired
     private DegreeLevelFeeService degreeLevelFeeService;
@@ -35,50 +38,50 @@ public class DegreeLevelFeeController {
 	@ApiOperation(value = "详情", notes = "考级等级费用配置-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/detail')")
     @GetMapping("/detail/{id}")
-    public R<DegreeLevelFeeNew> detail(@PathVariable("id") Long id) {
-    
-    	DegreeLevelFeeNew wrapper = degreeLevelFeeService.detail(id);
+    public HttpResponseResult<DegreeLevelFeeNew> detail(@PathVariable("id") Long id) {
+
+        DegreeLevelFeeNew wrapper = degreeLevelFeeService.detail(id);
         
-        return R.from(wrapper);
+        return succeed(wrapper);
 	}
     
-    @ApiOperation(value = "查询分页", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFeeQuery")
+    @ApiOperation(value = "查询分页", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFeeQuery") 
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/page')")
     @PostMapping("/page")
-    public R<PageInfo<DegreeLevelFeeNew>> page(@RequestBody DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
+    public HttpResponseResult<PageInfo<DegreeLevelFeeNew>> page(@RequestBody DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
         
         IPage<DegreeLevelFeeNew> pages = degreeLevelFeeService.selectPage(QueryInfo.getPage(query), query);
         
-        return R.from(QueryInfo.pageInfo(pages));
+        return succeed(QueryInfo.pageInfo(pages));
 	}
     
     @ApiOperation(value = "新增", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFee")
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/save')")
 	@PostMapping("/save")
-	public R<JSONObject> add(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
+	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
         
         // 新增数据
         degreeLevelFeeService.save(degreeLevelFee);
         
-        return R.defaultR();
+        return succeed();
 	}
     
     @ApiOperation(value = "修改", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFee")
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/update')")
 	@PostMapping("/update")
-	public R<JSONObject> update(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
+	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
         
         // 更新数据
         degreeLevelFeeService.updateById(degreeLevelFee);
         
-        return R.defaultR();
+        return succeed();
 	}
 
 	@ApiOperation(value = "删除", notes = "考级等级费用配置- 传入id")
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/remove')")
 	@PostMapping("/remove")    
-	public R<Boolean> remove(@RequestParam Long id) {
+	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
     
-		return R.from(degreeLevelFeeService.removeById(id));
+		return succeed(degreeLevelFeeService.removeById(id));
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeNewsController.java

@@ -1,13 +1,12 @@
 package com.ym.mec.web.controller.degree;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.common.response.template.R;
-import com.ym.mec.biz.dal.entity.DegreeNews;
-import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
-import com.ym.mec.biz.service.DegreeNewsService;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -21,64 +20,69 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.ym.mec.biz.service.DegreeNewsService;
+import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
+import com.ym.mec.biz.dal.entity.DegreeNews;
 
 @Slf4j
 @Validated
 @RestController
 @RequestMapping("/degreeNews")
 @Api(tags = "考级资讯表")
-public class DegreeNewsController {
+public class DegreeNewsController extends BaseController {
 
     @Autowired
     private DegreeNewsService degreeNewsService;
 
 	@ApiOperation(value = "详情", notes = "考级资讯表-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@pcs.hasPermissions('degreeNews/detail')")
+    @PreAuthorize("@pcs.hasPermissions(degreeNews'/detail')")
     @GetMapping("/detail/{id}")
-    public R<DegreeNews> detail(@PathVariable("id") Long id) {
+    public HttpResponseResult<DegreeNews> detail(@PathVariable("id") Long id) {
     
     	DegreeNews wrapper = degreeNewsService.detail(id);
         
-        return R.from(wrapper);
+        return succeed(wrapper);
 	}
     
-    @ApiOperation(value = "查询分页", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNewsQuery")
-    @PreAuthorize("@pcs.hasPermissions('degreeNews/page')")
+    @ApiOperation(value = "查询分页", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNewsQuery") 
+    @PreAuthorize("@pcs.hasPermissions(degreeNews'/page')")    
     @PostMapping("/page")
-    public R<PageInfo<DegreeNews>> page(@RequestBody DegreeNewsWrapper.DegreeNewsQuery query) {
+    public HttpResponseResult<PageInfo<DegreeNews>> page(@RequestBody DegreeNewsWrapper.DegreeNewsQuery query) {
         
         IPage<DegreeNews> pages = degreeNewsService.selectPage(QueryInfo.getPage(query), query);
         
-        return R.from(QueryInfo.pageInfo(pages));
+        return succeed(QueryInfo.pageInfo(pages));
 	}
     
     @ApiOperation(value = "新增", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNews")
-    @PreAuthorize("@pcs.hasPermissions('degreeNews/save')")
+    @PreAuthorize("@pcs.hasPermissions(degreeNews'/save')")
 	@PostMapping("/save")
-	public R<JSONObject> add(@Validated @RequestBody DegreeNews degreeNews) {
+	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeNews degreeNews) {
         
         // 新增数据
         degreeNewsService.save(degreeNews);
         
-        return R.defaultR();
+        return succeed();
 	}
     
     @ApiOperation(value = "修改", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNews")
-    @PreAuthorize("@pcs.hasPermissions('degreeNews/update')")
+    @PreAuthorize("@pcs.hasPermissions(degreeNews'/update')")
 	@PostMapping("/update")
-	public R<JSONObject> update(@Validated @RequestBody DegreeNews degreeNews) {
+	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeNews degreeNews) {
         
         // 更新数据
         degreeNewsService.updateById(degreeNews);
         
-        return R.defaultR();
+        return succeed();
 	}
 
 	@ApiOperation(value = "删除", notes = "考级资讯表- 传入id")
-    @PreAuthorize("@pcs.hasPermissions('degreeNews/remove')")
+    @PreAuthorize("@pcs.hasPermissions(degreeNews'/remove')")
 	@PostMapping("/remove")    
-	public R<Boolean> remove(@RequestParam Long id) {
+	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
     
-		return R.from(degreeNewsService.removeById(id));
+		return succeed(degreeNewsService.removeById(id));
 	}
 }