【feat】【第一版开发】

1.修改持久层框架前测试

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,69 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidCallStaticSimpleDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidCommentBehindStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidComplexCondition" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidConcurrentCompetitionRandom" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidDoubleOrFloatEqualCompare" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidManuallyCreateThread" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidMissUseOfMathRandom" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidNegationOperator" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidNewDateGetTime" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidPatternCompileInMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidReturnInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidStartWithDollarAndUnderLineNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaAvoidUseTimer" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaBigDecimalAvoidDoubleConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaBooleanPropertyShouldNotStartWithIs" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaClassCastExceptionWithSubListToArrayList" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaClassCastExceptionWithToArray" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaClassMustHaveAuthor" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaClassNamingShouldBeCamel" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaCollectionInitShouldAssignCapacity" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaCommentsMustBeJavadocFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaConcurrentExceptionWithModifyOriginSubList" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaConstantFieldShouldBeUpperCase" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaCountDownShouldInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaDontModifyInForeachCircle" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaEnumConstantsMustHaveComment" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaExceptionClassShouldEndWithException" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaIbatisMethodQueryForList" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaLockShouldWithTryFinally" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaLowerCamelCaseVariableNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaMethodReturnWrapperType" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaMethodTooLong" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaPackageNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaPojoMustOverrideToString" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaPojoMustUsePrimitiveField" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaPojoNoDefaultValue" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaRemoveCommentedCode" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaServiceOrDaoClassShouldEndWithImpl" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaSneakyThrowsWithoutExceptionType" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaStringConcat" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaSwitchExpression" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaTestClassShouldEndWithTestNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaThreadLocalShouldRemove" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaThreadPoolCreation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaThreadShouldSetName" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaTransactionMustHaveRollback" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaUndefineMagicConstant" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaUnsupportedExceptionWithModifyAsList" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaUseQuietReferenceNotation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true" />
   </profile>
 </component>

.idea/misc.xml

@@ -9,7 +9,7 @@
     </option>
     <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

pom.xml

@@ -16,14 +16,15 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
         <spring-cloud.version>2023.0.3</spring-cloud.version>
-        <mybatis-mapper.version>2.2.4</mybatis-mapper.version>
+<!--        <mybatis-mapper.version>5.0.0</mybatis-mapper.version>-->
         <jwt.version>4.4.0</jwt.version>
         <mybatis-springboot-starter.version>3.0.3</mybatis-springboot-starter.version>
+        <mapper-spring-boot-starter.version>5.0.1</mapper-spring-boot-starter.version>
     </properties>
 
     <dependencyManagement>
