From 969593ea90a18531555f6ce9104a3de55389a5e7 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 05 Mar 2021 15:02:37 +0800
Subject: [PATCH] 修改扣费的条件判断
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
index d0be6a6..69ae1b9 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
@@ -12,9 +12,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@@ -38,17 +41,14 @@
* 列表
*/
@ApiOperation(value = "查询列表")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
- @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
- })
- @GetMapping
- public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
- }
- return ResultBody.ok().data(sysAreaService.findList(params));
+ @GetMapping("/findAlls")
+ public PageResult<SysArea> findAlls(@RequestParam Map<String, Object> params) {
+ return sysAreaService.findList(params);
+ }
+ @ApiOperation(value = "查询列表")
+ @GetMapping("/getListByMap")
+ public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
+ return sysAreaService.getListByMap(params);
}
/**
@@ -77,9 +77,25 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysArea sysArea, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
+ //如果父级id是空的，默认填-1
+ if (sysArea.getAreaParentId()==null) {
+ sysArea.setAreaParentId(-1L);
+ }
+ //添加的时候得判断主键唯一
+ if (sysArea.getIsDel()==null) {
+ SysArea model =sysAreaService.getById(sysArea.getId());
+ if (model!=null)
+ {
+ return ResultBody.failed().msg("区域编号已存在！");
+ }
+ }
boolean v= sysAreaService.saveOrUpdate(sysArea);
if(v) {
return ResultBody.ok().data(sysArea).msg("保存成功");
@@ -104,4 +120,23 @@
return ResultBody.failed().msg("删除失败");
}
}
+ /**
+ * 修改状态
+ *
+ * @param params
+ * @return
+ */
+ @ApiOperation(value = "修改反馈数据状态")
+ @GetMapping("/updateEnabled")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
+ })
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+ if (params.size()==0)
+ {
+ return ResultBody.failed().msg("参数异常！");
+ }
+ return sysAreaService.updateEnabled(params);
+ }
}
--
Gitblit v1.8.0