From c2b226e7902dbb2b36f349612886ccc7333895e6 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Mon, 19 Aug 2019 20:08:44 +0800
Subject: [PATCH] 合并查询无人机平均值，最小值和最大值
---
src/main/java/com/moral/controller/OrganizationController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationController.java b/src/main/java/com/moral/controller/OrganizationController.java
index bfeae2d..b515654 100644
--- a/src/main/java/com/moral/controller/OrganizationController.java
+++ b/src/main/java/com/moral/controller/OrganizationController.java
@@ -3,6 +3,8 @@
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.*;
@@ -38,4 +40,15 @@
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);
+ }
+ @GetMapping("getforg")
+ public ResultBean<Organization> getFatherOrg(Integer cid){
+ Organization organization = organizationService.getFatherOrg(cid);
+ return new ResultBean<>(organization);
+ }
}
--
Gitblit v1.8.0