@@ -82,21 +83,20 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>tk.mybatis</groupId>-->
+<!--            <artifactId>mapper</artifactId>-->
+<!--            <version>${mybatis-mapper.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.mybatis.spring.boot</groupId>-->
+<!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
+<!--            <version>${mybatis-springboot-starter.version}</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>io.mybatis</groupId>
-            <artifactId>mybatis-mapper</artifactId>
-            <version>${mybatis-mapper.version}</version>
-        </dependency>
-        <!-- 使用 Service 层封装时 -->
-        <dependency>
-            <groupId>io.mybatis</groupId>
-            <artifactId>mybatis-service</artifactId>
-            <version>${mybatis-mapper.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-springboot-starter.version}</version>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>${mapper-spring-boot-starter.version}</version>
         </dependency>
         <dependency>
             <groupId>com.auth0</groupId>

src/main/java/com/punchsettle/server/atomic/entity/PunchIn.java

@@ -1,8 +1,10 @@
 package com.punchsettle.server.atomic.entity;
 
 import com.punchsettle.server.common.entity.BaseEntity;
-import io.mybatis.provider.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Table;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,7 +13,8 @@ import java.io.Serializable;
  * 打卡任务表
  */
 @Data
-@Entity.Table("punch_in")
+@Table(name = "punch_in")
+@EqualsAndHashCode(callSuper = true)
 public class PunchIn extends BaseEntity implements Serializable {
 
     @Serial
@@ -20,30 +23,30 @@ public class PunchIn extends BaseEntity implements Serializable {
     /**
      * 任务名称
      */
-    @Entity.Column("task_name")
+    @Column(name = "task_name")
     private String taskName;
 
     /**
      * 奖励倍数
      */
-    @Entity.Column("reward_num")
+    @Column(name = "reward_num")
     private Integer rewardNum;
 
     /**
      * 是否启用周末双倍标志(0-不是，1-是)
      */
-    @Entity.Column("weekend_double_flag")
+    @Column(name = "weekend_double_flag")
     private Boolean weekendDoubleFlag;
 
     /**
      * 是否启用全勤奖励标志(0-不是，1-是)
      */
-    @Entity.Column("full_attendance_flag")
+    @Column(name = "full_attendance_flag")
     private Boolean fullAttendanceFlag;
 
     /**
      * 是否归档标志(0-不是，1-是)
      */
-    @Entity.Column("archive_flag")
+    @Column(name = "archive_flag")
     private Boolean archiveFlag;
 }

src/main/java/com/punchsettle/server/atomic/entity/PunchInRecord.java

@@ -1,32 +0,0 @@
-package com.punchsettle.server.atomic.entity;
-
-import com.punchsettle.server.common.entity.BaseEntity;
-import io.mybatis.provider.Entity;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * 打卡任务记录表
- */
-@Data
-@Entity.Table("punch_in_record")
-public class PunchInRecord extends BaseEntity implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = -7093764607676755235L;
-
-    /**
-     * 打卡任务表主键
-     */
-    @Entity.Column("punch_in_id")
-    private Long punchInId;
-
-    /**
-     * 打卡任务表主键
-     */
-    @Entity.Column("punch_in_id")
-    private Timestamp punchInTime;
-}

src/main/java/com/punchsettle/server/atomic/entity/PunchInRecordSettlementRela.java

@@ -1,31 +0,0 @@
-package com.punchsettle.server.atomic.entity;
-
-import com.punchsettle.server.common.entity.BaseEntity;
-import io.mybatis.provider.Entity;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 打卡任务记录与结算关联表
- */
-@Data
-@Entity.Table("punch_in_record_settlement_rela")
-public class PunchInRecordSettlementRela extends BaseEntity implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 7950526992192733109L;
-
-    /**
-     * 打卡任务记录表ID
-     */
-    @Entity.Column("record_id")
-    private Long recordId;
-
-    /**
-     * 打卡任务结算表ID
-     */
-    @Entity.Column("settlement_id")
-    private Long settlementId;
-}

src/main/java/com/punchsettle/server/atomic/entity/PunchInSettlement.java

@@ -1,74 +0,0 @@
-package com.punchsettle.server.atomic.entity;
-
-import com.punchsettle.server.common.entity.BaseEntity;
-import io.mybatis.provider.Entity;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * 打卡任务结算表
- */
-@Data
-@Entity.Table("punch_in_settlement")
-public class PunchInSettlement extends BaseEntity implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = -3583266996949699066L;
-
-    /**
-     * 用户表主键
-     */
-    @Entity.Column("user_id")
-    private Long userId;
-
-    /**
-     * 结算奖励数
-     */
-    @Entity.Column("reward_num")
-    private Integer rewardNum;
-
-    /**
-     * 是否已领取奖励(0-未领取，1-已领取)
-     */
-    @Entity.Column("claim_reward_flag")
-    private Integer claimRewardFlag;
-
-    /**
-     * 领取奖励时间
-     */
-    @Entity.Column("claim_reward_time")
-    private Timestamp claimRewardTime;
-
-    /**
-     * 结算任务表id
-     */
-    @Entity.Column("settlement_task_id")
-    private Timestamp settlementTaskId;
-
-    /**
-     * 结算时间
-     */
-    @Entity.Column("settlement_time")
-    private Timestamp settlement_time;
-
-    /**
-     * 通知表ID
-     */
-    @Entity.Column("notify_id")
-    private Long notifyId;
-
-    /**
-     * 结算通知状态(fail-通知失败，success-成功通知，pending-待通知)
-     */
-    @Entity.Column("notify_status")
-    private String notifyStatus;
-
-    /**
-     * 结算通知时间
-     */
-    @Entity.Column("notify_time")
-    private Timestamp notifyTime;
-}

src/main/java/com/punchsettle/server/atomic/entity/SettlementNotifyTask.java

