From f32e22e52376cabe49e8c7d1f52adb4b1aebffd3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 20 Nov 2019 17:15:08 +0800
Subject: [PATCH] update：移动到设备marker上实时显示因子数据
---
src/main/java/com/moral/controller/RoleController.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/controller/RoleController.java b/src/main/java/com/moral/controller/RoleController.java
index 893fed6..a69b41b 100644
--- a/src/main/java/com/moral/controller/RoleController.java
+++ b/src/main/java/com/moral/controller/RoleController.java
@@ -1,8 +1,11 @@
package com.moral.controller;
+import java.util.List;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,7 +14,6 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Role;
-import com.moral.service.ChannelService;
import com.moral.service.RoleService;
@RestController
@@ -22,8 +24,10 @@
@Autowired
RoleService roleService;
- @Autowired
- ChannelService channelService;
+ @GetMapping("page-list")
+ public PageBean pageList(PageBean pageBean) {
+ return roleService.queryByPageBean(pageBean);
+ }
@GetMapping("count-by-example")
public ResultBean<Integer> countByExample(PageBean pageBean){
@@ -33,13 +37,6 @@
@GetMapping("role-list")
public PageBean getRoleList(PageBean pageBean) {
return roleService.getRoleList(pageBean);
- }
-
- @GetMapping("channel-list")
- public ResultBean getChannelList(String channelName) {
- ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
- resultBean.setData(channelService.getChannelList(channelName));
- return resultBean;
}
@PostMapping("add-or-modify")
@@ -56,4 +53,23 @@
return resultBean;
}
+ @GetMapping("get-role-ids")
+ public List<Integer> getRoleIds(int accountId){
+ return roleService.getRoleIds(accountId);
+ }
+
+ @PostMapping("allot-role/{id}")
+ public ResultBean allotRole(@PathVariable("id") Integer accountId, @RequestBody Integer [] roleIds){
+ ResultBean resultBean = new ResultBean();
+ if(accountId==null){
+ resultBean.setCode(ResultBean.NO_PERMISSION);
+ resultBean.setMessage("������ID���������null");
+ return resultBean;
+ }else{
+ roleService.allotRole(accountId,roleIds);
+ resultBean.setCode(ResultBean.SUCCESS);
+ }
+ return resultBean;
+ }
+
}
--
Gitblit v1.8.0