静态页面修改

src/main/java/com/stonedt/intelligence/controller/ProjectController.java

@@ -474,13 +474,17 @@ public class ProjectController {
                         }
                    }
                 	}
-                	
-//                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);
+                	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
+					}
+                
             } else {
                 response.put("code", 500);
                 response.put("msg", "方案新增失败");
@@ -659,7 +663,17 @@ public class ProjectController {
             	
             	
             }
-            
+            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
+			}
+           
            
             
 

src/main/resources/static/common/common.js

@@ -71,7 +71,7 @@ function installGroupAndProject(res) {
         let flag = res.flag;
         projectFlag = flag;
         if (data.length > 0) {
-            let groupStrAll = '<li class="p-15"><a onclick="createNewPro()" class="btn btn-block create-btn text-white d-flex align-items-center"><i class="fa fa-plus-square"></i><span class="hide-menu m-l-10">新建监测方案组</span></a></li>';
+            let groupStrAll = '<li class="p-15"><a onclick="createNewPro()" class="btn btn-block create-btn text-white d-flex align-items-center"><i class="fa fa-plus-square"></i><span class="hide-menu m-l-10">新建监测方案</span></a></li>';
             for (let i = 0; i < data.length; i++) {
                 let dataJson = data[i];
                 for (let key in dataJson) {
@@ -146,7 +146,7 @@ function installGroupAndProject(res) {
                 }
             }
             if (common_menu == 'project') {
-                let addGroup = '<li class="p-15"><a onclick="createNewPro()" class="btn btn-block create-btn text-white d-flex align-items-center"><i class="fa fa-plus-square"></i><span class="hide-menu m-l-10">新建监测方案组</span></a></li>';
+                let addGroup = '<li class="p-15"><a onclick="createNewPro()" class="btn btn-block create-btn text-white d-flex align-items-center"><i class="fa fa-plus-square"></i><span class="hide-menu m-l-10">新建监测方案</span></a></li>';
                 // groupStrAll =  addGroup + groupStrAll;
                 groupStrAll = groupStrAll;
             }

src/main/resources/static/dist/js/sidebarmenu.js

@@ -38,47 +38,51 @@ $("#sidebarnav .sidebar-item").mouseleave(function () {
 
 
 function createNewPro(params) {
-    var create =
-        '<div class="shadebox" id="createmodel">' +
-        '    <div class="modal-dialog" role="document">' +
-        '        <div class="modal-content">' +
-        '            <div class="modal-header align-flexend" style="border:none">' +
-        '                <h5 class="modal-title"><i class="ti-marker-alt m-r-10"></i>创建新方案组</h5>' +
-        '                <i class="mdi mdi-close-circle-outline font-18 cursor-po" id="closethis"></i>' +
-        '            </div>' +
-        '            <div class="modal-body">' +
-        '                <div class="input-group mb-3">' +
-        '                    <button type="button" class="btn " style="background:#cfcfd0"><i class="mdi mdi-mailbox text-white"></i></button>' +
-        '                    <input type="text" class="form-control" id="projectName" placeholder="输入方案组名称，最六个字符" maxlength="10">' +
-        '                </div>' +
-        '            </div>' +
-        '            <div class="modal-footer" style="border:none">' +
-        '                <button type="button" class="btn btn-info" id="confirm"> 确定</button>' +
-        '                <button type="button" class="btn btn-secondary" id="cancel">取消</button>' +
-        '             </div>' +
-        '        </div>' +
-        '    </div>' +
-        '</div>'
-
-    $("body").append(create)
-    $("#closethis").click(function (param) {
-        $("#createmodel").remove()
-    })
-    $("#cancel").click(function (param) {
-        $("#createmodel").remove()
-    })
-    $("#confirm").click(function () {
-        var name = $("#projectName").val()
-        if (name == '' || name == undefined||name=="") {
-            showtips("方案组名称不能为空！")
-        }else if (name.length>6) {
-            showtips("方案组名称长度最多六个字符")
-        }else {
-            createSolutionGroup(name);
-            console.log(name)
-            $("#createmodel").remove()
-        }
-    })
+	
+	
+	window.location.href = ctxPath + "project/addproject?groupid="
+	
+//    var create =
+//        '<div class="shadebox" id="createmodel">' +
+//        '    <div class="modal-dialog" role="document">' +
+//        '        <div class="modal-content">' +
+//        '            <div class="modal-header align-flexend" style="border:none">' +
+//        '                <h5 class="modal-title"><i class="ti-marker-alt m-r-10"></i>创建新方案组</h5>' +
+//        '                <i class="mdi mdi-close-circle-outline font-18 cursor-po" id="closethis"></i>' +
+//        '            </div>' +
+//        '            <div class="modal-body">' +
+//        '                <div class="input-group mb-3">' +
+//        '                    <button type="button" class="btn " style="background:#cfcfd0"><i class="mdi mdi-mailbox text-white"></i></button>' +
+//        '                    <input type="text" class="form-control" id="projectName" placeholder="输入方案组名称，最六个字符" maxlength="10">' +
+//        '                </div>' +
+//        '            </div>' +
+//        '            <div class="modal-footer" style="border:none">' +
+//        '                <button type="button" class="btn btn-info" id="confirm"> 确定</button>' +
+//        '                <button type="button" class="btn btn-secondary" id="cancel">取消</button>' +
+//        '             </div>' +
+//        '        </div>' +
+//        '    </div>' +
+//        '</div>'
+//
+//    $("body").append(create)
+//    $("#closethis").click(function (param) {
+//        $("#createmodel").remove()
+//    })
+//    $("#cancel").click(function (param) {
+//        $("#createmodel").remove()
+//    })
+//    $("#confirm").click(function () {
+//        var name = $("#projectName").val()
+//        if (name == '' || name == undefined||name=="") {
+//            showtips("方案组名称不能为空！")
+//        }else if (name.length>6) {
+//            showtips("方案组名称长度最多六个字符")
+//        }else {
+//            createSolutionGroup(name);
+//            console.log(name)
+//            $("#createmodel").remove()
+//        }
+//    })
 }
 
 //创建方案组

src/main/resources/static/dist/project.js

@@ -64,7 +64,7 @@ function getProjectsearch(res) {
 function installGroup(res) {
     let code = res.code;
     let groupInfo = '';
-    let addGroup = '<li class="p-15"><a onclick="createNewPro()" class="btn btn-block create-btn text-white d-flex align-items-center"><i class="fa fa-plus-square"></i><span class="hide-menu m-l-10">新建监测方案组</span></a></li>';
+    let addGroup = '<li class="p-15"><a onclick="createNewPro()" class="btn btn-block create-btn text-white d-flex align-items-center"><i class="fa fa-plus-square"></i><span class="hide-menu m-l-10">新建监测方案</span></a></li>';
     groupInfo = addGroup;  // 整的左侧方案组列表
     if (code == 200) {
         let data = res.data;

src/main/resources/templates/projectCenter/createProject.html

@@ -200,7 +200,7 @@
                                         </a>
                                     </div>
                                 </div>
-                                <div class="create-line2 m-b-20">
+                                <!-- <div class="create-line2 m-b-20">
                                     <span>国家/城市/地域 关键词</span>
                                     <textarea class="form-control" name="" id="proarea" rows="4"
                                               placeholder='关键词之间用逗号","隔开;例如：美国，上海，北京，滕家沟，南京西路'></textarea>
@@ -211,8 +211,8 @@
                                             <i class="fa fa-question-circle"></i>
                                         </a>
                                     </div>
-                                </div>
-                                <div class="create-line2 m-b-20">
+                                </div> -->
+                                <!-- <div class="create-line2 m-b-20">
                                     <span>人物/机构/企业 关键词</span>
                                     <textarea class="form-control" name="" id="properson" rows="4"
                                               placeholder='关键词之间用逗号","隔开；例如：马云，北京网安中心，腾讯科技'></textarea>
@@ -223,8 +223,8 @@
                                             <i class="fa fa-question-circle"></i>
                                         </a>
                                     </div>
-                                </div>
-                                <div class="create-line2 m-b-20">
+                                </div> -->
+                                <!-- <div class="create-line2 m-b-20">
                                     <span>事件/动词 关键词</span>
                                     <textarea class="form-control" name="" id="proaccident" rows="4"
                                               placeholder='关键词之间用逗号","隔开；例如：高管离职，拖欠工资，跑路，开销，焦虑'></textarea>
@@ -235,7 +235,7 @@
                                             <i class="fa fa-question-circle"></i>
                                         </a>
                                     </div>
-                                </div>
+                                </div> -->
                                 <div class="create-line2 m-b-20">
                                     <span>监测屏蔽歧义词</span>
                                     <textarea class="form-control" name="" id="proshield" rows="4"
@@ -495,9 +495,12 @@ $("#currentyear").text((new Date()).getFullYear());
     $("#gosubmit").click(function () {
         var proname = $("#proname").val();
         var prokeywords = $("#prokeywords").val();
-        var properson = $("#properson").val();
-        var proarea = $("#proarea").val();
-        var proaccident = $("#proaccident").val();
+       // var properson = $("#properson").val();
+        var properson = '';
+        //var proarea = $("#proarea").val();
+        var proarea = '';
+        //var proaccident = $("#proaccident").val();
+        var proaccident = '';
         var proshield = $("#proshield").val();
         if (proname == '') {
             $("#proname").addClass("text-error");

src/main/resources/templates/projectCenter/editProject.html

@@ -286,7 +286,7 @@
                                         </a>
                                     </div>
                                 </div>
-                                <div class="create-line2 m-b-20">
+                                <!-- <div class="create-line2 m-b-20">
                                     <span>国家/城市/地域 关键词</span>
                                     <textarea class="form-control" name="" id="proarea" rows="4"
                                               placeholder='关键词之间用逗号","隔开;例如：美国，上海，北京，滕家沟，南京西路'></textarea>
@@ -297,8 +297,8 @@
                                             <i class="fa fa-question-circle"></i>
                                         </a>
                                     </div>
-                                </div>
-                                <div class="create-line2 m-b-20">
+                                </div> -->
+                                <!-- <div class="create-line2 m-b-20">
                                     <span>人物/机构/企业 关键词</span>
                                     <textarea class="form-control" name="" id="properson" rows="4"
                                               placeholder='关键词之间用逗号","隔开；例如：马云，北京网安中心，腾讯科技'></textarea>
@@ -309,8 +309,8 @@
                                             <i class="fa fa-question-circle"></i>
                                         </a>
                                     </div>
-                                </div>
-                                <div class="create-line2 m-b-20">
+                                </div> -->
+                               <!--  <div class="create-line2 m-b-20">
                                     <span>事件/动词 关键词</span>
                                     <textarea class="form-control" name="" id="proaccident" rows="4"
                                               placeholder='关键词之间用逗号","隔开；例如：高管离职，拖欠工资，跑路，开销，焦虑'></textarea>
@@ -321,7 +321,7 @@
                                             <i class="fa fa-question-circle"></i>
                                         </a>
                                     </div>
-                                </div>
+                                </div> -->
                                 <div class="create-line2 m-b-20">
                                     <!--<span>监测屏蔽歧义词</span>-->
                                     <span>
@@ -426,9 +426,15 @@ $("#currentyear").text((new Date()).getFullYear());
                     let stop_word = data.stop_word;
                     let project_name = data.project_name;
                     let group_name = data.group_name;
-                    let character_word = data.character_word;
+                    /* let character_word = data.character_word;
                     let event_word = data.event_word;
-                    let regional_word = data.regional_word;
+                    let regional_word = data.regional_word; */
+                    let character_word = '';
+                    let event_word = '';
+                    let regional_word = '';
+                    
+                    
+                    
                     let precise = data.precise;
 
                     if (project_type == 1) { // 高级方案
@@ -592,9 +598,13 @@ $("#currentyear").text((new Date()).getFullYear());
     $("#gosubmit").click(function () {
         var proname = $("#proname").val();
         var prokeywords = $("#prokeywords").val();
-        var properson = $("#properson").val();
+        /* var properson = $("#properson").val();
         var proarea = $("#proarea").val();
-        var proaccident = $("#proaccident").val();
+        var proaccident = $("#proaccident").val(); */
+        
+        var properson = '';
+        var proarea = '';
+        var proaccident = '';
         var proshield = $("#proshield").val();
         if (proname == '') {
             $("#proname").addClass("text-error");

src/main/resources/templates/projectCenter/projectlistDetail.html

@@ -90,7 +90,7 @@
 	                                    <td>主体关键词</td>
 	                                    <td th:text="${projectDetail.subject_word}"> </td>
 	                                </tr>
-	                                <th:block th:if='${projectDetail.project_type == 2}'>
+	                                <!-- <th:block th:if='${projectDetail.project_type == 2}'>
 	                                    <tr>
 	                                        <td>国家/城市/地域 关键词</td>
 	                                        <td th:text="${projectDetail.regional_word}"> 江苏省、江苏、南京、南京市、中国 、大陆、中国境内</td>
@@ -107,7 +107,7 @@
 	                                        <td>事件/动词 关键词</td>
 	                                        <td th:text="${projectDetail.event_word}"> 疫情、新冠状病毒、病毒、美股、美股熔断、自然灾害、蝗虫灾害</td>
 	                                    </tr>
-	                                </th:block>
+	                                </th:block> -->
 	                                <tr>
 	                                    <td>监测屏蔽歧义词</td>
 	                                    <td th:text="${projectDetail.stop_word}">计算机病毒、杀毒软件</td>