From 959b3783aa01b26ef267e25258ab7089b45c0710 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 15 Apr 2020 11:55:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
index a63e640..43d1c19 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
@@ -1,28 +1,30 @@
package com.kidgrow.usercenter.controller;
+import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import com.kidgrow.common.model.PageResult;
-import com.kidgrow.common.model.ResultBody;
-import com.kidgrow.common.model.SysOrganization;
-import com.kidgrow.usercenter.service.ISysOrganizationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.usercenter.service.ISysOrganizationService;
+import com.kidgrow.common.model.*;
+
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
import javax.validation.Valid;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description: 组织架构表
* @Project: 用户中心
- * @CreateDate: Created in 2020-03-31 11:01:35 <br>
+ * @CreateDate: Created in 2020-04-10 15:21:10 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@@ -43,12 +45,28 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return sysOrganizationService.findList(params);
+ return ResultBody.ok().data(sysOrganizationService.findList(params));
+ }
+ @ApiOperation(value = "查询列表by MAP")
+ @GetMapping("getListByMap")
+ public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
+ return sysOrganizationService.getListByMap(params);
+ }
+
+ @ApiOperation(value = "获取tree")
+ @GetMapping("getTree")
+ public ResultBody getTree(@RequestParam Map<String, Object> params) {
+ return sysOrganizationService.getTree(params);
+ }
+ @ApiOperation(value = "更新状态")
+ @GetMapping("updateEnabled")
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+ return sysOrganizationService.updateEnabled(params);
}
/**
@@ -77,11 +95,20 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysOrganization sysOrganization, 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 {
- sysOrganizationService.saveOrUpdate(sysOrganization);
- return ResultBody.ok().data(sysOrganization).msg("保存成功");
+ boolean v= sysOrganizationService.saveOrUpdate(sysOrganization);
+ if(v) {
+ return ResultBody.ok().data(sysOrganization).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -91,7 +118,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- sysOrganizationService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= sysOrganizationService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
--
Gitblit v1.8.0