更新README

README.md

@@ -8,7 +8,7 @@
 
 使用方法：
 
-+ 在项目中放置jar包的地方把seq-1.4.1.jar、seq-1.4.1-sources.jar、seq-1.4.1-pom.xml复制过去
++ 在项目中放置jar包的地方把seq-1.5.2.jar、seq-1.5.2-sources.jar、seq-1.5.2-pom.xml复制过去
 + 在pom.xml中增加以下内容，然后执行maven命令：mvn clean
 
 ```xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.yanghuanglin</groupId>
             <artifactId>seq</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.2</version>
             <exclusions>
                 <!-- 如若你项目中有引用spring-jdbc，则需要排除seq的jdbc依赖 -->
                 <exclusion>
@@ -50,13 +50,13 @@
                         </goals>
                         <configuration>
                             <!-- ${project.basedir}表示当前项目的根目录 -->
-                            <file>${project.basedir}/lib/seq-1.4.1.jar</file>
-                            <pomFile>${pom.basedir}/lib/seq-1.4.1-pom.xml</pomFile>
-                            <sources>${project.basedir}/lib/seq-1.4.1-sources.jar</sources>
+                            <file>${project.basedir}/lib/seq-1.5.2.jar</file>
+                            <pomFile>${project.basedir}/lib/seq-1.5.2-pom.xml</pomFile>
+                            <sources>${project.basedir}/lib/seq-1.5.2-sources.jar</sources>
                             <repositoryLayout>default</repositoryLayout>
                             <groupId>com.yanghuanglin</groupId>
                             <artifactId>seq</artifactId>
-                            <version>1.4.1</version>
+                            <version>1.5.2</version>
                             <packaging>jar</packaging>
                             <generatePom>true</generatePom>
                         </configuration>
@@ -484,6 +484,15 @@ public interface Generator {
      * @param sequences 需要释放的序号。一般是一个通过{@link Sequences#setKey(String)}、{@link Sequences#setType(String)}、{@link Sequences#setSeq(Long)}三方法一起手动构建或通过{@link Sequences#Sequences(String, String, Long)}构造方法构建的实例对象
      */
     void release(Sequences sequences);
-}
 
+    /**
+     * 清空所有闲置序号和未锁定序号
+     */
+    void clear();
+
+    /**
+     * 清空指定时间段内闲置序号和未锁定序号
+     */
+    void clear(Date begin, Date end);
+}
 ```

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yanghuanglin</groupId>
     <artifactId>seq</artifactId>
-    <version>1.4.1</version>
+    <version>1.5.2</version>
     <name>seq</name>
     <description>seq</description>
     <properties>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/com/yanghuanglin/seq/dao/SequencesUnusedDao.java

@@ -2,6 +2,7 @@ package com.yanghuanglin.seq.dao;
 
 import com.yanghuanglin.seq.po.SequencesUnused;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,4 +37,14 @@ public interface SequencesUnusedDao {
     boolean saveBatch(List<SequencesUnused> sequencesUnusedList);
 
     void createTable();
+
+    /**
+     * 删除所有闲置的序号
+     */
+    boolean deleteAll();
+
+    /**
+     * 删除指定时间段内使用中的序号
+     */
+    boolean deleteByDate(Date begin, Date end);
 }

src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java

