角色管理添加角色类型 模块添加时自动给管理员角色添上对应模块

sapi/src/main/java/com/xhkjedu/sapi/controller/system/ModuleController.java

@@ -84,6 +84,7 @@ public class ModuleController {
                 module.getModulename(),"应用名称",2,
                 module.getMinout(),"应用分类",1,
                 module.getMclass(),"应用分组",1,
+                module.getSchoolid(),"学校id",1,
                 module.getModuletype(),"模块归属",1
         });
         int result = moduleService.add(module);

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/ModuleMapper.java

@@ -61,4 +61,7 @@ public interface ModuleMapper extends TkMapper<TModule> {
 
     //修改模块状态
     void updateModuleDisplay(@Param("moduleid") String moduleid, @Param("display") Integer display);
+
+    //根据学校id获取管理员角色id
+    Integer getRoleIdBySchoolId(@Param("schoolid") Integer schoolid);
 }

sapi/src/main/java/com/xhkjedu/sapi/model/system/TRole.java

@@ -20,6 +20,9 @@ public class TRole extends BaseBean {
     //角色名称
     private String rolename;
 
+    //角色类型0管理员1其他角色
+    private Integer roletype;
+
     //角色备注
     private String comm;
 

sapi/src/main/java/com/xhkjedu/sapi/service/system/ModuleService.java

@@ -1,12 +1,15 @@
 package com.xhkjedu.sapi.service.system;
 
 import com.xhkjedu.sapi.mapper.system.ModuleMapper;
+import com.xhkjedu.sapi.mapper.system.RoleModuleMapper;
 import com.xhkjedu.sapi.model.system.TModule;
+import com.xhkjedu.sapi.model.system.TRoleModule;
 import com.xhkjedu.sapi.utils.ApiUtil;
 import com.xhkjedu.sapi.vo.system.ModuleSelVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +25,8 @@ import java.util.Map;
 public class ModuleService {
     @Autowired
     private ModuleMapper moduleMapper;
+    @Autowired
+    private RoleModuleMapper roleModuleMapper;
 
     /**
      *功能描述 添加
@@ -30,11 +35,25 @@ public class ModuleService {
      * @param  * @param module
      * @return java.lang.Integer
      */
+    @Transactional(rollbackFor = Exception.class)
     public Integer add(TModule module){
         String id = ApiUtil.getId();
         module.setModuleid(id);
-        module.setCreatetime(N_Utils.getSecondTimestamp());
-        return moduleMapper.insertSelective(module);
+        int timestamp = N_Utils.getSecondTimestamp();
+        module.setCreatetime(timestamp);
+        int result = moduleMapper.insertSelective(module);
+        Integer schoolid = module.getSchoolid();
+        Integer createid = module.getCreateid();
+        Integer roleid=moduleMapper.getRoleIdBySchoolId(schoolid);//根据学校id获取管理员角色id
+        //角色模块
+        TRoleModule rm=new TRoleModule();
+        rm.setRoleid(roleid);
+        rm.setModuleid(id);
+        rm.setCreateid(createid);
+        rm.setCreatetime(timestamp);
+        rm.setSchoolid(schoolid);
+        roleModuleMapper.insertSelective(rm);
+        return result;
     }
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -130,6 +130,7 @@ public class SchoolService {
         role.setCreateid(userid);
         role.setCreatetime(N_Utils.getSecondTimestamp());
         role.setSchoolid(schoolid);
+        role.setRoletype(0);
         roleMapper.insertUseGeneratedKeys(role);
         return role.getId();
     }

sapi/src/main/resources/mapper/system/ModuleMapper.xml

@@ -79,4 +79,8 @@
     <update id="updateModuleDisplay">
         update t_module set display=#{display} where moduleid=#{moduleid}
     </update>
+    <!--根据学校id获取管理员角色id-->
+    <select id="getRoleIdBySchoolId" resultType="java.lang.Integer">
+        select roleid from t_role where schoolid=#{schoolid} and roletype=0 limit 1
+    </select>
 </mapper>

suser/src/main/java/com/xhkjedu/suser/mapper/system/RoleMapper.java

@@ -33,4 +33,7 @@ public interface RoleMapper extends TkMapper<TRole> {
      * @return RoleVo
      */
     RoleVo getRoleDetail(@Param("roleid")Integer roleid);
+
+    //根据角色id获取角色类型
+    Integer getTypeById(@Param("roleid") Integer roleid);
 }

suser/src/main/java/com/xhkjedu/suser/model/system/TRole.java

@@ -20,6 +20,9 @@ public class TRole extends BaseBean {
     //角色名称
     private String rolename;
 
+    //角色类型0管理员1其他角色
+    private Integer roletype;
+
     //角色备注
     private String comm;
 

suser/src/main/java/com/xhkjedu/suser/service/system/RoleService.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.suser.service.system;
 
+import com.xhkjedu.config.MissingParametersException;
 import com.xhkjedu.suser.mapper.system.RoleMapper;
 import com.xhkjedu.suser.mapper.system.RoleModuleMapper;
 import com.xhkjedu.suser.mapper.system.UserRoleMapper;
@@ -40,6 +41,7 @@ public class RoleService {
     public Integer save(TRole role) throws Exception {
         try {
             role.setCreatetime(N_Utils.getSecondTimestamp());
+            role.setRoletype(1);
             //保存角色信息
             roleMapper.insertUseGeneratedKeys(role);
             role.setRoleid(role.getId());
@@ -97,6 +99,7 @@ public class RoleService {
                 saveRoleModules(role.getModules(),role);
             }
             deleteNoRoleUserModule(role.getRoleid());//删除没有权限的用户常用模块
+            role.setRoletype(null);
             return roleMapper.updateByPrimaryKeySelective(role);
         } catch (Exception e) {
             log.error("教师修改失败："+e.getMessage());
@@ -119,6 +122,8 @@ public class RoleService {
 
     //删除
     public Integer del(Integer roleid){
+        Integer roletype = roleMapper.getTypeById(roleid);//根据角色id获取角色类型
+        if (roletype == 0) throw new MissingParametersException("管理员角色禁止删除");
         Integer result = roleMapper.deleteByPrimaryKey(roleid);
         deleteNoRoleUserModule(roleid);//删除没有权限的用户常用模块
         return result;

suser/src/main/resources/mapper/system/RoleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xhkjedu.suser.mapper.system.RoleMapper">
     <!-- 获取所有角色 -->
     <select id="listAllRoles" resultType="com.xhkjedu.suser.model.system.TRole">
-        SELECT r.roleid,r.rolename,r.comm,r.createid,r.createtime,u.username AS createname,
+        SELECT r.roleid,r.rolename,r.roletype,r.comm,r.createid,r.createtime,u.username AS createname,
         (SELECT COUNT(*) FROM t_user_role ur WHERE ur.roleid=r.roleid) AS usernum
         FROM t_role r LEFT JOIN t_user u ON r.createid = u.userid
         WHERE r.schoolid=#{schoolid} ORDER BY createtime desc
@@ -14,4 +14,8 @@
         SELECT r.roleid,r.rolename,r.comm from t_role r
         WHERE r.roleid=#{roleid} limit 1
     </select>
+    <!--根据角色id获取角色类型-->
+    <select id="getTypeById" resultType="java.lang.Integer">
+        select roletype from t_role where roleid=#{roleid}
+    </select>
 </mapper>