From 216e78e7d0930a158519b50b841f84f4adddfcd8 Mon Sep 17 00:00:00 2001 From: "udf_admin@163.com" Date: Sun, 26 Apr 2020 21:03:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/ITraceInfoRepository.xml | 6 ++-- .../cache/db/entity/DbCacheEntity.java | 8 ++--- .../cache/db/service/DbCacheService.java | 30 +++++++++---------- .../resources/mapper/IDbCacheRepository.xml | 4 +-- .../file/db/entity/DbFileInfoEntity.java | 4 +-- .../file/db/service/DbFileService.java | 2 +- .../resources/mapper/IDbQueueRepository.xml | 21 ++++++------- 7 files changed, 36 insertions(+), 39 deletions(-) diff --git a/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml b/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml index e76d110..f26edc6 100644 --- a/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml +++ b/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml @@ -3,7 +3,7 @@ DELETE - FROM TF_TRACE_INFO A - WHERE A.CREATE_DATE (SYSDATE - #{traceLogKeepDays}) + FROM TM_COMMON_TRACE_INFO A + WHERE A.CREATE_DATE date_sub(now(), INTERVAL #{traceLogKeepDays} day) - \ No newline at end of file + diff --git a/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/entity/DbCacheEntity.java b/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/entity/DbCacheEntity.java index 929e0d9..8c0bcfc 100644 --- a/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/entity/DbCacheEntity.java +++ b/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/entity/DbCacheEntity.java @@ -19,13 +19,13 @@ public class DbCacheEntity { /** * 键(主键) */ - @TableId("KEY") - private String key; + @TableId("K") + private String k; /** * 值 */ - @TableField("VALUE") - private String value; + @TableField("V") + private String v; /** * 过期时长(毫秒) */ diff --git a/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/service/DbCacheService.java b/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/service/DbCacheService.java index 07eef64..cfe0de1 100644 --- a/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/service/DbCacheService.java +++ b/udf-starter/udf-starter-cache-db/src/main/java/org/itkk/udf/starter/cache/db/service/DbCacheService.java @@ -72,7 +72,7 @@ public class DbCacheService { //判空 if (entity != null) { entity = new DbCacheEntity(); - entity.setKey(key); + entity.setK(key); entity.setCreateTime(System.currentTimeMillis()); entity.setExpire(expire); entity.setExpireTime(entity.getCreateTime() + entity.getExpire()); @@ -122,8 +122,8 @@ public class DbCacheService { if (entity == null) { //新增缓存 entity = new DbCacheEntity(); - entity.setKey(key); - entity.setValue(value); + entity.setK(key); + entity.setV(value); entity.setCreateTime(System.currentTimeMillis()); entity.setExpire(expire); entity.setExpireTime(entity.getCreateTime() + entity.getExpire()); @@ -175,8 +175,8 @@ public class DbCacheService { if (entity == null) { //新增缓存 entity = new DbCacheEntity(); - entity.setKey(key); - entity.setValue(value); + entity.setK(key); + entity.setV(value); entity.setCreateTime(System.currentTimeMillis()); entity.setExpire(expire); entity.setExpireTime(entity.getCreateTime() + entity.getExpire()); @@ -185,7 +185,7 @@ public class DbCacheService { iDbCacheRepository.insert(entity); } else { //更新缓存 - entity.setValue(value); + entity.setV(value); entity.setCreateTime(System.currentTimeMillis()); entity.setExpire(expire); entity.setExpireTime(entity.getCreateTime() + entity.getExpire()); @@ -215,7 +215,7 @@ public class DbCacheService { //构造key keyPrefix = getKey(keyPrefix) + "%"; //删除 - iDbCacheRepository.delete(new QueryWrapper().lambda().like(DbCacheEntity::getKey, keyPrefix)); + iDbCacheRepository.delete(new QueryWrapper().lambda().like(DbCacheEntity::getK, keyPrefix)); } /** @@ -230,7 +230,7 @@ public class DbCacheService { //构造key keyPrefix = getKey(keyPrefix) + "%"; //获得key清单 - List dbCacheEntityList = iDbCacheRepository.selectList(new QueryWrapper().lambda().select(DbCacheEntity::getKey).like(DbCacheEntity::getKey, keyPrefix)); + List dbCacheEntityList = iDbCacheRepository.selectList(new QueryWrapper().lambda().select(DbCacheEntity::getK).like(DbCacheEntity::getK, keyPrefix)); //判空 if (CollectionUtils.isNotEmpty(dbCacheEntityList)) { //初始化 @@ -238,11 +238,11 @@ public class DbCacheService { //遍历 for (DbCacheEntity dbCacheEntity : dbCacheEntityList) { //获得缓存实体 - DbCacheEntity entity = getEntity(dbCacheEntity.getKey()); + DbCacheEntity entity = getEntity(dbCacheEntity.getK()); //判空 if (entity != null) { //放入结果集 - rv.add(new DbCacheDto().setValue(entity.getValue()).setExpireTime(entity.getExpireTime())); + rv.add(new DbCacheDto().setValue(entity.getV()).setExpireTime(entity.getExpireTime())); } } } @@ -262,7 +262,7 @@ public class DbCacheService { //获得缓存实体 DbCacheEntity entity = getEntity(key); //返回 - return entity == null ? null : new DbCacheDto().setValue(entity.getValue()).setExpireTime(entity.getExpireTime()); + return entity == null ? null : new DbCacheDto().setValue(entity.getV()).setExpireTime(entity.getExpireTime()); } /** @@ -277,7 +277,7 @@ public class DbCacheService { //构造key keyPrefix = getKey(keyPrefix) + "%"; //获得key清单 - List dbCacheEntityList = iDbCacheRepository.selectList(new QueryWrapper().lambda().select(DbCacheEntity::getKey).like(DbCacheEntity::getKey, keyPrefix)); + List dbCacheEntityList = iDbCacheRepository.selectList(new QueryWrapper().lambda().select(DbCacheEntity::getK).like(DbCacheEntity::getK, keyPrefix)); //判空 if (CollectionUtils.isNotEmpty(dbCacheEntityList)) { //初始化 @@ -285,11 +285,11 @@ public class DbCacheService { //遍历 for (DbCacheEntity dbCacheEntity : dbCacheEntityList) { //获得缓存实体 - DbCacheEntity entity = getEntity(dbCacheEntity.getKey()); + DbCacheEntity entity = getEntity(dbCacheEntity.getK()); //判空 if (entity != null) { //放入结果集 - rv.add(entity.getValue()); + rv.add(entity.getV()); } } } @@ -309,7 +309,7 @@ public class DbCacheService { //获得缓存实体 DbCacheEntity entity = getEntity(key); //返回 - return entity == null ? null : entity.getValue(); + return entity == null ? null : entity.getV(); } /** diff --git a/udf-starter/udf-starter-cache-db/src/main/resources/mapper/IDbCacheRepository.xml b/udf-starter/udf-starter-cache-db/src/main/resources/mapper/IDbCacheRepository.xml index 3aa093f..a7cb161 100644 --- a/udf-starter/udf-starter-cache-db/src/main/resources/mapper/IDbCacheRepository.xml +++ b/udf-starter/udf-starter-cache-db/src/main/resources/mapper/IDbCacheRepository.xml @@ -4,6 +4,6 @@ DELETE FROM TF_DB_CACHE A - WHERE A.EXPIRE_TIME (TO_NUMBER(SYSDATE - TO_DATE('1970-01-01 8:0:0', 'YYYY-MM-DD HH24:MI:SS')) * 24 * 60 * 60 * 1000) + WHERE A.EXPIRE_TIME REPLACE(unix_timestamp(NOW(3)),'.','') - \ No newline at end of file + diff --git a/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/entity/DbFileInfoEntity.java b/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/entity/DbFileInfoEntity.java index df0ee70..ebced29 100644 --- a/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/entity/DbFileInfoEntity.java +++ b/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/entity/DbFileInfoEntity.java @@ -97,8 +97,8 @@ public class DbFileInfoEntity { /** * 创建时间(这里单词写错,多多包涵) */ - @TableField("CRETE_DATE") - private Date creteDate; + @TableField("CREATE_DATE") + private Date createDate; /** * 更新人 diff --git a/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/service/DbFileService.java b/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/service/DbFileService.java index 81576e1..0ef8c89 100644 --- a/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/service/DbFileService.java +++ b/udf-starter/udf-starter-file-db/src/main/java/org/itkk/udf/starter/file/db/service/DbFileService.java @@ -180,7 +180,7 @@ public class DbFileService { .setBusinessPath(businessPath) .setPreviewPdfFileId(previewPdfFileId) .setCreateBy(userId) - .setCreteDate(new Date()) + .setCreateDate(new Date()) .setUpdateBy(userId) .setUpdateDate(new Date()); iDbFileInfoRepository.insert(dbFileInfoEntity); diff --git a/udf-starter/udf-starter-queue-db/src/main/resources/mapper/IDbQueueRepository.xml b/udf-starter/udf-starter-queue-db/src/main/resources/mapper/IDbQueueRepository.xml index 5c6ca33..2aae8c1 100644 --- a/udf-starter/udf-starter-queue-db/src/main/resources/mapper/IDbQueueRepository.xml +++ b/udf-starter/udf-starter-queue-db/src/main/resources/mapper/IDbQueueRepository.xml @@ -9,16 +9,13 @@ AND A.STATUS = 2 - \ No newline at end of file +