调整数据库连接地址，增加knife4j 增加mybatis-plus

pom.xml

@@ -16,7 +16,7 @@
         <ruoyi.version>3.8.8</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <spring-framework.version>5.3.33</spring-framework.version>
         <spring-security.version>5.7.12</spring-security.version>
@@ -31,6 +31,8 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <knife4j.version>3.0.3</knife4j.version>
+        <mybatis-plus.version>3.5.2</mybatis-plus.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -105,6 +107,18 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-spring-boot-starter</artifactId>
+                <version>${knife4j.version}</version>
+            </dependency>
+            <!-- ruoyi-springboot2 / mybatis-plus 配置 -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
             <!-- io常用工具类 -->
             <dependency>
                 <groupId>commons-io</groupId>

ruoyi-admin/pom.xml

@@ -37,6 +37,12 @@
             <version>1.6.2</version>
         </dependency>
 
+        <!-- ruoyi-springboot2 / swagger knife4j 配置 -->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+
          <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dhc/DhcAreaController.java

@@ -8,6 +8,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.dhc.service.IDhcAreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +27,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2024-07-29
  */
+@Api(tags = "区域管理")
 @RestController
 @RequestMapping("/dhc/area")
 public class DhcAreaController extends BaseController
@@ -34,6 +38,7 @@ public class DhcAreaController extends BaseController
     /**
      * 查询区域列表
      */
+    @ApiOperation("查询区域列表")
     @PreAuthorize("@ss.hasPermi('dhc:area:list')")
     @GetMapping("/list")
     public TableDataInfo list(DhcArea dhcArea)
@@ -46,6 +51,7 @@ public class DhcAreaController extends BaseController
     /**
      * 导出区域列表
      */
+    @ApiOperation("导出区域列表")
     @PreAuthorize("@ss.hasPermi('dhc:area:export')")
     @Log(title = "区域", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -59,6 +65,8 @@ public class DhcAreaController extends BaseController
     /**
      * 获取区域详细信息
      */
+    @ApiOperation("获取区域详细信息")
+    @ApiImplicitParam(name = "areaId", value = "区域id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermi('dhc:area:query')")
     @GetMapping(value = "/{areaId}")
     public AjaxResult getInfo(@PathVariable("areaId") Long areaId)

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.89.204.142:13306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://121.89.204.142:13306/dhc-gss?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: root
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

@@ -95,10 +95,19 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 1440
 
-# MyBatis配置
+## MyBatis配置
-mybatis:
+#mybatis:
+#  # 搜索指定包别名
+#  typeAliasesPackage: com.ruoyi.**.domain
+#  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+#  mapperLocations: classpath*:mapper/**/*Mapper.xml
+#  # 加载全局的配置文件
+#  configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatis Plus配置
+mybatis-plus:
   # 搜索指定包别名
   typeAliasesPackage: com.ruoyi.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件

ruoyi-common/pom.xml

@@ -119,6 +119,15 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- mybatis-plus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -19,6 +21,7 @@ public class BaseEntity implements Serializable
 
     /** 搜索值 */
     @JsonIgnore
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
@@ -36,10 +39,12 @@ public class BaseEntity implements Serializable
     private Date updateTime;
 
     /** 备注 */
+    @TableField(exist = false)
     private String remark;
 
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/DhcArea.java

@@ -2,6 +2,8 @@ package com.ruoyi.common.core.domain.entity;
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-07-29
  */
+@ApiModel(value = "DhcArea", description = "区域对象")
 public class DhcArea extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -22,45 +25,56 @@ public class DhcArea extends BaseEntity
     private Long areaId;
 
     /** 父区域id */
+    @ApiModelProperty("父区域id")
     @Excel(name = "父区域id")
     private Long parentId;
 
     /** 区域编码 */
     @Excel(name = "区域编码")
+    @ApiModelProperty("区域编码")
     private String areaCode;
 
     /** 区域名称 */
     @Excel(name = "区域名称")
+    @ApiModelProperty("区域名称")
     private String areaName;
 
     /** 产品线 */
     @Excel(name = "产品线")
+    @ApiModelProperty("产品线")
     private String productLineCode;
 
     /** 区域类型 */
     @Excel(name = "区域类型")
+    @ApiModelProperty("区域类型")
     private String areaType;
 
     /** 区域层级 */
     @Excel(name = "区域层级")
+    @ApiModelProperty("区域层级")
     private String areaLevel;
 
     /** 显示顺序 */
     @Excel(name = "显示顺序")
+    @ApiModelProperty("显示顺序")
     private Long orderNum;
 
     /** 区域说明 */
     @Excel(name = "区域说明")
+    @ApiModelProperty("区域说明")
     private String areaDesc;
 
     /** 区域状态（0正常 1停用） */
     @Excel(name = "区域状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty("区域状态 0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 1代表删除） */
+    @ApiModelProperty("删除标志（0代表存在 1代表删除）")
     private String delFlag;
 
     /** 父区域名称 */
+    @ApiModelProperty("父区域名称")
     private String parentName;
 
     private boolean isEdit = false;

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-@Configuration
+//@Configuration
 public class MyBatisConfig
 {
     @Autowired

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -0,0 +1,62 @@
+package com.ruoyi.framework.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * Mybatis Plus 配置
+ *
+ * @author ruoyi
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+public class MybatisPlusConfig
+{
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor()
+    {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        // 乐观锁插件
+        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+        // 阻断插件
+        interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+        return interceptor;
+    }
+
+    /**
+     * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html
+     */
+    public PaginationInnerInterceptor paginationInnerInterceptor()
+    {
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        // 设置数据库类型为mysql
+        paginationInnerInterceptor.setDbType(DbType.MYSQL);
+        // 设置最大单页限制数量，默认 500 条，-1 不受限制
+        paginationInnerInterceptor.setMaxLimit(-1L);
+        return paginationInnerInterceptor;
+    }
+
+    /**
+     * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html
+     */
+    public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor()
+    {
+        return new OptimisticLockerInnerInterceptor();
+    }
+
+    /**
+     * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html
+     */
+    public BlockAttackInnerInterceptor blockAttackInnerInterceptor()
+    {
+        return new BlockAttackInnerInterceptor();
+    }
+}

ruoyi-plan/src/main/java/com/ruoyi/dhc/mapper/DhcCountryMapper.java

@@ -1,6 +1,9 @@
 package com.ruoyi.dhc.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.domain.entity.DhcArea;
 import com.ruoyi.dhc.domain.DhcCountry;
 
 /**
@@ -9,7 +12,7 @@ import com.ruoyi.dhc.domain.DhcCountry;
  * @author ruoyi
  * @date 2024-07-29
  */
-public interface DhcCountryMapper 
+public interface DhcCountryMapper extends BaseMapper<DhcCountry>
 {
     /**
      * 查询国家

ruoyi-plan/src/main/java/com/ruoyi/dhc/service/impl/DhcCountryServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.dhc.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,7 +44,9 @@ public class DhcCountryServiceImpl implements IDhcCountryService
     public List<DhcCountry> selectDhcCountryList(DhcCountry dhcCountry)
     {
         dhcCountry.setDelFlag("0");
-        return dhcCountryMapper.selectDhcCountryList(dhcCountry);
+//        return dhcCountryMapper.selectDhcCountryList(dhcCountry);
+        LambdaQueryWrapper<DhcCountry> eq = new LambdaQueryWrapper<DhcCountry>();
+        return dhcCountryMapper.selectList(eq);
     }
 
     /**