用户资源包列表修改

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/admin/userapiusage/UserApiUsageController.java

@@ -17,7 +17,6 @@ import java.io.IOException;
 import com.luhu.computility.framework.common.pojo.PageParam;
 import com.luhu.computility.framework.common.pojo.PageParam;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.common.pojo.CommonResult;
 import com.luhu.computility.framework.common.pojo.CommonResult;
-import com.luhu.computility.framework.common.util.object.BeanUtils;
 import static com.luhu.computility.framework.common.pojo.CommonResult.success;
 import static com.luhu.computility.framework.common.pojo.CommonResult.success;
 
 
 import com.luhu.computility.framework.excel.core.util.ExcelUtils;
 import com.luhu.computility.framework.excel.core.util.ExcelUtils;
@@ -26,7 +25,6 @@ import com.luhu.computility.framework.apilog.core.annotation.ApiAccessLog;
 import static com.luhu.computility.framework.apilog.core.enums.OperateTypeEnum.*;
 import static com.luhu.computility.framework.apilog.core.enums.OperateTypeEnum.*;
 
 
 import com.luhu.computility.module.apihub.controller.admin.userapiusage.vo.*;
 import com.luhu.computility.module.apihub.controller.admin.userapiusage.vo.*;
-import com.luhu.computility.module.apihub.dal.dataobject.userapiusage.UserApiUsageDO;
 import com.luhu.computility.module.apihub.service.userapiusage.UserApiUsageService;
 import com.luhu.computility.module.apihub.service.userapiusage.UserApiUsageService;
 
 
 @Tag(name = "管理后台 - 用户API管理")
 @Tag(name = "管理后台 - 用户API管理")
@@ -76,8 +74,7 @@ public class UserApiUsageController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('apihub:user-api-usage:query')")
     @PreAuthorize("@ss.hasPermission('apihub:user-api-usage:query')")
     public CommonResult<UserApiUsageRespVO> getUserApiUsage(@RequestParam("id") Long id) {
     public CommonResult<UserApiUsageRespVO> getUserApiUsage(@RequestParam("id") Long id) {
-        UserApiUsageDO userApiUsage = userApiUsageService.getUserApiUsage(id);
-        return success(BeanUtils.toBean(userApiUsage, UserApiUsageRespVO.class));
+        return success(userApiUsageService.getUserApiUsageWithUser(id));
     }
     }
 
 
     @GetMapping("/page")
     @GetMapping("/page")

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/admin/userapiusage/vo/UserApiUsageRespVO.java

