From 04167f529701b8a88ef52ba7ae854f444347f72c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 30 Jul 2018 14:46:18 +0800
Subject: [PATCH] stringToDate 类 更新优化
---
src/main/java/com/moral/controller/OrganizationController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationController.java b/src/main/java/com/moral/controller/OrganizationController.java
index 5c80fb2..039953d 100644
--- a/src/main/java/com/moral/controller/OrganizationController.java
+++ b/src/main/java/com/moral/controller/OrganizationController.java
@@ -3,18 +3,20 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Organization;
+import com.moral.security.auth.JwtAuthenticationToken;
+import com.moral.security.model.UserContext;
import com.moral.service.OrganizationService;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
import javax.annotation.Resource;
-import java.io.UnsupportedEncodingException;
@RestController
@RequestMapping("organization")
public class OrganizationController {
@Resource
OrganizationService organizationService;
-
@GetMapping("page-list")
public PageBean pageList(PageBean pageBean) {
return organizationService.queryByPageBean(pageBean);
@@ -31,4 +33,16 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("list/{name}")
+ public ResultBean<List<Organization>> getOrganizationsByName(@PathVariable("name") String name) {
+ List<Organization> organizations = organizationService.getOrganizationsByName(name);
+ return new ResultBean<List<Organization>>(organizations);
+ }
+ @GetMapping("get-my-org")
+ public ResultBean<Organization> getMyOrganization(JwtAuthenticationToken token){
+ UserContext userContext = token.getPrincipal();
+ Organization organization = organizationService.getOrganizationById(userContext.getOrganizationId());
+ return new ResultBean<>(organization);
+ }
}
--
Gitblit v1.8.0