Просмотр исходного кода

adjust 调整 冗余表

tags/24080901
liuxinxin 1 год назад
Родитель
Сommit
f1dc649268
25 измененных файлов: 63 добавлений и 436 удалений
  1. +3
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/common/constant/DingConstant.java
  2. +0
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/bean/vo/ProcessProgressDetailVo.java
  3. +0
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/bean/vo/ProgressNodeAuditInfoVo.java
  4. +0
    -6
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
  5. +4
    -6
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/dto/res/ResToBeProcessedDTO.java
  6. +2
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java
  7. +0
    -99
      pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserAuth.java
  8. +0
    -109
      pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserInfo.java
  9. +5
    -9
      pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserAuth.java
  10. +5
    -44
      pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java
  11. +0
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java
  12. +0
    -16
      pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.java
  13. +0
    -5
      pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.xml
  14. +2
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.java
  15. +4
    -4
      pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserAuthMapper.java
  16. +0
    -16
      pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserInfoMapper.java
  17. +0
    -5
      pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserInfoMapper.xml
  18. +0
    -16
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserAuthService.java
  19. +0
    -16
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserInfoService.java
  20. +9
    -4
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/IUserAuthService.java
  21. +3
    -7
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/IUserInfoService.java
  22. +0
    -20
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserAuthServiceImpl.java
  23. +0
    -20
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserInfoServiceImpl.java
  24. +20
    -4
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserAuthServiceImpl.java
  25. +6
    -21
      pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java

+ 3
- 1
pmapi/src/main/java/com/ningdatech/pmapi/common/constant/DingConstant.java Просмотреть файл

@@ -1,6 +1,8 @@
package com.ningdatech.pmapi.common.constant;

/**
* 浙政钉常量
*
* @author CMM
* @since 2023/02/01 14:49
*/
@@ -9,4 +11,4 @@ public interface DingConstant {
* 工作通知
*/
String WORKING_NOTICE = "/message/workNotification";
}
}

+ 0
- 1
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/bean/vo/ProcessProgressDetailVo.java Просмотреть файл

@@ -1,7 +1,6 @@
package com.ningdatech.pmapi.todocenter.bean.vo;


import com.ningdatech.pmapi.projectlib.model.entity.Project;
import com.ningdatech.pmapi.todocenter.bean.entity.ProgressNode;
import com.ningdatech.pmapi.user.entity.UserInfo;
import com.wflow.workflow.bean.process.OrgUser;


+ 0
- 1
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/bean/vo/ProgressNodeAuditInfoVo.java Просмотреть файл

@@ -2,7 +2,6 @@ package com.ningdatech.pmapi.todocenter.bean.vo;

import com.ningdatech.pmapi.todocenter.bean.entity.ProcessComment;
import com.ningdatech.pmapi.user.entity.UserInfo;
import com.wflow.workflow.bean.process.OrgUser;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;


+ 0
- 6
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java Просмотреть файл

@@ -2,17 +2,14 @@ package com.ningdatech.pmapi.todocenter.manage;

import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ningdatech.basic.enumeration.Status;
import com.ningdatech.basic.exception.BizException;
import com.ningdatech.basic.model.PageVo;
import com.ningdatech.basic.util.NdDateUtils;
import com.ningdatech.pmapi.common.constant.DingConstant;
import com.ningdatech.pmapi.common.enumeration.ExportOptionEnum;
import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter;
import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent;
@@ -34,8 +31,6 @@ import com.ningdatech.pmapi.todocenter.model.dto.req.ReqProcessHandlerDTO;
import com.ningdatech.pmapi.todocenter.model.dto.req.ReqToBeProcessedDTO;
import com.ningdatech.pmapi.todocenter.model.dto.req.ReqToBeProcessedExportDTO;
import com.ningdatech.pmapi.todocenter.model.dto.res.ResToBeProcessedDTO;
import com.ningdatech.pmapi.todocenter.zwdd.model.MessageContent;
import com.ningdatech.pmapi.todocenter.zwdd.model.MessageText;
import com.ningdatech.pmapi.user.entity.UserInfo;
import com.ningdatech.pmapi.user.service.IUserInfoService;
import com.wflow.bean.do_.UserDo;
@@ -83,7 +78,6 @@ import org.flowable.variable.api.history.HistoricVariableInstance;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;


