Merge remote-tracking branch 'remotes/origin/dev_voice' into dev

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
 	 */

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -134,6 +134,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <openapi.scan.server.url>http://localhost:8107/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
         <profile>
@@ -166,6 +167,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <openapi.scan.server.url>http://localhost:8107/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
     </profiles>

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);

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:";
 
     /**
      * 冒号

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<ArticleDao, ArticleEntit
 	@Autowired
 	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
-	@Value("${openapi.scan.server.host}")
-	private String scanApiHost;
+	@Value("${openapi.scan.server.url}")
+	private String scanApiUrl;
 	@Value("${openapi.scan.method.imgSyncScan}")
 	private String imgSyncScanMethod;
 	@Value("${openapi.scan.method.textSyncScan}")
@@ -974,12 +974,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 			if(!CollectionUtils.isEmpty(imgScanParamDTO.getTasks())){
 			log.info("scanContent imgScanParamDTO:{}", JSON.toJSONString(imgScanParamDTO));
-				imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiHost.concat(imgSyncScanMethod), imgScanParamDTO);
+				imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
 				log.info("scanContent imgSyncScanResult:{}", JSON.toJSONString(imgSyncScanResult));
 			}
 			if(!CollectionUtils.isEmpty(textScanParamDTO.getTasks())){
 			log.info("scanContent textScanParamDTO:{}", JSON.toJSONString(textScanParamDTO));
-				textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost.concat(textSyncScanMethod), textScanParamDTO);
+				textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
 				log.info("scanContent textSyncScanResult:{}", JSON.toJSONString(textSyncScanResult));
 			}
 
@@ -1068,7 +1068,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 			List<String> 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);

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -106,7 +106,7 @@ ribbon:
 openapi:
   scan:
     server:
-      host: http://localhost:8107/epmetscan/api
+      url: @openapi.scan.server.url@
     method:
       imgSyncScan: /imgSyncScan
       textSyncScan: /textSyncScan

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()
             )
         </foreach>
+        ON DUPLICATE KEY UPDATE
+        UPDATED_TIME = NOW()
     </insert>
 
 </mapper>

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' ,

epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java

@@ -20,7 +20,6 @@ public enum SysResponseEnum {
 	 */
 	/*通用枚举 */
 	EXCEPTION(10001,"系统异常"),
-	AUTH_FAIL(10002,"验签失败"),
 
 
 	/*审核内容 业务 01*/