@@ -20,6 +20,10 @@ public class UserApiUsageRespVO {
     @ExcelProperty("用户手机号")
     @ExcelProperty("用户手机号")
     private String userMobile;
     private String userMobile;
 
 
+    @Schema(description = "用户昵称", example = "26592")
+    @ExcelProperty("用户昵称")
+    private String userNickname;
+
     @Schema(description = "购买的API 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "10347")
     @Schema(description = "购买的API 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "10347")
     private String apiName;
     private String apiName;
 
 

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/dal/mysql/userapiusage/UserApiUsageMapper.java

@@ -32,6 +32,7 @@ public interface UserApiUsageMapper extends BaseMapperX<UserApiUsageDO> {
         return selectJoinPage(reqVO, UserApiUsageRespVO.class, new MPJLambdaWrapperX<UserApiUsageDO>()
         return selectJoinPage(reqVO, UserApiUsageRespVO.class, new MPJLambdaWrapperX<UserApiUsageDO>()
                 .selectAll(UserApiUsageDO.class)
                 .selectAll(UserApiUsageDO.class)
                 .selectAs(MemberUserDO :: getMobile, UserApiUsageRespVO :: getUserMobile)
                 .selectAs(MemberUserDO :: getMobile, UserApiUsageRespVO :: getUserMobile)
+                .selectAs(MemberUserDO :: getNickname, UserApiUsageRespVO :: getUserNickname)
                 .leftJoin(MemberUserDO.class, MemberUserDO::getId,UserApiUsageDO::getUserId)
                 .leftJoin(MemberUserDO.class, MemberUserDO::getId,UserApiUsageDO::getUserId)
                 .like(!StringUtils.isEmpty(reqVO.getPackageName()), UserApiUsageDO::getPackageName, reqVO.getPackageName())
                 .like(!StringUtils.isEmpty(reqVO.getPackageName()), UserApiUsageDO::getPackageName, reqVO.getPackageName())
                 .like(!StringUtils.isEmpty(reqVO.getApiName()), UserApiUsageDO::getApiName, reqVO.getApiName())
                 .like(!StringUtils.isEmpty(reqVO.getApiName()), UserApiUsageDO::getApiName, reqVO.getApiName())
@@ -39,6 +40,15 @@ public interface UserApiUsageMapper extends BaseMapperX<UserApiUsageDO> {
                 .orderByDesc(UserApiUsageDO::getCreateTime));
                 .orderByDesc(UserApiUsageDO::getCreateTime));
     }
     }
 
 
+    default UserApiUsageRespVO selectByIdWithUser(Long id) {
+        return selectJoinOne(UserApiUsageRespVO.class, new MPJLambdaWrapperX<UserApiUsageDO>()
+                .selectAll(UserApiUsageDO.class)
+                .selectAs(MemberUserDO::getMobile, UserApiUsageRespVO::getUserMobile)
+                .selectAs(MemberUserDO::getNickname, UserApiUsageRespVO::getUserNickname)
+                .leftJoin(MemberUserDO.class, MemberUserDO::getId, UserApiUsageDO::getUserId)
+                .eq(UserApiUsageDO::getId, id));
+    }
+
     default PageResult<AppUserApiUsageRespVO> selectAppPage(UserApiUsagePageReqVO reqVO) {
     default PageResult<AppUserApiUsageRespVO> selectAppPage(UserApiUsagePageReqVO reqVO) {
         return selectJoinPage(reqVO, AppUserApiUsageRespVO.class, new MPJLambdaWrapperX<UserApiUsageDO>()
         return selectJoinPage(reqVO, AppUserApiUsageRespVO.class, new MPJLambdaWrapperX<UserApiUsageDO>()
                 .selectAll(UserApiUsageDO.class)
                 .selectAll(UserApiUsageDO.class)

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/service/userapiusage/UserApiUsageService.java

@@ -55,6 +55,14 @@ public interface UserApiUsageService {
     UserApiUsageDO getUserApiUsage(Long id);
     UserApiUsageDO getUserApiUsage(Long id);
 
 
     /**
     /**
+     * 获得用户 API 使用统计详情（含用户信息）
+     *
+     * @param id 编号
+     * @return 用户 API 使用统计详情
+     */
+    UserApiUsageRespVO getUserApiUsageWithUser(Long id);
+
+    /**
      * 获得用户 API 使用统计分页
      * 获得用户 API 使用统计分页
      *
      *
      * @param pageReqVO 分页查询
      * @param pageReqVO 分页查询

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/service/userapiusage/UserApiUsageServiceImpl.java

@@ -75,6 +75,11 @@ public class UserApiUsageServiceImpl implements UserApiUsageService {
     }
     }
 
 
     @Override
     @Override
+    public UserApiUsageRespVO getUserApiUsageWithUser(Long id) {
+        return userApiUsageMapper.selectByIdWithUser(id);
+    }
+
+    @Override
     public PageResult<UserApiUsageRespVO> getUserApiUsagePage(UserApiUsagePageReqVO pageReqVO) {
     public PageResult<UserApiUsageRespVO> getUserApiUsagePage(UserApiUsagePageReqVO pageReqVO) {
         return userApiUsageMapper.selectPage(pageReqVO);
         return userApiUsageMapper.selectPage(pageReqVO);
     }
     }