Skip to content

Y
yd-user
Commit e01b67a9 by zhangxingmin
Options

Merge remote-tracking branch 'origin/dev_zxm' into test 

# Conflicts:
#	yd-user-api/yd-user-api.iml
#	yd-user-feign/yd-user-feign.iml
#	yd-user-service/yd-user-service.iml
#	yd-user.iml
parents 83d9e1bf 1a34c7d6
Showing with 494 additions and 47 deletions
yd-user-api/src/main/java/com/yd/user/api/controller/ClientUserController.java 0 → 100644
package com.yd.user.api.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 客户端用户表 前端控制器
* </p>
*
* @author zxm
* @since 2025-10-20
*/
@RestController
@RequestMapping("/clientUser")
public class ClientUserController {
}
yd-user-api/src/main/java/com/yd/user/api/service/ApiClientUserService.java 0 → 100644
package com.yd.user.api.service;
import com.yd.common.result.Result;
import java.util.List;
public interface ApiClientUserService {
Result saveClientUserList(List<String> userBizIdList,
String tenantBizId,
String projectBizId);
}
yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiClientUserServiceImpl.java 0 → 100644
package com.yd.user.api.service.impl;
import com.yd.common.enums.CommonEnum;
import com.yd.common.result.Result;
import com.yd.user.api.service.ApiClientUserService;
import com.yd.user.service.dto.ClientUserDto;
import com.yd.user.service.dto.SysUserDto;
import com.yd.user.service.model.ClientUser;
import com.yd.user.service.model.SysUser;
import com.yd.user.service.service.IClientUserService;
import com.yd.user.service.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@Service
public class ApiClientUserServiceImpl implements ApiClientUserService {
@Autowired
private ISysUserService iSysUserService;
@Autowired
private IClientUserService iClientUserService;
/**
* 同步sys_user系统用户，批量更新客户端用户表数据
* @param userBizIdList
* @param tenantBizId
* @param projectBizId
* @return
*/
@Override
public Result saveClientUserList(List<String> userBizIdList,
String tenantBizId,
String projectBizId) {
List<SysUser> sysUserList = iSysUserService.queryList(SysUserDto.builder().userBizIdList(userBizIdList).build());
if (!CollectionUtils.isEmpty(sysUserList)) {
//根据用户唯一标识(sys_user系统用户表)列表查询客户端用户列表，来做更新。
List<ClientUser> clientUserList = iClientUserService.queryList(ClientUserDto.builder()
.tenantBizId(tenantBizId)
.projectBizId(projectBizId)
.userBizIdList(userBizIdList)
.build());
List<ClientUser> saveList = new ArrayList<>();
if (CollectionUtils.isEmpty(clientUserList)) {
//全部新增同步sys_user数据
saveList = buildClientUserList(sysUserList,tenantBizId,projectBizId);
}else {
//部分新增部分更新
//过滤出不在clientUserList中的sysUser
Set<String> existUserBizIds = clientUserList.stream()
.map(ClientUser::getUserBizId)
.collect(Collectors.toSet());
List<SysUser> newSysUsers = sysUserList.stream()
.filter(sysUser -> !existUserBizIds.contains(sysUser.getUserBizId()))
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(newSysUsers)) {
//新增同步sys_user数据
saveList = buildClientUserList(sysUserList,tenantBizId,projectBizId);
}
}
if (!CollectionUtils.isEmpty(saveList)) {
iClientUserService.saveOrUpdateBatch(saveList);
}
}
return null;
}
/**
* 根据List<SysUser>构造List<ClientUser>
* @param sysUserList
* @return
*/
public List<ClientUser> buildClientUserList(List<SysUser> sysUserList,
String tenantBizId,
String projectBizId) {
List<ClientUser> clientUserList = new ArrayList<>();
if (!CollectionUtils.isEmpty(sysUserList)) {
clientUserList = sysUserList.stream().map(dto -> {
ClientUser clientUser = new ClientUser();
//待审核
clientUser.setApprovalStatus(CommonEnum.APPROVAL_STATUS_DSH.getCode());
clientUser.setClientUserBizId(CommonEnum.UID_TYPE_CLIENT_USER.getCode());
clientUser.setEmail(dto.getEmail());
//邀请码 TODO
// clientUser.setInvitationCode();
clientUser.setName(dto.getRealName());
clientUser.setPhone(dto.getMobile());
clientUser.setTenantBizId(tenantBizId);
clientUser.setProjectBizId(projectBizId);
//用户唯一标识(sys_user系统用户表)
clientUser.setUserBizId(dto.getUserBizId());
return clientUser;
}).collect(Collectors.toList());
}
return clientUserList;
}
}
yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelProjectUserServiceImpl.java
......@@ -2,9 +2,11 @@ package com.yd.user.api.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.user.api.service.ApiClientUserService;
import com.yd.user.api.service.ApiRelProjectUserService;
import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListAddRequest;
import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserListPageRequest;
......@@ -12,7 +14,9 @@ import com.yd.user.feign.request.relprojectuser.ApiRelProjectUserSelectPageReque
import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserListPageResponse;
import com.yd.user.feign.response.relprojectuser.ApiRelProjectUserSelectPageResponse;
import com.yd.user.service.model.RelProjectUser;
import com.yd.user.service.model.SysProject;
import com.yd.user.service.service.IRelProjectUserService;
import com.yd.user.service.service.ISysProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -27,6 +31,12 @@ public class ApiRelProjectUserServiceImpl implements ApiRelProjectUserService {
@Autowired
private IRelProjectUserService iRelProjectUserService;
@Autowired
private ISysProjectService iSysProjectService;
@Autowired
private ApiClientUserService apiClientUserService;
/**
* 项目和用户关系分页查询
* @param request
......@@ -60,6 +70,14 @@ public class ApiRelProjectUserServiceImpl implements ApiRelProjectUserService {
iRelProjectUserService.saveOrUpdateBatch(list);
}
//判断项目类型-客户端时，更新sys_user用户数据到客户端用户表中，客户端用户表审核状态为待审核
//查询项目信息
SysProject sysProject = iSysProjectService.queryOne(request.getProjectBizId());
if (!Objects.isNull(sysProject) &&
CommonEnum.PROJECT_TYPE_CLIENT.getCode().equals(sysProject.getProjectType())) {
//客户端来源项目，更新sys_user用户数据到客户端用户表中，客户端用户表审核状态为待审核
apiClientUserService.saveClientUserList(request.getUserBizIdList(), request.getTenantBizId(), request.getProjectBizId());
}
return Result.success();
}
......@@ -76,6 +94,7 @@ public class ApiRelProjectUserServiceImpl implements ApiRelProjectUserService {
throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
}
iRelProjectUserService.removeById(relProjectUser.getId());
//客户端项目类型的项目不支持删除 TODO
return Result.success();
}
......
yd-user-api/yd-user-api.iml
......@@ -26,19 +26,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.1.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.1.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.2" level="project" />
......@@ -130,10 +117,20 @@
<orderEntry type="library" name="Maven: p6spy:p6spy:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
<orderEntry type="module" module-name="yd-user-feign" />
<orderEntry type="library" name="Maven: com.yd:yd-feign:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.1" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.8" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.8" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
<orderEntry type="library" name="Maven: com.yd:yd-common:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.14.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
......@@ -142,11 +139,25 @@
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:73.2" level="project" />
<orderEntry type="library" name="Maven: com.yd:yd-auth-core:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
<orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-core:5.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-jose:5.6.2" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:9.14" level="project" />
......@@ -165,8 +176,6 @@
<orderEntry type="library" name="Maven: com.yd:yd-framework:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.6.2" level="project" />
<orderEntry type="library" name="Maven: org.redisson:redisson:3.20.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.69.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.69.Final" level="project" />
......@@ -187,13 +196,5 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
<orderEntry type="library" name="Maven: com.yd:yd-feign:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.1" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.8" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.8" level="project" />
</component>
</module>
\ No newline at end of file
yd-user-feign/src/main/java/com/yd/user/feign/request/sysproject/ApiSysProjectAddRequest.java
......@@ -70,4 +70,9 @@ public class ApiSysProjectAddRequest {
* 项目访问地址
*/
private String projectUrl;
/**
* 项目类型（PC、客户端）
*/
private String projectType;
}
yd-user-feign/src/main/java/com/yd/user/feign/request/sysproject/ApiSysProjectEditRequest.java
......@@ -83,4 +83,9 @@ public class ApiSysProjectEditRequest {
* 项目访问地址
*/
private String projectUrl;
/**
* 项目类型（PC、客户端）
*/
private String projectType;
}
yd-user-feign/src/main/java/com/yd/user/feign/response/sysproject/ApiSysProjectDetailResponse.java
......@@ -108,4 +108,9 @@ public class ApiSysProjectDetailResponse {
* 更新时间
*/
private LocalDateTime updateTime;
/**
* 项目类型（PC、客户端）
*/
private String projectType;
}
yd-user-feign/src/main/java/com/yd/user/feign/response/sysproject/ApiSysProjectPageResponse.java
......@@ -70,4 +70,8 @@ public class ApiSysProjectPageResponse {
*/
private LocalDateTime createTime;
/**
* 项目类型（PC、客户端）
*/
private String projectType;
}
yd-user-feign/yd-user-feign.iml
......@@ -17,25 +17,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
<orderEntry type="library" name="Maven: com.yd:yd-feign:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.1" level="project" />
......@@ -62,10 +43,29 @@
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
<orderEntry type="library" name="Maven: com.yd:yd-common:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
......@@ -102,6 +102,9 @@
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.69.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.69.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.69.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.60" level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:73.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
</component>
</module>
\ No newline at end of file
yd-user-service/src/main/java/com/yd/user/service/dao/ClientUserMapper.java 0 → 100644
package com.yd.user.service.dao;
import com.yd.user.service.model.ClientUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 客户端用户表 Mapper 接口
* </p>
*
* @author zxm
* @since 2025-10-20
*/
public interface ClientUserMapper extends BaseMapper<ClientUser> {
}
yd-user-service/src/main/java/com/yd/user/service/dto/ClientUserDto.java 0 → 100644
package com.yd.user.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ClientUserDto {
/**
* 所属租户唯一业务ID（冗余）
*/
private String tenantBizId;
/**
* 所属项目唯一业务ID（冗余）
*/
private String projectBizId;
/**
* 用户唯一标识(sys_user系统用户表)列表
*/
private List<String> userBizIdList;
}
yd-user-service/src/main/java/com/yd/user/service/dto/SysUserDto.java
......@@ -5,6 +5,8 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 用户公共参数对象
*/
......@@ -25,6 +27,11 @@ public class SysUserDto {
private String userBizId;
/**
* 用户唯一标识(业务ID)集合
*/
private List<String> userBizIdList;
/**
* 登录账号
*/
private String userName;
......
yd-user-service/src/main/java/com/yd/user/service/model/ClientUser.java 0 → 100644
package com.yd.user.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 客户端用户表
* </p>
*
* @author zxm
* @since 2025-10-20
*/
@Getter
@Setter
@TableName("client_user")
public class ClientUser implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 客户端用户表唯一业务ID
*/
@TableField("client_user_biz_id")
private String clientUserBizId;
/**
* 姓名
*/
@TableField("name")
private String name;
/**
* 手机号
*/
@TableField("phone")
private String phone;
/**
* 邮箱
*/
@TableField("email")
private String email;
/**
* 证件类型
*/
@TableField("id_card_type")
private String idCardType;
/**
* 证件号码
*/
@TableField("id_card_number")
private String idCardNumber;
/**
* 登录密码
*/
@TableField("password")
private String password;
/**
* 邀请码
*/
@TableField("invitation_code")
private String invitationCode;
/**
* 状态(0:停用 1:启用)
*/
@TableField("status")
private Integer status;
/**
* 审批状态
*/
@TableField("approval_status")
private String approvalStatus;
/**
* 所属租户唯一业务ID（冗余）
*/
@TableField("tenant_biz_id")
private String tenantBizId;
/**
* 所属项目唯一业务ID（冗余）
*/
@TableField("project_biz_id")
private String projectBizId;
/**
* 用户唯一标识(sys_user系统用户表)
*/
@TableField("user_biz_id")
private String userBizId;
/**
* 通用备注
*/
@TableField("remark")
private String remark;
/**
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Integer isDeleted;
/**
* 创建人ID
*/
@TableField("creator_id")
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
private String updaterId;
/**
* 创建时间
*/
@TableField("create_time")
private LocalDateTime createTime;
/**
* 更新时间
*/
@TableField("update_time")
private LocalDateTime updateTime;
}
yd-user-service/src/main/java/com/yd/user/service/model/SysProject.java
......@@ -34,6 +34,12 @@ public class SysProject implements Serializable {
private Long id;
/**
* 项目类型（PC、客户端）
*/
@TableField("project_type")
private String projectType;
/**
* 项目唯一标识(业务ID)
*/
@TableField("project_biz_id")
......
yd-user-service/src/main/java/com/yd/user/service/service/IClientUserService.java 0 → 100644
package com.yd.user.service.service;
import com.yd.user.service.dto.ClientUserDto;
import com.yd.user.service.model.ClientUser;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 客户端用户表 服务类
* </p>
*
* @author zxm
* @since 2025-10-20
*/
public interface IClientUserService extends IService<ClientUser> {
List<ClientUser> queryList(ClientUserDto dto);
}
yd-user-service/src/main/java/com/yd/user/service/service/impl/ClientUserServiceImpl.java 0 → 100644
package com.yd.user.service.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yd.user.service.dto.ClientUserDto;
import com.yd.user.service.model.ClientUser;
import com.yd.user.service.dao.ClientUserMapper;
import com.yd.user.service.model.SysUser;
import com.yd.user.service.service.IClientUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
/**
* <p>
* 客户端用户表 服务实现类
* </p>
*
* @author zxm
* @since 2025-10-20
*/
@Service
public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientUser> implements IClientUserService {
/**
* 查询列表
* @param dto
* @return
*/
@Override
public List<ClientUser> queryList(ClientUserDto dto) {
List<ClientUser> list = baseMapper.selectList(new LambdaQueryWrapper<ClientUser>()
.eq(StringUtils.isNotBlank(dto.getTenantBizId()),ClientUser::getTenantBizId,dto.getTenantBizId())
.eq(StringUtils.isNotBlank(dto.getProjectBizId()),ClientUser::getProjectBizId,dto.getProjectBizId())
.in(!CollectionUtils.isEmpty(dto.getUserBizIdList()),ClientUser::getUserBizId,dto.getUserBizIdList())
);
return list;
}
}
yd-user-service/src/main/java/com/yd/user/service/service/impl/SysUserServiceImpl.java
......@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
......@@ -77,6 +78,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
.eq(StringUtils.isNotBlank(dto.getMobile()),SysUser::getMobile,dto.getMobile())
.eq(!Objects.isNull(dto.getStatus()),SysUser::getStatus,dto.getStatus())
.eq(!Objects.isNull(dto.getIsSuperAdmin()),SysUser::getIsSuperAdmin,dto.getIsSuperAdmin())
.in(!CollectionUtils.isEmpty(dto.getUserBizIdList()),SysUser::getUserBizId,dto.getUserBizIdList())
.ne(dto.getIsExcludeMy(),SysUser::getUserBizId,dto.getUserBizId())
);
return list;
......
yd-user-service/src/main/java/com/yd/user/service/utils/MyBatisPlusCodeGenerator.java
......@@ -21,7 +21,7 @@ public class MyBatisPlusCodeGenerator {
})
.strategyConfig(builder -> {
builder.addInclude(
"rel_dept_user", "rel_tenant_dept", "rel_project_dept"
"client_user"
// "rel_dept_user", "rel_group_role", "rel_group_user",
// "rel_project_menu", "rel_project_role", "rel_project_user",
// "rel_project_user_group", "rel_role_menu", "rel_tenant_dept",
......
yd-user-service/src/main/resources/mappers/ClientUserMapper.xml 0 → 100644
<?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.yd.user.service.dao.ClientUserMapper">
</mapper>
yd-user.iml
......@@ -5,9 +5,6 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment