From 71da3c6702f18cfa6fc95c882bc7de32d9829511 Mon Sep 17 00:00:00 2001 From: wangyi15124 Date: Sat, 19 Feb 2022 19:54:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectController.java | 30 +++++-- src/main/resources/static/common/common.js | 4 +- .../resources/static/dist/js/sidebarmenu.js | 86 ++++++++++--------- src/main/resources/static/dist/project.js | 2 +- .../projectCenter/createProject.html | 21 +++-- .../templates/projectCenter/editProject.html | 30 ++++--- .../projectCenter/projectlistDetail.html | 4 +- 7 files changed, 104 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/stonedt/intelligence/controller/ProjectController.java b/src/main/java/com/stonedt/intelligence/controller/ProjectController.java index 294faa2..3e9a7e7 100644 --- a/src/main/java/com/stonedt/intelligence/controller/ProjectController.java +++ b/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 paramMap = new LinkedMultiValueMap(); -// 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 paramMap = new LinkedMultiValueMap(); + 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 paramMap = new LinkedMultiValueMap(); + 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 + } + diff --git a/src/main/resources/static/common/common.js b/src/main/resources/static/common/common.js index 17c7817..d953844 100644 --- a/src/main/resources/static/common/common.js +++ b/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 = '
  • 新建监测方案组
    • '; + let groupStrAll = '
  • 新建监测方案
    • '; 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 = '
  • 新建监测方案组
    • '; + let addGroup = '
  • 新建监测方案
    • '; // groupStrAll = addGroup + groupStrAll; groupStrAll = groupStrAll; } diff --git a/src/main/resources/static/dist/js/sidebarmenu.js b/src/main/resources/static/dist/js/sidebarmenu.js index 03c024d..df87044 100644 --- a/src/main/resources/static/dist/js/sidebarmenu.js +++ b/src/main/resources/static/dist/js/sidebarmenu.js @@ -38,47 +38,51 @@ $("#sidebarnav .sidebar-item").mouseleave(function () { function createNewPro(params) { - var create = - '
    ' + - '
    ' + - '
    ' + - '
    ' + - '
    创建新方案组
    ' + - ' ' + - '
    ' + - '
    ' + - '
    ' + - ' ' + - ' ' + - '
    ' + - '
    ' + - '
    ' + - ' ' + - ' ' + - '
    ' + - '
    ' + - '
    ' + - '
    ' - - $("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 = +// '
    ' + +// '
    ' + +// '
    ' + +// '
    ' + +// '
    创建新方案组
    ' + +// ' ' + +// '
    ' + +// '
    ' + +// '
    ' + +// ' ' + +// ' ' + +// '
    ' + +// '
    ' + +// '
    ' + +// ' ' + +// ' ' + +// '
    ' + +// '
    ' + +// '
    ' + +// '
    ' +// +// $("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() +// } +// }) } //创建方案组 diff --git a/src/main/resources/static/dist/project.js b/src/main/resources/static/dist/project.js index ad922df..9182327 100644 --- a/src/main/resources/static/dist/project.js +++ b/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 = '
  • 新建监测方案组
    • '; + let addGroup = '
  • 新建监测方案
    • '; groupInfo = addGroup; // 整的左侧方案组列表 if (code == 200) { let data = res.data; diff --git a/src/main/resources/templates/projectCenter/createProject.html b/src/main/resources/templates/projectCenter/createProject.html index 8e4c3f1..e5e1590 100644 --- a/src/main/resources/templates/projectCenter/createProject.html +++ b/src/main/resources/templates/projectCenter/createProject.html @@ -200,7 +200,7 @@ -
    + + +
    监测屏蔽歧义词 @@ -297,8 +297,8 @@
    -
    -
    +
    --> + +
    @@ -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"); diff --git a/src/main/resources/templates/projectCenter/projectlistDetail.html b/src/main/resources/templates/projectCenter/projectlistDetail.html index b32aab5..304b441 100644 --- a/src/main/resources/templates/projectCenter/projectlistDetail.html +++ b/src/main/resources/templates/projectCenter/projectlistDetail.html @@ -90,7 +90,7 @@ 主体关键词 - + 监测屏蔽歧义词 计算机病毒、杀毒软件