From 9b0e63a33e519f540345bd136d1cba57dfb8d79f Mon Sep 17 00:00:00 2001 From: hewencai <2357300448@qq.com> Date: Mon, 22 Dec 2025 09:51:05 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E8=B0=83=E6=95=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7-=E9=83=A8?= =?UTF-8?q?=E9=97=A8=EF=BC=8C=E7=94=A8=E6=88=B7-=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/UserDeptDataFeignProvider.java | 81 ++++++++++ .../provider/UserPostDataFeignProvider.java | 81 ++++++++++ .../provider/DatabusUserDeptProviderApi.java | 71 ++++++++ .../provider/DatabusUserPostProviderApi.java | 71 ++++++++ .../rpc/config/RpcConfiguration.java | 9 +- .../DatabusUserDeptProviderApiImpl.java | 151 ++++++++++++++++++ .../DatabusUserPostProviderApiImpl.java | 139 ++++++++++++++++ .../module/system/api/dept/PostApiImpl.java | 4 + 8 files changed, 604 insertions(+), 3 deletions(-) create mode 100644 zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserDeptDataFeignProvider.java create mode 100644 zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserPostDataFeignProvider.java create mode 100644 zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserDeptProviderApi.java create mode 100644 zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserPostProviderApi.java create mode 100644 zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserDeptProviderApiImpl.java create mode 100644 zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserPostProviderApiImpl.java diff --git a/zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserDeptDataFeignProvider.java b/zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserDeptDataFeignProvider.java new file mode 100644 index 00000000..81f3bcf2 --- /dev/null +++ b/zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserDeptDataFeignProvider.java @@ -0,0 +1,81 @@ +package com.zt.plat.framework.databus.server.provider; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.databus.server.core.provider.DataProvider; +import com.zt.plat.framework.databus.server.core.provider.DataProviderRegistry; +import com.zt.plat.module.databus.api.dto.CursorPageReqDTO; +import com.zt.plat.module.databus.api.dto.CursorPageResult; +import com.zt.plat.module.databus.api.data.DatabusUserDeptData; +import com.zt.plat.module.databus.api.provider.DatabusUserDeptProviderApi; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 用户-部门关系数据提供者 + */ +@Slf4j +@Component +public class UserDeptDataFeignProvider implements DataProvider { + + public static final String PROVIDER_TYPE = "USER_DEPT"; + + @Resource + private DatabusUserDeptProviderApi userDeptProviderApi; + + @Resource + private DataProviderRegistry dataProviderRegistry; + + @PostConstruct + public void init() { + dataProviderRegistry.register(this); + } + + @Override + public String getProviderType() { + return PROVIDER_TYPE; + } + + @Override + public CursorPageData getPageByCursor(LocalDateTime cursorTime, Long cursorId, + int batchSize, Long tenantId) { + CursorPageReqDTO reqDTO = CursorPageReqDTO.builder() + .cursorTime(cursorTime) + .cursorId(cursorId) + .batchSize(batchSize) + .tenantId(tenantId) + .build(); + + CommonResult> result = userDeptProviderApi.getPageByCursor(reqDTO); + if (!result.isSuccess()) { + throw new RuntimeException("获取用户-部门关系数据失败: " + result.getMsg()); + } + + CursorPageResult pageResult = result.getData(); + return CursorPageData.of( + pageResult.getList(), + pageResult.getNextCursorTime(), + pageResult.getNextCursorId(), + pageResult.getCount(), + Boolean.TRUE.equals(pageResult.getHasMore()), + (pageResult.getTotal() != null ? pageResult.getTotal() : 0L) + ); + } + + @Override + public long count(Long tenantId) { + CommonResult result = userDeptProviderApi.count(tenantId); + if (!result.isSuccess()) { + throw new RuntimeException("获取用户-部门关系总数失败: " + result.getMsg()); + } + return result.getData(); + } + + @Override + public Long extractUid(DatabusUserDeptData data) { + return data.getId(); + } +} diff --git a/zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserPostDataFeignProvider.java b/zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserPostDataFeignProvider.java new file mode 100644 index 00000000..b7df241a --- /dev/null +++ b/zt-framework/zt-spring-boot-starter-databus-server/src/main/java/com/zt/plat/framework/databus/server/provider/UserPostDataFeignProvider.java @@ -0,0 +1,81 @@ +package com.zt.plat.framework.databus.server.provider; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.databus.server.core.provider.DataProvider; +import com.zt.plat.framework.databus.server.core.provider.DataProviderRegistry; +import com.zt.plat.module.databus.api.dto.CursorPageReqDTO; +import com.zt.plat.module.databus.api.dto.CursorPageResult; +import com.zt.plat.module.databus.api.data.DatabusUserPostData; +import com.zt.plat.module.databus.api.provider.DatabusUserPostProviderApi; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 用户-岗位关系数据提供者 + */ +@Slf4j +@Component +public class UserPostDataFeignProvider implements DataProvider { + + public static final String PROVIDER_TYPE = "USER_POST"; + + @Resource + private DatabusUserPostProviderApi userPostProviderApi; + + @Resource + private DataProviderRegistry dataProviderRegistry; + + @PostConstruct + public void init() { + dataProviderRegistry.register(this); + } + + @Override + public String getProviderType() { + return PROVIDER_TYPE; + } + + @Override + public CursorPageData getPageByCursor(LocalDateTime cursorTime, Long cursorId, + int batchSize, Long tenantId) { + CursorPageReqDTO reqDTO = CursorPageReqDTO.builder() + .cursorTime(cursorTime) + .cursorId(cursorId) + .batchSize(batchSize) + .tenantId(tenantId) + .build(); + + CommonResult> result = userPostProviderApi.getPageByCursor(reqDTO); + if (!result.isSuccess()) { + throw new RuntimeException("获取用户-岗位关系数据失败: " + result.getMsg()); + } + + CursorPageResult pageResult = result.getData(); + return CursorPageData.of( + pageResult.getList(), + pageResult.getNextCursorTime(), + pageResult.getNextCursorId(), + pageResult.getCount(), + Boolean.TRUE.equals(pageResult.getHasMore()), + (pageResult.getTotal() != null ? pageResult.getTotal() : 0L) + ); + } + + @Override + public long count(Long tenantId) { + CommonResult result = userPostProviderApi.count(tenantId); + if (!result.isSuccess()) { + throw new RuntimeException("获取用户-岗位关系总数失败: " + result.getMsg()); + } + return result.getData(); + } + + @Override + public Long extractUid(DatabusUserPostData data) { + return data.getId(); + } +} diff --git a/zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserDeptProviderApi.java b/zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserDeptProviderApi.java new file mode 100644 index 00000000..5e393626 --- /dev/null +++ b/zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserDeptProviderApi.java @@ -0,0 +1,71 @@ +package com.zt.plat.module.databus.api.provider; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.databus.api.data.DatabusUserDeptData; +import com.zt.plat.module.databus.api.dto.CursorPageReqDTO; +import com.zt.plat.module.databus.api.dto.CursorPageResult; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Databus 用户-部门关系数据提供者 API + *

