人员管理-代理人管理：新增和修改代理人详情信息

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -17,22 +17,22 @@ import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
+import com.ydtech.modules.admin.vo.SysUserVo;
+import com.ydtech.modules.admin.vo.UserBasicInfoVo;
+import com.ydtech.modules.admin.vo.UserDetailsInfoVo;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
+import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
-import com.ydtech.modules.esm.model.vo.UserRegistVO;
 import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
-import com.ydtech.modules.inv.model.dto.InvInsChinaCoalExcelDto;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.excel.ExcelEasypoiUtils;
-import com.ydtech.utils.excel.ExcelUtils2;
 import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -41,13 +41,12 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.ydtech.constants.RedisConstant.PHONE_VERIFICATION_CODE_KEY;
-
 
 /**
  * 用户控制器
@@ -376,8 +375,8 @@ public class SysUserController extends BaseController {
      * 根据部门id查询该部门的推荐人信息
      */
     @GetMapping("/selectfindByreferrerId")
-    public HttpResult findByreferrerId(@Valid String deptId) {
-        return HttpResult.ok(sysUserService.findByreferrerId(deptId));
+    public HttpResult findByReferrerId(@Valid String deptId) {
+        return HttpResult.ok(sysUserService.findByReferrerId(deptId));
     }
 
 
@@ -504,7 +503,10 @@ public class SysUserController extends BaseController {
         SysUser sysUser = sysUserService.getById(userId);
         // 查询角色
         SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
-        sysUser.setRoleId(StringUtils.toString(sysUserRole.getRoleId()));
+//        SysUserRole sysUserRole = sysUserRoleService.getById(userId);
+        if (!ObjectUtils.isEmpty(sysUserRole)){
+            sysUser.setRoleId(StringUtils.toString(sysUserRole.getRoleId()));
+        }
         // 查询推荐人
         EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
         if (ObjectUtils.isEmpty(referrer)) {
@@ -514,7 +516,21 @@ public class SysUserController extends BaseController {
             sysUser.setReferrerId(referrer.getReferrerId());
             sysUser.setReferrerName(referrer.getReferrerName());
         }
-        return HttpResult.ok(sysUser);
+        //查询详情信息
+
+        EsmUserInternal userInternal = esmUserInternalService.getById(userId);
+        if (!ObjectUtils.isEmpty(userInternal)){
+            sysUser.setId(userInternal.getId());
+        }
+
+//        SysUserInfo userInfo = sysUserInfoService.getById(userId);
+//        if (!ObjectUtils.isEmpty(userInfo)){
+//            sysUser.setId(userInfo.getId());
+//        }
+        SysUserVo sysUserVo = new SysUserVo();
+        sysUserVo.setSysUser(sysUser);
+        sysUserVo.setUserInternal(userInternal);
+        return HttpResult.ok(sysUserVo);
 
     }
 
@@ -707,12 +723,9 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "保存或更新用户信息")
     @PostMapping(value = "/saveOrUpdateInfo")
     public HttpResult saveOrUpdateInfo(@RequestBody SysUserInfo sysUserInfo) {
-
         if (StringUtils.isNullOrEmpty(sysUserInfo.getId())) return HttpResult.error("用户ID不能为空");
-
         return HttpResult.ok(sysUserInfoService.saveOrUpdate(sysUserInfo));
 
-
     }
 
 
@@ -726,5 +739,21 @@ public class SysUserController extends BaseController {
         return HttpResult.ok(sysUserInfoService.getById(userId));
     }
 
+    @ApiOperation(value = "保存用户基本详情信息")
+    @Transactional
+    @PostMapping(value = "/saveUserInfo")
+    public HttpResult saveUserInfo(@RequestBody SysUserVo sysUserVo){
+        return HttpResult.ok(sysUserService.saveUserInfo(sysUserVo)) ;
+    }
+
+    @PostMapping(value = "/updateUserInfo/{userId}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "用户信息", required = true, dataType = "String")
+    })
+    @ApiOperation(value = "修改用户详情信息")
+    @Transactional
+    public HttpResult updateUserInfo(@PathVariable String userId,@RequestBody SysUserVo sysUserVo) {
+        return HttpResult.ok(sysUserService.updateUserInfo(userId,sysUserVo));
+    }
 
 }

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -2,14 +2,19 @@ package com.ydtech.modules.admin.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.SysUserInfo;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
+import com.ydtech.modules.admin.vo.SysUserVo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Set;
@@ -50,8 +55,10 @@ public interface SysUserService extends IService<SysUser> {
 
     SysUserVO gainUserInternalByDeptId(String deptId);
 
-    List<SysUserVO> findByreferrerId(String deptId);
-    PageVo gainUserPage(PageDto pageDto);
+    List<SysUserVO> findByReferrerId(String deptId);
+    PageVo<SysUserBaseVO> gainUserPage(PageDto<SysUserDto> pageDto);
+
+//    PageVo gainUserPage(PageDto pageDto);
 
 
     /**
@@ -79,7 +86,9 @@ public interface SysUserService extends IService<SysUser> {
 
     boolean saveUser(SysUser sysUser);
 
+    HttpResult   saveUserInfo( SysUserVo sysUserVo);
 
+    HttpResult updateUserInfo(String userId,SysUserVo sysUserVo);
 
 }
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -10,23 +10,29 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.*;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
+import com.ydtech.modules.admin.vo.SysUserVo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmUserAgent;
+import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserAgentService;
+import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.*;
 import java.util.function.Function;
@@ -52,6 +58,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     @Resource
     private EsmUserReferrerService esmUserReferrerService;
 
+    @Autowired
+    private EsmUserInternalService esmUserInternalService;
+
+
     @Override
     public SysUser findByUsername(String username) {
         SysUser sysUser = null;
@@ -203,8 +213,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     }
 
     @Override
-    public List<SysUserVO> findByreferrerId(String deptId) {
-        return super.baseMapper.findByreferrerId(deptId);
+    public List<SysUserVO> findByReferrerId(String deptId) {
+        return super.baseMapper.findByReferrerId(deptId);
     }
 
     @Override
@@ -240,8 +250,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         pageVo.setContent(super.baseMapper.gainUserBaseInfo(pageDto));
 
 
-
-
         return pageVo;
     }
 
@@ -291,20 +299,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     }
 
 
-
     @Override
     public String findMaxId(String deptId) {
         QueryWrapper<SysUser> qw = new QueryWrapper<>();
         qw.select("IFNULL(MAX(id),0) maxId");
-        qw.eq("dept_id",deptId);
-        Map<String,Object> m = getMap(qw);
+        qw.eq("dept_id", deptId);
+        Map<String, Object> m = getMap(qw);
         String maxId = m.get("maxId").toString();
         return maxId;
 
     }
 
     @Override
-    public boolean check(String userId,Integer approvalStatus,String approvalOpinion) {
+    public boolean check(String userId, Integer approvalStatus, String approvalOpinion) {
 
         SysUser user = getById(userId);
 //        user.setApprovalStatus(approvalStatus);
@@ -346,7 +353,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         eur.setReferrerName(sysUser.getReferrerName());
 
         // 新增或跟新用户表
-        saveOrUpdate(sysUser);
+        save(sysUser);
         // 保存推荐人
         esmUserReferrerService.save(eur);
         // 保存角色
@@ -354,6 +361,81 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         return true;
     }
 
+    @Override
+    @Transactional
+    public HttpResult saveUserInfo(SysUserVo sysUserVo) {
+
+        SysUser sysUser = sysUserVo.getSysUser();
+        String userId = gainNextUserId(sysUser.getDeptId());
+        sysUser.setId(userId);
+        save(sysUser);
+
+        //角色配置
+        SysUserRole userRole = new SysUserRole();
+        userRole.setUserId(sysUser.getId());
+        userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+        sysUserRoleService.save(userRole);
+
+        //推荐人
+        EsmUserReferrer eur = new EsmUserReferrer();
+//        if (!StringUtils.isNullOrEmpty(referrerId)) {
+//            EsmUserReferrer referrer = esmUserReferrerService.getById(referrerId);
+//            if (null != referrer) {
+//                eur.setLevel(referrer.getLevel() + 1);
+//            } else {
+//                eur.setLevel(1);
+//            }
+//        }
+        eur.setId(sysUser.getId());
+        eur.setReferrerName(sysUser.getReferrerName());
+        eur.setReferrerId(sysUser.getReferrerId());
+        eur.setLevel(1);
+        esmUserReferrerService.save(eur);
+
+//        SysUserInfo userInfo = sysUserVo.getSysUserInfo();
+//        userInfo.setId(sysUser.getId());
+//        sysUserInfoService.save(userInfo);
+        EsmUserInternal userInternal = sysUserVo.getUserInternal();
+        if (userInternal != null){
+            userInternal.setId(sysUser.getId());
+        }
+        esmUserInternalService.save(userInternal);
+        return HttpResult.ok("新增成功");
+    }
+
+    @Override
+    @Transactional
+    public HttpResult updateUserInfo(String userId, SysUserVo sysUserVo) {
+        SysUser sysUser = sysUserVo.getSysUser();
+        updateById(sysUser);
+
+        //角色配置
+        SysUserRole userRole = new SysUserRole();
+        userRole.setUserId(userId);
+        userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+        userRole.setLastUpdateBy(sysUser.getCreateBy());
+        userRole.setLastUpdateTime(new Date());
+        sysUserRoleService.updateById(userRole);
+
+        //推荐人
+        EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
+        EsmUserReferrer eur = new EsmUserReferrer();
+        eur.setId(userId);
+        eur.setReferrerName(sysUser.getReferrerName());
+        eur.setReferrerId(sysUser.getReferrerId());
+        if (null != referrer) {
+            eur.setLevel(referrer.getLevel() + 1);
+        } else {
+            eur.setLevel(1);
+        }
+        esmUserReferrerService.updateById(eur);
+
+        //用户详情信息
+        EsmUserInternal userInternal = sysUserVo.getUserInternal();
+        userInternal.setId(userId);
+        esmUserInternalService.updateById(userInternal);
+        return HttpResult.ok("修改成功");
+    }
 }