合并

CODE/smart-community/mq-message/src/main/java/com/community/huiju/dao/MqMessageMapper.java

@@ -18,4 +18,6 @@ public interface MqMessageMapper {
     int updateByPrimaryKeyWithBLOBs(MqMessage record);
 
     int updateByPrimaryKey(MqMessage record);
+	
+	int updateConnectionByName();
 }

CODE/smart-community/mq-message/src/main/java/com/community/huiju/service/impl/MqMessageServiceImpl.java

@@ -61,5 +61,7 @@ public class MqMessageServiceImpl implements MqMessageServiceI {
 		mqMessage.setPicUrl(exitFrom.getPicUrl());
 		//插入mq_message
 		mqMessageMapper.insertSelective(mqMessage);
+		//改变长连接表里的状态
+		mqMessageMapper.updateConnectionByName();
 	}
 }

CODE/smart-community/mq-message/src/main/resources/mapper/MqMessageMapper.xml

@@ -399,4 +399,7 @@
       pic_url = #{picUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <update id="updateConnectionByName">
+    update long_connection_status set `status` = '1' WHERE `connection_name` = "mq"
+  </update>
 </mapper>

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

@@ -13,6 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.Random;
+
 @RestController
 @RefreshScope
 @RequestMapping("/")
@@ -32,5 +36,28 @@ public class MqMessageController extends BaseController {
         responseBean = iMqMessageService.selectOpenDoorCount();
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "长连接", notes = "长连接")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/mq/connection",method = RequestMethod.GET)
+    public ResponseBean ajax(HttpServletResponse response) throws Exception {
+        Long startTime = System.currentTimeMillis();
+        // 死循环 查询有无数据变化
+        while (true) {
+            Long endTime = System.currentTimeMillis();
+            if (endTime - startTime > 8000){
+                return null;
+            }
+            // 获取开门次数的状态值
+            String status = iMqMessageService.getConnectionByName();
+            if (status.equals("1")) {
+                iMqMessageService.updateConnectionByName();
+                return getOpenDoor();
+            } else { // 模拟没有数据变化，将休眠 hold住连接
+                Thread.sleep(5000);
+            }
+        }
+        
+    }
 }

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

@@ -96,7 +96,7 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "用户成员列表", notes = "用户成员列表")
+    @ApiOperation(value = "添加成员", notes = "用户成员列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
     })
@@ -107,5 +107,37 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "修改成员", notes = "修改成员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+    })
+    @RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
+    public ResponseBean upDate(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.upDate(parameter,userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查看成员详情", notes = "查看成员详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+    })
+    @RequestMapping(value = "/user/selectById", method = RequestMethod.POST)
+    public ResponseBean selectById(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.selectById(parameter,userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改当前状态", notes = "修改当前状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+    })
+    @RequestMapping(value = "/user/upDateStatus", method = RequestMethod.POST)
+    public ResponseBean upDateStatus(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.upDateStatus(parameter,userElement.getId());
+        return responseBean;
+    }
 
 }

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

@@ -30,4 +30,8 @@ public interface MqMessageMapper {
      * @return
      */
     int selectUnitsOpenDoorCount(Integer eventType);
+    
+    String getConnectionByName();
+    
+    int updateConnectionByName();
 }

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

@@ -3,7 +3,6 @@ package com.community.huiju.dao;
 import com.community.huiju.model.ToSysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 @Mapper
@@ -20,6 +19,8 @@ public interface ToSysUserRoleMapper {
 
     int updateByPrimaryKey(ToSysUserRole record);
 
+
+    void deleteRole(@Param("userId") Integer userId);
     /**
      * 根据 角色id 查询 用户和角色关联关系
      * @param roleId

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

@@ -31,4 +31,13 @@ public interface ToUserMapper {
      * @return
      */
     String selectByIdUserName(Integer createUser);
+
+    List<ToUser> selectUser(@Param("id") Integer id);
+
+    /**
+     * 查询多个角色
+     * @return
+     */
+    List<ToUser>  selectRole(@Param("id") Integer id);
+
 }

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