@@ -1,56 +0,0 @@
-package com.punchsettle.server.atomic.entity;
-
-import com.punchsettle.server.common.entity.BaseEntity;
-import io.mybatis.provider.Entity;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * 通知定时任务执行记录表
- */
-@Data
-@Entity.Table("settlement_notify_task")
-public class SettlementNotifyTask extends BaseEntity implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = -5529226488225591121L;
-
-    /**
-     * 任务开始时间
-     */
-    @Entity.Column("start_time")
-    private Timestamp startTime;
-
-    /**
-     * 任务结束时间
-     */
-    @Entity.Column("end_time")
-    private Timestamp endTime;
-
-    /**
-     * 任务状态(success-成功，fail-失败，processing-处理中)
-     */
-    @Entity.Column("task_status")
-    private String taskStatus;
-
-    /**
-     * 通知数量
-     */
-    @Entity.Column("notify_num")
-    private Integer notifyNum;
-
-    /**
-     * 通知成功数量
-     */
-    @Entity.Column("notify_success_num")
-    private Integer notifySuccessNum;
-
-    /**
-     * 通知失败数量
-     */
-    @Entity.Column("notify_fail_num")
-    private Integer notifyFailNum;
-}

src/main/java/com/punchsettle/server/atomic/entity/SettlementTask.java

@@ -1,56 +0,0 @@
-package com.punchsettle.server.atomic.entity;
-
-import com.punchsettle.server.common.entity.BaseEntity;
-import io.mybatis.provider.Entity;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * 奖励结算定时任务执行记录表
- */
-@Data
-@Entity.Table("settlement_task")
-public class SettlementTask extends BaseEntity implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 4359906154365259984L;
-
-    /**
-     * 任务开始时间
-     */
-    @Entity.Column("start_time")
-    private Timestamp startTime;
-
-    /**
-     * 任务结束时间
-     */
-    @Entity.Column("end_time")
-    private Timestamp endTime;
-
-    /**
-     * 任务状态(success-成功，fail-失败，processing-处理中)
-     */
-    @Entity.Column("task_status")
-    private String taskStatus;
-
-    /**
-     * 处理数量
-     */
-    @Entity.Column("processed_num")
-    private Integer processedNum;
-
-    /**
-     * 处理成功数量
-     */
-    @Entity.Column("processed_success_num")
-    private Integer processedSuccessNum;
-
-    /**
-     * 处理失败数量
-     */
-    @Entity.Column("processed_fail_num")
-    private Integer processedFailNum;
-}

src/main/java/com/punchsettle/server/atomic/entity/User.java

@@ -1,37 +0,0 @@
-package com.punchsettle.server.atomic.entity;
-
-import com.punchsettle.server.common.entity.BaseEntity;
-import io.mybatis.provider.Entity;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 用户表
- */
-@Data
-@Entity.Table("user")
-public class User extends BaseEntity implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = -7534708835316500183L;
-
-    /**
-     * 微信id
-     */
-    @Entity.Column("open_id")
-    private String openId;
-
-    /**
-     * 微信昵称
-     */
-    @Entity.Column("nickname")
-    private String nickname;
-
-    /**
-     * 微信头像url
-     */
-    @Entity.Column("avator")
-    private String avator;
-}

src/main/java/com/punchsettle/server/atomic/mapper/PunchInMapper.java

@@ -1,12 +1,12 @@
 package com.punchsettle.server.atomic.mapper;
 
 import com.punchsettle.server.atomic.entity.PunchIn;
-import io.mybatis.mapper.logical.LogicalMapper;
-import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.common.MySqlMapper;
 
 /**
  * 打卡任务表 Mapper
  */
