feat:

- 将mybatis更换为mybatis-plus
- 修改mapper测试类

.idea/dataSources.xml

@@ -1,28 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="@122.152.201.90" uuid="a3d85aef-f993-4fcd-8b75-c4caadf67022">
+    <data-source source="LOCAL" name="workflow@122.152.201.90 [2]" uuid="a3d85aef-f993-4fcd-8b75-c4caadf67022">
       <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://122.152.201.90:9912</jdbc-url>
+      <jdbc-url>jdbc:mysql://122.152.201.90:9912/workflow</jdbc-url>
-      <jdbc-additional-properties>
-        <property name="com.intellij.clouds.kubernetes.db.host.port" />
-        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
-        <property name="com.intellij.clouds.kubernetes.db.container.port" />
-      </jdbc-additional-properties>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-    <data-source source="LOCAL" name="workflow@122.152.201.90" uuid="ef18523f-13a8-4f05-b7a1-136f3abe519b">
-      <driver-ref>mysql.8</driver-ref>
-      <synchronize>true</synchronize>
-      <imported>true</imported>
-      <remarks>$PROJECT_DIR$/src/main/resources/application.properties</remarks>
-      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://122.152.201.90:9912/workflow?useUnicode=true&amp;characterEncoding=UTF-8&amp;useSSL=false&amp;autoReconnect=true&amp;failOverReadOnly=false&amp;serverTimezone=GMT</jdbc-url>
       <jdbc-additional-properties>
         <property name="com.intellij.clouds.kubernetes.db.host.port" />
         <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
         <property name="com.intellij.clouds.kubernetes.db.container.port" />
       </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>

.idea/sqldialects.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/src/main/java/asia/yulinling/workflow/mapper/UserMapper.java" dialect="GenericSQL" />
     <file url="file://$PROJECT_DIR$/src/main/resources/db/data.sql" dialect="MySQL" />
     <file url="file://$PROJECT_DIR$/src/main/resources/db/schema.sql" dialect="MySQL" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/mapper/UserMapper.xml" dialect="MySQL" />
+    <file url="PROJECT" dialect="MySQL" />
   </component>
 </project>

pom.xml

@@ -43,11 +43,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>3.0.3</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
@@ -86,6 +81,16 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <version>3.5.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter-test</artifactId>
+            <version>3.5.12</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

src/main/java/asia/yulinling/workflow/WorkFlowMain.java

@@ -1,6 +1,7 @@
 package asia.yulinling.workflow;
 
 import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -8,14 +9,15 @@ import org.springframework.context.ConfigurableApplicationContext;
 
 @SpringBootApplication
 @Slf4j
+@MapperScan("asia.yulinling.workflow.mapper")
 public class WorkFlowMain {
     public static void main(String[] args) {
         ConfigurableApplicationContext context = SpringApplication.run(WorkFlowMain.class, args);
         int length = context.getBeanDefinitionCount();
-        log.trace("Number of beans in application context: " + length);
+        log.trace("Number of beans in application context: {}", length);
-        log.debug("Number of beans in application context: " + length);
+        log.debug("Number of beans in application context: {}", length);
-        log.info("Number of beans in application context: " + length);
+        log.info("Number of beans in application context: {}", length);
-        log.warn("Number of beans in application context: " + length);
+        log.warn("Number of beans in application context: {}", length);
-        log.error("Number of beans in application context: " + length);
+        log.error("Number of beans in application context: {}", length);
     }
 }

src/main/java/asia/yulinling/workflow/mapper/UserMapper.java

@@ -1,6 +1,7 @@
 package asia.yulinling.workflow.mapper;
 
 import asia.yulinling.workflow.model.entity.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -18,15 +19,7 @@ import java.util.List;
  */
 @Mapper
 @Component
-public interface UserMapper {
+public interface UserMapper extends BaseMapper<User> {
-
-    /**
-     * 查询所有用户
-     *
-     * @return 用户列表
-     */
-    @Select("SELECT * FROM orm_user")
-    List<User> selectAllUser();
 
     /**
      * 根据id查询用户

src/main/java/asia/yulinling/workflow/model/entity/User.java

@@ -1,5 +1,9 @@
 package asia.yulinling.workflow.model.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,10 +23,12 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@TableName("`orm_user`")
 public class User {
     /**
      * 主键id
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
@@ -58,20 +64,18 @@ public class User {
     /**
      * 创建时间
      */
+    @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
     /**
      * 上次登录时间
      */
+    @TableField("last_login_time")
     private Date lastLoginTime;
 
     /**
      * 上次更新时间
      */
+    @TableField("last_update_time")
     private Date lastUpdateTime;
 }

src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java

@@ -1,43 +1,61 @@
 package asia.yulinling.workflow.mapper;
 
-import asia.yulinling.workflow.WorkFlowMainTests;
 import asia.yulinling.workflow.model.entity.User;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.test.autoconfigure.MybatisPlusTest;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+import static org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace.NONE;
+
 /**
  * <p>
- *     用户Mapper测试
+ * 用户Mapper测试
  * </p>
  *
  * @author yulinling
  * @since 2025/6/4
  */
+@MybatisPlusTest
+@RunWith(SpringRunner.class)
+@AutoConfigureTestDatabase(replace = NONE)
 @Slf4j
-public class UserMapperTest extends WorkFlowMainTests {
+public class UserMapperTest {
     @Autowired
     private UserMapper userMapper;
 
+//    @Test
+//    public void selectAllUser() {
+//        List<User> users = userMapper.selectAllUser();
+//        Assert.assertTrue(CollUtil.isNotEmpty(users));
+//        log.info("users={}", users);
+//    }
+
     @Test
-    public void selectAllUser() {
+    public void selectAllUser2() {
-        List<User> users = userMapper.selectAllUser();
+        List<User> users = userMapper.selectList(null);
         Assert.assertTrue(CollUtil.isNotEmpty(users));
         log.info("users={}", users);
     }
 
     @Test
     public void selectUserById() {
-        User user = userMapper.selectUserById(1L);
+//        User user = userMapper.selectUserById(1L);
+        User user = userMapper.selectById(1);
         Assert.assertNotNull(user);
         log.info("user={}", user);
     }
@@ -59,7 +77,8 @@ public class UserMapperTest extends WorkFlowMainTests {
                 .lastUpdateTime(new DateTime())
                 .build();
 
-        int i = userMapper.saveUser(user);
+//        int i = userMapper.saveUser(user);
+        int i = userMapper.insert(user);
         Assert.assertEquals(1, i);
     }
 
@@ -67,7 +86,8 @@ public class UserMapperTest extends WorkFlowMainTests {
     @Transactional
     @Rollback
     public void deleteById() {
-        int i = userMapper.deleteById(1L);
+//        int i = userMapper.deleteById(1L);
+        int i = userMapper.deleteById(1);
         Assert.assertEquals(1, i);
     }
 }