+ 4
- 6
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/dto/res/ResToBeProcessedDTO.java Просмотреть файл

@@ -1,10 +1,5 @@
package com.ningdatech.pmapi.todocenter.model.dto.res;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ningdatech.pmapi.user.entity.UserInfo;
@@ -14,7 +9,10 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
* 待办中心-待我处理返回实体信息


+ 2
- 1
pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java Просмотреть файл

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.Valid;

@@ -26,7 +27,7 @@ import javax.validation.Valid;
* @author Liuxinxin
* @since 2023-01-04
*/
@Controller
@RestController
@RequestMapping("/api/v1/user-info")
@RequiredArgsConstructor
@Api(value = "UserInfoController", tags = "用户管理")


+ 0
- 99
pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserAuth.java Просмотреть файл

@@ -1,99 +0,0 @@
package com.ningdatech.pmapi.user.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

/**
* <p>
*
* </p>
*
* @author Lierbao
* @since 2023-02-01
*/
@TableName("nd_user_auth")
@ApiModel(value = "NdUserAuth对象", description = "")
public class NdUserAuth implements Serializable {

private static final long serialVersionUID = 1L;

private Long id;

private LocalDateTime createOn;

private LocalDateTime updateOn;

private Long userId;

private String authType;

private String identifier;

private String credential;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}
public LocalDateTime getCreateOn() {
return createOn;
}

public void setCreateOn(LocalDateTime createOn) {
this.createOn = createOn;
}
public LocalDateTime getUpdateOn() {
return updateOn;
}

public void setUpdateOn(LocalDateTime updateOn) {
this.updateOn = updateOn;
}
public Long getUserId() {
return userId;
}

public void setUserId(Long userId) {
this.userId = userId;
}
public String getAuthType() {
return authType;
}

public void setAuthType(String authType) {
this.authType = authType;
}
public String getIdentifier() {
return identifier;
}

public void setIdentifier(String identifier) {
this.identifier = identifier;
}
public String getCredential() {
return credential;
}

public void setCredential(String credential) {
this.credential = credential;
}

@Override
public String toString() {
return "NdUserAuth{" +
"id=" + id +
", createOn=" + createOn +
", updateOn=" + updateOn +
", userId=" + userId +
", authType=" + authType +
", identifier=" + identifier +
", credential=" + credential +
"}";
}
}

+ 0
- 109
pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserInfo.java Просмотреть файл

@@ -1,109 +0,0 @@
package com.ningdatech.pmapi.user.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

/**
* <p>
*
* </p>
*
* @author Lierbao
* @since 2023-02-01
*/
@TableName("nd_user_info")
@ApiModel(value = "NdUserInfo对象", description = "")
public class NdUserInfo implements Serializable {

private static final long serialVersionUID = 1L;

private Long id;

private LocalDateTime createOn;

private LocalDateTime updateOn;

private Long createBy;

private Long updateBy;

private String username;

private String mobile;

private String realName;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}
public LocalDateTime getCreateOn() {
return createOn;
}

public void setCreateOn(LocalDateTime createOn) {
this.createOn = createOn;
}
public LocalDateTime getUpdateOn() {
return updateOn;
}

public void setUpdateOn(LocalDateTime updateOn) {
this.updateOn = updateOn;
}
public Long getCreateBy() {
return createBy;
}

public void setCreateBy(Long createBy) {
this.createBy = createBy;
}
public Long getUpdateBy() {
return updateBy;
}

