日志更新，druid监控菜单

Author: liangrui198

src/main/java/com/huiwan/gdata/common/constants/uri/SysUri.java

@@ -25,6 +25,9 @@ public class SysUri extends Modules {
 	public static final String SYS_LOG = "sys/log";
 	/** 系统参数 **/
 	public static final String SYS_PARAMETER = "sys/parameter";
+	
+	/** 数据库监控 **/
+	public static final String SYS_DRUID = "druid";
 
 	/** 临时操作区 **/
 	public static final String SYS_TEMP_SERVICE = "sys/temp_service";

src/main/java/com/huiwan/gdata/modules/gdata/base/charset/bean/QueryCommBean.java

@@ -35,6 +35,8 @@ public class QueryCommBean implements Cloneable {
 
 	public String copyId;//副本id
 	public String file;//文件类型
+	public String name;
+	
 
 
 	public String getDt1() {
@@ -235,6 +237,17 @@ public String getFile() {
 	public void setFile(String file) {
 		this.file = file;
 	}
+	
+	
+	
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 
 	@Override
 	public String toString() {

src/main/java/com/huiwan/gdata/modules/gdata/combat/service/impl/CombatLogServiceImpl.java

@@ -438,6 +438,12 @@ private StringBuffer getSQLString(QueryCommBean vo) {
 				sbWhere.append(vo.getType());
 				sbWhere.append("'");
 			}
+			
+			if (StringUtils.isNotBlank(vo.getName())) {// 如果不为空，
+				sbWhere.append(" and cont->>'name'='");
+				sbWhere.append(vo.getName());
+				sbWhere.append("'");
+			}
 			//
 			// if (StringUtils.isNotBlank(vo.getCommQueryString())) {// 见听对象
 			// sbWhere.append(" and cont->>copyId='");
@@ -473,7 +479,7 @@ public List<Dict> getObjTypes(int type, String severId) {
 			if (StringUtils.isNotBlank(severId)) {
 				sql += " where server_id='" + severId + "'";
 			}
-			sql += " order by id desc  LIMIT 1000";
+			sql += " order by id desc  LIMIT 1500";
 			log.info("sql:>>>\n{}", sql.toString());
 			List<Dict> data = gdataDao.selectObjectList(sql.toString(), type_rowMapper);
 			// 排序去重
@@ -483,7 +489,7 @@ public List<Dict> getObjTypes(int type, String severId) {
 			if (data != null && data.size() > 0) {
 				for (Dict dict : data) {
 					data_new.put(dict.getValue(), dict);
-					if (data_new.size() >= 10) {
+					if (data_new.size() >= 20) {
 						break;
 					}
 				}

src/main/java/com/huiwan/gdata/modules/sys/web/DruidViewController.java

@@ -0,0 +1,32 @@
+package com.huiwan.gdata.modules.sys.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.huiwan.gdata.common.annotatiions.MenuAnnot;
+import com.huiwan.gdata.common.constants.Modules;
+import com.huiwan.gdata.common.constants.uri.SysUri;
+
+/**
+ * 系统参数
+ * 
+ * @author rui
+ *
+ */
+@Controller
+@RequestMapping(SysUri.SYS_DRUID)
+@MenuAnnot(id = "sys:druid", name = "数据库监控", parentId = Modules.SYS, href = "/druid/index", sortNo = 7)
+public class DruidViewController extends SysBaseController {
+
+
+//	@RequestMapping(value = "index", method = RequestMethod.GET)
+//	public String getList(
+//			@RequestParam(value = "pageIndex", defaultValue = "1") Integer pageIndex,
+//			@RequestParam(value = "pagesize", defaultValue = "12") Integer pagesize,
+//			Parameter parameter) {
+//	
+//
+//        return "redirect:/ toList "; 
+//	}
+
+}

src/main/resources/pro1.properties

@@ -23,4 +23,4 @@ sys.user.key=abcdxxxxxxxxxxxxxxxx
 #jpush.appKey=aee2aba4010a78f91b6945e7
 
 #0=init all,1=init menu,2=init menu AND init admin,
-initLevel=5
+initLevel=1

src/main/webapp/views/modules/gdata/combat/combatLog.html

@@ -65,6 +65,14 @@
 		              </select>
 		      </div> </div>
 		 </td>
+		 <td>
+		 </td>
+		<td>
+	    </td> 
+	    </tr>
+	    
+	    <tr>
+
 		 <td>
 		    <div class="form-group" >
 		         <div class="input-group">
@@ -79,7 +87,16 @@
 		     监听对象id： <input class="input-xlarge" name="_object_sd_id" id="_object_sd_id" placeholder="请先把下拉选择设为手动输入"	type="text"/> 
 		</div>
 	    </td> 
+	    
+    	 <td>
+		   <div class="form-group" >
+	               <div class="input-group">
+	                对象名称： <input name="types" id="_object_name" class="chosen-select" style="width: 150px;"/>
+	      </div> </div>
+	   </td>
+	    
 	    </tr>
+	    
 	   <tr>
 		<td>
 		 <div class="form-group" >
@@ -268,6 +285,15 @@ <h4 class="modal-title" id="openAttrsDivModalLabel">对象基础属性</h4>
 					});
 				}
 			}
+			//名称
+			var _object_name=$("#_object_name").val();
+			if (_object_name != "" && _object_name != null && _object_name != 'undefined') {
+				parma = $.extend(parma, {
+					name : _object_name,
+				});
+			}
+			
+			
 
 			return parma;
 		}
@@ -290,6 +316,8 @@ <h4 class="modal-title" id="openAttrsDivModalLabel">对象基础属性</h4>
 			function(){
 				getPaginationTable(".rl-page-table",true);
 				initAttrs();//属性刷新
+				//监听对像 刷新
+				initJianTingType();
 
 		});