+ * 供 Databus 调用，获取用户-部门关联数据用于全量/增量同步 + * + * @author ZT + */ +@FeignClient(name = "${databus.provider.user-dept.service:system-server}") +@Tag(name = "RPC 服务 - Databus 用户-部门关系数据提供者") +public interface DatabusUserDeptProviderApi { + + String PREFIX = "/rpc/databus/user-dept"; + + /** + * 游标分页查询用户-部门关系数据（用于全量同步） + * + * @param reqDTO 游标分页请求 + * @return 用户-部门关系数据分页结果 + */ + @PostMapping(PREFIX + "/page-by-cursor") + @Operation(summary = "游标分页查询用户-部门关系数据") + CommonResult> getPageByCursor(@RequestBody CursorPageReqDTO reqDTO); + + /** + * 根据ID查询用户-部门关系详情（用于增量同步） + * + * @param id 关系ID + * @return 用户-部门关系数据 + */ + @GetMapping(PREFIX + "/get") + @Operation(summary = "查询用户-部门关系详情") + @Parameter(name = "id", description = "关系ID", required = true, example = "1001") + CommonResult getById(@RequestParam("id") Long id); + + /** + * 批量查询用户-部门关系详情（用于增量同步批量获取） + * + * @param ids 关系ID列表 + * @return 用户-部门关系数据列表 + */ + @GetMapping(PREFIX + "/list") + @Operation(summary = "批量查询用户-部门关系详情") + @Parameter(name = "ids", description = "关系ID列表", required = true, example = "1001,1002,1003") + CommonResult> getListByIds(@RequestParam("ids") List ids); + + /** + * 统计用户-部门关系总数（用于全量同步进度计算） + * + * @param tenantId 租户ID（可选） + * @return 用户-部门关系总数 + */ + @GetMapping(PREFIX + "/count") + @Operation(summary = "统计用户-部门关系总数") + @Parameter(name = "tenantId", description = "租户ID", example = "1") + CommonResult count(@RequestParam(value = "tenantId", required = false) Long tenantId); + +} diff --git a/zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserPostProviderApi.java b/zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserPostProviderApi.java new file mode 100644 index 00000000..6e00365d --- /dev/null +++ b/zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusUserPostProviderApi.java @@ -0,0 +1,71 @@ +package com.zt.plat.module.databus.api.provider; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.databus.api.data.DatabusUserPostData; +import com.zt.plat.module.databus.api.dto.CursorPageReqDTO; +import com.zt.plat.module.databus.api.dto.CursorPageResult; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Databus 用户-岗位关系数据提供者 API + *

