调整角色管理、用户角色分配管理

src/main/java/com/hb/proj/sys/controller/RoleController.java

@@ -1,56 +1,45 @@
 package com.hb.proj.sys.controller;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.hb.proj.allconfig.AccessToken;
 import com.hb.proj.allconfig.SysLog;
 import com.hb.proj.model.RoleVO;
-import com.hb.proj.model.SortCodeVO;
-import com.hb.proj.model.User;
-import com.hb.proj.model.UserVO;
 import com.hb.proj.sys.service.RoleService;
-import com.hb.proj.sys.service.UserService;
 import com.hb.proj.utils.RequestParams;
 import com.hb.proj.utils.RespVO;
 import com.hb.proj.utils.RespVOBuilder;
 import com.hb.xframework.dao.util.PageModel;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * 基础信息-角色相关接口
  */
 @RestController
-@RequestMapping("/api/role")
+@RequestMapping("/role")
 @Validated
 public class RoleController {
 
 	@Autowired
 	private RoleService roleService;
+	
 	/**
 	 * 获取所有角色记录
 	 * @return
 	 */
 	@RequestMapping("/loadAll")
-	public RespVO<List<Map<String,String>>> loadAll(){
-		List<Map<String,String>> listM = new ArrayList<Map<String,String>>();
-		List<RoleVO> list =roleService.loadAll();
-
-		for(RoleVO vo: list){
-			Map<String,String> map = new HashMap<String,String>();
-			map.put("label",vo.getRoleName());
-			map.put("value",vo.getRoleId());
-			listM.add(map);
-		}
-		return RespVOBuilder.ok(listM);
+	public RespVO<List<RoleVO>> loadAll(){
+		return RespVOBuilder.ok(roleService.loadAll());
 	}
+	
 	/**
 	 * 查询角色列表
 	 * @apiNote 查询角色列表

src/main/java/com/hb/proj/sys/service/UserRoleService.java

@@ -1,27 +1,34 @@
 package com.hb.proj.sys.service;
 
-import com.hb.proj.model.RolePO;
-import com.hb.proj.model.RoleVO;
-import com.hb.proj.model.UserRolePO;
-import com.hb.xframework.dao.core.SpringJdbcDAO;
-import com.hb.xframework.dao.util.PageModel;
-import com.hb.xframework.dao.util.UUIDHexGenerator;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.hb.proj.model.UserRolePO;
+import com.hb.xframework.dao.core.SpringJdbcDAO;
+import com.hb.xframework.dao.util.UUIDHexGenerator;
 
 @Service
 public class UserRoleService {
 
 	@Autowired
 	private SpringJdbcDAO  dao;
+	
 	@Autowired
 	private RoleService roleService;
+	
+	public Set<String>  loadByUserId(String userId){
+		Map<String,Object> mapping=dao.queryForMapping("select user_id,role_id from tsys_user_role where user_id=?","role_id", "user_id", userId);
+		if(mapping==null||mapping.size()==0) {
+			return null;
+		}
+		return mapping.keySet();
+	}
+	
 	public List<String> queryByUserId(String userId) {
 		List<UserRolePO> list =dao.queryForList("select * from tsys_user_role where user_id=?",UserRolePO.class,userId);
 		List<String> listS = new ArrayList<String>();
@@ -40,14 +47,23 @@ public class UserRoleService {
 	}
 	public String add(UserRolePO userRolePO) {
 		UUIDHexGenerator uuid=UUIDHexGenerator.getInstance();
-		userRolePO.setMidId(uuid.generate());
+		userRolePO.setUrId(uuid.generate());
 		dao.insert(userRolePO,"tsys_user_role");
-		return userRolePO.getMidId();
+		return userRolePO.getUrId();
+	}
+	
+	public void add(String userId,Set<String> roleIds) {
+		dao.exeUpdate("delete from tsys_user_role where user_id=?",userId);  //先清除旧的角色绑定
+		UUIDHexGenerator uuid=UUIDHexGenerator.getInstance();
+		for(String roleId : roleIds) {
+			dao.exeUpdate("insert into tsys_user_role(ur_id,user_id,role_id) values(?,?,?)", uuid.generate(),userId,roleId);
+		}
+		
 	}
 	
-	public boolean delete(String midId) {
-		String sql="delete from tsys_user_role  where mid_id=?";
-		dao.exeUpdate(sql,midId);
+	public boolean delete(String urId) {
+		String sql="delete from tsys_user_role  where ur_id=?";
+		dao.exeUpdate(sql,urId);
 		return true;
 	}
 	public boolean deleteByUserId(String userId) {