合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -96,4 +96,16 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "用户成员列表", notes = "用户成员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+    })
+    @RequestMapping(value = "/user/addUser", method = RequestMethod.POST)
+    public ResponseBean addUser(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.addUser(parameter,userElement.getId());
+        return responseBean;
+    }
+
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToUserService.java

@@ -29,4 +29,12 @@ public interface IToUserService {
      * @return
      */
     ResponseBean userList(String parameter);
+
+    /**
+     * 添加成员角色
+     * @param parameter
+     * @param UserID
+     * @return
+     */
+    ResponseBean addUser(String parameter,Integer UserID);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -1,13 +1,16 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.beust.jcommander.internal.Maps;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.dao.ToSysRoleMapper;
+import com.community.huiju.dao.ToSysUserRoleMapper;
 import com.community.huiju.dao.ToUserMapper;
 import com.community.huiju.model.ToSysRole;
+import com.community.huiju.model.ToSysUserRole;
 import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
@@ -19,6 +22,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.security.auth.callback.TextOutputCallback;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +37,9 @@ public class ToUserServerImpl implements IToUserService {
     @Autowired
     private ToSysRoleMapper toSysRoleMapper;
 
+    @Autowired
+    private ToSysUserRoleMapper toSysUserRoleMapper;
+
     @Override
     public ResponseBean login(String loginName, String code) {
 
@@ -120,4 +128,35 @@ public class ToUserServerImpl implements IToUserService {
         response.addSuccess(map);
         return response;
     }
+
+    @Override
+    public ResponseBean addUser(String parameter,Integer userID) {
+        ResponseBean response= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        ToUser toUser= new ToUser();
+
+        String loginName= object.getString("loginName");
+        String userName = object.getString("userName");
+        JSONArray contentImg = object.getJSONArray("roleName");
+        Integer[] roleIDArray = contentImg.toArray(new Integer[]{});
+        String remark = object.getString("remark");
+
+        toUser.setUserName(userName);
+        toUser.setLoginName(loginName);
+        toUser.setRemark(remark);
+        toUser.setStatus("1");;
+        toUser.setCreateUser(userID);
+        toUser.setCreateDate(new Date());
+        toUserMapper.insert(toUser);
+
+        //会对应多个角色
+        for (Integer roleID:roleIDArray  ){
+           ToSysUserRole toSysUserRole= new ToSysUserRole();
+            toSysUserRole.setUserId(toUser.getId());
+            toSysUserRole.setRoleId(roleID);
+            toSysUserRoleMapper.insert(toSysUserRole);
+        }
+         response.addSuccess("成功");
+        return response;
+    }
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToUserMapper.xml

@@ -30,7 +30,7 @@
     delete from to_user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.ToUser" >
+  <insert id="insert" parameterType="com.community.huiju.model.ToUser" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
     insert into to_user (id, user_name, login_name, 
       login_password, email, head_portrait, 
       remark, status, create_user, 

VUECODE/smart-operate-manage/src/api/user.js

@@ -13,4 +13,16 @@ export function employeesList(data) {
     }
   })
 }
+// 获取角色暂定写死
+export function userRoleById(data) {
+  return request({
+    url: '/role/list',
+    method: 'post',
+    data: {
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName
+    }
+  })
+}
 

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

@@ -141,6 +141,13 @@ export const constantRouterMap = [
         name: 'role-info',
         hidden: true,
         meta: { title: '角色详情', icon: 'table' }
+      },
+      {
+        path: '/account/user/addUser',
+        component: () => import('@/views/account/user/addUser'),
+        name: 'user-addUser',
+        hidden: true,
+        meta: { title: '添加成员', icon: 'table' }
       }
     ]
   },

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logOut, getInfo, sendCode } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { employeesList } from '@/api/user'
+import { employeesList, userRoleById } from '@/api/user'
 
 const user = {
   state: {
@@ -110,6 +110,16 @@ const user = {
           reject(error)
         })
       })
