需求

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/RoleController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -41,7 +42,7 @@ public class RoleController extends BaseController {
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
 	})
 	@RequestMapping(value = "/roles",method = RequestMethod.GET)
-	public ResponseBean getInfo(@RequestParam(value = "roleName", required = false) String roleName,
+	public ResponseBean getRoleList(@RequestParam(value = "roleName", required = false) String roleName,
 	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
 	                            HttpSession session) {
@@ -64,4 +65,36 @@ public class RoleController extends BaseController {
 		responseBean = roleService.addRole(sysRole, userElement);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "获取角色详情", notes = "获取角色详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "角色id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
+	})
+	@RequestMapping(value = "/role/{id}",method = RequestMethod.GET)
+	public ResponseBean getRoleInfo(@PathVariable(value = "id", required = false) Integer id,
+	                            HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.getRoleInfo(id,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加角色", notes = "添加角色")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "角色id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
+	})
+	@RequestMapping(value = "/role/update/{id}", method = RequestMethod.PUT)
+	public ResponseBean updateRole(@PathVariable Integer id,@RequestBody SysRole sysRole, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		sysRole.setId(id);
+		responseBean = roleService.updateRole(sysRole, userElement);
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/RoleMapper.java

@@ -21,4 +21,6 @@ import java.util.List;
 @Mapper
 public interface RoleMapper extends BaseMapper<SysRole> {
 	List<SysRole> getRoleListByParams(Page page,@Param("role") SysRole role);
+	
+	SysRole selectByRoleName(@Param("roleName") String roleName);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/SysRole.java

@@ -65,11 +65,13 @@ public class SysRole implements Serializable {
     /**
      * 创建人
      */
+    @TableField(exist = false)
     private String createName;
     
     /**
      * 更新人
      */
+    @TableField(exist = false)
     private String updateName;
     
     /**

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/SysRoleMenu.java

@@ -23,6 +23,8 @@ public class SysRoleMenu implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
+    
     private Integer communityId;
 
     /**

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/RoleServiceI.java

@@ -24,4 +24,20 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @return
 	 */
 	ResponseBean addRole(SysRole sysRole, UserElement userElement);
+	
+	/**
+	 * 获取角色详情
+	 * @param id
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean getRoleInfo(Integer id, UserElement userElement);
+	
+	/**
+	 * 修改角色
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean updateRole(SysRole sysRole, UserElement userElement);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/RoleServiceImpl.java

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
@@ -77,6 +78,12 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		sysRole.setCreateDate(dateTime);
 		sysRole.setUpdateUser(userId);
 		sysRole.setUpdateDate(dateTime);
+		//校验角色名不能相同
+		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName());
+		if (null != checkSysRole){
+			responseBean.addError("存在重复的角色名称");
+			return responseBean;
+		}
 		//插入角色表
 		int size = roleMapper.insert(sysRole);
 		if (size < 1){
@@ -84,18 +91,89 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 			return responseBean;
 		}
 		//维护角色与menu的关系表
+		int count = addSysRoleMenu(sysRole);
+		if (count < 1){
+			responseBean.addError("插入失败");
+			return responseBean;
+		}
+		responseBean.addSuccess(size);
+		return responseBean;
+	}
+	
+	private int addSysRoleMenu(SysRole sysRole) {
 		List<SysRoleMenu> sysRoleMenuList = new ArrayList<SysRoleMenu>();
 		List<Integer> menuIdList = sysRole.getMenuArray();
 		menuIdList.stream().forEach(menuId -> {
 			SysRoleMenu sysRoleMenu = new SysRoleMenu();
-			sysRoleMenu.setCommunityId(userElement.getCommunityId());
+			sysRoleMenu.setCommunityId(sysRole.getCommunityId());
 			sysRoleMenu.setRoleId(sysRole.getId());
 			sysRoleMenu.setMenuId(menuId);
 			sysRoleMenuList.add(sysRoleMenu);
 		});
-		int count = sysRoleMenuMapper.insertList(sysRoleMenuList);
+		return sysRoleMenuMapper.insertList(sysRoleMenuList);
+	}
+	
+	/**
+	 * 获取角色详情
+	 *
+	 * @param id
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean getRoleInfo(Integer id, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//查询出这条角色信息
+		SysRole sysRole = roleMapper.selectById(id);
+		QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("role_id", id);
+		queryWrapper.eq("community_id", sysRole.getCommunityId());
+		List<Integer> menuArray = new ArrayList<Integer>();
+		//查询这条角色对应的权限
+		List<SysRoleMenu> sysRoleMenuList = sysRoleMenuMapper.selectList(queryWrapper);
+		sysRoleMenuList.stream().forEach(SysRoleMenu -> {
+			menuArray.add(SysRoleMenu.getMenuId());
+		});
+		sysRole.setMenuArray(menuArray);
+		responseBean.addSuccess(sysRole);
+		return responseBean;
+	}
+	
+	/**
+	 * 修改角色
+	 *
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean updateRole(SysRole sysRole, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//接收数据
+		sysRole.setCommunityId(userElement.getCommunityId());
+		sysRole.setUpdateUser(userElement.getId());
+		sysRole.setUpdateDate(LocalDateTime.now());
+		//校验角色名不能相同
+		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName());
+		if (null != checkSysRole && !checkSysRole.getId().equals(sysRole.getId())){
+			responseBean.addError("存在重复的角色名称");
+			return responseBean;
+		}
+		//更新角色信息
+		int size = roleMapper.updateById(sysRole);
+		if (size < 1){
+			responseBean.addError("更新失败");
+			return responseBean;
+		}
+		//维护角色与menu的关系表,先全部删除,在重新添加
+		QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("role_id", sysRole.getId());
+		queryWrapper.eq("community_id", sysRole.getCommunityId());
+		sysRoleMenuMapper.delete(queryWrapper);
+		//重新添加
+		int count = addSysRoleMenu(sysRole);
 		if (count < 1){
-			responseBean.addError("插入失败");
+			responseBean.addError("更新失败");
 			return responseBean;
 		}
 		responseBean.addSuccess(size);

CODE/smart-community/property-api/src/main/resources/mapper/SysRoleMapper.xml

@@ -21,9 +21,13 @@
           1 = 1
         AND t.community_id = #{role.communityId}
         <if test="role.roleName != null and role.roleName != ''">
-            and t.roleName like concat('%',#{role.roleName,jdbcType=VARCHAR},'%')
+            and t.role_name like concat('%',#{role.roleName,jdbcType=VARCHAR},'%')
         </if>
         ORDER BY
             t.create_date DESC
     </select>
+
+    <select id="selectByRoleName" resultType="com.community.huiju.model.SysRole">
+        SELECT id,community_id,role_name,description from tp_sys_role where role_name = #{roleName,jdbcType=VARCHAR}
+    </select>
 </mapper>

VUECODE/smart-property-manage/src/api/role.js

@@ -15,7 +15,7 @@ export function fetchMenuList() {
   })
 }
 
-export function addMenuInfo(data) {
+export function addRoleInfo(data) {
   return request({
     url: '/role/add',
     method: 'post',
@@ -27,3 +27,21 @@ export function addMenuInfo(data) {
   })
 }
 
+export function updateRoleInfo(data) {
+  return request({
+    url: '/role/update/' + data.id,
+    method: 'put',
+    data: {
+      roleName: data.roleName,
+      description: data.description,
+      menuArray: data.menuArray
+    }
+  })
+}
+
+export function getRoleInfo(id) {
+  return request({
+    url: '/role/' + id,
+    method: 'get'
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -199,6 +199,13 @@ export const constantRouterMap = [
         name: 'role-add',
         hidden: true,
         meta: { title: '添加角色', icon: 'table' }
+      },
+      {
+        path: '/account/edit',
+        component: () => import('@/views/account/edit/role-edit'),
+        name: 'role-edit',
+        hidden: true,
+        meta: { title: '修改角色', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/modules/role.js

@@ -1,4 +1,4 @@
-import { fetchList, fetchMenuList, addMenuInfo } from '@/api/role'
+import { fetchList, fetchMenuList, addRoleInfo, getRoleInfo, updateRoleInfo } from '@/api/role'
 
 const transaction = {
   namespaced: true,
@@ -45,15 +45,33 @@ const transaction = {
         })
       })
     },
-    AddMenuInfo({ commit }, listQuery) {
+    AddRoleInfo({ commit }, listQuery) {
       return new Promise((resolve, reject) => {
-        addMenuInfo(listQuery).then(response => {
+        addRoleInfo(listQuery).then(response => {
           resolve(response)
         }).catch(error => {
           reject(error)
         })
       })
-    }
+    },
+    GetRoleInfo({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getRoleInfo(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    UpdateRoleInfo({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        updateRoleInfo(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
   }
 }
 

VUECODE/smart-property-manage/src/views/account/edit/role-edit.vue

@@ -0,0 +1,142 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input v-model="ruleForm.roleName"/>
+      </el-form-item>
+      <el-form-item label="角色描述" prop="description">
+        <el-input v-model="ruleForm.description"/>
+      </el-form-item>
+      <el-form-item label="资源权限" prop="menuArray">
+        <el-tree
+          ref="tree"
+          :data="menuList"
+          show-checkbox
+          node-key="id"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps">
+        </el-tree>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import { parseTime } from '@/utils'
+
+export default {
+  computed: {
+    ...mapState('role', {
+      menuList: s => s.menuList
+    })
+  },
+  data() {
+    return {
+      ruleForm: {
+        id: '',
+        roleName: '',
+        description: '',
+        menuArray: []
+      },
+      rules: {
+        roleName: [
+          { required: true, message: '请输入角色名称', trigger: 'blur' }
+        ],
+        menuArray: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        ]
+      },
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      }
+    }
+  },
+  created(){
+    this.ruleForm.id = this.$route.params.id
+    this.getDataById()
+    this.getMenuList()
+  },
+  methods: {
+    ...mapMutations('role', {
+    }),
+    ...mapActions('role', [
+      'FetchMenuList',
+      'UpdateRoleInfo',
+      'GetRoleInfo'
+    ]),
+    submitForm(formName) { // 提交
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      console.log(this.ruleForm.menuArray)
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.updateRole()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    getMenuList() {
+      this.FetchMenuList().then(() => {
+      }).catch(() => {
+        console.log('get list error')
+      })
+    },
+    resetForm(formName) { // 重置
+      this.$refs[formName].resetFields()
+    },
+    updateRole() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.UpdateRoleInfo(this.ruleForm).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'role-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error updateRole')
+      })
+    },
+    getDataById() {
+      this.GetRoleInfo(this.ruleForm.id).then((res) => {
+        this.ruleForm.roleName = res.data.roleName
+        this.ruleForm.description = res.data.description
+        this.ruleForm.menuArray = res.data.menuArray
+      }).catch(() => {
+        console.log('error init role')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>

VUECODE/smart-property-manage/src/views/account/role.vue

@@ -19,7 +19,7 @@
       fit
       highlight-current-row
       style="width: 100%; margin-top: 20px;"
-      @sort-change="sortChange">
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="角色名称" align="center">
         <template slot-scope="scope">
@@ -101,7 +101,8 @@ export default {
         roleName: undefined
       },
       tableKey: 0,
-      downloadLoading: false
+      downloadLoading: false,
+      selectedIds: [] // 选择的id集合
     }
   },
   created() {
@@ -148,6 +149,13 @@ export default {
         this.sortByID(order)
       }
     },
+    handleSelectionChange(data) {
+      // 设置为 空
+      this.selectedIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedIds.push(data[i].id)
+      }
+    },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.listQuery.pageSize = val
@@ -161,6 +169,18 @@ export default {
     addRole(){
       this.$router.push({ name: 'role-add' })
     },
+    editRole(){
+      const ids = this.selectedIds
+      if (ids.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+      this.$router.push({ name: 'role-edit', params: { id: ids[0] }})
+    },
     sortByID(order) {
       if (order === 'ascending') {
         this.listQuery.sort = '+id'