【feat】【第一版开发】

1.修改持久层框架前提交

.idea/misc.xml

@@ -7,8 +7,9 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

doc/sql/db.sql

@@ -0,0 +1 @@
+CREATE DATABASE `punch_settle` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;

doc/sql/punch_settle-ddl.sql → doc/sql/schema.sql

@@ -1,6 +1,4 @@
 -- punch_settle.punch_in definition
-CREATE DATABASE `punch_settle` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
-
 CREATE TABLE `punch_in` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `task_name` varchar(128) NOT NULL COMMENT '任务名称',

doc/技术文档.md

@@ -221,16 +221,23 @@ mysqld --initialize-insecure
 
 # 注册mysql服务（需要管理员权限）
 mysqld -install
+# 注册mysql服务并指定配置文件（需要管理员权限）
+mysqld --install MySQL --defaults-file="配置文件路径\mysql-lts\current\my.ini"
 
 # 启动mysql服务（需要管理员权限）
+# 如果启动报错："服务没有响应控制功能。请键入 NET HELPMSG 2186 以获得更多的帮助。",则看下面的参考文章看是否缺少组件
 net start mysql
 
 # 关闭mysql服务（需要管理员权限）
 net stop mysql
+
+# 如果mysql服务无法启动，则可以手动启动mysql
+mysqld --standalone
 ```
 
 参考：
 
 * [MySQL中的basedir和datadir的作用](https://blog.csdn.net/wolfalcon/article/details/80528678)
 * [MYSQL8.0安装、配置、启动、登入与卸载详细步骤总结](https://blog.csdn.net/qq_51688022/article/details/137105751)
+* [mysql服务没有响应控制功能](https://blog.csdn.net/m0_72160374/article/details/143462612)
 

pom.xml

@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>21</java.version>
         <spring-cloud.version>2023.0.3</spring-cloud.version>
-        <mybatis-mapper.version>2.2.3</mybatis-mapper.version>
+        <mybatis-mapper.version>2.2.4</mybatis-mapper.version>
         <jwt.version>4.4.0</jwt.version>
         <mybatis-springboot-starter.version>3.0.3</mybatis-springboot-starter.version>
     </properties>
@@ -87,6 +87,12 @@
             <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>

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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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/PunchInRecordService.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,14 @@
+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 {
+}

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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -46,9 +46,8 @@ public class BaseEntity {
     /**
      * 逻辑删除标志（0-未删除，1-已删除）
      */
-
     @LogicalColumn(delete = "1")
     @Entity.Column(updatable = false, insertable = false)
-    private Boolean deleteFlag;
+    private String deleteFlag;
 
 }