From 3cef96fd15c2c26597ec6ba5a0de3cb863e122cb Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 20 Jul 2024 17:45:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=8F=E6=84=9F=E8=AF=8D=E6=A3=80?= =?UTF-8?q?=E6=B5=8Bupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/dto/SchisandraShareSensitiveWordsDTO.java | 2 +- .../schisandra/share/application/sensitive/WordContext.java | 6 ++---- .../share/domain/bo/SchisandraShareSensitiveWordsBO.java | 2 +- .../infra/basic/entity/SchisandraShareSensitiveWords.java | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareSensitiveWordsDTO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareSensitiveWordsDTO.java index f048f93..64318e8 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareSensitiveWordsDTO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareSensitiveWordsDTO.java @@ -17,7 +17,7 @@ public class SchisandraShareSensitiveWordsDTO implements Serializable { /** * */ - private String id; + private Long id; /** * diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/sensitive/WordContext.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/sensitive/WordContext.java index 831c0b3..942342b 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/sensitive/WordContext.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/sensitive/WordContext.java @@ -8,7 +8,6 @@ import com.schisandra.share.common.enums.IsDeletedFlagEnum; import com.schisandra.share.infra.basic.dao.SchisandraShareSensitiveWordsDao; import com.schisandra.share.infra.basic.entity.SchisandraShareSensitiveWords; import com.schisandra.share.infra.basic.entity.table.SchisandraShareSensitiveWordsTableDef; -import com.schisandra.share.infra.basic.service.SchisandraShareSensitiveWordsService; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; @@ -62,7 +61,7 @@ public class WordContext { } } if (CollectionUtil.isNotEmpty(list)) { - this.addLastId = Long.parseLong(list.get(list.size() - 1).getId()); + this.addLastId = list.get(list.size() - 1).getId(); } initKeyWord(black, white); if (autoLoad) { @@ -121,10 +120,9 @@ public class WordContext { QueryWrapper query = new QueryWrapper(); query.where(SchisandraShareSensitiveWordsTableDef.SCHISANDRA_SHARE_SENSITIVE_WORDS.ID.gt(addLastId).and(SchisandraShareSensitiveWordsTableDef.SCHISANDRA_SHARE_SENSITIVE_WORDS.IS_DELETED.eq(IsDeletedFlagEnum.UN_DELETED.getCode()))); List list = schisandraShareSensitiveWordsDao.selectListByQuery(query); - if (CollectionUtil.isNotEmpty(list)) { log.info("addNewWords {}", JSON.toJSON(list)); - this.addLastId = Long.parseLong(list.get(list.size() - 1).getId()); + this.addLastId = list.get(list.size() - 1).getId(); Set black = new HashSet<>(); Set white = new HashSet<>(); for (SchisandraShareSensitiveWords words : list) { diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareSensitiveWordsBO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareSensitiveWordsBO.java index f35b140..4708231 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareSensitiveWordsBO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareSensitiveWordsBO.java @@ -16,7 +16,7 @@ public class SchisandraShareSensitiveWordsBO implements Serializable { /** * */ - private String id; + private Long id; /** * diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareSensitiveWords.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareSensitiveWords.java index a87ba91..b199e08 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareSensitiveWords.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareSensitiveWords.java @@ -23,8 +23,8 @@ public class SchisandraShareSensitiveWords implements Serializable { /** * */ - @Id(keyType=KeyType.Generator, value= KeyGenerators.flexId) - private String id; + @Id(keyType = KeyType.Auto) + private Long id; /** *