-@Mapper
-public interface PunchInMapper extends LogicalMapper<PunchIn, Long> {
+//@Mapper
+public interface PunchInMapper extends Mapper<PunchIn>, MySqlMapper<PunchIn> {
 }

src/main/java/com/punchsettle/server/atomic/mapper/PunchInRecordMapper.java

@@ -1,12 +0,0 @@
-package com.punchsettle.server.atomic.mapper;
-
-import com.punchsettle.server.atomic.entity.PunchInRecord;
-import io.mybatis.mapper.logical.LogicalMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 打卡任务记录表 Mapper
- */
-@Mapper
-public interface PunchInRecordMapper extends LogicalMapper<PunchInRecord, Long> {
-}

src/main/java/com/punchsettle/server/atomic/mapper/PunchInRecordSettlementRelaMapper.java

@@ -1,12 +0,0 @@
-package com.punchsettle.server.atomic.mapper;
-
-import com.punchsettle.server.atomic.entity.PunchInRecordSettlementRela;
-import io.mybatis.mapper.logical.LogicalMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 打卡任务记录与结算关联表 Mapper
- */
-@Mapper
-public interface PunchInRecordSettlementRelaMapper extends LogicalMapper<PunchInRecordSettlementRela, Long> {
-}

src/main/java/com/punchsettle/server/atomic/mapper/PunchInSettlementMapper.java

@@ -1,12 +0,0 @@
-package com.punchsettle.server.atomic.mapper;
-
-import com.punchsettle.server.atomic.entity.PunchInSettlement;
-import io.mybatis.mapper.logical.LogicalMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 打卡任务结算表 Mapper
- */
-@Mapper
-public interface PunchInSettlementMapper extends LogicalMapper<PunchInSettlement, Long> {
-}

src/main/java/com/punchsettle/server/atomic/mapper/SettlementNotifyTaskMapper.java

@@ -1,12 +0,0 @@
-package com.punchsettle.server.atomic.mapper;
-
-import com.punchsettle.server.atomic.entity.SettlementNotifyTask;
-import io.mybatis.mapper.logical.LogicalMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 通知定时任务执行记录表 Mapper
- */
-@Mapper
-public interface SettlementNotifyTaskMapper extends LogicalMapper<SettlementNotifyTask, Long> {
-}

src/main/java/com/punchsettle/server/atomic/mapper/SettlementTaskMapper.java

@@ -1,12 +0,0 @@
-package com.punchsettle.server.atomic.mapper;
-
-import com.punchsettle.server.atomic.entity.SettlementTask;
-import io.mybatis.mapper.logical.LogicalMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 奖励结算定时任务执行记录表 Mapper
- */
-@Mapper
-public interface SettlementTaskMapper extends LogicalMapper<SettlementTask, Long> {
-}

src/main/java/com/punchsettle/server/atomic/mapper/UserMapper.java

@@ -1,12 +0,0 @@
-package com.punchsettle.server.atomic.mapper;
-
-import com.punchsettle.server.atomic.entity.User;
-import io.mybatis.mapper.logical.LogicalMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 用户表 Mapper
- */
-@Mapper
-public interface UserMapper extends LogicalMapper<User, Long> {
-}

src/main/java/com/punchsettle/server/atomic/service/PunchInRecordSettlementRelaService.java

@@ -1,7 +0,0 @@
-package com.punchsettle.server.atomic.service;
-
-/**
- * 打卡任务记录与结算关联表 service
- */
-public interface PunchInRecordSettlementRelaService {
-}

src/main/java/com/punchsettle/server/atomic/service/PunchInService.java

@@ -1,8 +0,0 @@
-package com.punchsettle.server.atomic.service;
-
-/**
- * 打卡任务表 service
- */
-public interface PunchInService {
-
-}

src/main/java/com/punchsettle/server/atomic/service/PunchInSettlementService.java

@@ -1,7 +0,0 @@
-package com.punchsettle.server.atomic.service;
-
-/**
- * 打卡任务结算表 service
- */
-public interface PunchInSettlementService {
-}

src/main/java/com/punchsettle/server/atomic/service/SettlementNotifyTaskService.java

@@ -1,7 +0,0 @@
-package com.punchsettle.server.atomic.service;
-
-/**
- * 通知定时任务执行记录表 service
- */
-public interface SettlementNotifyTaskService {
-}

src/main/java/com/punchsettle/server/atomic/service/SettlementTaskService.java

@@ -1,7 +0,0 @@
-package com.punchsettle.server.atomic.service;
-
-/**
- * 奖励结算定时任务执行记录表 service
- */
-public interface SettlementTaskService {
-}

src/main/java/com/punchsettle/server/atomic/service/UserService.java

@@ -1,7 +0,0 @@
-package com.punchsettle.server.atomic.service;
-
-/**
- * 用户表 service
- */
-public interface UserService {
-}

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInRecordServiceImpl.java

@@ -1,14 +1,11 @@
 package com.punchsettle.server.atomic.service.impl;
 
-import com.punchsettle.server.atomic.entity.PunchInRecord;
-import com.punchsettle.server.atomic.mapper.PunchInRecordMapper;
 import com.punchsettle.server.atomic.service.PunchInRecordService;
-import io.mybatis.service.AbstractService;
 import org.springframework.stereotype.Service;
 
 /**
  * 打卡任务记录表 service
  */
 @Service
-public class PunchInRecordServiceImpl extends AbstractService<PunchInRecord, Long, PunchInRecordMapper> implements PunchInRecordService {
+public class PunchInRecordServiceImpl implements PunchInRecordService {
 }

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInRecordSettlementRelaServiceImpl.java

@@ -1,15 +0,0 @@
-package com.punchsettle.server.atomic.service.impl;
-
-import com.punchsettle.server.atomic.entity.PunchInRecordSettlementRela;
-import com.punchsettle.server.atomic.mapper.PunchInRecordSettlementRelaMapper;
-import com.punchsettle.server.atomic.service.PunchInRecordSettlementRelaService;
-import io.mybatis.service.AbstractService;
-import org.springframework.stereotype.Service;
-
-/**
- * 打卡任务记录与结算关联表 service
- */
-@Service
-public class PunchInRecordSettlementRelaServiceImpl extends AbstractService<PunchInRecordSettlementRela, Long, PunchInRecordSettlementRelaMapper> implements PunchInRecordSettlementRelaService
-{
-}

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInServiceImpl.java

@@ -1,14 +0,0 @@
-package com.punchsettle.server.atomic.service.impl;
-
-import com.punchsettle.server.atomic.entity.PunchIn;
-import com.punchsettle.server.atomic.mapper.PunchInMapper;
-import com.punchsettle.server.atomic.service.PunchInService;
-import io.mybatis.service.AbstractService;
-import org.springframework.stereotype.Service;
-
-/**
- * 打卡任务表 service
- */
-@Service
-public class PunchInServiceImpl extends AbstractService<PunchIn, Long, PunchInMapper> implements PunchInService {
-}

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInSettlementServiceImpl.java

@@ -1,14 +0,0 @@
-package com.punchsettle.server.atomic.service.impl;
-
-import com.punchsettle.server.atomic.entity.PunchInSettlement;
-import com.punchsettle.server.atomic.mapper.PunchInSettlementMapper;
-import com.punchsettle.server.atomic.service.PunchInSettlementService;
-import io.mybatis.service.AbstractService;
-import org.springframework.stereotype.Service;
-
-/**
- * 打卡任务结算表 service
- */
-@Service
-public class PunchInSettlementServiceImpl extends AbstractService<PunchInSettlement, Long, PunchInSettlementMapper> implements PunchInSettlementService {
-}

src/main/java/com/punchsettle/server/atomic/service/impl/SettlementNotifyTaskServiceImpl.java

@@ -1,14 +0,0 @@
-package com.punchsettle.server.atomic.service.impl;
-
-import com.punchsettle.server.atomic.entity.SettlementNotifyTask;
-import com.punchsettle.server.atomic.mapper.SettlementNotifyTaskMapper;
-import com.punchsettle.server.atomic.service.SettlementNotifyTaskService;
-import io.mybatis.service.AbstractService;
-import org.springframework.stereotype.Service;
-
-/**
- * 通知定时任务执行记录表 service
- */
-@Service
-public class SettlementNotifyTaskServiceImpl extends AbstractService<SettlementNotifyTask, Long, SettlementNotifyTaskMapper> implements SettlementNotifyTaskService {
-}

src/main/java/com/punchsettle/server/atomic/service/impl/SettlementTaskServiceImpl.java

@@ -1,14 +0,0 @@
-package com.punchsettle.server.atomic.service.impl;
-
-import com.punchsettle.server.atomic.entity.SettlementTask;
-import com.punchsettle.server.atomic.mapper.SettlementTaskMapper;
-import com.punchsettle.server.atomic.service.SettlementTaskService;
-import io.mybatis.service.AbstractService;
-import org.springframework.stereotype.Service;
-
-/**
- * 奖励结算定时任务执行记录表 service
- */
-@Service
-public class SettlementTaskServiceImpl extends AbstractService<SettlementTask, Long, SettlementTaskMapper> implements SettlementTaskService {
-}

src/main/java/com/punchsettle/server/atomic/service/impl/UserServiceImpl.java

@@ -1,14 +0,0 @@
-package com.punchsettle.server.atomic.service.impl;
-
-import com.punchsettle.server.atomic.entity.User;
-import com.punchsettle.server.atomic.mapper.UserMapper;
-import com.punchsettle.server.atomic.service.UserService;
-import io.mybatis.service.AbstractService;
-import org.springframework.stereotype.Service;
-
-/**
- * 用户表 service
- */
-@Service
-public class UserServiceImpl extends AbstractService<User, Long, UserMapper> implements UserService {
-}

src/main/java/com/punchsettle/server/common/entity/BaseEntity.java

@@ -1,8 +1,10 @@
 package com.punchsettle.server.common.entity;
 
-import io.mybatis.mapper.logical.LogicalColumn;
-import io.mybatis.provider.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.LogicDelete;
+import tk.mybatis.mapper.annotation.Version;
 
 import java.sql.Timestamp;
 
@@ -15,39 +17,46 @@ public class BaseEntity {
     /**
      * 主键
      */
-    @Entity.Column(id = true, updatable = false, insertable = false)
+    @Id
+    @Column(name = "id")
     private Long id;
 
     /**
      * 创建人
      */
+    @Column(name = "created_by")
     private Long createdBy;
 
     /**
      * 创建时间
      */
+    @Column(name = "creation_time")
     private Timestamp creationTime;
 
     /**
      * 最后更新人
      */
+    @Column(name = "last_updated_by")
     private Long lastUpdatedBy;
 
     /**
      * 最后更新时间
      */
+    @Column(name = "last_update_time")
     private Timestamp lastUpdateTime;
 
     /**
      * 版本号
      */
+    @Version
+    @Column(name = "version")
     private Integer version;
 
     /**
      * 逻辑删除标志（0-未删除，1-已删除）
      */
-    @LogicalColumn(delete = "1")
-    @Entity.Column(updatable = false, insertable = false)
+    @LogicDelete
+    @Column(name = "delete_flag")
     private String deleteFlag;
 
 }

src/main/java/com/punchsettle/server/core/config/MyBatisConfig.java → src/main/java/com/punchsettle/server/core/config/TkMyBatisConfig.java

@@ -1,11 +1,11 @@
 package com.punchsettle.server.core.config;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Configuration;
+import tk.mybatis.spring.annotation.MapperScan;
 
 /**
  * mybatis配置扫描路径
  */
 @Configuration
 @MapperScan(basePackages = "com.punchsettle.server.atomic.mapper")
-public class MyBatisConfig {}
+public class TkMyBatisConfig {}

src/main/java/com/punchsettle/server/service/controller/HealthController.java

@@ -1,5 +1,8 @@
 package com.punchsettle.server.service.controller;
 
+import com.punchsettle.server.atomic.entity.PunchIn;
+import com.punchsettle.server.atomic.mapper.PunchInMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,8 +20,29 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/health")
 public class HealthController {
 
+    @Autowired
+    private PunchInMapper punchInMapper;
+
     @GetMapping("/info")
     public String info() {
         return "打卡结算后端服务 正在运行";
     }
+
+    @GetMapping("/test")
+    public String test() {
+        // 新增
+        // 查询
+        // 删除
+        // 修改
+        PunchIn punchIn = new PunchIn();
+        punchIn.setTaskName("任务名");
+        punchIn.setArchiveFlag(true);
+        punchIn.setRewardNum(12);
+        punchIn.setFullAttendanceFlag(true);
+        punchIn.setWeekendDoubleFlag(false);
+        punchIn.setVersion(1);
+//        punchInMapper.insert(punchIn);
+        punchInMapper.updateByPrimaryKey(punchIn);
+        return "测试";
+    }
 }

src/main/resources/application.yaml

@@ -7,10 +7,14 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
-    url: url=jdbc:mysql://localhost:3306/punch_settle?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://localhost:3306/punch_settle?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
   cache:
     type: caffeine
 
+logging:
+  level:
+    com.punchsettle.server: debug
+
 biz:
   wechat:
     mini-program: