日志管理页面调整

src/main/java/com/chinaitop/depot/system/controller/SystemLogController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.system.model.SystemLog;
-import com.chinaitop.depot.system.model.UserOperationlog;
+import com.chinaitop.depot.system.model.SystemLogExample;
 import com.chinaitop.depot.system.service.UserOperationlogService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -42,7 +42,7 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value="/systemLog")
 @Api(description = "系统日志控制类")
 public class SystemLogController {
-	
+
 	@Resource
 	private UserOperationlogService userOperationlogService;
 
@@ -59,17 +59,40 @@ public class SystemLogController {
 			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
 			@ApiImplicitParam(name = "username", value = "真实姓名", paramType = "query")
 	})
-	public PageInfo<UserOperationlog> getSystemLog(HttpServletRequest request, Integer pageNum, 
+	public PageInfo<SystemLog> getSystemLog(HttpServletRequest request, Integer pageNum, 
 			Integer pageSize, String username) {
 		
 		if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}
-		
-		HashMap<Object, Object> map = new HashMap<Object, Object>();
-		map.put("username", username);
-		List<UserOperationlog> listAll=userOperationlogService.queryAll(map);
-		PageInfo<UserOperationlog> pageInfo = new PageInfo<UserOperationlog>(listAll);
+
+		SystemLogExample example = new SystemLogExample();
+		SystemLogExample.Criteria criteria = example.createCriteria();
+		if (null != username && !"".equals(username)) {
+			criteria.andUserNameLike("%"+username+"%");
+		}
+		example.setOrderByClause("operation_time desc");
+
+		List<SystemLog> list = userOperationlogService.findSystemLogCondition(example);
+		if (null != list && list.size() > 0) {
+			SystemLog log = null;
+			String parameter = "";
+			int parameter_length = 0;
+			for (int i = 0; i < list.size(); i++) {
+				log = list.get(i);
+				parameter = log.getParameter();
+				if (null != parameter && !"".equals(parameter)) {
+					parameter_length = parameter.length();
+					if (parameter_length > 50) {
+						parameter = parameter.substring(0, 50)+"......";
+						log.setParameter(parameter);
+					}
+				}
+			}
+		}
+
+		PageInfo<SystemLog> pageInfo = new PageInfo<SystemLog>(list);
+
 		return pageInfo;
 	}
 
@@ -104,7 +127,7 @@ public class SystemLogController {
 
         	String enumid = ObjectUtils.toString(orginfo.get("areaCode"), "0");
         	if (!"0".equals(enumid)) {
-        		String httpurl = "http://"+device_ip+":9022/Enum/findByEnum?id="+Integer.parseInt(enumid);
+        		String httpurl = "http://localhost:9022/Enum/findByEnum?id="+Integer.parseInt(enumid);
         		String strResult = doGet(httpurl);
         		if (!"".equals(strResult)) {
         			JSONObject enum_obj = JSONObject.parseObject(strResult);

src/main/java/com/chinaitop/depot/system/service/UserOperationlogService.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.chinaitop.depot.system.model.SystemLog;
+import com.chinaitop.depot.system.model.SystemLogExample;
 import com.chinaitop.depot.system.model.UserOperationlog;
 
 public interface UserOperationlogService {
@@ -25,4 +26,12 @@ public interface UserOperationlogService {
      * @param systemLog SystemLog对象
      */
     void AddSystemLog(SystemLog systemLog);
+
+    /**
+     * 查询systemlog表日志
+     * 
+     * @param example
+     * @return
+     */
+	List<SystemLog> findSystemLogCondition(SystemLogExample example);
 }

src/main/java/com/chinaitop/depot/system/service/impl/UserOperationlogServiceImpl.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.system.service.impl;
 import com.chinaitop.depot.system.mapper.SystemLogMapper;
 import com.chinaitop.depot.system.mapper.UserOperationlogMapper;
 import com.chinaitop.depot.system.model.SystemLog;
+import com.chinaitop.depot.system.model.SystemLogExample;
 import com.chinaitop.depot.system.model.UserOperationlog;
 import com.chinaitop.depot.system.service.UserOperationlogService;
 
@@ -41,4 +42,9 @@ public class UserOperationlogServiceImpl implements UserOperationlogService {
 		systemLogMapper.insertSelective(systemLog);
 	}
 
+	@Override
+	public List<SystemLog> findSystemLogCondition(SystemLogExample example) {
+		return systemLogMapper.selectByExample(example);
+	}
+
 }