From b42ec019fbf0ff13577e3c5047a1e87db8ba71f9 Mon Sep 17 00:00:00 2001
From: wangyi15124 <wiaini83321394>
Date: Sun, 20 Mar 2022 13:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=86=E6=9E=90=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PublicOptionContoller.java          | 26 +++++++++++++++++++++-
 .../intelligence/quartz/publicoptionQuartz.java    |  2 +-
 .../templates/publicoption/eventAnalysisList.html  |  8 +++----
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/stonedt/intelligence/controller/PublicOptionContoller.java b/src/main/java/com/stonedt/intelligence/controller/PublicOptionContoller.java
index ce74e77..918f535 100644
--- a/src/main/java/com/stonedt/intelligence/controller/PublicOptionContoller.java
+++ b/src/main/java/com/stonedt/intelligence/controller/PublicOptionContoller.java
@@ -14,12 +14,15 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.fastjson.JSON;
@@ -31,6 +34,8 @@ import com.stonedt.intelligence.entity.PublicoptionDetailEntity;
 import com.stonedt.intelligence.entity.PublicoptionEntity;
 import com.stonedt.intelligence.entity.User;
 import com.stonedt.intelligence.service.PublicOptionService;
+import com.stonedt.intelligence.util.MyHttpRequestUtil;
+import com.stonedt.intelligence.util.ProjectWordUtil;
 import com.stonedt.intelligence.util.TextUtil;
 import com.stonedt.intelligence.aop.SystemControllerLog;
 /**
@@ -45,7 +50,11 @@ public class PublicOptionContoller {
 	private PublicOptionService publicOptionService;
 	 
 	
-	
+	@Value("${kafuka.url}")
+    private String kafuka_url;
+
+    @Value("${insertnewwords.url}")
+    private String insert_new_words_url;
 	
 	/**
 	 * 舆情研判分析详情任务列表
@@ -217,6 +226,21 @@ public class PublicOptionContoller {
 		User user = (User) session.getAttribute("User");
 		
 		
+		
+		
+		String message = ProjectWordUtil.CommononprojectKeyWord(eventkeywords);
+		
+		try {
+            String kafukaResponse = MyHttpRequestUtil.doPostKafka("ikHotWords", message, kafuka_url);
+            RestTemplate template = new RestTemplate();
+            MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
+            paramMap.add("text", message);
+            String result = template.postForObject(insert_new_words_url, paramMap, String.class);
+            System.out.println("result========================="+result);
+        } catch (Exception e) {
+            // TODO: handle exception
+        }
+		
 		String result =publicOptionService.addpublicoptiondata(user.getUser_id(),eventname,eventkeywords,eventstarttime,eventendtime,eventstopwords);
 		
 		return result;
diff --git a/src/main/java/com/stonedt/intelligence/quartz/publicoptionQuartz.java b/src/main/java/com/stonedt/intelligence/quartz/publicoptionQuartz.java
index f5fde07..f6979f5 100644
--- a/src/main/java/com/stonedt/intelligence/quartz/publicoptionQuartz.java
+++ b/src/main/java/com/stonedt/intelligence/quartz/publicoptionQuartz.java
@@ -67,7 +67,7 @@ public class publicoptionQuartz {
      * 舆情研判
      */
 //    @PostConstruct
-    @Scheduled(cron = "0 0/2 * * * ?")
+    @Scheduled(cron = "0 0/10 * * * ?")
     public void popularInformation() {
         if (schedule_publicoption_open == 1) {
         	//publicoptionevent
diff --git a/src/main/resources/templates/publicoption/eventAnalysisList.html b/src/main/resources/templates/publicoption/eventAnalysisList.html
index eccb895..d11454a 100644
--- a/src/main/resources/templates/publicoption/eventAnalysisList.html
+++ b/src/main/resources/templates/publicoption/eventAnalysisList.html
@@ -247,13 +247,13 @@
 		            '</div>';
 	            }else if(list[i].status==2){
 	            	eventAnalysisliststr+= '<div>'+
-	                '<i class="mdi mdi-close-circle zx"></i>'+
-	                '正在创建'+
+	                '<i class="mdi mdi-close-circle-outline zx"></i>'+
+	                '正在生成'+
 	            '</div>';
 	            }else if(list[i].status==3){
 	            	eventAnalysisliststr+= '<div>'+
-	                '<i class="mdi mdi-close-circle zx"></i>'+
-	                '创建成功'+
+	                '<i class="mdi mdi-check-circle-outline zx"></i>'+
+	                '生成成功'+
 	            '</div>';
 	            	
 	            }