运营加入用户查询功能

java110-bean/src/main/java/com/java110/dto/user/UserDto.java

@@ -96,6 +96,9 @@ public class UserDto extends PageDto implements Serializable {
 
     private List<String> urls;
 
+    private String ownerCount;
+
+    private String createTime;
 
 
 
@@ -418,4 +421,20 @@ public class UserDto extends PageDto implements Serializable {
     public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
+
+    public String getOwnerCount() {
+        return ownerCount;
+    }
+
+    public void setOwnerCount(String ownerCount) {
+        this.ownerCount = ownerCount;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -203,4 +203,60 @@
             limit #{page}, #{row}
         </if>
     </select>
+    <select id="getSystemUserCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from u_user t
+        where t.status_cd = '0'
+        and t.level_cd != '00'
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="levelCd !=null and levelCd != ''">
+            and t.level_cd= #{levelCd}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="nameLike !=null and nameLike != ''">
+            and t.name like concat('%', #{nameLike},'%')
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="email !=null and email != ''">
+            and t.email= #{email}
+        </if>
+    </select>
+
+    <select id="getSystemUsers" parameterType="Map" resultType="Map">
+        select t.user_id userId,t.`name` userName,t.email,t.address,t.tel,t.create_time createTime,t.level_cd levelCd,
+        count(oau.app_user_id) ownerCount
+        from u_user t
+        left join owner_app_user oau on t.user_id = oau.user_id and oau.status_cd = '0'
+        where t.status_cd = '0'
+        and t.level_cd != '00'
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="levelCd !=null and levelCd != ''">
+            and t.level_cd= #{levelCd}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="nameLike !=null and nameLike != ''">
+            and t.name like concat('%', #{nameLike},'%')
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="email !=null and email != ''">
+            and t.email= #{email}
+        </if>
+        group by t.user_id ,t.`name` ,t.email,t.address,t.tel,t.create_time ,t.level_cd
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
 </mapper>

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

@@ -95,4 +95,10 @@ public interface IUserV1InnerServiceSMO {
      */
     @RequestMapping(value = "/generatorUserIdQrCode", method = RequestMethod.POST)
     String generatorUserIdQrCode(@RequestBody String userId);
+
+    @RequestMapping(value = "/getSystemUserCount", method = RequestMethod.POST)
+    int getSystemUserCount(@RequestBody UserDto userDto);
+
+    @RequestMapping(value = "/getSystemUsers", method = RequestMethod.POST)
+    List<UserDto> getSystemUsers(@RequestBody UserDto userDto);
 }

service-user/src/main/java/com/java110/user/cmd/user/DeleteSystemUserCmd.java

@@ -0,0 +1,342 @@
+package com.java110.user.cmd.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.Environment;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.attendance.AttendanceClassesStaffDto;
+import com.java110.dto.classes.ScheduleClassesStaffDto;
+import com.java110.dto.data.DataPrivilegeStaffDto;
+import com.java110.dto.inspection.InspectionPlanStaffDto;
+import com.java110.dto.maintainance.MaintainancePlanStaffDto;
+import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.privilege.PrivilegeUserDto;
+import com.java110.dto.repair.RepairTypeUserDto;
+import com.java110.dto.store.StoreUserDto;
+import com.java110.dto.user.StaffAppAuthDto;
+import com.java110.intf.community.IInspectionPlanStaffV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainancePlanStaffV1InnerServiceSMO;
+import com.java110.intf.community.IRepairTypeUserInnerServiceSMO;
+import com.java110.intf.community.IRepairTypeUserV1InnerServiceSMO;
+import com.java110.intf.store.IScheduleClassesStaffV1InnerServiceSMO;
+import com.java110.intf.store.IStoreUserV1InnerServiceSMO;
+import com.java110.intf.user.*;
+import com.java110.po.attendance.AttendanceClassesStaffPo;
+import com.java110.po.classes.ScheduleClassesStaffPo;
+import com.java110.po.inspection.InspectionPlanStaffPo;
+import com.java110.po.maintainance.MaintainancePlanStaffPo;
+import com.java110.po.owner.OwnerAppUserPo;
+import com.java110.po.privilege.DataPrivilegeStaffPo;
+import com.java110.po.privilege.PrivilegeUserPo;
+import com.java110.po.repair.RepairTypeUserPo;
+import com.java110.po.store.StoreUserPo;
+import com.java110.po.user.StaffAppAuthPo;
+import com.java110.po.user.UserPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "user.deleteSystemUser")
+public class DeleteSystemUserCmd extends Cmd {
+
+
+    @Autowired
+    private IRepairTypeUserInnerServiceSMO repairTypeUserInnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IPrivilegeUserV1InnerServiceSMO privilegeUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IRepairTypeUserV1InnerServiceSMO repairTypeUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IScheduleClassesStaffV1InnerServiceSMO scheduleClassesStaffV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IAttendanceClassesStaffV1InnerServiceSMO attendanceClassesStaffV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IInspectionPlanStaffV1InnerServiceSMO inspectionPlanStaffV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IStaffAppAuthInnerServiceSMO staffAppAuthInnerServiceSMOImpl;
+
+    @Autowired
+    private IDataPrivilegeStaffV1InnerServiceSMO dataPrivilegeStaffV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IMaintainancePlanStaffV1InnerServiceSMO maintainancePlanStaffV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        super.validateAdmin(context);
+        Environment.isDevEnv();
+        Assert.hasKeyAndValue(reqJson, "staffId", "未包含用户ID");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        // 删除员工信息
+        deleteStaff(reqJson);
+
+        //todo 删除用户
+        deleteUser(reqJson);
+
+        // 解绑业主
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setUserId(reqJson.getString("staffId"));
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+        if (ListUtil.isNull(ownerAppUserDtos)) {
+            return;
+        }
+        OwnerAppUserPo ownerAppUserPo = null;
+        for (OwnerAppUserDto tmpOwnerAppUserDto : ownerAppUserDtos) {
+            ownerAppUserPo = BeanConvertUtil.covertBean(tmpOwnerAppUserDto, OwnerAppUserPo.class);
+            ownerAppUserV1InnerServiceSMOImpl.deleteOwnerAppUser(ownerAppUserPo);
+        }
+    }
+
+
+    /**
+     * 删除商户
+     *
+     * @param paramInJson
+     * @return
+     */
+    public void deleteUser(JSONObject paramInJson) {
+        UserPo userPo = new UserPo();
+        userPo.setUserId(paramInJson.getString("staffId"));
+        int flag = userV1InnerServiceSMOImpl.deleteUser(userPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除员工失败");
+        }
+    }
+
+    /**
+     * 删除商户
+     *
+     * @param reqJson
+     * @return
+     */
+    public void deleteStaff(JSONObject reqJson) {
+
+        StoreUserDto storeUserDto = new StoreUserDto();
+        storeUserDto.setUserId(reqJson.getString("staffId"));
+        List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
+        if (ListUtil.isNull(storeUserDtos)) {
+            return;
+        }
+        StoreUserPo storeUserPo = null;
+        for (StoreUserDto tmpStoreUserDto : storeUserDtos) {
+            storeUserPo = new StoreUserPo();
+            storeUserPo.setStoreUserId(tmpStoreUserDto.getStoreUserId());
+            storeUserPo.setUserId(tmpStoreUserDto.getUserId());
+            storeUserPo.setStoreId(tmpStoreUserDto.getStoreId());
+            storeUserV1InnerServiceSMOImpl.deleteStoreUser(storeUserPo);
+        }
+
+        //todo 删除报修设置
+        RepairTypeUserDto repairTypeUserDto = new RepairTypeUserDto();
+        repairTypeUserDto.setStaffId(reqJson.getString("staffId"));
+        repairTypeUserDto.setStatusCd("0");
+        List<RepairTypeUserDto> repairTypeUserDtoList = repairTypeUserInnerServiceSMOImpl.queryRepairTypeUsers(repairTypeUserDto);
+        if (!ListUtil.isNull(repairTypeUserDtoList)) {
+            for (RepairTypeUserDto tmpRepairTypeUserDto : repairTypeUserDtoList) {
+                JSONObject typeUserJson1 = (JSONObject) JSONObject.toJSON(tmpRepairTypeUserDto);
+                deleteRepairTypeUser(typeUserJson1);
+            }
+        }
+        //todo 删除员工排班数据
+        deleteScheduleClassesStaff(reqJson);
+
+        //todo 删除员工考勤组
+        deleteAttendanceClassesStaff(reqJson);
+
+        // todo 删除巡检员工
+        deleteInspectionPlanStaff(reqJson);
+
+        //todo 赋权
+        deleteUserPrivilege(reqJson);
+
+        // todo 删除员工认证
+        deleteStaffAppAuth(reqJson);
+
+        // todo 删除数据权限
+        deleteStaffDataPri(reqJson);
+
+        //todo 删除保养员工
+        deleteMaintainanceStaff(reqJson);
+    }
+
+    /**
+     * 删除数据权限
+     *
+     * @param reqJson
+     */
+    private void deleteStaffDataPri(JSONObject reqJson) {
+
+        DataPrivilegeStaffDto dataPrivilegeStaffDto = new DataPrivilegeStaffDto();
+        dataPrivilegeStaffDto.setStaffId(reqJson.getString("staffId"));
+        List<DataPrivilegeStaffDto> dataPrivilegeStaffDtos
+                = dataPrivilegeStaffV1InnerServiceSMOImpl.queryDataPrivilegeStaffs(dataPrivilegeStaffDto);
+        if (ListUtil.isNull(dataPrivilegeStaffDtos)) {
+            return;
+        }
+        for (DataPrivilegeStaffDto tmpDataPrivilegeStaffDto : dataPrivilegeStaffDtos) {
+
+            DataPrivilegeStaffPo dataPrivilegeStaffPo = new DataPrivilegeStaffPo();
+            dataPrivilegeStaffPo.setDpsId(tmpDataPrivilegeStaffDto.getDpsId());
+            dataPrivilegeStaffV1InnerServiceSMOImpl.deleteDataPrivilegeStaff(dataPrivilegeStaffPo);
+        }
+    }
+
+    private void deleteStaffAppAuth(JSONObject reqJson) {
+
+        StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
+        staffAppAuthDto.setStaffId(reqJson.getString("staffId"));
+        List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuths(staffAppAuthDto);
+        if (ListUtil.isNull(staffAppAuthDtos)) {
+            return;
+        }
+        for (StaffAppAuthDto tmpStaffAppAuthDto : staffAppAuthDtos) {
+            StaffAppAuthPo staffAppAuthPo = new StaffAppAuthPo();
+            staffAppAuthPo.setAuId(tmpStaffAppAuthDto.getAuId());
+            staffAppAuthInnerServiceSMOImpl.deleteStaffAppAuth(staffAppAuthPo);
+        }
+    }
+
+    private void deleteInspectionPlanStaff(JSONObject reqJson) {
+
+        InspectionPlanStaffDto inspectionPlanStaffDto = new InspectionPlanStaffDto();
+        inspectionPlanStaffDto.setStaffId(reqJson.getString("staffId"));
+        List<InspectionPlanStaffDto> inspectionPlanStaffDtos
+                = inspectionPlanStaffV1InnerServiceSMOImpl.queryInspectionPlanStaffs(inspectionPlanStaffDto);
+        if (ListUtil.isNull(inspectionPlanStaffDtos)) {
+            return;
+        }
+
+        for (InspectionPlanStaffDto tmpInspectionPlanStaffDto : inspectionPlanStaffDtos) {
+            InspectionPlanStaffPo inspectionPlanStaffPo = new InspectionPlanStaffPo();
+            inspectionPlanStaffPo.setIpStaffId(tmpInspectionPlanStaffDto.getIpStaffId());
+            inspectionPlanStaffV1InnerServiceSMOImpl.deleteInspectionPlanStaff(inspectionPlanStaffPo);
+        }
+    }
+
+    /**
+     * 删除保养员工
+     *
+     * @param reqJson
+     */
+    private void deleteMaintainanceStaff(JSONObject reqJson) {
+        MaintainancePlanStaffDto maintainancePlanStaffDto = new MaintainancePlanStaffDto();
+        maintainancePlanStaffDto.setStaffId(reqJson.getString("staffId"));
+        List<MaintainancePlanStaffDto> maintainancePlanStaffDtos
+                = maintainancePlanStaffV1InnerServiceSMOImpl.queryMaintainancePlanStaffs(maintainancePlanStaffDto);
+        if (ListUtil.isNull(maintainancePlanStaffDtos)) {
+            return;
+        }
+
+        for (MaintainancePlanStaffDto tmpMaintainancePlanStaffDto : maintainancePlanStaffDtos) {
+            MaintainancePlanStaffPo maintainancePlanStaffPo = new MaintainancePlanStaffPo();
+            maintainancePlanStaffPo.setMpsId(tmpMaintainancePlanStaffDto.getMpsId());
+            maintainancePlanStaffV1InnerServiceSMOImpl.deleteMaintainancePlanStaff(maintainancePlanStaffPo);
+        }
+    }
+
+    private void deleteAttendanceClassesStaff(JSONObject reqJson) {
+
+        AttendanceClassesStaffDto attendanceClassesStaffDto = new AttendanceClassesStaffDto();
+        attendanceClassesStaffDto.setStaffId(reqJson.getString("staffId"));
+        List<AttendanceClassesStaffDto> attendanceClassesStaffDtos
+                = attendanceClassesStaffV1InnerServiceSMOImpl.queryAttendanceClassesStaffs(attendanceClassesStaffDto);
+        if (ListUtil.isNull(attendanceClassesStaffDtos)) {
+            return;
+        }
+        for (AttendanceClassesStaffDto tmpAttendanceClassesStaffDto : attendanceClassesStaffDtos) {
+            AttendanceClassesStaffPo attendanceClassesStaffPo = new AttendanceClassesStaffPo();
+            attendanceClassesStaffPo.setCsId(tmpAttendanceClassesStaffDto.getCsId());
+            attendanceClassesStaffV1InnerServiceSMOImpl.deleteAttendanceClassesStaff(attendanceClassesStaffPo);
+        }
+    }
+
+    /**
+     * 删除考勤员工
+     *
+     * @param reqJson
+     */
+    private void deleteScheduleClassesStaff(JSONObject reqJson) {
+        ScheduleClassesStaffDto scheduleClassesStaffDto = new ScheduleClassesStaffDto();
+        scheduleClassesStaffDto.setStaffId(reqJson.getString("staffId"));
+        List<ScheduleClassesStaffDto> scheduleClassesStaffDtos
+                = scheduleClassesStaffV1InnerServiceSMOImpl.queryScheduleClassesStaffs(scheduleClassesStaffDto);
+        if (ListUtil.isNull(scheduleClassesStaffDtos)) {
+            return;
+        }
+        for (ScheduleClassesStaffDto tmpScheduleClassesStaffDto : scheduleClassesStaffDtos) {
+            ScheduleClassesStaffPo scheduleClassesStaffPo = new ScheduleClassesStaffPo();
+            scheduleClassesStaffPo.setScsId(tmpScheduleClassesStaffDto.getScsId());
+            scheduleClassesStaffV1InnerServiceSMOImpl.deleteScheduleClassesStaff(scheduleClassesStaffPo);
+        }
+
+    }
+
+    /**
+     * 删除用户权限
+     *
+     * @param paramInJson
+     */
+    private void deleteUserPrivilege(JSONObject paramInJson) {
+
+        PrivilegeUserDto privilegeUserDto = new PrivilegeUserDto();
+        privilegeUserDto.setUserId(paramInJson.getString("staffId"));
+        List<PrivilegeUserDto> privilegeUserDtos = privilegeUserV1InnerServiceSMOImpl.queryPrivilegeUsers(privilegeUserDto);
+
+        if (ListUtil.isNull(privilegeUserDtos)) {
+            return;
+        }
+
+        for (PrivilegeUserDto tmpPrivilegeUserDto : privilegeUserDtos) {
+            PrivilegeUserPo privilegeUserPo = new PrivilegeUserPo();
+            privilegeUserPo.setPuId(tmpPrivilegeUserDto.getPuId());
+            int flag = privilegeUserV1InnerServiceSMOImpl.deletePrivilegeUser(privilegeUserPo);
+            if (flag < 1) {
+                throw new CmdException("删除员工失败");
+            }
+        }
+    }
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson 接口调用放传入入参
+     * @return 订单服务能够接受的报文
+     */
+    public void deleteRepairTypeUser(JSONObject paramInJson) {
+
+        RepairTypeUserPo repairTypeUserPo = BeanConvertUtil.covertBean(paramInJson, RepairTypeUserPo.class);
+        //super.update(dataFlowContext, repairTypeUserPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_REPAIR_TYPE_USER);
+        int flag = repairTypeUserV1InnerServiceSMOImpl.deleteRepairTypeUser(repairTypeUserPo);
+        if (flag < 1) {
+            throw new CmdException("删除员工失败");
+        }
+    }
+
+}

service-user/src/main/java/com/java110/user/cmd/user/ListSystemUsersCmd.java

@@ -0,0 +1,56 @@
+package com.java110.user.cmd.user;
+
+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.user.UserDto;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import com.java110.vo.api.user.ApiUserDataVo;
+import com.java110.vo.api.user.ApiUserVo;
+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 = "user.listSystemUsers")
+public class ListSystemUsersCmd extends Cmd {
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMO;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        super.validatePageInfo(reqJson);
+        super.validateAdmin(context);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        UserDto userDto = BeanConvertUtil.covertBean(reqJson, UserDto.class);
+        userDto.setUserId("");
+
+        int count = userV1InnerServiceSMO.getSystemUserCount(userDto);
+
+        List<UserDto> userDtos = null;
+
+        if (count > 0) {
+            userDtos = userV1InnerServiceSMO.getSystemUsers(userDto);
+        } else {
+            userDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+}

service-user/src/main/java/com/java110/user/cmd/user/ResetSystemUserPwdCmd.java

@@ -0,0 +1,71 @@
+package com.java110.user.cmd.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.Environment;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.user.UserPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.List;
+
+@Java110Cmd(serviceCode = "user.resetSystemUserPwd")
+public class ResetSystemUserPwdCmd extends Cmd {
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Environment.isDevEnv();
+        super.validateAdmin(context);
+        Assert.hasKeyAndValue(reqJson,"staffId","未包含人员ID");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+
+        UserDto userDto = new UserDto();
+        userDto.setStatusCd("0");
+        userDto.setUserId(reqJson.getString("staffId"));
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUserHasPwd(userDto);
+
+        Assert.listOnlyOne(userDtos, "数据错误查询到多条用户信息或单条");
+
+        JSONObject userInfo = JSONObject.parseObject(JSONObject.toJSONString(userDtos.get(0)));
+        String pwd = GenerateCodeFactory.getRandomCode(6);
+        //userInfo.putAll(paramObj);
+        userInfo.put("password", AuthenticationFactory.passwdMd5(pwd));
+
+
+        UserPo userPo = BeanConvertUtil.covertBean(userInfo, UserPo.class);
+
+        int flag = userV1InnerServiceSMOImpl.updateUser(userPo);
+        if (flag < 1) {
+            throw new CmdException("重置失败");
+        }
+
+        JSONObject paramOut = new JSONObject();
+        paramOut.put("pwd", pwd);
+        paramOut.put("code",0);
+        paramOut.put("msg","成功");
+        ResponseEntity<String> responseEntity = new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
+        context.setResponseEntity(responseEntity);
+    }
+
+
+
+}

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

@@ -73,4 +73,8 @@ public interface IUserV1ServiceDao {
     int queryStaffsNoInOrgCount(Map beanCovertMap);
 
     List<Map> queryStaffsNoInOrg(Map beanCovertMap);
+
+    int getSystemUserCount(Map info);
+
+    List<Map> getSystemUsers(Map info);
 }

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

@@ -71,9 +71,9 @@ public class UserV1ServiceDaoImpl extends BaseServiceDao implements IUserV1Servi
     public List<Map> getUserInfo(Map info) throws DAOException {
         logger.debug("查询 getUserInfo 入参 info : {}",info);
 
-        List<Map> businessUserInfos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.getUserInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.getUserInfo",info);
 
-        return businessUserInfos;
+        return infos;
     }
 
 
@@ -100,33 +100,54 @@ public class UserV1ServiceDaoImpl extends BaseServiceDao implements IUserV1Servi
     public int queryUsersCount(Map info) {
         logger.debug("查询 queryUsersCount 入参 info : {}",info);
 
-        List<Map> businessUserInfos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryUsersCount", info);
-        if (businessUserInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryUsersCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessUserInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public int queryStaffsNoInOrgCount(Map info) {
         logger.debug("查询 queryStaffsNoInOrgCount 入参 info : {}",info);
 
-        List<Map> businessUserInfos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryStaffsNoInOrgCount", info);
-        if (businessUserInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryStaffsNoInOrgCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessUserInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public List<Map> queryStaffsNoInOrg(Map info) {
         logger.debug("查询 queryStaffsNoInOrg 入参 info : {}",info);
 
-        List<Map> businessUserInfos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryStaffsNoInOrg",info);
+        List<Map> infos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryStaffsNoInOrg",info);
 
-        return businessUserInfos;
+        return infos;
+    }
+
+    @Override
+    public int getSystemUserCount(Map info) {
+        logger.debug("查询 getSystemUserCount 入参 info : {}",info);
+
+        List<Map> infos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.getSystemUserCount", info);
+        if (infos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(infos.get(0).get("count").toString());
+    }
+
+    @Override
+    public List<Map> getSystemUsers(Map info) {
+        logger.debug("查询 getSystemUsers 入参 info : {}",info);
+
+        List<Map> infos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.getSystemUsers",info);
+
+        return infos;
     }
 
 

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

@@ -144,4 +144,25 @@ public class UserV1InnerServiceSMOImpl extends BaseServiceSMO implements IUserV1
         return key;
     }
 
+    @Override
+    public int getSystemUserCount(@RequestBody UserDto userDto) {
+        return userV1ServiceDaoImpl.getSystemUserCount(BeanConvertUtil.beanCovertMap(userDto));
+
+    }
+
+    @Override
+    public List<UserDto> getSystemUsers(@RequestBody UserDto userDto) {
+        //校验是否传了 分页信息
+
+        int page = userDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            userDto.setPage((page - 1) * userDto.getRow());
+        }
+
+        List<UserDto> users = BeanConvertUtil.covertBeanList(userV1ServiceDaoImpl.getSystemUsers(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);
+
+        return users;
+    }
+
 }