+ * 供 Databus 调用，获取用户-岗位关联数据用于全量/增量同步 + * + * @author ZT + */ +@FeignClient(name = "${databus.provider.user-post.service:system-server}") +@Tag(name = "RPC 服务 - Databus 用户-岗位关系数据提供者") +public interface DatabusUserPostProviderApi { + + String PREFIX = "/rpc/databus/user-post"; + + /** + * 游标分页查询用户-岗位关系数据（用于全量同步） + * + * @param reqDTO 游标分页请求 + * @return 用户-岗位关系数据分页结果 + */ + @PostMapping(PREFIX + "/page-by-cursor") + @Operation(summary = "游标分页查询用户-岗位关系数据") + CommonResult> getPageByCursor(@RequestBody CursorPageReqDTO reqDTO); + + /** + * 根据ID查询用户-岗位关系详情（用于增量同步） + * + * @param id 关系ID + * @return 用户-岗位关系数据 + */ + @GetMapping(PREFIX + "/get") + @Operation(summary = "查询用户-岗位关系详情") + @Parameter(name = "id", description = "关系ID", required = true, example = "1001") + CommonResult getById(@RequestParam("id") Long id); + + /** + * 批量查询用户-岗位关系详情（用于增量同步批量获取） + * + * @param ids 关系ID列表 + * @return 用户-岗位关系数据列表 + */ + @GetMapping(PREFIX + "/list") + @Operation(summary = "批量查询用户-岗位关系详情") + @Parameter(name = "ids", description = "关系ID列表", required = true, example = "1001,1002,1003") + CommonResult> getListByIds(@RequestParam("ids") List ids); + + /** + * 统计用户-岗位关系总数（用于全量同步进度计算） + * + * @param tenantId 租户ID（可选） + * @return 用户-岗位关系总数 + */ + @GetMapping(PREFIX + "/count") + @Operation(summary = "统计用户-岗位关系总数") + @Parameter(name = "tenantId", description = "租户ID", example = "1") + CommonResult count(@RequestParam(value = "tenantId", required = false) Long tenantId); + +} diff --git a/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/rpc/config/RpcConfiguration.java b/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/rpc/config/RpcConfiguration.java index 32e911e1..c62e2b2d 100644 --- a/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/rpc/config/RpcConfiguration.java +++ b/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/rpc/config/RpcConfiguration.java @@ -4,6 +4,8 @@ import com.zt.plat.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; import com.zt.plat.module.databus.api.provider.DatabusDeptProviderApi; import com.zt.plat.module.databus.api.provider.DatabusPostProviderApi; import com.zt.plat.module.databus.api.provider.DatabusUserProviderApi; +import com.zt.plat.module.databus.api.provider.DatabusUserDeptProviderApi; +import com.zt.plat.module.databus.api.provider.DatabusUserPostProviderApi; import com.zt.plat.module.system.api.dept.DeptApi; import com.zt.plat.module.system.api.dept.PostApi; import com.zt.plat.module.system.api.user.AdminUserApi; @@ -21,9 +23,10 @@ import org.springframework.context.annotation.Configuration; DatabusDeptProviderApi.class, DatabusUserProviderApi.class, DatabusPostProviderApi.class, - PostApi.class, - DeptApi.class, - AdminUserApi.class, + DatabusUserDeptProviderApi.class, + DatabusUserPostProviderApi.class, + PostApi.class, + DeptApi.class, }) public class RpcConfiguration { } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserDeptProviderApiImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserDeptProviderApiImpl.java new file mode 100644 index 00000000..15b375eb --- /dev/null +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserDeptProviderApiImpl.java @@ -0,0 +1,151 @@ +package com.zt.plat.module.system.api.databus; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.databus.api.data.DatabusUserDeptData; +import com.zt.plat.module.databus.api.dto.CursorPageReqDTO; +import com.zt.plat.module.databus.api.dto.CursorPageResult; +import com.zt.plat.module.databus.api.provider.DatabusUserDeptProviderApi; +import com.zt.plat.module.system.dal.dataobject.userdept.UserDeptDO; +import com.zt.plat.module.system.dal.mysql.userdept.UserDeptMapper; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +/** + * Databus 用户-部门关系数据提供者 API 实现 + * + * @author ZT + */ +@Slf4j +@RestController +@Validated +public class DatabusUserDeptProviderApiImpl implements DatabusUserDeptProviderApi { + + @Resource + private UserDeptMapper userDeptMapper; + + @Override + public CommonResult> getPageByCursor(CursorPageReqDTO reqDTO) { + // 构建游标查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + // 游标条件：create_time > cursorTime OR (create_time = cursorTime AND id > cursorId) + if (!reqDTO.isFirstPage()) { + queryWrapper.and(w -> w + .gt(UserDeptDO::getCreateTime, reqDTO.getCursorTime()) + .or(o -> o + .eq(UserDeptDO::getCreateTime, reqDTO.getCursorTime()) + .gt(UserDeptDO::getId, reqDTO.getCursorId()) + ) + ); + } + + // 租户过滤（如果指定） + if (reqDTO.getTenantId() != null) { + queryWrapper.eq(UserDeptDO::getTenantId, reqDTO.getTenantId()); + } + + // 按 create_time, id 升序排列，确保顺序稳定 + queryWrapper.orderByAsc(UserDeptDO::getCreateTime) + .orderByAsc(UserDeptDO::getId); + + // 多查一条判断是否有更多数据 + int limit = reqDTO.getBatchSize() != null ? reqDTO.getBatchSize() : 100; + queryWrapper.last("LIMIT " + (limit + 1)); + + List list = userDeptMapper.selectList(queryWrapper); + + // 判断是否有更多 + boolean hasMore = list.size() > limit; + if (hasMore) { + list = list.subList(0, limit); + } + + if (CollUtil.isEmpty(list)) { + return success(CursorPageResult.empty()); + } + + // 转换为同步数据 + List dataList = list.stream() + .map(this::convertToData) + .collect(Collectors.toList()); + + // 获取最后一条数据的游标 + UserDeptDO last = list.get(list.size() - 1); + + // 首次查询时返回总数 + Long total = null; + if (reqDTO.isFirstPage()) { + LambdaQueryWrapper countWrapper = new LambdaQueryWrapper<>(); + if (reqDTO.getTenantId() != null) { + countWrapper.eq(UserDeptDO::getTenantId, reqDTO.getTenantId()); + } + total = userDeptMapper.selectCount(countWrapper); + } + + return success(CursorPageResult.of( + dataList, + last.getCreateTime(), + last.getId(), + hasMore, + total + )); + } + + @Override + public CommonResult getById(Long id) { + UserDeptDO userDept = userDeptMapper.selectById(id); + if (userDept == null) { + return success(null); + } + return success(convertToData(userDept)); + } + + @Override + public CommonResult> getListByIds(List ids) { + if (CollUtil.isEmpty(ids)) { + return success(Collections.emptyList()); + } + + List list = userDeptMapper.selectBatchIds(ids); + if (CollUtil.isEmpty(list)) { + return success(Collections.emptyList()); + } + + return success(list.stream() + .map(this::convertToData) + .collect(Collectors.toList())); + } + + @Override + public CommonResult count(Long tenantId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (tenantId != null) { + queryWrapper.eq(UserDeptDO::getTenantId, tenantId); + } + return success(userDeptMapper.selectCount(queryWrapper)); + } + + /** + * 将 UserDeptDO 转换为 DatabusUserDeptData + */ + private DatabusUserDeptData convertToData(UserDeptDO userDept) { + return DatabusUserDeptData.builder() + .id(userDept.getId()) + .userId(userDept.getUserId()) + .deptId(userDept.getDeptId()) + .tenantId(userDept.getTenantId()) + .remark(userDept.getRemark()) + .build(); + } + +} diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserPostProviderApiImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserPostProviderApiImpl.java new file mode 100644 index 00000000..96db8704 --- /dev/null +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserPostProviderApiImpl.java @@ -0,0 +1,139 @@ +package com.zt.plat.module.system.api.databus; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.databus.api.data.DatabusUserPostData; +import com.zt.plat.module.databus.api.dto.CursorPageReqDTO; +import com.zt.plat.module.databus.api.dto.CursorPageResult; +import com.zt.plat.module.databus.api.provider.DatabusUserPostProviderApi; +import com.zt.plat.module.system.dal.dataobject.dept.UserPostDO; +import com.zt.plat.module.system.dal.mysql.dept.UserPostMapper; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +/** + * Databus 用户-岗位关系数据提供者 API 实现 + * + * @author ZT + */ +@Slf4j +@RestController +@Validated +public class DatabusUserPostProviderApiImpl implements DatabusUserPostProviderApi { + + @Resource + private UserPostMapper userPostMapper; + + @Override + public CommonResult> getPageByCursor(CursorPageReqDTO reqDTO) { + // 构建游标查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + // 游标条件：create_time > cursorTime OR (create_time = cursorTime AND id > cursorId) + if (!reqDTO.isFirstPage()) { + queryWrapper.and(w -> w + .gt(UserPostDO::getCreateTime, reqDTO.getCursorTime()) + .or(o -> o + .eq(UserPostDO::getCreateTime, reqDTO.getCursorTime()) + .gt(UserPostDO::getId, reqDTO.getCursorId()) + ) + ); + } + + // 注意：UserPostDO 没有租户字段，忽略 tenantId 过滤 + + // 按 create_time, id 升序排列，确保顺序稳定 + queryWrapper.orderByAsc(UserPostDO::getCreateTime) + .orderByAsc(UserPostDO::getId); + + // 多查一条判断是否有更多数据 + int limit = reqDTO.getBatchSize() != null ? reqDTO.getBatchSize() : 100; + queryWrapper.last("LIMIT " + (limit + 1)); + + List list = userPostMapper.selectList(queryWrapper); + + // 判断是否有更多 + boolean hasMore = list.size() > limit; + if (hasMore) { + list = list.subList(0, limit); + } + + if (CollUtil.isEmpty(list)) { + return success(CursorPageResult.empty()); + } + + // 转换为同步数据 + List dataList = list.stream() + .map(this::convertToData) + .collect(Collectors.toList()); + + // 获取最后一条数据的游标 + UserPostDO last = list.get(list.size() - 1); + + // 首次查询时返回总数 + Long total = null; + if (reqDTO.isFirstPage()) { + total = userPostMapper.selectCount(new LambdaQueryWrapper<>()); + } + + return success(CursorPageResult.of( + dataList, + last.getCreateTime(), + last.getId(), + hasMore, + total + )); + } + + @Override + public CommonResult getById(Long id) { + UserPostDO userPost = userPostMapper.selectById(id); + if (userPost == null) { + return success(null); + } + return success(convertToData(userPost)); + } + + @Override + public CommonResult> getListByIds(List ids) { + if (CollUtil.isEmpty(ids)) { + return success(Collections.emptyList()); + } + + List list = userPostMapper.selectBatchIds(ids); + if (CollUtil.isEmpty(list)) { + return success(Collections.emptyList()); + } + + return success(list.stream() + .map(this::convertToData) + .collect(Collectors.toList())); + } + + @Override + public CommonResult count(Long tenantId) { + // 注意：UserPostDO 没有租户字段，返回全量总数 + return success(userPostMapper.selectCount(new LambdaQueryWrapper<>())); + } + + /** + * 将 UserPostDO 转换为 DatabusUserPostData + */ + private DatabusUserPostData convertToData(UserPostDO userPost) { + return DatabusUserPostData.builder() + .id(userPost.getId()) + .userId(userPost.getUserId()) + .postId(userPost.getPostId()) + .build(); + } + +} diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/dept/PostApiImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/dept/PostApiImpl.java index 40c7e22b..97cf029e 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/dept/PostApiImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/dept/PostApiImpl.java @@ -10,6 +10,7 @@ import com.zt.plat.module.system.controller.admin.dept.vo.post.PostSaveReqVO; import com.zt.plat.module.system.dal.dataobject.dept.PostDO; import com.zt.plat.module.system.service.dept.PostService; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -20,6 +21,7 @@ import java.util.List; import static com.zt.plat.framework.common.pojo.CommonResult.success; +@Slf4j @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated public class PostApiImpl implements PostApi { @@ -36,6 +38,7 @@ public class PostApiImpl implements PostApi { @Override public CommonResult updatePost(PostSaveReqDTO updateReqVO) { + log.error("ssssssssss"); PostSaveReqVO reqVO = BeanUtils.toBean(updateReqVO, PostSaveReqVO.class); postService.updatePost(reqVO); return success(true); @@ -49,6 +52,7 @@ public class PostApiImpl implements PostApi { @Override public CommonResult getPost(Long id) { + log.error("cccccccc"+id); PostDO post = postService.getPost(id); return success(BeanUtils.toBean(post, PostRespDTO.class)); }