角色员工

java110-bean/src/main/java/com/java110/dto/privilegeUser/PrivilegeUserDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.privilegeUser;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,11 +15,12 @@ import java.util.Date;
  **/
 public class PrivilegeUserDto extends PageDto implements Serializable {
 
+    public static final String PRIVILEGE_FLAG_GROUP = "1";
     private String privilegeFlag;
-private String puId;
-private String pId;
-private String storeId;
-private String userId;
+    private String puId;
+    private String pId;
+    private String storeId;
+    private String userId;
 
 
     private Date createTime;
@@ -29,31 +31,40 @@ private String userId;
     public String getPrivilegeFlag() {
         return privilegeFlag;
     }
-public void setPrivilegeFlag(String privilegeFlag) {
+
+    public void setPrivilegeFlag(String privilegeFlag) {
         this.privilegeFlag = privilegeFlag;
     }
-public String getPuId() {
+
+    public String getPuId() {
         return puId;
     }
-public void setPuId(String puId) {
+
+    public void setPuId(String puId) {
         this.puId = puId;
     }
-public String getPId() {
+
+    public String getPId() {
         return pId;
     }
-public void setPId(String pId) {
+
+    public void setPId(String pId) {
         this.pId = pId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
 

java110-db/src/main/resources/mapper/user/PrivilegeUserV1ServiceDaoImplMapper.xml

@@ -5,102 +5,157 @@
 <mapper namespace="privilegeUserV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存用户权限信息 add by wuxw 2018-07-03 -->
     <insert id="savePrivilegeUserInfo" parameterType="Map">
         insert into p_privilege_user(
-privilege_flag,pu_id,p_id,store_id,user_id
-) values (
-#{privilegeFlag},#{puId},#{pId},#{storeId},#{userId}
-)
+        privilege_flag,pu_id,p_id,store_id,user_id
+        ) values (
+        #{privilegeFlag},#{puId},#{pId},#{storeId},#{userId}
+        )
     </insert>
 
 
-
     <!-- 查询用户权限信息 add by wuxw 2018-07-03 -->
     <select id="getPrivilegeUserInfo" parameterType="Map" resultType="Map">
-        select  t.privilege_flag,t.privilege_flag privilegeFlag,t.pu_id,t.pu_id puId,t.p_id,t.p_id pId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.user_id,t.user_id userId 
-from p_privilege_user t 
-where 1 =1 
-<if test="privilegeFlag !=null and privilegeFlag != ''">
-   and t.privilege_flag= #{privilegeFlag}
-</if> 
-<if test="puId !=null and puId != ''">
-   and t.pu_id= #{puId}
-</if> 
-<if test="pId !=null and pId != ''">
-   and t.p_id= #{pId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.privilege_flag,t.privilege_flag privilegeFlag,t.pu_id,t.pu_id puId,t.p_id,t.p_id
+        pId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.user_id,t.user_id userId
+        from p_privilege_user t
+        where 1 =1
+        <if test="privilegeFlag !=null and privilegeFlag != ''">
+            and t.privilege_flag= #{privilegeFlag}
+        </if>
+        <if test="puId !=null and puId != ''">
+            and t.pu_id= #{puId}
+        </if>
+        <if test="pId !=null and pId != ''">
+            and t.p_id= #{pId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改用户权限信息 add by wuxw 2018-07-03 -->
     <update id="updatePrivilegeUserInfo" parameterType="Map">
-        update  p_privilege_user t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="privilegeFlag !=null and privilegeFlag != ''">
-, t.privilege_flag= #{privilegeFlag}
-</if> 
-<if test="pId !=null and pId != ''">
-, t.p_id= #{pId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
- where 1=1 <if test="puId !=null and puId != ''">
-and t.pu_id= #{puId}
-</if> 
+        update p_privilege_user t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="privilegeFlag !=null and privilegeFlag != ''">
+            , t.privilege_flag= #{privilegeFlag}
+        </if>
+        <if test="pId !=null and pId != ''">
+            , t.p_id= #{pId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        where 1=1
+        <if test="puId !=null and puId != ''">
+            and t.pu_id= #{puId}
+        </if>
 
     </update>
 
     <!-- 查询用户权限数量 add by wuxw 2018-07-03 -->
-     <select id="queryPrivilegeUsersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from p_privilege_user t 
-where 1 =1 
-<if test="privilegeFlag !=null and privilegeFlag != ''">
-   and t.privilege_flag= #{privilegeFlag}
-</if> 
-<if test="puId !=null and puId != ''">
-   and t.pu_id= #{puId}
-</if> 
-<if test="pId !=null and pId != ''">
-   and t.p_id= #{pId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
+    <select id="queryPrivilegeUsersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from p_privilege_user t
+        where 1 =1
+        <if test="privilegeFlag !=null and privilegeFlag != ''">
+            and t.privilege_flag= #{privilegeFlag}
+        </if>
+        <if test="puId !=null and puId != ''">
+            and t.pu_id= #{puId}
+        </if>
+        <if test="pId !=null and pId != ''">
+            and t.p_id= #{pId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+    </select>
 
+    <!-- 查询用户权限数量 add by wuxw 2018-07-03 -->
+    <select id="queryPrivilegeUserInfoCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from p_privilege_user t
+        inner JOIN u_user uu on t.user_id = uu.user_id and uu.status_cd = '0'
+        where 1 =1
+        <if test="privilegeFlag !=null and privilegeFlag != ''">
+            and t.privilege_flag= #{privilegeFlag}
+        </if>
+        <if test="puId !=null and puId != ''">
+            and t.pu_id= #{puId}
+        </if>
+        <if test="pId !=null and pId != ''">
+            and t.p_id= #{pId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+    </select>
+
+    <!-- 查询用户权限信息 add by wuxw 2018-07-03 -->
+    <select id="queryPrivilegeUserInfos" parameterType="Map" resultType="Map">
+        select t.privilege_flag,t.privilege_flag privilegeFlag,t.pu_id,t.pu_id puId,t.p_id,t.p_id
+        pId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.user_id,t.user_id userId,
+        uu.address,uu.sex,uu.user_id,uu.user_id userId,uu.level_cd,uu.level_cd
+        levelCd,uu.location_cd,uu.location_cd locationCd,uu.score,uu.name,uu.tel,uu.email,uu.age
+        from p_privilege_user t
+        inner JOIN u_user uu on t.user_id = uu.user_id and uu.status_cd = '0'
+        where 1 =1
+        <if test="privilegeFlag !=null and privilegeFlag != ''">
+            and t.privilege_flag= #{privilegeFlag}
+        </if>
+        <if test="puId !=null and puId != ''">
+            and t.pu_id= #{puId}
+        </if>
+        <if test="pId !=null and pId != ''">
+            and t.p_id= #{pId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
 
-     </select>
 
 </mapper>

java110-interface/src/main/java/com/java110/intf/user/IPrivilegeUserV1InnerServiceSMO.java

@@ -17,6 +17,7 @@ package com.java110.intf.user;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.privilegeUser.PrivilegeUserDto;
+import com.java110.dto.user.UserDto;
 import com.java110.po.privilegeUser.PrivilegeUserPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,18 +40,17 @@ public interface IPrivilegeUserV1InnerServiceSMO {
 
 
     @RequestMapping(value = "/savePrivilegeUser", method = RequestMethod.POST)
-    public int savePrivilegeUser(@RequestBody  PrivilegeUserPo privilegeUserPo);
+    public int savePrivilegeUser(@RequestBody PrivilegeUserPo privilegeUserPo);
 
     @RequestMapping(value = "/updatePrivilegeUser", method = RequestMethod.POST)
-    public int updatePrivilegeUser(@RequestBody  PrivilegeUserPo privilegeUserPo);
+    public int updatePrivilegeUser(@RequestBody PrivilegeUserPo privilegeUserPo);
 
     @RequestMapping(value = "/deletePrivilegeUser", method = RequestMethod.POST)
-    public int deletePrivilegeUser(@RequestBody  PrivilegeUserPo privilegeUserPo);
+    public int deletePrivilegeUser(@RequestBody PrivilegeUserPo privilegeUserPo);
 
     /**
      * <p>查询小区楼信息</p>
      *
-     *
      * @param privilegeUserDto 数据对象分享
      * @return PrivilegeUserDto 对象数据
      */
@@ -65,4 +65,10 @@ public interface IPrivilegeUserV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryPrivilegeUsersCount", method = RequestMethod.POST)
     int queryPrivilegeUsersCount(@RequestBody PrivilegeUserDto privilegeUserDto);
+
+    @RequestMapping(value = "/queryPrivilegeUserInfoCount", method = RequestMethod.POST)
+    int queryPrivilegeUserInfoCount(@RequestBody PrivilegeUserDto privilegeUserDto);
+
+    @RequestMapping(value = "/queryPrivilegeUserInfos", method = RequestMethod.POST)
+    List<UserDto> queryPrivilegeUserInfos(@RequestBody PrivilegeUserDto privilegeUserDto);
 }

service-user/src/main/java/com/java110/user/cmd/role/ListRoleStaffCmd.java

@@ -0,0 +1,59 @@
+package com.java110.user.cmd.role;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.privilegeUser.PrivilegeUserDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IPrivilegeUserV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "role.listRoleStaff")
+public class ListRoleStaffCmd extends Cmd {
+
+    @Autowired
+    private IPrivilegeUserV1InnerServiceSMO privilegeUserV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "roleId", "未包含角色");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+
+        String storeId = context.getReqHeaders().get("store-id");
+
+        PrivilegeUserDto privilegeUserDto = new PrivilegeUserDto();
+        privilegeUserDto.setPId(reqJson.getString("roleId"));
+        privilegeUserDto.setStoreId(storeId);
+        privilegeUserDto.setPrivilegeFlag(PrivilegeUserDto.PRIVILEGE_FLAG_GROUP);
+
+        int count = privilegeUserV1InnerServiceSMOImpl.queryPrivilegeUserInfoCount(privilegeUserDto);
+
+        List<UserDto> staffsDtos = null;
+
+        if (count > 0) {
+            staffsDtos = privilegeUserV1InnerServiceSMOImpl.queryPrivilegeUserInfos(privilegeUserDto);
+        } else {
+            staffsDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, staffsDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+}

service-user/src/main/java/com/java110/user/dao/IPrivilegeUserV1ServiceDao.java

@@ -74,4 +74,7 @@ public interface IPrivilegeUserV1ServiceDao {
      */
     int queryPrivilegeUsersCount(Map info);
 
+    List<Map> queryPrivilegeUserInfos(Map info);
+
+    int queryPrivilegeUserInfoCount(Map info);
 }

service-user/src/main/java/com/java110/user/dao/impl/PrivilegeUserV1ServiceDaoImpl.java

@@ -108,5 +108,26 @@ public class PrivilegeUserV1ServiceDaoImpl extends BaseServiceDao implements IPr
         return Integer.parseInt(businessPrivilegeUserInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public List<Map> queryPrivilegeUserInfos(Map info) {
+        logger.debug("查询 getPrivilegeUserInfo 入参 info : {}",info);
+
+        List<Map> businessPrivilegeUserInfos = sqlSessionTemplate.selectList("privilegeUserV1ServiceDaoImpl.queryPrivilegeUserInfos",info);
+
+        return businessPrivilegeUserInfos;
+    }
+
+    @Override
+    public int queryPrivilegeUserInfoCount(Map info) {
+        logger.debug("查询 queryPrivilegeUsersCount 入参 info : {}",info);
+
+        List<Map> businessPrivilegeUserInfos = sqlSessionTemplate.selectList("privilegeUserV1ServiceDaoImpl.queryPrivilegeUserInfoCount", info);
+        if (businessPrivilegeUserInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessPrivilegeUserInfos.get(0).get("count").toString());
+    }
+
 
 }

service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java

@@ -86,4 +86,24 @@ public class PrivilegeUserV1InnerServiceSMOImpl extends BaseServiceSMO implement
     public int queryPrivilegeUsersCount(@RequestBody PrivilegeUserDto privilegeUserDto) {
         return privilegeUserV1ServiceDaoImpl.queryPrivilegeUsersCount(BeanConvertUtil.beanCovertMap(privilegeUserDto));    }
 
+    @Override
+    public int queryPrivilegeUserInfoCount(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        return privilegeUserV1ServiceDaoImpl.queryPrivilegeUserInfoCount(BeanConvertUtil.beanCovertMap(privilegeUserDto));
+    }
+
+    @Override
+    public List<UserDto> queryPrivilegeUserInfos(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        //校验是否传了 分页信息
+
+        int page = privilegeUserDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            privilegeUserDto.setPage((page - 1) * privilegeUserDto.getRow());
+        }
+
+        List<UserDto> privilegeUsers = BeanConvertUtil.covertBeanList(privilegeUserV1ServiceDaoImpl.queryPrivilegeUserInfos(BeanConvertUtil.beanCovertMap(privilegeUserDto)), UserDto.class);
+
+        return privilegeUsers;
+    }
+
 }