修改bug

Pu Zhibing

3 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java

@@ -1,13 +1,11 @@
package com.stylefeng.guns.modular.system.controller.system;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.Tip;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.annotion.Permission;
import com.stylefeng.guns.core.common.constant.Const;
import com.stylefeng.guns.core.common.constant.dictmap.UserDict;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
@@ -30,7 +28,8 @@
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.transfer.UserDto;
import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.GetStaffNodeRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -38,10 +37,12 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.naming.NoPermissionException;
import javax.validation.Valid;
import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;

@@ -54,19 +55,24 @@
@Controller
@RequestMapping("/mgr")
public class UserMgrController extends BaseController {

    
    private static String PREFIX = "/system/user/";

    
    @Autowired
    private GunsProperties gunsProperties;

    
    @Autowired
    private IUserService userService;

    
    @Autowired
    private ITDriverService itDriverService;


    
    @Autowired
    private ITCompanyService companyService;
    @Resource
    private ShiroExtUtil shiroExtUtil;
    
    
    /**
     * 跳转到查看管理员列表的页面
     */
@@ -74,7 +80,7 @@
    public String index() {
        return PREFIX + "user.html";
    }

    
    /**
     * 跳转到查看管理员列表的页面
     */
@@ -86,8 +92,6 @@
    /**
     * 跳转到角色分配页面
     */
    //@RequiresPermissions("/mgr/role_assign")  //利用shiro自带的权限检查
    @Permission
    @RequestMapping("/role_assign/{userId}")
    public String roleAssign(@PathVariable Integer userId, Model model) {
        if (ToolUtil.isEmpty(userId)) {
@@ -102,7 +106,6 @@
    /**
     * 跳转到编辑管理员页面
     */
    @Permission
    @RequestMapping("/user_edit/{userId}")
    public String userEdit(@PathVariable Integer userId, Model model) {
        if (ToolUtil.isEmpty(userId)) {
@@ -121,7 +124,7 @@
     */
    @RequestMapping("/user_info")
    public String userInfo(Model model) {
       Integer userId = ShiroExtUtil.getUser().getId();
        Integer userId = shiroExtUtil.getUser().getId();
        if (ToolUtil.isEmpty(userId)) {
            throw new GunsException(BizExceptionEnum.REQUEST_NULL);
        }
@@ -150,8 +153,8 @@
        if (!newPwd.equals(rePwd)) {
            throw new GunsException(BizExceptionEnum.TWO_PWD_NOT_MATCH);
        }
       Integer userId = ShiroExtUtil.getUser().getId();
       User user = userService.selectById(userId);
        Integer userId = shiroExtUtil.getUser().getId();
        User user = userService.selectById(userId);
        String oldMd5 = ShiroKit.md5(oldPwd, user.getSalt());
        if (user.getPassword().equals(oldMd5)) {
            String newMd5 = ShiroKit.md5(newPwd, user.getSalt());
@@ -167,26 +170,25 @@
     * 查询管理员列表
     */
    @RequestMapping("/list")
    @Permission
    @ResponseBody
    public Object list(@RequestParam(required = false) String name, @RequestParam(required = false) String createTime, @RequestParam(required = false) Integer deptid) {
        //创建日期
        String beginTime = null;
        String endTime = null;
       if (SinataUtil.isNotEmpty(createTime)) {
          String[] timeArray = createTime.split(" - ");
          beginTime = timeArray[0];
          endTime = timeArray[1];
       }
       if (ShiroExtUtil.getUser().isAdmin()) {
          Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
          page.setRecords(userService.getUserListPage(page, null, name, beginTime, endTime, deptid));
          return super.packForBT(page);
       } else {
          Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
          page.setRecords(userService.getUserListPage(page, null, name, beginTime, endTime, deptid));
          return super.packForBT(page);
       }
        if (SinataUtil.isNotEmpty(createTime)) {
            String[] timeArray = createTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        if (shiroExtUtil.getUser().isAdmin()) {
            Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
            page.setRecords(userService.getUserListPage(page, null, name, beginTime, endTime, deptid));
            return super.packForBT(page);
        } else {
            Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
            page.setRecords(userService.getUserListPage(page, null, name, beginTime, endTime, deptid));
            return super.packForBT(page);
        }
    }

    /**
@@ -194,33 +196,55 @@
     */
    @RequestMapping("/add")
    @BussinessLog(value = "添加管理员", key = "account", dict = UserDict.class)
    @Permission(Const.ADMIN_NAME)
    @ResponseBody
    public Tip add(@Valid UserDto user, BindingResult result) {
        if (result.hasErrors()) {
            throw new GunsException(BizExceptionEnum.REQUEST_NULL);
        }

    
        // 判断账号是否重复
        User theUser = userService.getByAccount(user.getAccount());
        if (theUser != null) {
            throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);
        }

        ShiroUser user1 = shiroExtUtil.getUser();
        User user2 = userService.selectById(user1.getId());
        TCompany tCompany = companyService.selectById(user2.getObjectId());
        List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(user.getPhone(), tCompany.getEnterCode());
        Long empId = null;
        if(null == userInfoByPhone || userInfoByPhone.size() == 0){
            SaveStaffNodeRequest request1 = new SaveStaffNodeRequest();
            request1.setMobile(tCompany.getPrincipalPhone());
            request1.setEntercode(tCompany.getEnterCode());
            request1.setEmpName(user.getName());
            request1.setEmpNickname(user.getName());
            request1.setLoginNo(user.getAccount());
            request1.setEmpSex(user.getSex() == 1 ? "男" : "女");
            request1.setMphone(user.getPhone());
            request1.setEmail(user.getPhone() + "@qyt.com");
            request1.setDeptId(0);
            request1.setPositionId(1);
            request1.setSuperLevel(0);
            request1.setHideMobile(0);
            SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request1);
            empId = saveStaffNode.getEmpId();
        }else{
            empId = userInfoByPhone.get(0).getEmpId();
        }
    
        // 完善账号信息
        user.setSalt(ShiroKit.getRandomSalt(5));
        user.setPassword(ShiroKit.md5(user.getPassword(), user.getSalt()));
        user.setStatus(ManagerStatus.OK.getCode());
        user.setCreatetime(new Date());

        user.setEmpId(empId);
        user.setEntercode(tCompany.getEnterCode());
        user.setEnterId(Long.valueOf(tCompany.getEnterCode()));
    
        User objectUser = UserFactory.createUser(user);
        //查找平台所属公司
        TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).orderBy("id", true).last(" limit 1"));
        if (SinataUtil.isNotEmpty(company)){
            objectUser.setObjectId(company.getId());
        }
        objectUser.setObjectId(user1.getObjectId());
        this.userService.insert(objectUser);

    
        return SUCCESS_TIP;
    }

@@ -233,27 +257,78 @@
    @BussinessLog(value = "修改管理员", key = "account", dict = UserDict.class)
    @ResponseBody
    public Tip edit(@Valid UserDto user, BindingResult result) throws NoPermissionException {
       if (result.hasErrors()) {
          throw new GunsException(BizExceptionEnum.REQUEST_NULL);
       }
       User oldUser = userService.selectById(user.getId());
       //调用中台接口
       GetStaffNodeRequest request = new GetStaffNodeRequest();
	
       EmployeeUtil.getStaffNode(request);
	
	
       if (ShiroExtUtil.getUser().isAdmin) {
          this.userService.updateById(UserFactory.editUser(user, oldUser));
          return SUCCESS_TIP;
       } else {
          ShiroUser shiroUser = ShiroExtUtil.getUser();
          if (shiroUser.getId().equals(user.getId())) {
             this.userService.updateById(UserFactory.editUser(user, oldUser));
             return SUCCESS_TIP;
          } else {
             throw new GunsException(BizExceptionEnum.NO_PERMITION);
          }
        if (result.hasErrors()) {
            throw new GunsException(BizExceptionEnum.REQUEST_NULL);
        }
        User oldUser = userService.selectById(user.getId());
        ShiroUser user1 = shiroExtUtil.getUser();
        User user2 = userService.selectById(user1.getId());
        TCompany tCompany = companyService.selectById(user2.getObjectId());
        //调用中台接口
        GetStaffNodeRequest request = new GetStaffNodeRequest();
        request.setEmpId(oldUser.getEmpId());
        request.setMobile(tCompany.getPrincipalPhone());
        request.setEntercode(tCompany.getEnterCode());
        StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
        Long empId = null;
        if (null == staffNode || "0".equals(staffNode.getIsValid())) {
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(user.getPhone(), tCompany.getEnterCode());
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request1 = new SaveStaffNodeRequest();
                request1.setMobile(tCompany.getPrincipalPhone());
                request1.setEntercode(tCompany.getEnterCode());
                request1.setEmpName(user.getName());
                request1.setEmpNickname(user.getName());
                request1.setLoginNo(user.getAccount());
                request1.setEmpSex(user.getSex() == 1 ? "男" : "女");
                request1.setMphone(user.getPhone());
                request1.setEmail(user.getPhone() + "@qyt.com");
                request1.setDeptId(0);
                request1.setPositionId(1);
                request1.setSuperLevel(0);
                request1.setHideMobile(0);
                SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request1);
                empId = saveStaffNode.getEmpId();
            }else{
                empId = userInfoByPhone.get(0).getEmpId();
            }
        } else {
            EditStaffNodeRequest request1 = new EditStaffNodeRequest();
            request1.setEmpId(staffNode.getEmpId());
           request1.setMobile(tCompany.getPrincipalPhone());
            request1.setEntercode(tCompany.getEnterCode());
            request1.setEnterId(Long.valueOf(tCompany.getEnterCode()));
            request1.setEmpName(user.getName());
            request1.setEmpNickname(user.getName());
            request1.setLoginNo(user.getAccount());
            request1.setEmpSex(user.getSex() == 1 ? "男" : "女");
            request1.setMphone(user.getPhone());
           request1.setEmail(user.getPhone() + "@qyt.com");
           request1.setDeptIds(staffNode.getDeptId() + "");
           request1.setPositionId(1);
            request1.setSuperLevel(0);
            request1.setHideMobile(0);
            EmployeeUtil.editStaffNode(request1);
            empId = staffNode.getEmpId();
        }
        oldUser.setEmpId(empId);
        oldUser.setEntercode(tCompany.getEnterCode());
        oldUser.setEnterId(Long.valueOf(tCompany.getEnterCode()));
        user.setEmpId(empId);
        user.setEntercode(tCompany.getEnterCode());
        user.setEnterId(Long.valueOf(tCompany.getEnterCode()));
    
        if (shiroExtUtil.getUser().isAdmin) {
            this.userService.updateById(UserFactory.editUser(user, oldUser));
            return SUCCESS_TIP;
        } else {
            ShiroUser shiroUser = shiroExtUtil.getUser();
            if (shiroUser.getId().equals(user.getId())) {
                this.userService.updateById(UserFactory.editUser(user, oldUser));
                return SUCCESS_TIP;
            } else {
                throw new GunsException(BizExceptionEnum.NO_PERMITION);
            }
        }
    }

@@ -262,7 +337,6 @@
     */
    @RequestMapping("/delete")
    @BussinessLog(value = "删除管理员", key = "userId", dict = UserDict.class)
    @Permission
    @ResponseBody
    public Tip delete(@RequestParam Integer userId) {
        if (ToolUtil.isEmpty(userId)) {
@@ -272,8 +346,23 @@
        if (userId.equals(Const.ADMIN_ID)) {
            throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN);
        }


        User user = userService.selectById(userId);
        ShiroUser user1 = shiroExtUtil.getUser();
        User user2 = userService.selectById(user1.getId());
        TCompany tCompany = companyService.selectById(user2.getObjectId());
        //调用中台接口
        GetStaffNodeRequest request = new GetStaffNodeRequest();
        request.setEmpId(user.getEmpId());
        request.setMobile(tCompany.getPrincipalPhone());
        request.setEntercode(tCompany.getEnterCode());
        StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
        if (null != staffNode && "1".equals(staffNode.getIsValid())) {
            DeleteStafNodeRequest request1 = new DeleteStafNodeRequest();
            request1.setEmpId(user.getEnterId());
            request1.setMobile(tCompany.getPrincipalPhone());
            request1.setEntercode(tCompany.getEnterCode());
            EmployeeUtil.ecrmDeleteStafNode(request1);
        }
        this.userService.setStatus(userId, ManagerStatus.DELETED.getCode());
        return SUCCESS_TIP;
    }
@@ -295,7 +384,6 @@
     */
    @RequestMapping("/reset")
    @BussinessLog(value = "重置管理员密码", key = "userId", dict = UserDict.class)
    @Permission(Const.ADMIN_NAME)
    @ResponseBody
    public Tip reset(@RequestParam Integer userId) {
        if (ToolUtil.isEmpty(userId)) {
@@ -317,7 +405,6 @@
     */
    @RequestMapping("/freeze")
    @BussinessLog(value = "冻结用户", key = "userId", dict = UserDict.class)
    @Permission(Const.ADMIN_NAME)
    @ResponseBody
    public Tip freeze(@RequestParam Integer userId) {
        if (ToolUtil.isEmpty(userId)) {
@@ -356,7 +443,6 @@
     */
    @RequestMapping("/unfreeze")
    @BussinessLog(value = "解除冻结用户", key = "userId", dict = UserDict.class)
    @Permission(Const.ADMIN_NAME)
    @ResponseBody
    public Tip unfreeze(@RequestParam Integer userId) {
        if (ToolUtil.isEmpty(userId)) {
@@ -391,7 +477,6 @@
     */
    @RequestMapping("/setRole")
    @BussinessLog(value = "分配角色", key = "userId,roleIds", dict = UserDict.class)
    @Permission(Const.ADMIN_NAME)
    @ResponseBody
    public Tip setRole(@RequestParam("userId") Integer userId, @RequestParam("roleIds") String roleIds) {
        if (ToolUtil.isOneEmpty(userId, roleIds)) {