fix: 对基类再向上抽取一层

src/main/java/cc/niushuai/bastionserver/common/base/entity/BaseEntity.java

@@ -1,17 +1,13 @@
 package cc.niushuai.bastionserver.common.base.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * Entity基类
@@ -23,47 +19,35 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class BaseEntity implements Serializable {
+public class BaseEntity extends Entity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "ID")
-    private String id;
 
     /**
-     * 创建人
+     * 企业id
      */
-    @ApiModelProperty(value = "创建人")
+    @ApiModelProperty(value = "企业id")
-    @Excel(name = "创建人", width = 15)
+    private String tenantId;
-    private String createBy;
 
     /**
-     * 创建时间
+     * 备注
      */
-    @ApiModelProperty(value = "创建时间")
+    @Excel(name = "备注", width = 15)
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "备注")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String remark;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
 
     /**
-     * 更新人
+     * 状态 0禁用 1启用
      */
-    @ApiModelProperty(value = "更新人")
+    @Excel(name = "状态", width = 15)
-    @Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "状态")
-    private String updateBy;
+    private Integer status;
 
     /**
-     * 更新时间
+     * 是否删除 0否 1是 默认否
      */
-    @ApiModelProperty(value = "更新时间")
+    @ApiModelProperty(value = "是否删除 0否 1是 默认否")
-    @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @TableLogic
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Integer deleted;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
 }

src/main/java/cc/niushuai/bastionserver/common/base/entity/Entity.java

@@ -0,0 +1,68 @@
+package cc.niushuai.bastionserver.common.base.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 不带企业id的entity基类
+ *
+ * @author niushuai233
+ * @date: 2023/1/4 10:45
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Entity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    @Excel(name = "创建人", width = 15)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    @Excel(name = "更新人", width = 15)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+}

src/main/java/cc/niushuai/bastionserver/common/base/service/impl/BaseServiceImpl.java

@@ -1,6 +1,6 @@
 package cc.niushuai.bastionserver.common.base.service.impl;
 
-import cc.niushuai.bastionserver.common.base.entity.BaseEntity;
+import cc.niushuai.bastionserver.common.base.entity.Entity;
 import cc.niushuai.bastionserver.common.base.service.BaseService;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +14,6 @@ import lombok.extern.slf4j.Slf4j;
  * @Version: 1.0
  */
 @Slf4j
-public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> extends ServiceImpl<M, T> implements BaseService<T> {
+public class BaseServiceImpl<M extends BaseMapper<T>, T extends Entity> extends ServiceImpl<M, T> implements BaseService<T> {
 
 }

src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/BaseDemo.java

@@ -1,6 +1,6 @@
 package cc.niushuai.bastionserver.modules.demo.test.entity;
 
-import cc.niushuai.bastionserver.common.base.entity.BaseEntity;
+import cc.niushuai.bastionserver.common.base.entity.Entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -25,7 +25,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @ApiModel(value = "测试DEMO对象", description = "测试DEMO")
 @TableName("demo")
-public class BaseDemo extends BaseEntity implements Serializable {
+public class BaseDemo extends Entity implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 姓名
@@ -97,7 +97,5 @@ public class BaseDemo extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "部门编码")
     private String sysOrgCode;
 
-    @ApiModelProperty(value = "租户ID")
-    private Integer tenantId;
 
 }

src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessage.java

@@ -1,7 +1,7 @@
 package cc.niushuai.bastionserver.modules.message.entity;
 
 import cc.niushuai.bastionserver.common.aspect.annotation.Dict;
-import cc.niushuai.bastionserver.common.base.entity.BaseEntity;
+import cc.niushuai.bastionserver.common.base.entity.Entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_sms")
-public class SysMessage extends BaseEntity {
+public class SysMessage extends Entity {
     /**
      * 推送内容
      */

src/main/java/cc/niushuai/bastionserver/modules/oss/entity/OssFile.java

@@ -1,6 +1,6 @@
 package cc.niushuai.bastionserver.modules.oss.entity;
 
-import cc.niushuai.bastionserver.common.base.entity.BaseEntity;
+import cc.niushuai.bastionserver.common.base.entity.Entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,7 +16,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @TableName("oss_file")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class OssFile extends BaseEntity {
+public class OssFile extends Entity {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/cc/niushuai/bastionserver/modules/tunnel/controller/ServerInfoController.java

@@ -18,6 +18,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 服务器信息
@@ -42,7 +43,7 @@ public class ServerInfoController extends BaseController<ServerInfo, ServerInfoS
      */
     @AutoLog(value = "服务器信息-分页列表查询")
     @ApiOperation(value = "服务器信息-分页列表查询", notes = "服务器信息-分页列表查询")
-    @GetMapping(value = "/list")
+    @GetMapping(value = "/page")
     public Result<?> queryPageList(ServerInfo serverInfo,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -53,6 +54,22 @@ public class ServerInfoController extends BaseController<ServerInfo, ServerInfoS
         return Result.OK(pageList);
     }
 
+    /**
+     * 分页列表查询
+     *
+     * @param serverInfo
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "服务器信息-列表查询")
+    @ApiOperation(value = "服务器信息-列表查询", notes = "服务器信息-列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> list(ServerInfo serverInfo, HttpServletRequest req) {
+        QueryWrapper<ServerInfo> queryWrapper = QueryGenerator.initQueryWrapper(serverInfo, req.getParameterMap());
+        List<ServerInfo> list = service.list(queryWrapper);
+        return Result.ok(list);
+    }
+
     /**
      * 添加
      *

src/main/java/cc/niushuai/bastionserver/modules/tunnel/entity/ServerInfo.java

@@ -59,24 +59,5 @@ public class ServerInfo extends BaseEntity {
     @Excel(name = "密码 加密", width = 15)
     @ApiModelProperty(value = "密码 加密")
     private String password;
-    /**
-     * 备注
-     */
-    @Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private String remark;
 
-    /**
-     * 状态 0禁用 1启用
-     */
-    @Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private Integer status;
-
-    /**
-     * 是否删除 0否 1是 默认否
-     */
-    @ApiModelProperty(value = "是否删除 0否 1是 默认否")
-    @TableLogic
-    private Integer deleted;
 }