需求

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

@@ -97,4 +97,18 @@ public class RoleController extends BaseController {
 		responseBean = roleService.updateRole(sysRole, userElement);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "删除角色", notes = "删除角色")
+	@ApiImplicitParams({
+			@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 = "idArray角色id集合")
+	})
+	@RequestMapping(value = "/role/delete", method = RequestMethod.POST)
+	public ResponseBean deleteRole(@RequestBody SysRole sysRole, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.deleteRole(sysRole, userElement);
+		return responseBean;
+	}
 }

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

@@ -79,4 +79,10 @@ public class SysRole implements Serializable {
      */
     @TableField(exist = false)
     private List<Integer> menuArray;
+    
+    /**
+     * 角色ID集合
+     */
+    @TableField(exist = false)
+    private List<Integer> idArray;
 }

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

@@ -40,4 +40,12 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @return
 	 */
 	ResponseBean updateRole(SysRole sysRole, UserElement userElement);
+	
+	/**
+	 * 批量删除角色
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean deleteRole(SysRole sysRole, UserElement userElement);
 }

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

@@ -179,4 +179,32 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		responseBean.addSuccess(size);
 		return responseBean;
 	}
+	
+	/**
+	 * 批量删除角色
+	 *
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean deleteRole(SysRole sysRole, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		List<Integer> sysRoleIdList = sysRole.getIdArray();
+		//删除角色
+		int size = roleMapper.deleteBatchIds(sysRoleIdList);
+		if (size < 1){
+			responseBean.addError("删除失败");
+			return responseBean;
+		}
+		//维护角色与menu的关系表,全部删除
+		sysRoleIdList.stream().forEach(roleId -> {
+			QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("role_id", roleId);
+			queryWrapper.eq("community_id", userElement.getCommunityId());
+			sysRoleMenuMapper.delete(queryWrapper);
+		});
+		responseBean.addSuccess(size);
+		return responseBean;
+	}
 }

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

@@ -45,3 +45,14 @@ export function getRoleInfo(id) {
     method: 'get'
   })
 }
+
+export function deleteRoles(ids) {
+  return request({
+    url: '/role/delete',
+    method: 'post',
+    data: {
+      idArray: ids
+    }
+  })
+}
+

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

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

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

@@ -1,4 +1,4 @@
-import { fetchList, fetchMenuList, addRoleInfo, getRoleInfo, updateRoleInfo } from '@/api/role'
+import { fetchList, fetchMenuList, addRoleInfo, getRoleInfo, updateRoleInfo, deleteRoles } from '@/api/role'
 
 const transaction = {
   namespaced: true,
@@ -72,6 +72,15 @@ const transaction = {
         })
       })
     },
+    DeleteRoles({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        deleteRoles(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
   }
 }
 

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

@@ -64,7 +64,7 @@ export default {
     }),
     ...mapActions('role', [
       'FetchMenuList',
-      'AddMenuInfo'
+      'AddRoleInfo'
     ]),
     submitForm(formName) { // 提交
       // 获取选中的树形节点 key
@@ -96,7 +96,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.AddMenuInfo(this.ruleForm).then((res) => {
+      this.AddRoleInfo(this.ruleForm).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,

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

@@ -0,0 +1,145 @@
+<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 :disabled="true" v-model="ruleForm.roleName"/>
+      </el-form-item>
+      <el-form-item label="角色描述" prop="description">
+        <el-input :disabled="true" 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="goEditRole">去修改</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',
+        disabled: () => true
+      }
+    }
+  },
+  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')
+      })
+    },
+    goEditRole(){
+      this.$router.push({ name: 'role-edit', params: { id: this.ruleForm.id }})
+    },
+    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

@@ -112,7 +112,8 @@ export default {
     ...mapMutations('role', {
     }),
     ...mapActions('role', [
-      'FetchRoleList'
+      'FetchRoleList',
+      'DeleteRoles'
     ]),
     setCurrent(item) {
       this.setDetail({ ...item })
@@ -181,6 +182,29 @@ export default {
       }
       this.$router.push({ name: 'role-edit', params: { id: ids[0] }})
     },
+    deleteRole(){
+      const ids = this.selectedIds
+      if (ids < 1) {
+        this.$message.error('请选择数据!')
+        return
+      }
+      this.listLoading = true
+      this.DeleteRoles(ids).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.getList()
+          this.listLoading = false
+          return
+        }
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+
+    },
     sortByID(order) {
       if (order === 'ascending') {
         this.listQuery.sort = '+id'
@@ -200,7 +224,7 @@ export default {
       this.getEditDistrictList()
     },
     handleLook(id) {
-      this.$router.push({ name: 'transaction-info', params: { id: id }})
+      this.$router.push({ name: 'role-info', params: { id: id }})
     },
     handleCreate() {
       this.resetDetail()