Merge remote-tracking branch 'origin/master'

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";
-}
+}

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;

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;

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;

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;
 
 /**
  * 待办中心-待我处理返回实体信息

pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java

@@ -11,22 +11,18 @@ import com.ningdatech.pmapi.user.model.vo.ResUserInfoListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-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;
 
 /**
- * <p>
- * 用户信息表 前端控制器
- * </p>
- *
  * @author Liuxinxin
  * @since 2023-01-04
  */
-@Controller
+@RestController
 @RequestMapping("/api/v1/user-info")
 @RequiredArgsConstructor
 @Api(value = "UserInfoController", tags = "用户管理")
@@ -40,10 +36,10 @@ public class UserInfoController {
         return userInfoManage.list(reqUserInfoListPO);
     }
 
-    @ApiOperation(value = "用户禁用", notes = "用户禁用")
-    @PostMapping("/disable")
-    public void disable(@Valid @RequestBody ReqUserDisablePO reqUserDisablePO) {
-        userInfoManage.disable(reqUserDisablePO);
+    @ApiOperation(value = "用户禁用/启用", notes = "用户禁用/启用")
+    @PostMapping("/disable-enable")
+    public void disableOrEnable(@Valid @RequestBody ReqUserDisablePO reqUserDisablePO) {
+        userInfoManage.disableOrEnable(reqUserDisablePO);
     }
 
     @ApiOperation(value = "用户详情", notes = "用户详情")

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 +
-        "}";
-    }
-}

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 +
-        "}";
-    }
-}

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;
-
 }

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,35 @@ 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;
-
+    private String available;
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

@@ -1,15 +1,25 @@
 package com.ningdatech.pmapi.user.manage;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.model.PageVo;
-import com.ningdatech.pmapi.user.mapper.UserInfoMapper;
+import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo;
+import com.ningdatech.pmapi.organization.service.IDingEmployeeInfoService;
+import com.ningdatech.pmapi.organization.service.IDingOrganizationService;
 import com.ningdatech.pmapi.user.model.po.ReqUserDetailEditPO;
 import com.ningdatech.pmapi.user.model.po.ReqUserDisablePO;
 import com.ningdatech.pmapi.user.model.po.ReqUserInfoListPO;
 import com.ningdatech.pmapi.user.model.vo.ResUserDetailVO;
 import com.ningdatech.pmapi.user.model.vo.ResUserInfoListVO;
+import com.ningdatech.pmapi.user.service.IUserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author liuxinxin
  * @date 2023/2/13 上午9:09
@@ -17,15 +27,48 @@ import org.springframework.stereotype.Component;
 @Component
 @RequiredArgsConstructor
 public class UserInfoManage {
-    private final UserInfoMapper userInfoMapper;
 
+    private final IDingOrganizationService iDingOrganizationService;
+    private final IDingEmployeeInfoService iDingEmployeeInfoService;
+    private final IUserInfoService iUserInfoService;
 
     public PageVo<ResUserInfoListVO> list(ReqUserInfoListPO reqUserInfoListPO) {
+        LambdaQueryWrapper<DingEmployeeInfo> wrapper = Wrappers.lambdaQuery(DingEmployeeInfo.class)
+                .eq(DingEmployeeInfo::getMainJob, "true");
 
-        return null;
+        Page<DingEmployeeInfo> page = iDingEmployeeInfoService.page(new Page<>(reqUserInfoListPO.getPageNumber(), reqUserInfoListPO.getPageSize()), wrapper);
+        List<DingEmployeeInfo> records = page.getRecords();
+        long total = page.getTotal();
+        List<ResUserInfoListVO> resUserInfoListVOList = new ArrayList<>();
+        if (records != null && records.size() > 0) {
+            resUserInfoListVOList = records.stream()
+                    .map(r -> {
+                        ResUserInfoListVO resListVO = new ResUserInfoListVO();
+                        resListVO.setName(r.getEmployeeName());
+                        resListVO.setOrgName(r.getOrganizationCode());
+                        resListVO.setOrgCode(r.getOrganizationCode());
+                        // TODO 从用户信息中获取
+//                        resListVO.setPhoneNo();
+                        // 从所属组织中获取
+//                        resListVO.setRegionId();
+                        resListVO.setStatus(false);
+                        resListVO.setUpdateTime(r.getUpdateOn());
+//                        从用户信息中获取
+                        resListVO.setUserId(1L);
+                        resListVO.setEmployeeCode(r.getEmployeeCode());
+                        resListVO.setUserRoleList(new ArrayList<>());
+                        return resListVO;
+                    }).collect(Collectors.toList());
+        }
+
+        PageVo<ResUserInfoListVO> pageVo = new PageVo<>();
+        pageVo.setTotal(total);
+        pageVo.setRecords(resUserInfoListVOList);
+        return pageVo;
     }
 
-    public void disable(ReqUserDisablePO reqUserDisablePO) {
+    public void disableOrEnable(ReqUserDisablePO reqUserDisablePO) {
+
 
     }
 

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> {
-
-}

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>

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> {
 
 }

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> {
 

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> {
-
-}

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>

pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisablePO.java

@@ -12,11 +12,18 @@ import javax.validation.constraints.NotBlank;
  */
 
 @Data
-@ApiModel("用户禁用PO")
+@ApiModel("用户禁用/启用 PO")
 public class ReqUserDisablePO {
 
-    @NotBlank(message = "用户ID不能为空")
     @ApiModelProperty("用户id")
     private Long userId;
 
+    @NotBlank(message = "浙政钉 用户编码 不能为空")
+    @ApiModelProperty("浙政钉 用户编码")
+    private String employeeCode;
+
+    @NotBlank(message = "浙政钉 用户编码 不能为空")
+    @ApiModelProperty("操作 true: 启用 / false 禁用")
+    private Boolean operation;
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserInfoListVO.java

@@ -19,6 +19,9 @@ public class ResUserInfoListVO {
     @ApiModelProperty("用户id")
     private Long userId;
 
+    @ApiModelProperty("浙政钉 用户编码")
+    private String employeeCode;
+
     @ApiModelProperty("姓名")
     private String name;
 
@@ -28,8 +31,8 @@ public class ResUserInfoListVO {
     @ApiModelProperty("所在单位（主职）")
     private String orgName;
 
-    @ApiModelProperty("所在单位（主职）id")
-    private Long orgId;
+    @ApiModelProperty("所在单位（主职）code")
+    private String orgCode;
 
     @ApiModelProperty("所属区域")
     private Long regionId;
@@ -38,7 +41,7 @@ public class ResUserInfoListVO {
     private List<Role> userRoleList;
 
     @ApiModelProperty("状态")
-    private String status;
+    private Boolean status;
 
     @ApiModelProperty("更新时间")
     private LocalDateTime updateTime;

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> {
-
-}

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> {
-
-}

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);
 }

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);
 }

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 {
-
-}

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 {
-
-}

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));
+    }
 }

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 {
+
 }