合并

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.SysMenu;
+import com.community.huiju.model.SysRole;
 import com.community.huiju.service.RoleServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -11,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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -47,4 +50,18 @@ public class RoleController extends BaseController {
 		responseBean = roleService.getRoleList(roleName,userElement,pageNum,pageSize);
 		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 = "roleName角色名称;description角色描述;menuArray菜单id集合")
+	})
+	@RequestMapping(value = "/role/add", method = RequestMethod.POST)
+	public ResponseBean addRole(@RequestBody SysRole sysRole, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.addRole(sysRole, userElement);
+		return responseBean;
+	}
 }

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

@@ -4,6 +4,7 @@ package com.community.huiju.controller;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.SysMenu;
 import com.community.huiju.service.ISysMenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -11,6 +12,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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -37,6 +39,8 @@ public class SysMenuController extends BaseController {
 	
 	@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"),
 	})
 	@RequestMapping(value = "/menus",method = RequestMethod.GET)
 	public ResponseBean getInfo(HttpSession session) {

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.SysRoleMenu;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业端角色可查看的菜单 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-18
+ */
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+	
+	int insertList(List<SysRoleMenu> sysRoleMenuList);
+}

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

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -68,5 +69,6 @@ public class SysMenu implements Serializable {
     /**
      * 子节点
      */
+    @TableField(exist = false)
     private List<SysMenu> children;
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -24,6 +26,7 @@ public class SysRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
     /**
      * 小区id
      */
@@ -68,4 +71,10 @@ public class SysRole implements Serializable {
      * 更新人
      */
     private String updateName;
+    
+    /**
+     * 前端的menuId
+     */
+    @TableField(exist = false)
+    private List<Integer> menuArray;
 }

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

@@ -0,0 +1,39 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 物业端角色可查看的菜单
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_sys_role_menu")
+public class SysRoleMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer communityId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+    /**
+     * 菜单ID
+     */
+    private Integer menuId;
+
+
+}

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

@@ -16,4 +16,12 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @return
 	 */
 	ResponseBean getRoleList(String roleName, UserElement userElement, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 添加角色
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean addRole(SysRole sysRole, UserElement userElement);
 }

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.RoleMapper;
+import com.community.huiju.dao.SysRoleMenuMapper;
 import com.community.huiju.model.SysRole;
+import com.community.huiju.model.SysRoleMenu;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.RoleServiceI;
 import com.google.common.collect.Maps;
@@ -14,6 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +31,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	
 	@Autowired
 	private RoleMapper roleMapper;