@@ -42,6 +42,18 @@ public class ToUser {
      */
     private String updateNmae;
 
+    /**
+     * 角色id
+     */
+    private  String roleId;
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
 
     public String getCreateNmae() {
         return createNmae;

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

@@ -14,5 +14,16 @@ public interface IMqMessageService {
      * @return
      */
     ResponseBean selectOpenDoorCount();
-
+	
+	/**
+	 * 是否需要返回数据
+	 * @return
+	 */
+	String getConnectionByName();
+	
+	/**
+	 * 更新长连接的状态
+	 * @return
+	 */
+	int updateConnectionByName();
 }

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

@@ -37,4 +37,28 @@ public interface IToUserService {
      * @return
      */
     ResponseBean addUser(String parameter,Integer UserID);
+
+    /**
+     * 修改成员
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean upDate(String parameter, Integer id);
+
+    /**
+     * 查看成员详情
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean selectById(String parameter, Integer id);
+
+    /**
+     * 修改当前状态
+     * @param parameter
+     * @return
+     */
+    ResponseBean upDateStatus(String parameter,Integer userID);
+
 }

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

@@ -48,4 +48,24 @@ public class MqMessageService implements IMqMessageService {
         responseBean.addSuccess(mapList);
         return responseBean;
     }
+    
+    /**
+     * 是否需要返回数据
+     *
+     * @return
+     */
+    @Override
+    public String getConnectionByName() {
+        return mqMessageMapper.getConnectionByName();
+    }
+    
+    /**
+     * 更新长连接的状态
+     *
+     * @return
+     */
+    @Override
+    public int updateConnectionByName() {
+        return mqMessageMapper.updateConnectionByName();
+    }
 }

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

@@ -23,9 +23,7 @@ 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;
+import java.util.*;
 
 @Service("iToUserServer")
 @Slf4j
@@ -113,6 +111,8 @@ public class ToUserServerImpl implements IToUserService {
         List<ToUser> userList=toUserMapper.userList(loginName,userName);
 
         for (ToUser toUser:userList){
+            //查询当前所有角色
+            toUser.setRoleName(selectRole(toUser.getId()));
             // 创建人
             String createNmae=toUserMapper.selectByIdUserName(toUser.getCreateUser());
             // 修改人
@@ -137,8 +137,8 @@ public class ToUserServerImpl implements IToUserService {
 
         String loginName= object.getString("loginName");
         String userName = object.getString("userName");
-        JSONArray contentImg = object.getJSONArray("roleName");
-        Integer[] roleIDArray = contentImg.toArray(new Integer[]{});
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIDArray = List.toArray(new Integer[]{});
         String remark = object.getString("remark");
 
         toUser.setUserName(userName);
@@ -159,4 +159,99 @@ public class ToUserServerImpl implements IToUserService {
          response.addSuccess("成功");
         return response;
     }
+
+    @Override
+    public ResponseBean upDate(String parameter, Integer userID) {
+        ResponseBean response = new ResponseBean<>();
+        JSONObject object = JSONObject.parseObject(parameter);
+        ToUser toUser = new ToUser();
+
+        String loginName = object.getString("loginName");
+        Integer ID= object.getInteger("id");
+        String userName = object.getString("userName");
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIDArray = List.toArray(new Integer[]{});
+        String remark = object.getString("remark");
+
+        toUser.setUserName(userName);
+        toUser.setLoginName(loginName);
+        toUser.setRemark(remark);
+        toUser.setStatus("1");
+        toUser.setId(ID);
+        toUser.setUpdateUser(userID);
+        toUser.setUpdateDate(new Date());
+        toUserMapper.updateByPrimaryKeySelective(toUser);
+
+        //会对应多个角色
+        if (null!=List) {
+            toSysUserRoleMapper.deleteRole(ID);
+            for (Integer roleID : roleIDArray) {
+                ToSysUserRole toSysUserRole = new ToSysUserRole();
+                toSysUserRole.setUserId(toUser.getId());
+                toSysUserRole.setRoleId(roleID);
+                toSysUserRoleMapper.insert(toSysUserRole);
+            }
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean selectById(String parameter, Integer userID) {
+        ResponseBean response= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer ID= object.getInteger("id");
+        List<String> list=new ArrayList<String>();
+        List<ToUser> userList=toUserMapper.selectUser(ID);
+        for (ToUser toUser:userList){
+            list.add(toUser.getRoleId());
+        }
+         HashMap map= new HashMap<>();
+        map.put("userList",userList);
+        map.put("roleList",list);
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean upDateStatus(String parameter,Integer userID) {
+        ResponseBean response = new ResponseBean<>();
+        JSONObject object = JSONObject.parseObject(parameter);
+        Integer status = object.getInteger("status");
+        Integer id = object.getInteger("id");
+        ToUser toUser = new ToUser();
+        toUser.setId(id);
+        int st=status.intValue();
+        if (st==1){
+            toUser.setStatus("0");
+        }else if (st==0){
+            toUser.setStatus("1");
+        }
+        toUser.setUpdateUser(userID);
+        toUser.setUpdateDate(new Date());
+        toUserMapper.updateByPrimaryKey(toUser);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    //查询多个角色转换为字符串
+    public String selectRole(Integer id) {
+        List<ToUser> toUser= toUserMapper.selectRole(id);
+        List<String> list=new ArrayList<String>();
+         for (ToUser user:toUser){
+             list.add(user.getRoleName());
+         }
+        String result = "";
+        if (list != null && list.size() > 0) {
+            for (String item : list) {
+                // 把列表中的每条数据用逗号分割开来，然后拼接成字符串
+                result += item + ",";
+
+            }
+            result = result.substring(0,result.length()-1);
+        }
+        return result;
+    }
+
+
 }

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

@@ -410,4 +410,17 @@
     from mq_message
     where event_type = #{eventType,jdbcType=INTEGER}
   </select>
+
+  <select id="getConnectionByName" resultType="java.lang.String">
+    SELECT
+        `status`
+    FROM
+        long_connection_status
+    WHERE
+        `connection_name` = "mq"
+  </select>
+
+  <update id="updateConnectionByName">
+    update long_connection_status set `status` = '0' WHERE `connection_name` = "mq"
+  </update>
 </mapper>

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

@@ -50,6 +50,7 @@
       </if>
     </trim>
   </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.ToSysUserRole" >
     update to_sys_user_role
     <set >
@@ -62,16 +63,24 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
+
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.ToSysUserRole" >
     update to_sys_user_role
     set user_id = #{userId,jdbcType=INTEGER},
       role_id = #{roleId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <delete id="deleteRole" parameterType="java.lang.Integer" >
+    delete from to_sys_user_role
+    where user_id = #{userId,jdbcType=INTEGER}
+  </delete>
+
   <select id="selelctByRoleId" parameterType="integer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"/>
     from to_sys_user_role
     where role_id = #{roleId,jdbcType=INTEGER}
   </select>
+
 </mapper>

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

@@ -15,6 +15,7 @@
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="role_id" property="roleId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, user_name, login_name, login_password, email, head_portrait, remark, status, 
@@ -193,13 +194,13 @@
     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
+    group by to_sys_user_role.user_id
     <where>
     <if test="loginName != null and loginName !=''" >
       and tu.login_name = #{loginName,jdbcType=VARCHAR}
@@ -218,4 +219,37 @@
     WHERE id=#{id,jdbcType=INTEGER}
   </select>
 
+  <select id="selectUser"  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.status,
+    tu.id,
+    to_sys_user_role.role_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 tu.id=#{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectRole"  resultMap="BaseResultMap" parameterType="int">
+      SELECT
+          sr.role_name,
+          tu.remark,
+          tu.login_name,
+          tu.id,
+          to_sys_user_role.role_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 tu.id=#{id,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -0,0 +1,21 @@
+package com.community.huiju.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.community.huiju.common.base.BaseController;
+
+/**
+ * <p>
+ * 物业web端用户是那些角色 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-21
+ */
+@RestController
+@RequestMapping("/tp/sys-user-role")
+public class SysUserRoleController extends BaseController {
+
+}

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

@@ -99,4 +99,60 @@ 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,HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.userList(parameter,userElement.getCommunityId());
+		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 = userService.addUser(parameter,userElement.getId(),userElement.getCommunityId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "修改成员", notes = "修改成员")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+	})
+	@RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
+	public ResponseBean upDate(@RequestBody String parameter,HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.upDate(parameter,userElement.getId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "查看成员详情", notes = "查看成员详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+	})
+	@RequestMapping(value = "/user/selectById", method = RequestMethod.POST)
+	public ResponseBean selectById(@RequestBody String parameter,HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.selectById(parameter,userElement.getId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "修改当前状态", notes = "修改当前状态")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+	})
+	@RequestMapping(value = "/user/upDateStatus", method = RequestMethod.POST)
+	public ResponseBean upDateStatus(@RequestBody String parameter,HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.upDateStatus(parameter,userElement.getId());
+		return responseBean;
+	}
+
 }

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.SysUserRole;
+
+/**
+ * <p>
+ * 物业web端用户是那些角色 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-21
+ */
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+}

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

@@ -1,11 +1,17 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.model.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 物业web端用户表 Mapper 接口
@@ -18,4 +24,22 @@ import org.apache.ibatis.annotations.Param;
 public interface UserMapper extends BaseMapper<User> {
     String selectByIdUserName(@Param("id") Integer id);
 
+    IPage<User> userList(Page page, @Param("loginName") String loginName, @Param("userName") String userName,@Param("communityId")Integer communityId);
+
+
+    void updateByPrimaryKeySelective(User user);
+
+    /**
+     * 当前成员信息
+     * @param id
+     * @return
+     */
+    List<User> selectUser(@Param("id") Integer id);
+
+    /**
+     * 查询当前多个角色
+     * @param id
+     * @return
+     */
+    List<User> selectRole(@Param("id") Integer id);
 }

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

@@ -0,0 +1,38 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物业web端用户是那些角色
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_sys_user_role")
+public class SysUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer communityId;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+
+}

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

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +27,7 @@ public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -87,5 +90,23 @@ public class User implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /**
+     * 角色名称
+     */
+    private String RoleName;
+
+    /**
+     * 创建人名称
+     */
+    private String CreateNmae;
 
+    /**
+     * 修改人名称
+     */
+    private String UpdateNmae;
+
+    /**
+     * 角色ID
+     */
+    private String RoleId;
 }

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.SysUserRole;
+
+/**
+ * <p>
+ * 物业web端用户是那些角色 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-21
+ */
+public interface ISysUserRoleService extends IService<SysUserRole> {
+
+}

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

@@ -39,4 +39,42 @@ public interface IUserService extends IService<User> {
      */
     ResponseBean userInfo(UserElement userElement);
 
+    /**
+     * 获取成员列表
+     * @param parameter
+     * @return
+     */
+    ResponseBean userList(String parameter,Integer communityId);
+
+    /**
+     * 添加成员角色
+     * @param parameter
+     * @param UserID
+     * @return
+     */
+    ResponseBean addUser(String parameter,Integer UserID,Integer communityId);
+
+    /**
+     * 修改成员
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean upDate(String parameter, Integer id);
+
+    /**
+     * 查看成员详情
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean selectById(String parameter, Integer id);
+
+    /**
+     * 修改当前状态
+     * @param parameter
+     * @return
+     */
+    ResponseBean upDateStatus(String parameter,Integer userID);
+
 }

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

@@ -34,7 +34,7 @@ public interface TpAnnouncementService extends IService<TpAnnouncement> {
     ResponseBean announcementById(String paramets);
 
     /**
-     * 添加公告
+     * 修改公告
       * @param paramets
      * @return
      */

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.SysUserRoleMapper;
+import com.community.huiju.model.SysUserRole;
+import com.community.huiju.service.ISysUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物业web端用户是那些角色 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-21
+ */
+@Service
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
+
+}

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

@@ -1,7 +1,9 @@
 package com.community.huiju.service.impl;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
@@ -29,8 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
 
 /**
  * <p>
@@ -57,6 +59,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private ToCommunitiesMapper toCommunitiesMapper;
 
+    @Autowired
+    private  SysUserRoleMapper sysUserRoleMapper;
+
+
     @Override
     public ResponseBean login(String phone, Integer communityId, String code) {
         ResponseBean responseBean = new ResponseBean();
@@ -161,4 +167,170 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
     }
 
+    @Override
+    public ResponseBean userList(String parameter,Integer communityId) {
+        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");
+
+        // 分页
+        Page<TpBuildingOwnerInfo> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<User> pageInfo = userMapper.userList(page,loginName,userName,communityId);
+        List<User> userList = pageInfo.getRecords();
+        for (User user:userList){
+            //查询当前所有角色
+            user.setRoleName(selectRole(user.getId()));
+            // 创建人
+            String createNmae=userMapper.selectByIdUserName(user.getCreateUser());
+            // 修改人
+            String updateNmae=userMapper.selectByIdUserName(user.getUpdateUser());
+
+            user.setCreateNmae(createNmae);
+            user.setUpdateNmae(updateNmae);
+        }
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("list", userList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean addUser(String parameter,Integer userID,Integer communityId) {
+        ResponseBean response= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        User user= new User();
+
+        String loginName= object.getString("loginName");
+        String userName = object.getString("userName");
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIdArray = List.toArray(new Integer[]{});
+        String remark = object.getString("remark");
+
+        user.setUserName(userName);
+        user.setLoginName(loginName);
+        user.setRemark(remark);
+        user.setStatus("1");;
+        user.setCreateUser(userID);
+        user.setCreateDate(LocalDateTime.now());
+        userMapper.insert(user);
+        //维护小区
+        TpUserCommunity tpUserCommunity= new TpUserCommunity();
+        tpUserCommunity.setCommunityId(communityId);
+        tpUserCommunity.setId(user.getId());
+        tpUserCommunityMapper.insert(tpUserCommunity);
+        //会对应多个角色
+        for (Integer roleID:roleIdArray  ){
+            SysUserRole toSysUserRole= new SysUserRole();
+            toSysUserRole.setUserId(user.getId());
+            toSysUserRole.setRoleId(roleID);
+            sysUserRoleMapper.insert(toSysUserRole);
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean upDate(String parameter, Integer userID) {
+        ResponseBean response = new ResponseBean<>();
+        JSONObject object = JSONObject.parseObject(parameter);
+        User user = new User();
+
+        String loginName = object.getString("loginName");
+        Integer ID= object.getInteger("id");
+        String userName = object.getString("userName");
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIDArray = List.toArray(new Integer[]{});
+        String remark = object.getString("remark");
+
+        user.setUserName(userName);
+        user.setLoginName(loginName);
+        user.setRemark(remark);
+        user.setStatus("1");
+        user.setId(ID);
+        user.setUpdateUser(userID);
+        user.setUpdateDate(LocalDateTime.now());
+        userMapper.updateByPrimaryKeySelective(user);
+
+        //会对应多个角色
+        if (null!=List) {
+            sysUserRoleMapper.deleteById(ID);
+            for (Integer roleID : roleIDArray) {
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setUserId(user.getId());
+                sysUserRole.setRoleId(roleID);
+                sysUserRoleMapper.insert(sysUserRole);
+            }
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean selectById(String parameter, Integer userID) {
+        ResponseBean response= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer ID= object.getInteger("id");
+        List<String> list=new ArrayList<String>();
+        List<User> userList=userMapper.selectUser(ID);
+        for (User user:userList){
+            list.add(user.getRoleId());
+        }
+        HashMap map= new HashMap<>();
+        map.put("userList",userList);
+        map.put("roleList",list);
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean upDateStatus(String parameter,Integer userID) {
+        ResponseBean response = new ResponseBean<>();
+        JSONObject object = JSONObject.parseObject(parameter);
+        Integer status = object.getInteger("status");
+        Integer id = object.getInteger("id");
+        User user = new User();
+        user.setId(id);
+        int st=status.intValue();
+        if (st==1){
+            user.setStatus("0");
+        }else if (st==0){
+            user.setStatus("1");
+        }
+        user.setUpdateUser(userID);
+        user.setUpdateDate(LocalDateTime.now());
+        userMapper.updateByPrimaryKeySelective(user);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    //查询多个角色转换为字符串
+    public String selectRole(Integer id) {
+        List<User> toUser= userMapper.selectRole(id);
+        List<String> list=new ArrayList<String>();
+        for (User user:toUser){
+            list.add(user.getRoleName());
+        }
+        String result = "";
+        if (list != null && list.size() > 0) {
+            for (String item : list) {
+                // 把列表中的每条数据用逗号分割开来，然后拼接成字符串
+                result += item + ",";
+
+            }
+            result = result.substring(0,result.length()-1);
+        }
+        return result;
+    }
+
 }

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

@@ -9,4 +9,107 @@
         WHERE id=#{id,jdbcType=INTEGER}
     </select>
 
+    <select id="userList" resultType="com.community.huiju.model.User" >
+        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.status,
+        tu.id
+        FROM
+        tp_user tu
+        LEFT JOIN tp_sys_user_role ON tu.id = tp_sys_user_role.user_id
+        LEFT JOIN tp_sys_role sr ON tp_sys_user_role.role_id = sr.id
+        LEFT JOIN tp_user_community uc ON tu.id=uc.tp_user_id
+        group by tp_sys_user_role.user_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>
+            and  uc.community_id=#{communityId,jdbcType=INTEGER}
+        </where>
+    </select>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.User" >
+    update tp_user
+    <set >
+        <if test="userName != null" >
+            user_name = #{userName,jdbcType=VARCHAR},
+        </if>
+        <if test="loginName != null" >
+            login_name = #{loginName,jdbcType=VARCHAR},
+        </if>
+        <if test="loginPassword != null" >
+            login_password = #{loginPassword,jdbcType=VARCHAR},
+        </if>
+        <if test="email != null" >
+            email = #{email,jdbcType=VARCHAR},
+        </if>
+        <if test="headPortrait != null" >
+            head_portrait = #{headPortrait,jdbcType=VARCHAR},
+        </if>
+        <if test="remark != null" >
+            remark = #{remark,jdbcType=VARCHAR},
+        </if>
+        <if test="status != null" >
+            status = #{status,jdbcType=CHAR},
+        </if>
+        <if test="createUser != null" >
+            create_user = #{createUser,jdbcType=INTEGER},
+        </if>
+        <if test="createDate != null" >
+            create_date = #{createDate,jdbcType=TIMESTAMP},
+        </if>
+        <if test="updateUser != null" >
+            update_user = #{updateUser,jdbcType=INTEGER},
+        </if>
+        <if test="updateDate != null" >
+            update_date = #{updateDate,jdbcType=TIMESTAMP},
+        </if>
+    </set>
+    </update>
+
+    <select id="selectUser"  resultType="com.community.huiju.model.User" >
+        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.status,
+        tu.id,
+        tp_sys_user_role.role_id
+        FROM
+        tp_user tu
+        LEFT JOIN tp_sys_user_role ON tu.id = tp_sys_user_role.user_id
+        LEFT JOIN tp_sys_role sr ON tp_sys_user_role.role_id = sr.id
+        WHERE tu.id=#{id,jdbcType=INTEGER}
+    </select>
+    <select id="selectRole"  resultType="com.community.huiju.model.User" parameterType="int">
+        SELECT
+        sr.role_name,
+        tu.remark,
+        tu.login_name,
+        tu.id,
+        tp_sys_user_role.role_id
+        FROM
+        tp_user tu
+        LEFT JOIN tp_sys_user_role ON tu.id = tp_sys_user_role.user_id
+        LEFT JOIN tp_sys_role sr ON tp_sys_user_role.role_id = sr.id
+        WHERE tu.id=#{id,jdbcType=INTEGER}
+    </select>
+
 </mapper>

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

@@ -1,4 +1,6 @@
+import axios from 'axios'
 import request from '@/utils/request'
+import { getToken } from '@/utils/auth'
 
 // 硬件数据统计
 export function getHardData() {
@@ -15,3 +17,22 @@ export function getSignUser() {
     method: 'get'
   })
 }
+
+// 硬件数据统计
+export function setUpConnection() {
+  return new Promise((resolve, reject) => {
+    axios({
+      url: '/mq/connection',
+      method: 'get',
+      baseURL: process.env.BASE_API,
+      timeout: 10000,
+      headers: {
+        'X-Auth-Token': getToken(),
+        'Login-Type': 'web'
+      }
+    }).then(response => {
+      resolve(response.data)
+    }).catch(e => reject(e))
+  })
+}
+

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

@@ -25,4 +25,57 @@ export function userRoleById(data) {
     }
   })
 }
-
+// 添加用户角色
+export function addUser(data) {
+  return request({
+    url: '/user/addUser',
+    method: 'post',
+    data: {
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName,
+      remark: data.remark,
+      userName: data.userName,
+      loginName: data.loginName,
+      menuArray: data.menuArray
+    }
+  })
+}
+// 查看用户角色
+export function selectUser(data) {
+  return request({
+    url: '/user/selectById',
+    method: 'post',
+    data: {
+      id: data.id
+    }
+  })
+}
+// 修改用户角色
+export function upDate(data) {
+  return request({
+    url: '/user/upDate',
+    method: 'post',
+    data: {
+      id: data.id,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName,
+      remark: data.remark,
+      userName: data.userName,
+      loginName: data.loginName,
+      menuArray: data.menuArray
+    }
+  })
+}
+// 修改用户当前状态
+export function upDateStatus(data) {
+  return request({
+    url: '/user/upDateStatus',
+    method: 'post',
+    data: {
+      id: data.id,
+      status: data.status
+    }
+  })
+}

VUECODE/smart-operate-manage/src/components/chart/chart3.vue

@@ -20,16 +20,20 @@
 import { mapState, mapActions } from 'vuex'
 
 export default {
+  props: [
+    'arr'
+  ],
   data() {
     return {
-      arr: [
-        { text: '小区门禁开启', num: '13400次', active: false },
-        { text: '单元门开启', num: '12788次', active: false },
-        { text: '车辆进入数量', num: '5664辆', active: false },
-        { text: '咖啡厅销量', num: '3994次', active: false },
-        { text: '智慧食堂销量', num: '5664人次', active: false },
-        { text: '健身房健身', num: '1255人次', active: false }
-      ]
+      longPoll: true,
+      // arr: [
+      //   { text: '小区门禁开启', num: '13400次', active: false },
+      //   { text: '单元门开启', num: '12788次', active: false },
+      //   { text: '车辆进入数量', num: '5664辆', active: false },
+      //   { text: '咖啡厅销量', num: '3994次', active: false },
+      //   { text: '智慧食堂销量', num: '5664人次', active: false },
+      //   { text: '健身房健身', num: '1255人次', active: false }
+      // ]
     }
   },
   computed: {
@@ -37,22 +41,51 @@ export default {
       hardData: item => item.trunkIndex.hardData
     })
   },
+  // beforeRouteEnter (to, from, next) {
+  //   next(vm => {
+  //     vm.longPoll = true
+  //     const foo = () => {
+  //       if (!vm.longPoll) return
+
+  //       vm.SetUpConnection().then(() => {
+  //         vm.hardData.forEach(item => {
+  //           if (item.message === '小区开门次数') {
+  //             vm.arr[0].num = item.count + '次'
+  //           } else if (item.message === '单元门开门次数') {
+  //             vm.arr[1].num = item.count + '次'
+  //           }
+  //         })
+  //         vm.arr = JSON.parse(JSON.stringify(vm.arr))
+  //         foo()
+  //       }).catch(() => {
+  //         foo()
+  //       })
+  //     }
+  //     foo()
+  //   })
+  // },
+  // beforeRouteLeave(to, from, next) {
+  //   this.longPoll = false
+  //   next()
+  // },
   created() {
-    this.GetHardData().then(() => {
-      console.log(this.hardData)
-      this.hardData.forEach(item => {
-        if (item.message === '小区开门次数') {
-          this.arr[0].num = item.count + '次'
-        } else if (item.message === '单元门开门次数') {
-          this.arr[1].num = item.count + '次'
-        }
-      })
-      this.arr = JSON.parse(JSON.stringify(this.arr))
-    })
+    // this.GetHardData().then(() => {
+    //   console.log(this.hardData)
+    //   this.hardData.forEach(item => {
+    //     if (item.message === '小区开门次数') {
+    //       this.arr[0].num = item.count + '次'
+    //     } else if (item.message === '单元门开门次数') {
+    //       this.arr[1].num = item.count + '次'
+    //     }
+    //   })
+    //   this.arr = JSON.parse(JSON.stringify(this.arr))
+    // })
+
   },
   methods: {
     ...mapActions('trunkIndex', [
-      'GetHardData'
+      'GetHardData',
+      'SetUpConnection'
     ])
   }
 }

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

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

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

@@ -1,4 +1,4 @@
-import { getHardData, getSignUser } from '@/api/index'
+import { getHardData, getSignUser, setUpConnection } from '@/api/index'
 
 const trunkIndex = {
   namespaced: true,
@@ -30,6 +30,19 @@ const trunkIndex = {
       })
     },
 
+    // 建立长连接
+    SetUpConnection({ commit }) {
+      return new Promise((resolve, reject) => {
+        setUpConnection().then(response => {
+          const data = response.data
+          commit('upDateHardData', data)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
     // 注册用户统计
     GetSignUser({ commit }) {
       return new Promise((resolve, reject) => {

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, userRoleById } from '@/api/user'
+import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus } from '@/api/user'
 
 const user = {
   state: {
@@ -112,7 +112,7 @@ const user = {
       })
     },
     // 查询角色 UserRoleById
-    UserRoleById({ commit, state }, data) { // 查询活动详情
+    UserRoleById({ commit, state }, data) {
       return new Promise((resolve, reject) => {
         userRoleById(data).then(response => {
           resolve(response)
@@ -120,8 +120,47 @@ const user = {
           reject(error)
         })
       })
+    },
+    // 添加成员角色
+    AddUser({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        addUser(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 获取成员信息
+    SelectUser({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        selectUser(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 修改成员信息
+    UpDate({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        upDate(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 修改成员状态(停用或者启用)
+    UpDateStatus({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        upDateStatus(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }
-
 export default user

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

@@ -1,127 +1,137 @@
 <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 ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="名称" prop="userName">
+        <el-input v-model="ruleForm.userName"/>
       </el-form-item>
-      <el-form-item label="手机号:" prop="description">
-        <el-input v-model="listQuery.description"/>
+     <el-form-item class="filter-item" label="手机号" prop="loginName" >
+        <el-input v-model.trim="ruleForm.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
       </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 label="角色" prop="menuArray">
+        <!-- default-expanded-keys 展示选中的
+             default-checked-keys 勾上选中的-->
+        <el-tree
+          ref="tree"
+          :data="menuData"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="ruleForm.remark"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary">立即创建</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
       </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
-import { mapActions } from 'vuex'
 export default {
   data() {
     return {
-      listQuery: {
-        id: '',  
+      ruleForm: {
+        id: '',
+        userName: '',
+        loginName:'',
+        remark: '',
         roleName: '',
-        description: '',
-        menuArray: [], // 已选中的权限资源
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
         pageNum: 1,
-        pageSize:100
+        pageSize: 10,
+        menuArray: [] // 已选中的权限资源
+      },
+      menuData: [], // 所有权限资源
+      defaultProps: { // 设置树形节点的渲染的属性
+        id: 'id',
+        label: 'roleName',
+        children: 'children'
       },
-       va3:[], 
-       value2:[1,4],
-       dataList:[],
-       citiesList:['上海', '北京', '广州', '深圳', '南京', '西安'],
-       pinyinList:['上海', '北京', '广州', '深圳', '南京', '西安', '成都'],
       rules: {
         roleName: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
+          { required: true, message: '名称', trigger: 'blur' }
         ],
-        description: [
+        loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }
         ],
+        
       }
     }
   },
   mounted() {
-      this.getById()
-    //    this.roleBox()
+     this.getById()
   },
   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)
+    submitForm(formName) {
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        if (valid) {
+          console.log('this.roleName',this.roleName)
+          this.$store.dispatch('AddUser', this.ruleForm).then((res) => {
+            const resCode = res.code
+            this.ruleForm.id=''
+            if (resCode === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              loading.close()
+              this.$router.push({ name: 'user-index' })
+            }
+          }).catch(() => {
+            console.log('error AddUser')
+            loading.close()
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
         }
       })
     },
-    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])
-        // }
-
-        // }
-  }    
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleCheckChange(data, checked, indeterminate) { // 树形图选择事件
+      console.log(data, checked, indeterminate)
+    },
+    getMenuList() { // 获取 菜单列表
+      this.$store.dispatch('GetMenuList').then((res) => {
+        this.menuData = res.data
+      }).catch(() => {
+        console.log('error GetMenuList')
+      })
+    },
+    getById(){
+    this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
+      this.menuData = res.data.list
+      console.log(this.menuData)
+    }).catch(() => {
+      console.log('error UserRoleById')
+    })
 }
+  }
+  }
 </script>
 
 <style scoped>
-.demo-listQuery {
+.demo-ruleForm {
   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/edit.vue

@@ -0,0 +1,156 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="名称" prop="userName">
+        <el-input v-model="ruleForm.userName"/>
+      </el-form-item>
+     <el-form-item class="filter-item" label="手机号" prop="loginName" >
+        <el-input v-model.trim="ruleForm.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
+      </el-form-item>
+      <el-form-item label="角色" prop="menuArray">
+        <!-- default-expanded-keys 展示选中的
+             default-checked-keys 勾上选中的-->
+        <el-tree
+          ref="tree"
+          :data="menuData"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="ruleForm.remark"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+        id: '',
+        userName: '',
+        loginName:'',
+        remark: '',
+        roleName: '',
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
+        pageNum: 1,
+        pageSize: 10,
+        menuArray: [] // 已选中的权限资源
+      },
+      menuData: [], // 所有权限资源
+      defaultProps: { // 设置树形节点的渲染的属性
+        id: 'id',
+        label: 'roleName',
+        children: 'children'
+      },
+      rules: {
+        roleName: [
+          { required: true, message: '名称', trigger: 'blur' }
+        ],
+        loginName: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+        
+      }
+    }
+  },
+  mounted() {
+     this.selectUser(this.$route.params.id)
+     console.log('this.$route.params.id',this.$route.params.id)
+     this.getById()
+  },
+  methods: {
+    submitForm(formName) {
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        if (valid) {
+          console.log('this.roleName',this.roleName)
+          this.$store.dispatch('UpDate', this.ruleForm).then((res) => {
+            const resCode = res.code
+            if (resCode === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              loading.close()
+              this.$router.push({ name: 'user-index' })
+            }
+          }).catch(() => {
+            console.log('error AddUser')
+            loading.close()
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleCheckChange(data, checked, indeterminate) { // 树形图选择事件
+      console.log(data, checked, indeterminate)
+    },
+    getMenuList() { // 获取 菜单列表
+      this.$store.dispatch('GetMenuList').then((res) => {
+        this.menuData = res.data
+      }).catch(() => {
+        console.log('error GetMenuList')
+      })
+    },
+    getById(){
+    this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
+      this.menuData = res.data.list
+      console.log(this.menuData)
+    }).catch(() => {
+      console.log('error UserRoleById')
+    })
+},
+  selectUser(id){
+    this.ruleForm.id=id
+    this.$store.dispatch('SelectUser', this.ruleForm).then((res) => {
+      // this.ruleForm.loginName = res.data.loginName
+      // this.ruleForm=res.data[0]
+        // this.ruleForm.loginName.push(res.data[0])
+        this.ruleForm.loginName=res.data.userList[0].loginName
+         this.ruleForm.userName=res.data.userList[0].userName
+         this.ruleForm.remark=res.data.userList[0].remark
+         this.ruleForm.menuArray=res.data.roleList
+        console.log('res.data',res.data)
+
+    }).catch(() => {
+      console.log('error SelectUser')
+    })
+
+
+  }
+  }
+  }
+</script>
+
+<style scoped>
+.demo-ruleForm {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>

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

@@ -14,7 +14,7 @@
     </el-form>
     <div class="button">
       <el-button type="primary" @click="addUser">添加</el-button>
-      <el-button type="warning" >修改</el-button>
+      <el-button type="warning" @click="upDate">修改</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -36,7 +36,7 @@
       <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>
+          <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ 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>
@@ -70,6 +70,7 @@ export default {
         createUser: '',
         updateUser: '',
         updateDate: '',
+        status : '',
         pageNum: 1,
         pageSize: 10
       },
@@ -101,34 +102,33 @@ export default {
       value = value < 10 ? '0' + value : value
       return value
     },
-    getStatus(row) { // 获取状态
-      let statusName = ''
+    // getStatus(row) { // 获取状态
+    //   let statusName = ''
 
-      // 判断状态
-      switch (row.status) {
-        case '0':
-          statusName = '已作废'
-          break
-        case '1':
-          statusName = '已发布'
-          break
-        case '2':
-          statusName = '草稿'
-          break
-      }
+    //   // 判断状态
+    //   switch (row.status) {
+    //     case '0':
+    //       statusName = '已作废'
+    //       break
+    //     case '1':
+    //       statusName = '已发布'
+    //       break
+    //     case '2':
+    //       statusName = '草稿'
+    //       break
+    //   }
 
-      // 如果修改时间和创建时间不一致, 就显示已修改
-      if (row.status === '1' && (row.updateDate > row.createDate)) {
-        statusName = '已修改'
-      }
+    //   // 如果修改时间和创建时间不一致, 就显示已修改
+    //   if (row.status === '1' && (row.updateDate > row.createDate)) {
+    //     statusName = '已修改'
+    //   }
 
-      return 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
@@ -136,6 +136,7 @@ export default {
         this.listLoading = false
         console.log('error EmployeesList')
       })
+      
     },
     handleSelectionChange(data) {
       // 设置为 空
@@ -171,9 +172,29 @@ export default {
     },
     addUser(){
     this.$router.push({ name: 'user-addUser' })
+     this.listQuery.id=''
+    },
+    upDate(){
+      //  this.$router.push({ name: 'user-edit' })
+       const ids = this.deleteIds[0]
+          this.$router.push({ name: 'user-edit', params: { id: ids }})
+    },
+    upDateStatus(id,status){
+      this.listQuery.id=id
+      this.listQuery.status=status
+      this.$store.dispatch('UpDateStatus', this.listQuery).then((res) => {
+        console.log('res',res)
+        this.dataQuery()
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error UpDateStatus')
+      })
     }
-  }
-}
+    }
+    }
+  
+
 </script>
 
 <style scoped>

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

@@ -3,7 +3,7 @@
     <div class="left">
       <chart1/>
       <chart2/>
-      <chart3/>
+      <chart3 :arr="arr"/>
     </div>
     <div class="middle">
       <chart4/>
@@ -24,6 +24,7 @@ import chart4 from '@/components/chart/chart4.vue'
 import chart5 from '@/components/chart/chart5.vue'
 import chart6 from '@/components/chart/chart6.vue'
 import chart7 from '@/components/chart/chart7.vue'
+import { mapState, mapActions } from 'vuex'
 
 export default {
   components: {
@@ -34,6 +35,91 @@ export default {
     chart5,
     chart6,
     chart7
+  },
+  data() {
+    return {
+      longPoll: true,
+      // arr: [
+      //   { text: '小区门禁开启', num: '13400次', active: false },
+      //   { text: '单元门开启', num: '12788次', active: false },
+      //   { text: '车辆进入数量', num: '5664辆', active: false },
+      //   { text: '咖啡厅销量', num: '3994次', active: false },
+      //   { text: '智慧食堂销量', num: '5664人次', active: false },
+      //   { text: '健身房健身', num: '1255人次', active: false }
+      // ]
+    }
+  },
+  computed: {
+    ...mapState('trunkIndex', {
+      hardData: item => item.trunkIndex.hardData
+    }),
+    arr() {
+      let num1, num2
+
+      const rawData = !this.hardData ? [] : this.hardData
+      rawData.forEach(item => {
+        if (item.message === '小区开门次数') {
+          num1 = item.count
+        } else if (item.message === '单元门开门次数') {
+          num2 = item.count
+        }
+      })
+
+      return [
+        { text: '小区门禁开启', num: `${num1}次`, active: false },
+        { text: '单元门开启', num: `${num2}次`, active: false },
+        { text: '车辆进入数量', num: '5664辆', active: false },
+        { text: '咖啡厅销量', num: '3994次', active: false },
+        { text: '智慧食堂销量', num: '5664人次', active: false },
+        { text: '健身房健身', num: '1255人次', active: false }
+      ]
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.longPoll = true
+      const foo = () => {
+        if (!vm.longPoll) return
+
+        vm.SetUpConnection().then(() => {
+          // vm.hardData.forEach(item => {
+          //   if (item.message === '小区开门次数') {
+          //     vm.arr[0].num = item.count + '次'
+          //   } else if (item.message === '单元门开门次数') {
+          //     vm.arr[1].num = item.count + '次'
+          //   }
+          // })
+          vm.arr = JSON.parse(JSON.stringify(vm.arr))
+          foo()
+        }).catch(() => {
+          foo()
+        })
+      }
+      foo()
+    })
+  },
+  beforeRouteLeave(to, from, next) {
+    this.longPoll = false
+    next()
+  },
+  created() {
+    this.GetHardData().then(() => {
+      // console.log(this.hardData)
+      // this.hardData.forEach(item => {
+      //   if (item.message === '小区开门次数') {
+      //     this.arr[0].num = item.count + '次'
+      //   } else if (item.message === '单元门开门次数') {
+      //     this.arr[1].num = item.count + '次'
+      //   }
+      // })
+      // this.arr = JSON.parse(JSON.stringify(this.arr))
+    })
+  },
+  methods: {
+    ...mapActions('trunkIndex', [
+      'GetHardData',
+      'SetUpConnection'
+    ])
   }
 }
 

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

@@ -0,0 +1,81 @@
+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
+    }
+  })
+}
+// 获取角色暂定写死
+export function userRoleById(data) {
+  return request({
+    url: '/role/list',
+    method: 'post',
+    data: {
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName
+    }
+  })
+}
+// 添加用户角色
+export function addUser(data) {
+  return request({
+    url: '/user/addUser',
+    method: 'post',
+    data: {
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName,
+      remark: data.remark,
+      userName: data.userName,
+      loginName: data.loginName,
+      menuArray: data.menuArray
+    }
+  })
+}
+// 查看用户角色
+export function selectUser(data) {
+  return request({
+    url: '/user/selectById',
+    method: 'post',
+    data: {
+      id: data.id
+    }
+  })
+}
+// 修改用户角色
+export function upDate(data) {
+  return request({
+    url: '/user/upDate',
+    method: 'post',
+    data: {
+      id: data.id,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName,
+      remark: data.remark,
+      userName: data.userName,
+      loginName: data.loginName,
+      menuArray: data.menuArray
+    }
+  })
+}
+// 修改用户当前状态
+export function upDateStatus(data) {
+  return request({
+    url: '/user/upDateStatus',
+    method: 'post',
+    data: {
+      id: data.id,
+      status: data.status
+    }
+  })
+}

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

@@ -183,7 +183,7 @@ export const constantRouterMap = [
     children: [
       {
         path: '/account/user',
-        component: () => import('@/views/account/user'),
+        component: () => import('@/views/account/user/index'),
         name: 'user-index',
         meta: { title: '员工管理', icon: 'table' }
       },

VUECODE/smart-property-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, userRoleById, addUser, selectUser, upDate, upDateStatus } from '@/api/user'
 
 const user = {
   state: {
@@ -99,6 +100,67 @@ 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)
+        })
+      })
+    },
+    // 查询角色 UserRoleById
+    UserRoleById({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        userRoleById(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 添加成员角色
+    AddUser({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        addUser(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 获取成员信息
+    SelectUser({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        selectUser(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 修改成员信息
+    UpDate({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        upDate(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 修改成员状态(停用或者启用)
+    UpDateStatus({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        upDateStatus(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -1,262 +0,0 @@
-<template>
-  <div class="app-container">
-    <span>这个是用户相关的页面</span>
-    <div class="filter-container">
-      <el-input v-model="listQuery.transactionId" placeholder="帖子编号" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
-      <el-input v-model="listQuery.transactionTitle" placeholder="帖子标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
-      <el-select v-model="listQuery.status" placeholder="发布状态" style="width: 130px" class="filter-item">
-        <el-option label="已发布" value="1"/>
-        <el-option label="已作废" value="0"/>
-      </el-select>
-      <el-select v-model="listQuery.isReported" placeholder="是否被举报" class="filter-item" style="width: 130px">
-        <el-option label="无举报" value="0"/>
-        <el-option label="被举报" value="1"/>
-      </el-select>
-      <el-button v-waves class="filter-item" type="info" @click="clearListQuery">清空</el-button>
-      <el-button v-waves class="filter-item" type="primary" @click="handleFilter">查询</el-button>
-    </div>
-
-    <el-table
-      v-loading="listLoading"
-      :key="tableKey"
-      :data="transactionList"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%; margin-top: 20px;"
-      @sort-change="sortChange">
-      <el-table-column label="编号" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.id }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类型" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.type === '0'">二手</span>
-          <span v-if="scope.row.type === '1'">求购</span>
-          <span v-if="scope.row.type === '2'">租赁</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="标题" align="center">
-        <template slot-scope="scope">
-          <span @click="handleLook(scope.row.id)" style="color: #409EFF;cursor: pointer">{{ scope.row.transactionTitle }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="查看人数" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.viewCount }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="发布人" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.userName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="发布时间" align="center">
-        <template slot-scope="scope">
-          <span>{{ formatDate(scope.row.createDate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="发布状态" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status === '0'">已作废</span>
-          <span v-if="scope.row.status === '1'">已发布</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="举报状态" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.isReported === '1' ? "被举报" : "无举报" }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 20, 30]" @pagination="getList" /> -->
-    <el-pagination
-      :total="total"
-      :current-page="listQuery.pageNum"
-      :page-sizes="[5, 10, 20, 30]"
-      :page-size="listQuery.pageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"/>
-
-  </div>
-</template>
-
-<script>
-import { mapState, mapActions, mapMutations } from 'vuex'
-import waves from '@/directive/waves' // Waves directive
-import { parseTime } from '@/utils'
-
-export default {
-  computed: {
-    ...mapState('transaction', {
-      transactionList: s => s.transactionList,
-      total: s => s.total
-    })
-  },
-  directives: { waves },
-  data() {
-    var _self = this
-    return {
-      events: {
-        click: (e) => {
-          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
-          _self.detail.longitude = e.lnglat.lng
-          _self.detail.latitude = e.lnglat.lat
-        }
-      },
-      markers: [],
-      searchOption: {
-        city: '南京',
-        citylimit: false
-      },
-      listLoading: true,
-      listQuery: {
-        pageNum: 1,
-        pageSize: 20,
-        transactionId: undefined,
-        transactionTitle: undefined,
-        status: undefined,
-        isReported: undefined
-      },
-      tableKey: 0,
-      downloadLoading: false
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    ...mapMutations('transaction', {
-    }),
-    ...mapActions('transaction', [
-      'FetchTransactionList'
-    ]),
-    setCurrent(item) {
-      this.setDetail({ ...item })
-    },
-    getList() {
-      this.listLoading = true
-      this.FetchTransactionList(this.listQuery).then(() => {
-        this.listLoading = false
-      }).catch(() => {
-        this.loading = false
-        console.log('get list error')
-      })
-    },
-    clearListQuery() {
-      this.listQuery.pageNum = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.transactionId = undefined
-      this.listQuery.transactionTitle = undefined
-      this.listQuery.status = undefined
-      this.listQuery.isReported = undefined
-      this.getList()
-    },
-    handleFilter() {
-      this.listQuery.pageNum = 1
-      this.getList()
-    },
-    handleModifyStatus(row, status) {
-      this.$message({
-        message: '操作成功',
-        type: 'success'
-      })
-      row.status = status
-    },
-    sortChange(data) {
-      const { prop, order } = data
-      if (prop === 'id') {
-        this.sortByID(order)
-      }
-    },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.listQuery.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
-      this.listQuery.pageNum = val
-      this.getList()
-    },
-    sortByID(order) {
-      if (order === 'ascending') {
-        this.listQuery.sort = '+id'
-      } else {
-        this.listQuery.sort = '-id'
-      }
-      this.handleFilter()
-    },
-    handleUpdate(row) {
-      this.setCurrent(row)
-      this.dialogStatus = 'update'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      this.getEditCityList()
-      this.getEditDistrictList()
-    },
-    handleLook(id) {
-      this.$router.push({ name: 'transaction-info', params: { id: id }})
-    },
-    handleCreate() {
-      this.resetDetail()
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    handleDelete(row) {
-      this.$notify({
-        title: '成功',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
-      const index = this.list.indexOf(row)
-      this.list.splice(index, 1)
-    },
-    handleDownload() {
-      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-        const data = this.formatJson(filterVal, this.list)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: 'table-list'
-        })
-        this.downloadLoading = false
-      })
-    },
-    padDate(value) {
-      value = value < 10 ? '0' + value : value
-      return value
-    },
-    formatDate(val) {
-      var value = new Date(val)
-      var year = value.getFullYear()
-      var month = this.padDate(value.getMonth() + 1)
-      var day = this.padDate(value.getDate())
-      var hour = this.padDate(value.getHours())
-      var minutes = this.padDate(value.getMinutes())
-      var seconds = this.padDate(value.getSeconds())
-      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'timestamp') {
-          return parseTime(v[j])
-        } else {
-          return v[j]
-        }
-      }))
-    },
-  }
-}
-</script>

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

@@ -0,0 +1,137 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="名称" prop="userName">
+        <el-input v-model="ruleForm.userName"/>
+      </el-form-item>
+     <el-form-item class="filter-item" label="手机号" prop="loginName" >
+        <el-input v-model.trim="ruleForm.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
+      </el-form-item>
+      <el-form-item label="角色" prop="menuArray">
+        <!-- default-expanded-keys 展示选中的
+             default-checked-keys 勾上选中的-->
+        <el-tree
+          ref="tree"
+          :data="menuData"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="ruleForm.remark"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+        id: '',
+        userName: '',
+        loginName:'',
+        remark: '',
+        roleName: '',
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
+        pageNum: 1,
+        pageSize: 10,
+        menuArray: [] // 已选中的权限资源
+      },
+      menuData: [], // 所有权限资源
+      defaultProps: { // 设置树形节点的渲染的属性
+        id: 'id',
+        label: 'roleName',
+        children: 'children'
+      },
+      rules: {
+        roleName: [
+          { required: true, message: '名称', trigger: 'blur' }
+        ],
+        loginName: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+        
+      }
+    }
+  },
+  mounted() {
+     this.getById()
+  },
+  methods: {
+    submitForm(formName) {
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        if (valid) {
+          console.log('this.roleName',this.roleName)
+          this.$store.dispatch('AddUser', this.ruleForm).then((res) => {
+            const resCode = res.code
+            this.ruleForm.id=''
+            if (resCode === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              loading.close()
+              this.$router.push({ name: 'user-index' })
+            }
+          }).catch(() => {
+            console.log('error AddUser')
+            loading.close()
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleCheckChange(data, checked, indeterminate) { // 树形图选择事件
+      console.log(data, checked, indeterminate)
+    },
+    getMenuList() { // 获取 菜单列表
+      this.$store.dispatch('GetMenuList').then((res) => {
+        this.menuData = res.data
+      }).catch(() => {
+        console.log('error GetMenuList')
+      })
+    },
+    getById(){
+    this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
+      this.menuData = res.data.list
+      console.log(this.menuData)
+    }).catch(() => {
+      console.log('error UserRoleById')
+    })
+}
+  }
+  }
+</script>
+
+<style scoped>
+.demo-ruleForm {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>

VUECODE/smart-property-manage/src/views/account/user/editUser.vue

@@ -0,0 +1,156 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="名称" prop="userName">
+        <el-input v-model="ruleForm.userName"/>
+      </el-form-item>
+     <el-form-item class="filter-item" label="手机号" prop="loginName" >
+        <el-input v-model.trim="ruleForm.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
+      </el-form-item>
+      <el-form-item label="角色" prop="menuArray">
+        <!-- default-expanded-keys 展示选中的
+             default-checked-keys 勾上选中的-->
+        <el-tree
+          ref="tree"
+          :data="menuData"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="ruleForm.remark"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+        id: '',
+        userName: '',
+        loginName:'',
+        remark: '',
+        roleName: '',
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
+        pageNum: 1,
+        pageSize: 10,
+        menuArray: [] // 已选中的权限资源
+      },
+      menuData: [], // 所有权限资源
+      defaultProps: { // 设置树形节点的渲染的属性
+        id: 'id',
+        label: 'roleName',
+        children: 'children'
+      },
+      rules: {
+        roleName: [
+          { required: true, message: '名称', trigger: 'blur' }
+        ],
+        loginName: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+        
+      }
+    }
+  },
+  mounted() {
+     this.selectUser(this.$route.params.id)
+     console.log('this.$route.params.id',this.$route.params.id)
+     this.getById()
+  },
+  methods: {
+    submitForm(formName) {
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        if (valid) {
+          console.log('this.roleName',this.roleName)
+          this.$store.dispatch('UpDate', this.ruleForm).then((res) => {
+            const resCode = res.code
+            if (resCode === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              loading.close()
+              this.$router.push({ name: 'user-index' })
+            }
+          }).catch(() => {
+            console.log('error AddUser')
+            loading.close()
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleCheckChange(data, checked, indeterminate) { // 树形图选择事件
+      console.log(data, checked, indeterminate)
+    },
+    getMenuList() { // 获取 菜单列表
+      this.$store.dispatch('GetMenuList').then((res) => {
+        this.menuData = res.data
+      }).catch(() => {
+        console.log('error GetMenuList')
+      })
+    },
+    getById(){
+    this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
+      this.menuData = res.data.list
+      console.log(this.menuData)
+    }).catch(() => {
+      console.log('error UserRoleById')
+    })
+},
+  selectUser(id){
+    this.ruleForm.id=id
+    this.$store.dispatch('SelectUser', this.ruleForm).then((res) => {
+      // this.ruleForm.loginName = res.data.loginName
+      // this.ruleForm=res.data[0]
+        // this.ruleForm.loginName.push(res.data[0])
+        this.ruleForm.loginName=res.data.userList[0].loginName
+         this.ruleForm.userName=res.data.userList[0].userName
+         this.ruleForm.remark=res.data.userList[0].remark
+         this.ruleForm.menuArray=res.data.roleList
+        console.log('res.data',res.data)
+
+    }).catch(() => {
+      console.log('error SelectUser')
+    })
+
+
+  }
+  }
+  }
+</script>
+
+<style scoped>
+.demo-ruleForm {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>

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

@@ -0,0 +1,195 @@
+<template>
+  <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" @click="addUser">添加</el-button>
+      <el-button type="warning" @click="upDate">修改</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="id" label="操作" align="center">
+          <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
+          </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: '',
+        status : '',
+        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
+    },
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('EmployeesList', this.listQuery).then((res) => {
+         this.listDate = res.item
+        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
+    },
+    addUser(){
+    this.$router.push({ name: 'user-addUser' })
+     this.listQuery.id=''
+    },
+    upDate(){
+      //  this.$router.push({ name: 'user-edit' })
+       const ids = this.deleteIds[0]
+          this.$router.push({ name: 'user-edit', params: { id: ids }})
+    },
+    upDateStatus(id,status){
+      this.listQuery.id=id
+      this.listQuery.status=status
+      this.$store.dispatch('UpDateStatus', this.listQuery).then((res) => {
+        console.log('res',res)
+        this.dataQuery()
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error UpDateStatus')
+      })
+    }
+    }
+    }
+  
+
+</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>
+