+    },
+    // 查询角色 UserRoleById
+    UserRoleById({ commit, state }, data) { // 查询活动详情
+      return new Promise((resolve, reject) => {
+        userRoleById(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-operate-manage/src/views/account/user/addUser.vue

@@ -0,0 +1,127 @@
+<template>
+  <div id="root">
+    <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="100px" class="demo-listQuery">
+      <el-form-item label="姓名:" prop="roleName">
+        <el-input v-model="listQuery.roleName"/>
+      </el-form-item>
+      <el-form-item label="手机号:" prop="description">
+        <el-input v-model="listQuery.description"/>
+      </el-form-item>
+      <el-transfer
+    filterable
+    :titles="['所有角色', '已选角色']"
+    :left-default-checked="[2, 3]"
+    :filter-method="filterMethod"
+    filter-placeholder="请输角色名称"
+    v-model="value2"
+    :data="dataList"/>
+      <el-form-item label="备注:" prop="description">
+        <el-input v-model="listQuery.description"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">立即创建</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+export default {
+  data() {
+    return {
+      listQuery: {
+        id: '',  
+        roleName: '',
+        description: '',
+        menuArray: [], // 已选中的权限资源
+        pageNum: 1,
+        pageSize:100
+      },
+       va3:[], 
+       value2:[1,4],
+       dataList:[],
+       citiesList:['上海', '北京', '广州', '深圳', '南京', '西安'],
+       pinyinList:['上海', '北京', '广州', '深圳', '南京', '西安', '成都'],
+      rules: {
+        roleName: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        description: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  mounted() {
+      this.getById()
+    //    this.roleBox()
+  },
+  methods: {
+     getById() { // 根据ID获取活动信息
+    //   this.ruleForm.id = this.$route.params.id
+      this.$store.dispatch('UserRoleById', this.listQuery).then((res) => {
+            console.log('1111',res.data.list)
+             const iss= res.data.list
+
+    for (let i = 0; i < iss.length;i++) {
+          this.va3.push(iss[i].id)
+          console.log('this.va3',this.va3)
+        }
+      })
+    },
+    roleBox(){
+        const generateData2 = _ => {
+        const data = this.dataList;
+        const cities = this.citiesList
+        const pinyin = this.pinyinList
+        cities.forEach((city, index) => {
+          data.push({
+            label: city,
+            key: index,
+            pinyin: pinyin[index]
+          });
+        });
+         console.log('data:',data)
+        return data;
+        this.filterMethod(query,item)
+      };
+      return {
+        data2: generateData2(),
+        }
+        this.filterMethod
+      },
+      filterMethod(query, item) {
+        //  console.log('item:',item)
+        const s = item.pinyin.indexOf(query) > -1;
+        //  console.log('this.value2:++',this.value2)
+        // console.log('this.value2:++',this.citiesList[2])
+        // console.log('this.value2:++',this.citiesList[4])
+        return s
+        },
+        // ss4(){
+        //   console.log('11111111111111111111')
+        //    console.log('this.checked:',this.checked)
+        // let value = this.value2
+        // for(let i=0;i < value.length;i++){
+        //      const va= this.value2[i]
+        //    console.log('根据下标遍历每一条数据',this.citiesList[va])
+        // }
+
+        // }
+  }    
+}
+</script>
+
+<style scoped>
+.demo-listQuery {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+#button-checked{
+     float:right;
+     margin-right: 50px; 
+}
+</style>

VUECODE/smart-operate-manage/src/views/account/user/index.vue

@@ -13,7 +13,7 @@
       </el-form-item>
     </el-form>
     <div class="button">
-      <el-button type="primary">添加</el-button>
+      <el-button type="primary" @click="addUser">添加</el-button>
       <el-button type="warning" >修改</el-button>
     </div>
     <el-table
@@ -37,7 +37,6 @@
       <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
       <el-table-column prop="id" label="操作" align="center">
           <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
-
       <!-- <a><template slot-scope="scope">
           <span v-if="scope.row.status==1">{{ '停用账号' }}</span>
           <span v-if="scope.row.status==0">{{ '启用账号' }}</span>
@@ -169,6 +168,9 @@ export default {
       var month = value.getMonth() + 1
       var day = value.getDate()
       return year + '-' + month + '-' + day
+    },
+    addUser(){
+    this.$router.push({ name: 'user-addUser' })
     }
   }
 }