public void setUpdateBy(Long updateBy) {
this.updateBy = updateBy;
}
public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}
public String getMobile() {
return mobile;
}

public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getRealName() {
return realName;
}

public void setRealName(String realName) {
this.realName = realName;
}

@Override
public String toString() {
return "NdUserInfo{" +
"id=" + id +
", createOn=" + createOn +
", updateOn=" + updateOn +
", createBy=" + createBy +
", updateBy=" + updateBy +
", username=" + username +
", mobile=" + mobile +
", realName=" + realName +
"}";
}
}

+ 5
- 9
pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserAuth.java Просмотреть файл

@@ -1,7 +1,5 @@
package com.ningdatech.pmapi.user.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -11,20 +9,19 @@ import java.time.LocalDateTime;

/**
* <p>
* 用户鉴权表
*
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
* @author Lierbao
* @since 2023-02-01
*/
@Data
@TableName("nd_user_auth")
@ApiModel(value = "UserAuth对象", description = "用户鉴权表")
@Data
@ApiModel(value = "NdUserAuth对象", description = "")
public class UserAuth implements Serializable {

private static final long serialVersionUID = 1L;

@TableId(value = "id", type = IdType.AUTO)
private Long id;

private LocalDateTime createOn;
@@ -38,5 +35,4 @@ public class UserAuth implements Serializable {
private String identifier;

private String credential;

}

+ 5
- 44
pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java Просмотреть файл

@@ -1,10 +1,7 @@
package com.ningdatech.pmapi.user.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;

@@ -13,70 +10,34 @@ import java.time.LocalDateTime;

/**
* <p>
* 用户信息表
*
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
* @author Lierbao
* @since 2023-02-01
*/
@Data
@TableName("nd_user_info")
@ApiModel(value = "UserInfo对象", description = "用户信息表")
@Builder
@Data
@ApiModel(value = "NdUserInfo对象", description = "")
public class UserInfo implements Serializable {

private static final long serialVersionUID = 1L;

@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;

@ApiModelProperty("创建时间")
private LocalDateTime createOn;

@ApiModelProperty("最后修改时间")
private LocalDateTime updateOn;

@ApiModelProperty("创建人")
private Long createBy;

@ApiModelProperty("最后修改人")
private Long updateBy;

@ApiModelProperty("用户名(登陆账号)")
private String username;

@ApiModelProperty("手机")
private String mobile;

@ApiModelProperty("用户真实姓名")
private String realName;

@ApiModelProperty("所属公司id")
private Long companyId;

@ApiModelProperty("所属公司名称")
private String companyName;

@ApiModelProperty("用户角色")
private String role;

@ApiModelProperty("区域id")
private Long regionCode;

@ApiModelProperty("头像文件id")
private Long avatarFileId;

@ApiModelProperty("所负责的公司id列表")
private String manageCompanyIds;

@ApiModelProperty("是否删除")
private Boolean deleted;

@ApiModelProperty("身份证号")
private String idCard;

@ApiModelProperty("浙政钉accountId")
private Long accountId;

}

+ 0
- 3
pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java Просмотреть файл

@@ -1,7 +1,6 @@
package com.ningdatech.pmapi.user.manage;

import com.ningdatech.basic.model.PageVo;
import com.ningdatech.pmapi.user.mapper.UserInfoMapper;
import com.ningdatech.pmapi.user.model.po.ReqUserDetailEditPO;
import com.ningdatech.pmapi.user.model.po.ReqUserDisablePO;
import com.ningdatech.pmapi.user.model.po.ReqUserInfoListPO;
@@ -17,8 +16,6 @@ import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
public class UserInfoManage {
private final UserInfoMapper userInfoMapper;


public PageVo<ResUserInfoListVO> list(ReqUserInfoListPO reqUserInfoListPO) {



+ 0
- 16
pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.java Просмотреть файл

@@ -1,16 +0,0 @@
package com.ningdatech.pmapi.user.mapper;

import com.ningdatech.pmapi.user.entity.NdUserAuth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* <p>
* Mapper 接口
* </p>
*
* @author Lierbao
* @since 2023-02-01
*/
public interface NdUserAuthMapper extends BaseMapper<NdUserAuth> {

}

+ 0
- 5
pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.xml Просмотреть файл

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ningdatech.pmapi.user.mapper.NdUserAuthMapper">

</mapper>

+ 2
- 2
pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.java Просмотреть файл

@@ -1,6 +1,6 @@
package com.ningdatech.pmapi.user.mapper;

import com.ningdatech.pmapi.user.entity.NdUserInfo;
import com.ningdatech.pmapi.user.entity.UserInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author Lierbao
* @since 2023-02-01
*/
public interface NdUserInfoMapper extends BaseMapper<NdUserInfo> {
public interface NdUserInfoMapper extends BaseMapper<UserInfo> {

}

+ 4
- 4
pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserAuthMapper.java Просмотреть файл

@@ -1,15 +1,15 @@
package com.ningdatech.pmapi.user.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ningdatech.pmapi.user.entity.UserAuth;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* <p>
* 用户鉴权表 Mapper 接口
* Mapper 接口
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
* @author Lierbao
* @since 2023-02-01
*/
public interface UserAuthMapper extends BaseMapper<UserAuth> {



+ 0
- 16
pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserInfoMapper.java Просмотреть файл

@@ -1,16 +0,0 @@
package com.ningdatech.pmapi.user.mapper;

import com.ningdatech.pmapi.user.entity.UserInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* <p>
* 用户信息表 Mapper 接口
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
*/
public interface UserInfoMapper extends BaseMapper<UserInfo> {

}

+ 0
- 5
pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserInfoMapper.xml Просмотреть файл

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ningdatech.pmapi.user.mapper.UserInfoMapper">

</mapper>

+ 0
- 16
pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserAuthService.java Просмотреть файл

@@ -1,16 +0,0 @@
package com.ningdatech.pmapi.user.service;

import com.ningdatech.pmapi.user.entity.NdUserAuth;
import com.baomidou.mybatisplus.extension.service.IService;

/**
* <p>
* 服务类
* </p>
*
* @author Lierbao
* @since 2023-02-01
*/
public interface INdUserAuthService extends IService<NdUserAuth> {

}

+ 0
- 16
pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserInfoService.java Просмотреть файл

@@ -1,16 +0,0 @@
package com.ningdatech.pmapi.user.service;

import com.ningdatech.pmapi.user.entity.NdUserInfo;
import com.baomidou.mybatisplus.extension.service.IService;

/**
* <p>
* 服务类
* </p>
*
* @author Lierbao
* @since 2023-02-01
*/
public interface INdUserInfoService extends IService<NdUserInfo> {

}

+ 9
- 4
pmapi/src/main/java/com/ningdatech/pmapi/user/service/IUserAuthService.java Просмотреть файл

@@ -1,16 +1,21 @@
package com.ningdatech.pmapi.user.service;

import com.ningdatech.pmapi.user.entity.UserAuth;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ningdatech.pmapi.user.entity.UserAuth;
import com.ningdatech.pmapi.user.entity.UserInfo;

import java.util.Map;
import java.util.Set;

/**
* <p>
* 用户鉴权表 服务类
* 服务类
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
* @author Lierbao
* @since 2023-02-01
*/
public interface IUserAuthService extends IService<UserAuth> {

Map<Long, UserInfo> getUserMapByIds(Set<String> staterUsers);
}

+ 3
- 7
pmapi/src/main/java/com/ningdatech/pmapi/user/service/IUserInfoService.java Просмотреть файл

@@ -3,18 +3,14 @@ package com.ningdatech.pmapi.user.service;
import com.ningdatech.pmapi.user.entity.UserInfo;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.Map;
import java.util.Set;

/**
* <p>
* 用户信息表 服务类
* 服务类
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
* @author Lierbao
* @since 2023-02-01
*/
public interface IUserInfoService extends IService<UserInfo> {

Map<Long, UserInfo> getUserMapByIds(Set<String> staterUsers);
}

+ 0
- 20
pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserAuthServiceImpl.java Просмотреть файл

@@ -1,20 +0,0 @@
package com.ningdatech.pmapi.user.service.impl;

import com.ningdatech.pmapi.user.entity.NdUserAuth;
import com.ningdatech.pmapi.user.mapper.NdUserAuthMapper;
import com.ningdatech.pmapi.user.service.INdUserAuthService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* </p>
*
* @author Lierbao
* @since 2023-02-01
*/
@Service
public class NdUserAuthServiceImpl extends ServiceImpl<NdUserAuthMapper, NdUserAuth> implements INdUserAuthService {

}

+ 0
- 20
pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserInfoServiceImpl.java Просмотреть файл

@@ -1,20 +0,0 @@
package com.ningdatech.pmapi.user.service.impl;

import com.ningdatech.pmapi.user.entity.NdUserInfo;
import com.ningdatech.pmapi.user.mapper.NdUserInfoMapper;
import com.ningdatech.pmapi.user.service.INdUserInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* </p>
*
* @author Lierbao
* @since 2023-02-01
*/
@Service
public class NdUserInfoServiceImpl extends ServiceImpl<NdUserInfoMapper, NdUserInfo> implements INdUserInfoService {

}

+ 20
- 4
pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserAuthServiceImpl.java Просмотреть файл

@@ -1,20 +1,36 @@
package com.ningdatech.pmapi.user.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ningdatech.pmapi.user.entity.UserAuth;
import com.ningdatech.pmapi.user.entity.UserInfo;
import com.ningdatech.pmapi.user.mapper.UserAuthMapper;
import com.ningdatech.pmapi.user.mapper.NdUserInfoMapper;
import com.ningdatech.pmapi.user.service.IUserAuthService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
* <p>
* 用户鉴权表 服务实现类
* 服务实现类
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
* @author Lierbao
* @since 2023-02-01
*/
@Service
@RequiredArgsConstructor
public class UserAuthServiceImpl extends ServiceImpl<UserAuthMapper, UserAuth> implements IUserAuthService {

private final NdUserInfoMapper userInfoMapper;

@Override
public Map<Long, UserInfo> getUserMapByIds(Set<String> staterUsers) {
List<UserInfo> userInfos = userInfoMapper.selectBatchIds(staterUsers);
return userInfos.stream().collect(Collectors.toMap(UserInfo::getId, u -> u));
}
}

+ 6
- 21
pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java Просмотреть файл

@@ -1,35 +1,20 @@
package com.ningdatech.pmapi.user.service.impl;

import com.ningdatech.pmapi.user.entity.UserInfo;
import com.ningdatech.pmapi.user.mapper.UserInfoMapper;
import com.ningdatech.pmapi.user.mapper.NdUserInfoMapper;
import com.ningdatech.pmapi.user.service.IUserInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.apache.catalina.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
* <p>
* 用户信息表 服务实现类
* 服务实现类
* </p>
*
* @author Liuxinxin
* @since 2023-01-04
* @author Lierbao
* @since 2023-02-01
*/
@Service
@RequiredArgsConstructor
public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements IUserInfoService {
private final UserInfoMapper userInfoMapper;
@Override
public Map<Long, UserInfo> getUserMapByIds(Set<String> staterUsers) {
List<UserInfo> userInfos = userInfoMapper.selectBatchIds(staterUsers);
return userInfos.stream().collect(Collectors.toMap(UserInfo::getId,u -> u ));
}
public class UserInfoServiceImpl extends ServiceImpl<NdUserInfoMapper, UserInfo> implements IUserInfoService {

}

Загрузка…
Отмена
Сохранить