优化更新

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

@@ -445,13 +445,12 @@ public class ProjectController {
                 String message = "";
                 
                 if(CommonJson.getIntValue("project_type") == 1){
-                	message = ProjectWordUtil.CommononprojectKeyWord(kafukaJson.getString("subject_word"));
+                    message = ProjectWordUtil.CommononprojectKeyWord(kafukaJson.getString("subject_word"));
                 }else {
-                	
-                	if(kafukaJson.getString("subject_word").indexOf("\\|")!=-1||kafukaJson.getString("subject_word").indexOf("+")!=-1) {
+                    if(kafukaJson.getString("subject_word").indexOf("\\|")!=-1||kafukaJson.getString("subject_word").indexOf("+")!=-1) {
                 		message = ProjectWordUtil.CommononprojectKeyWord(kafukaJson.getString("subject_word"));
                 	}else {
-                		kafukaJson.remove("project_type");
+                        kafukaJson.remove("project_type");
                         kafukaJson.remove("group_id");
                         kafukaJson.remove("project_name");
                         for (Map.Entry entry : kafukaJson.entrySet()) {
@@ -473,18 +472,18 @@ 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
-					}
-                
+                }
+                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
+                }
+                return response;
             } else {
                 response.put("code", 500);
                 response.put("msg", "方案新增失败");

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

@@ -86,7 +86,9 @@ public class UserController {
                             @RequestParam("newPassword") String newPassword, HttpSession session) {
         User user = (User) session.getAttribute("User");
         if (MD5Util.getMD5(oldPassword).equals(user.getPassword())) {
-            boolean updateUserPwdById = userService.updateUserPwdById(user.getUser_id(), MD5Util.getMD5(newPassword));
+            //开源版本暂时不支持修改密码
+            //boolean updateUserPwdById = userService.updateUserPwdById(user.getUser_id(), MD5Util.getMD5(newPassword));
+            boolean updateUserPwdById = true;
             if (updateUserPwdById) {
                 return ResultUtil.build(200, "密码修改成功！");
             } else {

src/main/resources/mapper/ProjectMapper.xml

@@ -95,7 +95,7 @@
     </select>
 
     <select id="getProjectAndGroupInfoByUserId" resultType="map" parameterType="map">
-        SELECT date_format(project.create_time, '%Y-%m-%d') AS create_time,project.project_id,project.project_name,
+        SELECT date_format(project.create_time, '%Y-%m-%d %H:%i:%s') AS create_time,project.project_id,project.project_name,
 
         project.character_word, project.event_word, project.regional_word, project.stop_word,project.subject_word,
 

src/main/resources/static/dist/css/custom.css

@@ -714,9 +714,9 @@ a {
 }
 
 .project-times {
-    width: 200px;
-    text-align: center;
-    padding: 0 20px;
+    width: 250px;
+    text-align: left;
+    /*padding: 0 40px;*/
 }
 .project-handle{
 	width: 200px;

src/main/resources/templates/common/header.html

@@ -115,6 +115,19 @@
                         </svg>
                     </a>
                 </li> -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle text-muted waves-effect waves-dark pro-pic" id="iPhone">
+                        <svg t="1645517749496" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5425" width="600" height="600"><path d="M925.375198 814.828718c-15.353678-44.43535-37.751984-85.980596-66.653025-123.55195-28.539778-37.21009-62.679132-69.362498-101.334274-95.734697-35.223143-24.02399-73.697654-42.809667-114.159111-55.634504 40.280826-22.398307 74.239548-54.189451 98.986065-92.663961 28.359146-44.074087 43.351561-95.012171 43.351561-147.57594C785.566414 147.395308 661.833833 23.482096 509.922738 23.482096 357.650379 23.482096 233.737167 147.395308 233.737167 299.667666c0 52.383136 14.992415 103.321221 43.351561 147.395308 24.927148 38.655142 58.885871 70.626918 98.986065 92.844593-40.461457 13.005468-78.574705 31.610513-113.97848 55.634504-38.655142 26.3722-72.794496 58.524608-101.514905 95.734697-28.901041 37.571353-51.479979 79.116599-66.833657 123.55195-16.076204 46.061034-24.204622 94.289645-24.204622 143.421414 0 23.120833 18.966308 42.087141 42.087141 42.087141s42.087141-18.966308 42.08714-42.087141c0-195.985183 159.497619-355.482801 355.482802-355.482801S864.683013 762.26495 864.683013 958.250132c0 23.120833 18.966308 42.087141 42.08714 42.087141s42.087141-18.966308 42.087141-42.087141c0.361263-49.131769-7.586523-97.360381-23.482096-143.421414z m-223.983065-515.341683c0 105.488799-85.799965 191.469395-191.469395 191.469395h-0.903158c-50.576821 0-98.263539-19.688834-134.209208-55.453872-36.306932-36.126301-56.357029-84.354913-56.357029-135.473629 0-105.850062 85.799965-192.011289 191.469395-192.011289s191.469395 85.799965 191.469395 191.469395z" p-id="5426"></path></svg>
+                        联系
+                    </a>
+
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle text-muted waves-effect waves-dark pro-pic" id="gitee">
+                        <svg t="1645517814394" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6372" width="600" height="600"><path d="M978.467145 409.613653H455.100998v0.011378A45.5101 45.5101 0 0 0 409.590898 455.123753l-0.04551 113.775249a45.5101 45.5101 0 0 0 45.5101 45.521478L773.671696 614.409102a45.5101 45.5101 0 0 1 45.5101 45.5101v22.75505c0 75.398858-61.131442 136.530299-136.530299 136.530299H250.271416a45.5101 45.5101 0 0 1-45.5101-45.5101V341.348503h-0.011377c0-75.398858 61.120064-136.530299 136.530299-136.530299h637.061754v-0.022755a45.5101 45.5101 0 0 0 45.5101-45.487345l0.102398-113.775249H1023.977245a45.5101 45.5101 0 0 0-45.5101-45.532855L341.325748 0.022755C152.822915 0.022755 0 152.84567 0 341.348503v637.141397a45.5101 45.5101 0 0 0 45.5101 45.5101h671.273971c169.661652 0 307.193173-137.531522 307.193174-307.193173V455.123753a45.5101 45.5101 0 0 0-45.5101-45.5101z" p-id="6373"></path></svg>
+                        源码
+                    </a>
+                </li>
                 <li class="nav-item dropdown">
                     <!-- onclick=(countDown()) -->
                     <a class="nav-link dropdown-toggle waves-effect  waves-dark" href="javascript:void(0)"
@@ -227,6 +240,12 @@
             </ul>
         </div>
     </nav>
+    <div class="" id="iPhoneQRCode" style="display: none;position: absolute;left: 50%;transform: translateX(-50%);top: 300%;">
+        <img style="width: 300px;" th:src="@{/assets/images/users/stonedtQRCode.jpg}">
+        <div>
+            <h3 style="text-align: center">联系我们</h3>
+        </div>
+    </div>
     <!--     drop-search  -->
     <div class="animated bounceInDown shadebox" style="display: none;" id="search">
         <div class="drop-search-box">
@@ -275,10 +294,31 @@
         var ctxPath = /*[[@{/}]]*/'';
         countDown();
         getSystemTitle();
-        
-        
-        
-        
+
+        var gitee = document.getElementById("gitee");
+        // 跳转到gitee源码
+        gitee.onclick = function(){
+            window.open("https://gitee.com/stonedtx/yuqing");
+        };
+
+        // 获取弹窗
+        var iPhoneQRCode = document.getElementById('iPhoneQRCode');
+        var iPhone = document.getElementById("iPhone");
+        //联系我们 弹窗
+        iPhone.onclick = function(){
+            if (iPhoneQRCode.style.display === "block"){
+                iPhoneQRCode.style.display = "none"
+            }else {
+                iPhoneQRCode.style.display = "block"
+            }
+        };
+        // 在用户点击其他地方时，关闭弹窗
+        window.onclick = function(event) {
+            if (event.target !== iPhone) {
+                iPhoneQRCode.style.display = "none";
+            }
+        }
+
         //获取系统名称
         function getSystemTitle(){
         	$.ajax({

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

@@ -440,10 +440,13 @@ $("#currentyear").text((new Date()).getFullYear());
         $("#createcomplete").addClass("line-active");
 
 
+        prokeywords = prokeywords.toString().replace(/(\s|;|-|"|‘|；|、|‘’|'|’|“”|》|《|<|>)/g, ",");
+        prokeywords = prokeywords.toString().replace(/,{1,}/, ",");
         if (prokeywords.indexOf("，") != -1) {
             prokeywords = prokeywords.toString().replace(new RegExp("，", 'gm'), ",");
         }
-
+        proshield = proshield.toString().replace(/(\s|;|-|"|‘|；|、|‘’|'|’|“”|》|《|<|>)/g, ",");
+        proshield = proshield.toString().replace(/,{1,}/, ",");
         if (proshield.indexOf("，") != -1) {
             proshield = proshield.toString().replace(new RegExp("，", 'gm'), ",");
         }
@@ -516,7 +519,8 @@ $("#currentyear").text((new Date()).getFullYear());
             $("#prokeywords").removeClass("text-error");
         }
 
-
+        prokeywords = prokeywords.toString().replace(/(\s|;|-|"|‘|；|、|‘’|'|’|“”|》|《|<|>)/g, ",");
+        prokeywords = prokeywords.toString().replace(/,{1,}/, ",");
         if (prokeywords.indexOf("，") != -1) {
             prokeywords = prokeywords.toString().replace(new RegExp("，", 'gm'), ",");
         }
@@ -533,6 +537,8 @@ $("#currentyear").text((new Date()).getFullYear());
             proaccident = proaccident.toString().replace(new RegExp("，", 'gm'), ",");
         }
 
+        proshield = proshield.toString().replace(/(\s|;|-|"|‘|；|、|‘’|'|’|“”|》|《|<|>)/g, ",");
+        proshield = proshield.toString().replace(/,{1,}/, ",");
         if (proshield.indexOf("，") != -1) {
             proshield = proshield.toString().replace(new RegExp("，", 'gm'), ",");
         }

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

@@ -115,7 +115,7 @@
                                 </div>
                                 <div class="project-handle">
                                     <a href="#">数据监测</a>
-                                    <a href="#">声量监测</a>
+<!--                                    <a href="#">声量监测</a>-->
                                 </div>
                                 <div class="project-edit-delete">
                                     <i class="mdi mdi-table-edit"></i>

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

@@ -248,25 +248,25 @@ $("#currentyear").text((new Date()).getFullYear());
 						            '</tr>';
 	   			$('#projectDetail').append(keywordHtml);
 	   			
-	   			if(res.project_type == 2){
-	   				var regionalWordHtml = '<tr>'+
-						                        '<td>国家/城市/地域 关键词</td>'+
-						                        '<td>'+res.regional_word+'</td>'+
-						                    '</tr>';
-	   				$('#projectDetail').append(regionalWordHtml);
-	   				
-					var characterWordHtml = '<tr>'+
-												'<td>人物/机构/企业 关键词</td>'+
-												'<td>'+res.character_word+'</td>'+
-											'</tr>';
-					$('#projectDetail').append(characterWordHtml);
-	   				
-	   				var eventWordHtml = '<tr>'+
-						                    '<td>事件/动词 关键词</td>'+
-						                    '<td>'+res.event_word+'</td>'+
-						                '</tr>';
-					$('#projectDetail').append(eventWordHtml);
-	   			}
+	   			// if(res.project_type == 2){
+	   			// 	var regionalWordHtml = '<tr>'+
+				// 		                        '<td>国家/城市/地域 关键词</td>'+
+				// 		                        '<td>'+res.regional_word+'</td>'+
+				// 		                    '</tr>';
+	   			// 	$('#projectDetail').append(regionalWordHtml);
+	   			//
+				// 	var characterWordHtml = '<tr>'+
+				// 								'<td>人物/机构/企业 关键词</td>'+
+				// 								'<td>'+res.character_word+'</td>'+
+				// 							'</tr>';
+				// 	$('#projectDetail').append(characterWordHtml);
+	   			//
+	   			// 	var eventWordHtml = '<tr>'+
+				// 		                    '<td>事件/动词 关键词</td>'+
+				// 		                    '<td>'+res.event_word+'</td>'+
+				// 		                '</tr>';
+				// 	$('#projectDetail').append(eventWordHtml);
+	   			// }
 	   			
 	   			var stopwordHtml = '<tr>'+
 						                '<td>监测屏蔽歧义词</td>'+

src/main/resources/templates/setting/preference.html

@@ -87,7 +87,7 @@
                             	<i id="icon1" data-type="analysis" class="fa fa-chart-bar" title="监测分析"></i>
                             	<i id="icon2" data-type="monitor" class="mdi mdi-eye-outline" title="数据监测"></i>
                             	<i id="icon3" data-type="project" class="fas fa-pencil-alt" title="监测管理"></i>
-                            	<i id="icon4" data-type="volume" class="fa fa-rss" title="声量监测"></i>
+<!--                            	<i id="icon4" data-type="volume" class="fa fa-rss" title="声量监测"></i>-->
                             </div>
                         </div>
                         <div id="nodata"></div>