+	
+	@Autowired
+	private SysRoleMenuMapper sysRoleMenuMapper;
 	/**
 	 * 获取角色列表
 	 *
@@ -51,4 +58,47 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 添加角色
+	 *
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean addRole(SysRole sysRole, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//接收数据
+		sysRole.setCommunityId(userElement.getCommunityId());
+		Integer userId = userElement.getId();
+		LocalDateTime dateTime = LocalDateTime.now();
+		sysRole.setCreateUser(userId);
+		sysRole.setCreateDate(dateTime);
+		sysRole.setUpdateUser(userId);
+		sysRole.setUpdateDate(dateTime);
+		//插入角色表
+		int size = roleMapper.insert(sysRole);
+		if (size < 1){
+			responseBean.addError("插入失败");
+			return responseBean;
+		}
+		//维护角色与menu的关系表
+		List<SysRoleMenu> sysRoleMenuList = new ArrayList<SysRoleMenu>();
+		List<Integer> menuIdList = sysRole.getMenuArray();
+		menuIdList.stream().forEach(menuId -> {
+			SysRoleMenu sysRoleMenu = new SysRoleMenu();
+			sysRoleMenu.setCommunityId(userElement.getCommunityId());
+			sysRoleMenu.setRoleId(sysRole.getId());
+			sysRoleMenu.setMenuId(menuId);
+			sysRoleMenuList.add(sysRoleMenu);
+		});
+		int count = sysRoleMenuMapper.insertList(sysRoleMenuList);
+		if (count < 1){
+			responseBean.addError("插入失败");
+			return responseBean;
+		}
+		responseBean.addSuccess(size);
+		return responseBean;
+	}
 }

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

@@ -9,6 +9,7 @@ import com.community.huiju.model.SysMenu;
 import com.community.huiju.service.ISysMenuService;
 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 +23,7 @@ import java.util.List;
  * @since 2019-01-17
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
 	
 	@Autowired
@@ -39,7 +41,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 		List<SysMenu> menuList = new ArrayList<SysMenu>();
 		sysMenuList.stream().forEach(sysMenu -> {
 			//父节点是0的，为根节点。
-			if(sysMenu.getParentId().equals("0")){
+			if(sysMenu.getParentId().equals(0)){
 				menuList.add(sysMenu);
 			}
 		});

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.SysRoleMenuMapper">
+
+    <insert id="insertList" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_sys_role_menu(community_id,role_id,menu_id)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.roleId},#{item.menuId})
+        </foreach>
+    </insert>
+</mapper>

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

@@ -14,3 +14,16 @@ export function fetchMenuList() {
     method: 'get'
   })
 }
+
+export function addMenuInfo(data) {
+  return request({
+    url: '/role/add',
+    method: 'post',
+    data: {
+      roleName: data.roleName,
+      description: data.description,
+      menuArray: data.menuArray
+    }
+  })
+}
+

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

@@ -1,4 +1,4 @@
-import { fetchList, fetchMenuList } from '@/api/role'
+import { fetchList, fetchMenuList, addMenuInfo } from '@/api/role'
 
 const transaction = {
   namespaced: true,
@@ -33,19 +33,27 @@ const transaction = {
           reject(error)
         })
       })
-    }
-  },
-  FetchMenuList({ commit }) {
-    console.log(1)
-    return new Promise((resolve, reject) => {
-      fetchMenuList().then(response => {
-        const data = response.data
-        commit('SET_MENU_LIST', data)
-        resolve()
-      }).catch(error => {
-        reject(error)
+    },
+    FetchMenuList({ commit }) {
+      return new Promise((resolve, reject) => {
+        fetchMenuList().then(response => {
+          const data = response.data
+          commit('SET_MENU_LIST', data)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    AddMenuInfo({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        addMenuInfo(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
       })
-    })
+    }
   }
 }
 

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

@@ -1,18 +1,21 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
-      <el-form-item label="角色名称" prop="phase">
-        <el-input v-model="ruleForm.phase"/>
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input v-model="ruleForm.roleName"/>
       </el-form-item>
-      <el-form-item label="角色描述" prop="building">
-        <el-input v-model="ruleForm.building"/>
+      <el-form-item label="角色描述" prop="description">
+        <el-input v-model="ruleForm.description"/>
       </el-form-item>
-      <el-tree
-        :data="menuList"
-        show-checkbox
-        node-key="id"
-        :props="defaultProps">
-      </el-tree>
+      <el-form-item label="资源权限" prop="menuArray">
+        <el-tree
+          ref="tree"
+          :data="menuList"
+          show-checkbox
+          node-key="id"
+          :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>
@@ -35,17 +38,16 @@ export default {
   data() {
     return {
       ruleForm: {
-        phase: '',
-        building: '',
-        unit: '',
-        level: '',
-        roomNo: '',
-        ownerName: '',
-        ownerTel: ''
+        roleName: '',
+        description: '',
+        menuArray: []
       },
       rules: {
-        phase: [
+        roleName: [
           { required: true, message: '请输入角色名称', trigger: 'blur' }
+        ],
+        menuArray: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
         ]
       },
       defaultProps: {
@@ -61,12 +63,16 @@ export default {
     ...mapMutations('role', {
     }),
     ...mapActions('role', [
-      'FetchMenuList'
+      'FetchMenuList',
+      'AddMenuInfo'
     ]),
     submitForm(formName) { // 提交
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      console.log(this.ruleForm.menuArray)
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.addBuilding()
+          this.addRole()
         } else {
           console.log('error submit!!')
           return false
@@ -82,7 +88,7 @@ export default {
     resetForm(formName) { // 重置
       this.$refs[formName].resetFields()
     },
-    addBuilding() {
+    addRole() {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -90,13 +96,13 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.$store.dispatch('AddBuilding', this.ruleForm).then((res) => {
+      this.AddMenuInfo(this.ruleForm).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,
             type: 'success'
           })
-          this.$router.push({ name: 'building-index' })
+          this.$router.push({ name: 'role-index' })
           loading.close()
           return
         }
@@ -104,7 +110,7 @@ export default {
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error AddBuilding')
+        console.log('error addRole')
       })
     }
   }