合并

CODE/smart-community/operate-api/pom.xml

@@ -141,8 +141,13 @@
 			<artifactId>okhttp</artifactId>
 			<version>3.11.0</version>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>RELEASE</version>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 
 	<dependencyManagement>
 		<dependencies>

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

@@ -85,5 +85,15 @@ public class UserController extends BaseController {
         responseBean.addSuccess("退出成功!");
         return responseBean;
     }
+    @ApiOperation(value = "用户成员列表", notes = "用户成员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号, " +
+                    "userName：用户名,pageNum:第几页，pageSize：每页长度")
+    })
+    @RequestMapping(value = "/user/userList", method = RequestMethod.POST)
+    public ResponseBean userList(@RequestBody String parameter){
+        ResponseBean  responseBean = iToUserService.userList(parameter);
+        return responseBean;
+    }
 
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToUserMapper.java

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 import com.community.huiju.model.ToUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 @Mapper
 public interface ToUserMapper {
@@ -19,4 +22,13 @@ public interface ToUserMapper {
     int updateByPrimaryKey(ToUser record);
 
     ToUser selectByLoginName(@Param(value = "loginName") String loginName);
+
+    List<ToUser> userList(@Param("loginName") String loginName, @Param("userName") String userName);
+
+    /**
+     * 查询创建人或者修改人
+     * @param createUser
+     * @return
+     */
+    String selectByIdUserName(Integer createUser);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToUser.java

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class ToUser {
     private Integer id;
@@ -27,6 +28,45 @@ public class ToUser {
 
     private Date updateDate;
 
+    private  String roleName;
+
+    /**
+     * 创建人
+     * @return
+     */
+    private String createNmae;
+
+    /**
+     * 修改人
+     * @return
+     */
+    private String updateNmae;
+
+
+    public String getCreateNmae() {
+        return createNmae;
+    }
+
+    public void setCreateNmae(String createNmae) {
+        this.createNmae = createNmae;
+    }
+
+    public void setUpdateNmae(String updateNmae) {
+        this.updateNmae = updateNmae;
+    }
+
+    public String getUpdateNmae() {
+        return updateNmae;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -23,4 +23,10 @@ public interface IToUserService {
      */
     ResponseBean getInfo(Integer userId);
 
+    /**
+     * 获取成员列表
+     * @param parameter
+     * @return
+     */
+    ResponseBean userList(String parameter);
 }

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

@@ -1,5 +1,7 @@
 package com.community.huiju.service.impl;
 
+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;
@@ -9,6 +11,8 @@ import com.community.huiju.model.ToSysRole;
 import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -16,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service("iToUserServer")
 @Slf4j
@@ -82,4 +87,37 @@ public class ToUserServerImpl implements IToUserService {
 
         return response;
     }
+
+    @Override
+    public ResponseBean userList(String parameter) {
+        ResponseBean response= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        String loginName= object.getString("loginName");
+        String userName = object.getString("userName");
+
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        pageNum=pageNum==null?1:pageNum;
+        pageSize=pageSize==null?10:pageSize;
+
+        Page<ToUser> page = PageHelper.startPage(pageNum,pageSize);
+        List<ToUser> userList=toUserMapper.userList(loginName,userName);
+
+        for (ToUser toUser:userList){
+            // 创建人
+            String createNmae=toUserMapper.selectByIdUserName(toUser.getCreateUser());
+            // 修改人
+            String updateNmae=toUserMapper.selectByIdUserName(toUser.getUpdateUser());
+
+            toUser.setCreateNmae(createNmae);
+            toUser.setUpdateNmae(updateNmae);
+        }
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("item",userList);
+        map.put("total",page.getTotal());
+        response.addSuccess(map);
+        return response;
+    }
 }

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

@@ -14,6 +14,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, user_name, login_name, login_password, email, head_portrait, remark, status, 
@@ -181,4 +182,40 @@
     from to_user where login_name = #{loginName,jdbcType=VARCHAR}
   </select>
 
+  <select id="userList" parameterType="com.community.huiju.model.ToUser" resultMap="BaseResultMap" >
+    SELECT
+    sr.role_name,
+    sr.description,
+    sr.create_user,
+    sr.create_date,
+    sr.update_date,
+    sr.update_user,
+    tu.user_name,
+    tu.remark,
+    tu.login_name,
+    tu.remark,
+    tu.status,
+    tu.id
+    FROM
+    to_user tu
+    LEFT JOIN to_sys_user_role ON tu.id = to_sys_user_role.user_id
+    LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
+    <where>
+    <if test="loginName != null and loginName !=''" >
+      and tu.login_name = #{loginName,jdbcType=VARCHAR}
+    </if>
+    <if test="userName != null and userName !=''" >
+      and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
+    </if>
+    </where>
+  </select>
+
+  <select id="selectByIdUserName" parameterType="int" resultType="string">
+    SELECT
+    user_name
+    FROM
+    to_user
+    WHERE id=#{id,jdbcType=INTEGER}
+  </select>
+
 </mapper>

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

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+// 根据条件查询成员
+export function employeesList(data) {
+  return request({
+    url: '/user/userList',
+    method: 'post',
+    data: {
+      loginName: data.loginName,
+      userName: data.userName,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+

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

@@ -1,5 +1,6 @@
 import { login, logOut, getInfo, sendCode } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import { employeesList } from '@/api/user'
 
 const user = {
   state: {
@@ -98,6 +99,17 @@ const user = {
         removeToken()
         resolve()
       })
+    },
+    // 根据条件查询 employeesList
+    EmployeesList({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        employeesList(listQuery).then(response => {
+          const data = response.data
+          resolve(data)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -1,10 +1,201 @@
 <template>
-    <div>员工管理</div>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item" label="姓名">
+        <el-input v-model.trim="listQuery.userName" placeholder="姓名" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="手机号" >
+        <el-input v-model.trim="listQuery.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="button">
+      <el-button type="primary">添加</el-button>
+      <el-button type="warning" >修改</el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="listDate"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="userName" label="姓名" align="center"/>
+      <el-table-column prop="roleName" label="角色" align="center"/>
+      <el-table-column prop="loginName" label="手机号" align="center"/>
+      <el-table-column prop="remark" label="备注" align="center"/>
+      <el-table-column prop="createNmae" label="创建人" align="center"/>
+      <el-table-column prop="createDate" label="创建时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
+      <el-table-column prop="updateNmae" label="修改人" align="center"/>
+      <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>
+     </template></a> -->
+          </el-table-column>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
 </template>
 
 <script>
+import { mapActions } from 'vuex'
+
 export default {
-    
+  data() {
+    return {
+      listQuery: {
+        id: '',
+        userName: '',
+        loginName:'',
+        roleName: '',
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      listDate: [],
+      deleteIds: [], // 选择的id集合
+      listLoading: true // 加载圈
+    }
+  },
+  mounted() {
+    // 获取数据
+    this.dataQuery()
+  },
+  methods: {
+    ...mapActions('listAnnouncement', [
+      'BserPassCertification'
+    ]),
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    getStatus(row) { // 获取状态
+      let statusName = ''
+
+      // 判断状态
+      switch (row.status) {
+        case '0':
+          statusName = '已作废'
+          break
+        case '1':
+          statusName = '已发布'
+          break
+        case '2':
+          statusName = '草稿'
+          break
+      }
+
+      // 如果修改时间和创建时间不一致, 就显示已修改
+      if (row.status === '1' && (row.updateDate > row.createDate)) {
+        statusName = '已修改'
+      }
+
+      return statusName
+    },
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('EmployeesList', this.listQuery).then((res) => {
+         this.listDate = res.item
+        console.log('resData1',this.listDate)
+        this.list = res.item
+        this.total = res.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error EmployeesList')
+      })
+    },
+    handleSelectionChange(data) {
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
+    },
+	  search() {
+      this.listQuery.pageNum = 1
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.ownerName =''
+      this.listQuery.userName=''
+      this.listQuery.loginName=''
+      this.dataQuery()
+    },
+    clickTitle(id) {
+      this.$router.push({ name: 'contentParticulars-details', params: { id: id }})
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      return year + '-' + month + '-' + day
+    }
+  }
 }
 </script>
 
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.button {
+  margin-left: 20px;
+}
+</style>
+