✨ 移除Vo返回结果

tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java

@@ -1,6 +1,5 @@
 package com.inscloudtech.functional.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.inscloudtech.common.annotation.RepeatSubmit;
 import com.inscloudtech.common.config.ProjectConfig;
 import com.inscloudtech.common.core.controller.BaseController;
@@ -11,8 +10,6 @@ import com.inscloudtech.common.core.validate.AddGroup;
 import com.inscloudtech.common.utils.StringUtils;
 import com.inscloudtech.common.utils.file.FileUtils;
 import com.inscloudtech.functional.domain.FuncCarApi;
-import com.inscloudtech.functional.domain.vo.FuncCarApiDto;
-import com.inscloudtech.functional.domain.vo.FuncCarApiVo;
 import com.inscloudtech.functional.service.IFuncCarApiService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
@@ -44,7 +41,7 @@ public class FuncCarApiController extends BaseController {
      */
 
     @GetMapping("/list")
-    public TableDataInfo<FuncCarApiVo> list(FuncCarApi bo, PageQuery pageQuery) {
+    public TableDataInfo<FuncCarApi> list(FuncCarApi bo, PageQuery pageQuery) {
         bo.setType("compatibility");
         return iFuncCarApiService.queryPageList(bo, pageQuery);
     }
@@ -80,7 +77,7 @@ public class FuncCarApiController extends BaseController {
      * 检查API接口参数的正确性、完整性和有效性-结果列表
      */
     @GetMapping("/checkApiResultList")
-    public TableDataInfo<FuncCarApiVo> checkApiResultList(FuncCarApi bo, PageQuery pageQuery) {
+    public TableDataInfo<FuncCarApi> checkApiResultList(FuncCarApi bo, PageQuery pageQuery) {
         bo.setType("checkApi");
         return iFuncCarApiService.queryPageList(bo, pageQuery);
     }

tp-functional/src/main/java/com/inscloudtech/functional/domain/vo/FuncCarApiVo.java

@@ -1,100 +0,0 @@
-package com.inscloudtech.functional.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.inscloudtech.common.annotation.ExcelDictFormat;
-import com.inscloudtech.common.convert.ExcelDictConvert;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 兼容可靠性测试系统-API接口兼容性测试工具视图对象 func_car_api
- *
- * @author inscloudtech
- * @date 2024-06-11
- */
-@Data
-@ExcelIgnoreUnannotated
-public class FuncCarApiVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ExcelProperty(value = "主键")
-    private Long operId;
-
-    /**
-     * api地址
-     */
-    @ExcelProperty(value = "api地址")
-    private String apiUrl;
-
-    /**
-     * 操作系统
-     */
-    @ExcelProperty(value = "操作系统")
-    private String os;
-
-    /**
-     * 浏览器
-     */
-    @ExcelProperty(value = "浏览器")
-    private String browser;
-
-    /**
-     * 设备
-     */
-    @ExcelProperty(value = "设备")
-    private String equipment;
-
-    /**
-     * 网络环境
-     */
-    @ExcelProperty(value = "网络环境")
-    private String network;
-
-    /**
-     * 请求参数
-     */
-    @ExcelProperty(value = "请求参数")
-    private String operParam;
-
-    /**
-     * 返回参数
-     */
-    @ExcelProperty(value = "返回参数")
-    private String jsonResult;
-
-    /**
-     * 操作状态（0正常 1异常）
-     */
-    @ExcelProperty(value = "操作状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=正常,1=异常")
-    private Long status;
-
-    /**
-     * 错误消息
-     */
-    @ExcelProperty(value = "错误消息")
-    private String errorMsg;
-
-    /**
-     * 操作时间
-     */
-    @ExcelProperty(value = "操作时间")
-    private Date operTime;
-
-    /**
-     * 单位（秒）
-     */
-    @ExcelProperty(value = "单位", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "秒=")
-    private Long responseTime;
-
-
-}

tp-functional/src/main/java/com/inscloudtech/functional/mapper/FuncCarApiMapper.java

@@ -2,7 +2,6 @@ package com.inscloudtech.functional.mapper;
 
 import com.inscloudtech.functional.domain.FuncCarApi;
 import com.inscloudtech.common.core.mapper.BaseMapperPlus;
-import com.inscloudtech.functional.domain.vo.FuncCarApiVo;
 
 /**
  * 兼容可靠性测试系统-API接口兼容性测试工具Mapper接口

tp-functional/src/main/java/com/inscloudtech/functional/service/IFuncCarApiService.java

@@ -1,8 +1,6 @@
 package com.inscloudtech.functional.service;
 
 import com.inscloudtech.functional.domain.FuncCarApi;
-import com.inscloudtech.functional.domain.vo.FuncCarApiDto;
-import com.inscloudtech.functional.domain.vo.FuncCarApiVo;
 import com.inscloudtech.common.core.page.TableDataInfo;
 import com.inscloudtech.common.core.domain.PageQuery;
 
@@ -20,17 +18,17 @@ public interface IFuncCarApiService {
     /**
      * 查询兼容可靠性测试系统-API接口兼容性测试工具
      */
-    FuncCarApiVo queryById(Long operId);
+    FuncCarApi queryById(Long operId);
 
     /**
      * 查询兼容可靠性测试系统-API接口兼容性测试工具列表
      */
-    TableDataInfo<FuncCarApiVo> queryPageList(FuncCarApi bo, PageQuery pageQuery);
+    TableDataInfo<FuncCarApi> queryPageList(FuncCarApi bo, PageQuery pageQuery);
 
     /**
      * 查询兼容可靠性测试系统-API接口兼容性测试工具列表
      */
-    List<FuncCarApiVo> queryList(FuncCarApi bo);
+    List<FuncCarApi> queryList(FuncCarApi bo);
 
     /**
      * 新增兼容可靠性测试系统-API接口兼容性测试工具

tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java

@@ -12,10 +12,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.inscloudtech.common.helper.LoginHelper;
 import com.inscloudtech.common.utils.StringUtils;
-import com.inscloudtech.functional.domain.vo.FuncCarApiDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.inscloudtech.functional.domain.vo.FuncCarApiVo;
 import com.inscloudtech.functional.domain.FuncCarApi;
 import com.inscloudtech.functional.mapper.FuncCarApiMapper;
 import com.inscloudtech.functional.service.IFuncCarApiService;
@@ -38,17 +36,17 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService {
      * 查询兼容可靠性测试系统-API接口兼容性测试工具
      */
     @Override
-    public FuncCarApiVo queryById(Long operId){
-        return baseMapper.selectVoById(operId);
+    public FuncCarApi queryById(Long operId){
+        return baseMapper.selectById(operId);
     }
 
     /**
      * 查询兼容可靠性测试系统-API接口兼容性测试工具列表
      */
     @Override
-    public TableDataInfo<FuncCarApiVo> queryPageList(FuncCarApi bo, PageQuery pageQuery) {
+    public TableDataInfo<FuncCarApi> queryPageList(FuncCarApi bo, PageQuery pageQuery) {
         LambdaQueryWrapper<FuncCarApi> lqw = buildQueryWrapper(bo);
-        Page<FuncCarApiVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<FuncCarApi> result = baseMapper.selectPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -56,9 +54,9 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService {
      * 查询兼容可靠性测试系统-API接口兼容性测试工具列表
      */
     @Override
-    public List<FuncCarApiVo> queryList(FuncCarApi bo) {
+    public List<FuncCarApi> queryList(FuncCarApi bo) {
         LambdaQueryWrapper<FuncCarApi> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectList(lqw);
     }
 
     private LambdaQueryWrapper<FuncCarApi> buildQueryWrapper(FuncCarApi bo) {