@@ -57,9 +57,9 @@ public class SequencesDaoImpl implements SequencesDao {
     @Override
     public void createTable() {
         String sql = "CREATE TABLE IF NOT EXISTS `%s` ( " +
-                " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号英文名称'," +
-                " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号类型'," +
-                " `%s` BIGINT ( 2 ) NOT NULL COMMENT '已使用到的序号'," +
+                " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号英文名称'," +
+                " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号类型'," +
+                " `%s` BIGINT ( 20 ) NOT NULL COMMENT '已使用到的序号'," +
                 " PRIMARY KEY ( `%s`, `%s` ) " +
                 " ) COMMENT '当前序号表'";
         sql = String.format(sql, tableConfig.getTable(),

src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java

@@ -72,9 +72,9 @@ public class SequencesUnlockDaoImpl implements SequencesUnlockDao {
     @Override
     public void createTable() {
         String sql = "CREATE TABLE IF NOT EXISTS `%s_unlock` ( " +
-                " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号英文名称'," +
-                " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号类型'," +
-                " `%s` BIGINT ( 2 ) NOT NULL COMMENT '尚未锁定的序号'," +
+                " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号英文名称'," +
+                " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号类型'," +
+                " `%s` BIGINT ( 20 ) NOT NULL COMMENT '尚未锁定的序号'," +
                 " `%s` DATETIME NOT NULL COMMENT '使用时间'," +
                 " PRIMARY KEY ( `%s`, `%s` ,`%s` ) " +
                 " ) COMMENT '未锁定序号表'";

src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java

@@ -10,6 +10,8 @@ import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,7 +30,7 @@ public class SequencesUnusedDaoImpl implements SequencesUnusedDao {
 
     @Override
     public SequencesUnused findMinSeq(SequencesUnused sequencesUnused) {
-        String sql = "select * from `%s_ununsed` where `%s`=? and `%s`=? order by `%s` asc limit 0,1";
+        String sql = "select * from `%s_unused` where `%s`=? and `%s`=? order by `%s` asc limit 0,1";
         sql = String.format(sql, tableConfig.getTable(), tableConfig.getKeyColumn(), tableConfig.getTypeColumn(), tableConfig.getSeqColumn());
         try {
             return this.jdbcTemplate.queryForObject(sql, rowMapper(), sequencesUnused.getKey(), sequencesUnused.getType());
@@ -40,7 +42,7 @@ public class SequencesUnusedDaoImpl implements SequencesUnusedDao {
     @Override
     public SequencesUnused findMaxSeq(SequencesUnused sequencesUnused) {
         try {
-            String sql = "select * from `%s_ununsed` where `%s`=? and `%s`=? order by `%s` desc limit 0,1";
+            String sql = "select * from `%s_unused` where `%s`=? and `%s`=? order by `%s` desc limit 0,1";
             sql = String.format(sql, tableConfig.getTable(), tableConfig.getKeyColumn(), tableConfig.getTypeColumn(), tableConfig.getSeqColumn());
             return this.jdbcTemplate.queryForObject(sql, rowMapper(), sequencesUnused.getKey(), sequencesUnused.getType());
         } catch (EmptyResultDataAccessException ignored) {
@@ -50,7 +52,7 @@ public class SequencesUnusedDaoImpl implements SequencesUnusedDao {
 
     @Override
     public boolean delete(SequencesUnused sequencesUnused) {
-        String sql = "delete from `%s_ununsed` where `%s`=? and `%s`=? and `%s`=?";
+        String sql = "delete from `%s_unused` where `%s`=? and `%s`=? and `%s`=?";
         sql = String.format(sql, tableConfig.getTable(), tableConfig.getKeyColumn(), tableConfig.getTypeColumn(), tableConfig.getSeqColumn());
         int result = this.jdbcTemplate.update(sql, sequencesUnused.getKey(), sequencesUnused.getType(), sequencesUnused.getSeq());
         return result != 0;
@@ -58,16 +60,16 @@ public class SequencesUnusedDaoImpl implements SequencesUnusedDao {
 
     @Override
     public boolean save(SequencesUnused sequencesUnused) {
-        String sql = "insert into `%s_ununsed`(`%s`,`%s`,`%s`) values(?,?,?)";
-        sql = String.format(sql, tableConfig.getTable(), tableConfig.getKeyColumn(), tableConfig.getTypeColumn(), tableConfig.getSeqColumn());
-        int result = this.jdbcTemplate.update(sql, sequencesUnused.getKey(), sequencesUnused.getType(), sequencesUnused.getSeq());
+        String sql = "insert into `%s_unused`(`%s`,`%s`,`%s`,`%s`) values(?,?,?,?)";
+        sql = String.format(sql, tableConfig.getTable(), tableConfig.getKeyColumn(), tableConfig.getTypeColumn(), tableConfig.getSeqColumn(), tableConfig.getCreateTimeColumn());
+        int result = this.jdbcTemplate.update(sql, sequencesUnused.getKey(), sequencesUnused.getType(), sequencesUnused.getSeq(), sequencesUnused.getCreateTime());
         return result != 0;
     }
 
     @Override
     public boolean saveBatch(List<SequencesUnused> sequencesUnusedList) {
-        String sql = "insert into `%s_ununsed`(`%s`,`%s`,`%s`) values(?,?,?)";
-        sql = String.format(sql, tableConfig.getTable(), tableConfig.getKeyColumn(), tableConfig.getTypeColumn(), tableConfig.getSeqColumn());
+        String sql = "insert into `%s_unused`(`%s`,`%s`,`%s`,`%s`) values(?,?,?,?)";
+        sql = String.format(sql, tableConfig.getTable(), tableConfig.getKeyColumn(), tableConfig.getTypeColumn(), tableConfig.getSeqColumn(), tableConfig.getCreateTimeColumn());
         int[] result = this.jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
             @Override
             public void setValues(PreparedStatement ps, int i) throws SQLException {
@@ -75,6 +77,7 @@ public class SequencesUnusedDaoImpl implements SequencesUnusedDao {
                 ps.setString(1, sequencesUnused.getKey());
                 ps.setString(2, sequencesUnused.getType());
                 ps.setLong(3, sequencesUnused.getSeq());
+                ps.setTimestamp(4, new Timestamp(sequencesUnused.getCreateTime().getTime()));
             }
 
             @Override
@@ -87,29 +90,48 @@ public class SequencesUnusedDaoImpl implements SequencesUnusedDao {
 
     @Override
     public void createTable() {
-        String sql = "CREATE TABLE IF NOT EXISTS `%s_ununsed` ( " +
-                " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号英文名称'," +
-                " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号类型'," +
-                " `%s` BIGINT ( 2 ) NOT NULL COMMENT '闲置的的序号'," +
+        String sql = "CREATE TABLE IF NOT EXISTS `%s_unused` ( " +
+                " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号英文名称'," +
+                " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号类型'," +
+                " `%s` BIGINT ( 20 ) NOT NULL COMMENT '闲置的的序号'," +
+                " `%s` DATETIME NOT NULL COMMENT '设为闲置序号的时间'," +
                 " PRIMARY KEY ( `%s`, `%s`, `%s` ) " +
                 " ) COMMENT '闲置序号表'";
         sql = String.format(sql, tableConfig.getTable(),
                 tableConfig.getKeyColumn(),
                 tableConfig.getTypeColumn(),
                 tableConfig.getSeqColumn(),
+                tableConfig.getCreateTimeColumn(),
                 tableConfig.getKeyColumn(),
                 tableConfig.getTypeColumn(),
                 tableConfig.getSeqColumn());
         this.jdbcTemplate.execute(sql);
     }
 
+    @Override
+    public boolean deleteAll() {
+        String sql = "delete from `%s_unused`";
+        sql = String.format(sql, tableConfig.getTable());
+        int result = this.jdbcTemplate.update(sql);
+        return result != 0;
+    }
+
+    @Override
+    public boolean deleteByDate(Date begin, Date end) {
+        String sql = "delete from `%s_unused` where `%s`>=? and `%s`<=?";
+        sql = String.format(sql, tableConfig.getTable(), tableConfig.getCreateTimeColumn(), tableConfig.getCreateTimeColumn());
+        int result = this.jdbcTemplate.update(sql, begin, end);
+        return result != 0;
+    }
+
     private RowMapper<SequencesUnused> rowMapper() {
         return (rs, rowNum) -> {
-            SequencesUnused result = new SequencesUnused();
-            result.setKey(rs.getString(tableConfig.getKeyColumn()));
-            result.setType(rs.getString(tableConfig.getTypeColumn()));
-            result.setSeq(rs.getLong(tableConfig.getSeqColumn()));
-            return result;
+            SequencesUnused sequencesUnused = new SequencesUnused();
+            sequencesUnused.setKey(rs.getString(tableConfig.getKeyColumn()));
+            sequencesUnused.setType(rs.getString(tableConfig.getTypeColumn()));
+            sequencesUnused.setSeq(rs.getLong(tableConfig.getSeqColumn()));
+            sequencesUnused.setCreateTime(rs.getDate(tableConfig.getCreateTimeColumn()));
+            return sequencesUnused;
         };
     }
 }

src/main/java/com/yanghuanglin/seq/generator/Generator.java

@@ -190,4 +190,14 @@ public interface Generator {
      * @param sequences 需要释放的序号。一般是一个通过{@link Sequences#setKey(String)}、{@link Sequences#setType(String)}、{@link Sequences#setSeq(Long)}三方法一起手动构建或通过{@link Sequences#Sequences(String, String, Long)}构造方法构建的实例对象
      */
     void release(Sequences sequences);
+
+    /**
+     * 清空所有闲置序号和未锁定序号
+     */
+    void clear();
+
+    /**
+     * 清空指定时间段内闲置序号和未锁定序号
+     */
+    void clear(Date begin, Date end);
 }

src/main/java/com/yanghuanglin/seq/generator/impl/SequencesGenerator.java

@@ -249,7 +249,7 @@ public class SequencesGenerator implements Generator {
 
         List<SequencesUnused> sequencesUnusedList = new ArrayList<>();
         for (SequencesUnlock sequencesUnlock : sequencesUnlockList) {
-            sequencesUnusedList.add(new SequencesUnused(sequencesUnlock));
+            sequencesUnusedList.add(new SequencesUnused(sequencesUnlock, new Date()));
         }
 
         //将使用中表的序号放到空闲表中
@@ -265,7 +265,7 @@ public class SequencesGenerator implements Generator {
 
         List<SequencesUnused> sequencesUnusedList = new ArrayList<>();
         for (SequencesUnlock sequencesUnlock : sequencesUnlockList) {
-            sequencesUnusedList.add(new SequencesUnused(sequencesUnlock));
+            sequencesUnusedList.add(new SequencesUnused(sequencesUnlock, new Date()));
         }
 
         //将指定时间段内使用中表的序号放到空闲表中
@@ -279,6 +279,18 @@ public class SequencesGenerator implements Generator {
         if (sequences == null)
             return;
         sequencesUnlockDao.delete(new SequencesUnlock(sequences));
-        sequencesUnusedDao.save(new SequencesUnused(sequences));
+        sequencesUnusedDao.save(new SequencesUnused(sequences, new Date()));
+    }
+
+    @Override
+    public void clear() {
+        sequencesUnlockDao.deleteAll();
+        sequencesUnusedDao.deleteAll();
+    }
+
+    @Override
+    public void clear(Date begin, Date end) {
+        sequencesUnlockDao.deleteByDate(begin, end);
+        sequencesUnusedDao.deleteByDate(begin, end);
     }
 }

src/main/java/com/yanghuanglin/seq/po/Sequences.java

@@ -129,9 +129,9 @@ public class Sequences {
      * @return 补零后的序号，若未单独设置序号的长度，则最小长度为{@link BaseConfig#getMinLength()}长度；否则为修改后的长度，不足部分补零
      */
     public String format() {
-        BaseConfig baseConfig = BaseConfig.getInstance();
-        if (baseConfig.getMinLength() != null)
-            return String.format("%0" + baseConfig.getMinLength() + "d", this.seq);
+        Integer minLength = BaseConfig.getInstance().getMinLength();
+        if (minLength != null)
+            return String.format("%0" + minLength + "d", this.seq);
         return String.valueOf(this.seq);
     }
 

src/main/java/com/yanghuanglin/seq/po/SequencesUnused.java

@@ -1,6 +1,8 @@
 package com.yanghuanglin.seq.po;
 
 
+import java.util.Date;
+
 /**
  * 闲置序号
  *
@@ -8,6 +10,8 @@ package com.yanghuanglin.seq.po;
  * @since 2022/1/28
  */
 public class SequencesUnused extends Sequences {
+    private Date createTime;
+
     public SequencesUnused() {
     }
 
@@ -17,12 +21,28 @@ public class SequencesUnused extends Sequences {
         this.seq = sequences.getSeq();
     }
 
+    public SequencesUnused(Sequences sequences, Date createTime) {
+        this.key = sequences.getKey();
+        this.type = sequences.getType();
+        this.seq = sequences.getSeq();
+        this.createTime = createTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     @Override
     public String toString() {
         return "SequencesUnused{" +
                 "key='" + key + '\'' +
                 ", type='" + type + '\'' +
                 ", seq=" + seq +
+                ", createTime=" + createTime +
                 '}';
     }
 }

src/test/java/SeqTest.java

@@ -30,7 +30,7 @@ public class SeqTest {
         tableConfig.setTable("sequences");
         tableConfig.setKeyColumn("SEQUENCE_KEY");
         tableConfig.setTypeColumn("SEQUENCE_TYPE");
-        tableConfig.setSeqColumn("NEXT_ID");
+        tableConfig.setSeqColumn("CURRENT");
         generatorConfig.setTableConfig(tableConfig);
 
         generator = new SequencesGenerator(generatorConfig);