From 75c32d6d697a550400d0b4eec95b8570d83b726f Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期五, 27 十一月 2020 19:20:32 +0800
Subject: [PATCH] 提交
---
src/main/java/com/highdatas/srs/web/SysRoleMappingController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/srs/web/SysRoleMappingController.java b/src/main/java/com/highdatas/srs/web/SysRoleMappingController.java
index 4d97d4a..8791463 100644
--- a/src/main/java/com/highdatas/srs/web/SysRoleMappingController.java
+++ b/src/main/java/com/highdatas/srs/web/SysRoleMappingController.java
@@ -1,12 +1,15 @@
package com.highdatas.srs.web;
+import com.highdatas.srs.entity.SysRole;
import com.highdatas.srs.mapper.SysRoleMapper;
import com.highdatas.srs.pojo.Result;
+import com.highdatas.srs.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,6 +30,8 @@
*/
@Autowired
SysRoleMapper roleMapper;
+ @Autowired
+ ISysRoleService roleService;
@RequestMapping("detail")
public Result downLoad() {
@@ -36,11 +41,11 @@
stringObjectHashMap.put("name", "鐮旂┒鍛�");
stringObjectHashMap.put("roleName", null);
byDepart.add(stringObjectHashMap);
- stringObjectHashMap = new HashMap<>();
- stringObjectHashMap.put("id", "瀹炰範鐢�");
- stringObjectHashMap.put("name", "瀹炰範鐢�");
- stringObjectHashMap.put("roleName", null);
- byDepart.add(stringObjectHashMap);
+// stringObjectHashMap = new HashMap<>();
+// stringObjectHashMap.put("id", "瀹炰範鐢�");
+// stringObjectHashMap.put("name", "瀹炰範鐢�");
+// stringObjectHashMap.put("roleName", null);
+// byDepart.add(stringObjectHashMap);
stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("id", "椤圭洰缁忕悊");
stringObjectHashMap.put("name", "椤圭洰缁忕悊");
@@ -49,4 +54,26 @@
return Result.success(byDepart);
}
+
+ @RequestMapping("partTime")
+ public Result partTime() {
+ List<Map<String, Object>> byDepart = roleMapper.findByDepart("01-600");
+ return Result.success(byDepart);
+ }
+
+ @RequestMapping("all")
+ public Result all() {
+ List<Map<String, Object>> byDepart = new ArrayList<>();
+
+ List<SysRole> sysRoles = roleService.selectList(null);
+ for (SysRole sysRole : sysRoles) {
+ HashMap stringObjectHashMap = new HashMap<>();
+ stringObjectHashMap.put("id", sysRole.getName());
+ stringObjectHashMap.put("name", sysRole.getName());
+ stringObjectHashMap.put("roleName", null);
+ byDepart.add(stringObjectHashMap);
+ }
+ byDepart.addAll(roleMapper.all());
+ return Result.success(byDepart);
+ }
}
--
Gitblit v1.8.0