From 8d826b38ddcd3b7d1b462f0bec7070354edd5935 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Jun 2020 18:33:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ArticleServiceImpl.java | 2 +- .../src/main/resources/migration/epmet_gov_voice.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 3435a1581d..bfc9a6ade6 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -1068,7 +1068,7 @@ public class ArticleServiceImpl extends BaseServiceImpl successDataIds = syncScanResult.getSuccessDataIds(); successDataIds.forEach(id -> { - if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= 0) { + if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= NumConstant.ZERO) { draftCoverDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_PASS); } else { draftContentDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_PASS); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql index 4cdfcba0f6..ee10a0fac4 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql @@ -39,7 +39,7 @@ INSERT INTO `epmet_gov_voice`.`tag_default`(`ID`, `TAG_NAME`, `DEL_FLAG`, `REVIS INSERT INTO `epmet_gov_voice`.`tag_default`(`ID`, `TAG_NAME`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES (REPLACE(UUID(),'-',''), '生活服务', 0, 0, 'default', NOW(), 'default', NOW()); INSERT INTO `epmet_gov_voice`.`tag_default`(`ID`, `TAG_NAME`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES (REPLACE(UUID(),'-',''), '党建要闻', 0, 0, 'default', NOW(), 'default', NOW()); -ALTER TABLE tag_customer ADD INDEX INX_TAG_NAME(TAG_NAME); +ALTER TABLE tag_customer ADD UNIQUE UNX_TAG_NAME(CUSTOMER_ID,TAG_NAME); ALTER TABLE tag_customer COMMENT '客户标签表'; CREATE TABLE tag_grid( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , From 0c84457c5ce630b522dbd56afe6aeae480214056 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Jun 2020 18:36:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?gov=5Fvoice=E6=B7=BB=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/GovVoiceApplication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java index 2adaacc1c8..db1073c8e8 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java @@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.scheduling.annotation.EnableAsync; /** * @@ -13,6 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients +@EnableAsync public class GovVoiceApplication { public static void main(String[] args) { SpringApplication.run(GovVoiceApplication.class, args); From 5a34dde4cb94648b50397b0ef3e03a95c493e64a Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 11 Jun 2020 10:35:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ERR10002=E9=94=99=E8=AF=AF=E7=A0=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=81=E5=88=9D=E5=A7=8B=E5=8C=96=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java | 2 ++ .../src/main/resources/mapper/TagCustomerDao.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 89fdb4cf19..0df23a82f1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -6,6 +6,8 @@ package com.epmet.commons.tools.exception; * @Description: */ public enum EpmetErrorCode { + + ERR10002( 10002,"数据库中已存在该记录"), /** * 账号或密码错误ACCOUNT_NOT_EXIST */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml index f1a9ed06ca..b7db9517c9 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml @@ -33,6 +33,8 @@ #{tag.id},#{tag.customerId}, #{tag.tagName}, #{tag.useCount}, #{tag.delFlag}, #{tag.revision}, #{tag.createdBy}, NOW(), #{tag.updatedBy}, NOW() ) + ON DUPLICATE KEY UPDATE + UPDATED_TIME = NOW() \ No newline at end of file From 35a95f07eeb76b829330cd1314d2737413c3ee4e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 11 Jun 2020 10:38:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9openApi=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 ++ .../java/com/epmet/service/impl/ArticleServiceImpl.java | 8 ++++---- .../gov-voice-server/src/main/resources/bootstrap.yml | 2 +- .../epmet/openapi/scan/common/enu/SysResponseEnum.java | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index ae10e72c5e..1284d33f70 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -134,6 +134,7 @@ false + http://localhost:8107/epmetscan/api @@ -166,6 +167,7 @@ true + http://localhost:8107/epmetscan/api diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index bfc9a6ade6..74915f7882 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -121,8 +121,8 @@ public class ArticleServiceImpl extends BaseServiceImpl Date: Thu, 11 Jun 2020 10:44:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/constant/TagConstant.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java index 494ec2c154..b5e1375746 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java @@ -18,22 +18,22 @@ public interface TagConstant { /** * 客户维度（政府端） 热度标签 key的前缀 【zset】 */ - String GOV_TAG_KEY = "epmet:customer:articletag:"; + String GOV_TAG_KEY = "epmet:tags:customer:rankingTag:"; /** * 客户维度（政府端） 关联标签 key的前缀 【set】 */ - String GOV_RETAG_KEY = "epmet:customer:article:retag:"; + String GOV_RETAG_KEY = "epmet:tags:customer:relationTag:"; /** - * 网格热度标签 key的前缀 【zset】 + * 网格热度标签（居民端） key的前缀 【zset】 */ - String GRID_TAG_KEY = "epmet:grid:articletag:"; + String GRID_TAG_KEY = "epmet:tags:grid:rankingTag:"; /** - * 政府——关联标签 key的前缀 【set】 + * 网格关联标签（居民端） key的前缀 【set】 */ - String GRID_RETAG_KEY ="epmet:grid:article:retag:"; + String GRID_RETAG_KEY ="epmet:tags:grid:relationTag:"; /** * 冒号