日志功能更新

src/main/java/com/chinaitop/depot/LogercostInterceptor.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -12,6 +13,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.ObjectUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;
 import org.springframework.web.method.HandlerMethod;
@@ -53,10 +60,7 @@ public class LogercostInterceptor implements HandlerInterceptor {
     	if ("/userInfo/exitLogin".equals(url)) {
     		loginLogger(request, response, url);
     	}
-    	
-        //System.out.println(butn_list);
-        
-        //System.out.println("Interception cost="+(System.currentTimeMillis()-start));
+
         return true;//返回true,postHandler和afterCompletion方法才能执行,否则false为拒绝执行，起到拦截器控制作用
     }
 
@@ -100,6 +104,7 @@ public class LogercostInterceptor implements HandlerInterceptor {
     	user_map.put("realName", userinfo == null ? "" : userinfo.get("realName")+"");
     	user_map.put("orgId", userinfo == null ? "" : userinfo.get("orgId")+"");
     	user_map.put("roleName", userinfo == null ? "" : userinfo.get("roleNames")+"");
+    	user_map.put("areaCode", orginfo == null ? "":ObjectUtils.toString(orginfo.get("areaCode")+"",""));
     	user_map.put("areaName", orginfo == null ? "":ObjectUtils.toString(orginfo.get("areaName")+"",""));
     	user_map.put("orgName", orginfo == null ? "":ObjectUtils.toString(orginfo.get("orgName")+"",""));
 		return user_map;
@@ -121,11 +126,20 @@ public class LogercostInterceptor implements HandlerInterceptor {
 			log.setSystemIdentify(system_index);
 			log.setUserZh(ObjectUtils.toString(user_map.get("username"),""));//账号
 			log.setUserName(ObjectUtils.toString(user_map.get("realName"),""));//名称
-			log.setDeviceIp(getClientIpAddress(request));
+			String device_ip = getClientIpAddress(request);
+			log.setDeviceIp(device_ip);
 			log.setDlTime(new Date());
 			log.setUserRole(ObjectUtils.toString(user_map.get("roleName"),""));//角色
 			log.setOrgId(Integer.parseInt(user_map.get("orgId")));//单位
-			log.setUserAddress(user_map.get("areaName"));//行政区划
+			String enumid = ObjectUtils.toString(user_map.get("areaCode"), "0");
+			if (!"0".equals(enumid)) {
+				String httpurl = "http://"+device_ip+":9022/Enum/findByEnum?id="+Integer.parseInt(enumid);
+				String strResult = doGet(httpurl);
+				if (!"".equals(strResult)) {
+					JSONObject enum_obj = JSONObject.parseObject(strResult);
+					log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
+				}
+			}
 			log.setId(UUID.randomUUID().toString().replace("-", ""));
 			log.setUserId(Integer.parseInt(user_map.get("userId")));
 			log.setOperationTime(new Date());//操作时间
@@ -163,6 +177,32 @@ public class LogercostInterceptor implements HandlerInterceptor {
     }
     
     /**
+     * get请求
+     * @return
+     */
+    public static String doGet(String url) {
+        try {
+            HttpClient client = new DefaultHttpClient();
+            //发送get请求
+            HttpGet request = new HttpGet(url);
+            HttpResponse response = client.execute(request);
+
+            /**请求发送成功，并得到响应**/
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                /**读取服务器返回过来的json字符串数据**/
+                String strResult = EntityUtils.toString(response.getEntity());
+
+                return strResult;
+            }
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+    
+    /**
      * 操作日志实现思路：
      * 1、URL要是可以在菜单里面找到对应菜单，那么当前这个操作属于功能操作日志
      * 2、如果没在菜单里面找到对应菜单，却在按钮中找到了，那么就是功能访问日志
@@ -172,7 +212,8 @@ public class LogercostInterceptor implements HandlerInterceptor {
      * @param response
      * @param url
      */
-    private void operationLogger(HttpServletRequest request, HttpServletResponse response, String url, Object handler) {
+    @SuppressWarnings("all")
+	private void operationLogger(HttpServletRequest request, HttpServletResponse response, String url, Object handler) {
     	//获取用户信息和单位信息
         String userJson = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
         String orgInfoJson = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
@@ -192,17 +233,28 @@ public class LogercostInterceptor implements HandlerInterceptor {
     			String func_url = ObjectUtils.toString(object.get("funcUrl"));
     			if (url.equals(func_url)) {
     				log.setId(UUID.randomUUID().toString().replace("-", ""));
-    				log.setType("3");//功能操作日志
+    				log.setType("3");//功能访问日志
     				log.setSystemIdentify(system_index);//标识
     				log.setUserId(Integer.parseInt(user_map.get("userId")));//用户ID
     				log.setUserZh(ObjectUtils.toString(user_map.get("username"),""));//账号
     				log.setUserName(ObjectUtils.toString(user_map.get("realName"),""));//名称
-    				log.setDeviceIp(getClientIpAddress(request));//操作IP
+    				String device_ip = getClientIpAddress(request);
+    				log.setDeviceIp(device_ip);//操作IP
+    				log.setFuncId(Integer.parseInt(object.get("funcId").toString()));//功能ID
     				log.setFuncName(ObjectUtils.toString(object.get("funcName")));//功能名称
     				log.setOperationTime(new Date());//操作时间
     				log.setUserRole(ObjectUtils.toString(user_map.get("roleName"),""));//角色
     				log.setOrgId(Integer.parseInt(user_map.get("orgId")));//单位
-    				log.setUserAddress(user_map.get("areaName"));//行政区划
+    				
+    				String enumid = ObjectUtils.toString(user_map.get("areaCode"), "0");
+    				if (!"0".equals(enumid)) {
+    					String httpurl = "http://"+device_ip+":9022/Enum/findByEnum?id="+Integer.parseInt(enumid);
+    					String strResult = doGet(httpurl);
+    					if (!"".equals(strResult)) {
+    						JSONObject enum_obj = JSONObject.parseObject(strResult);
+    						log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
+    					}
+    				}
 
     				//添加保存日志
     				systemLogMapper.insert(log);
@@ -229,12 +281,13 @@ public class LogercostInterceptor implements HandlerInterceptor {
         			String but_url = ObjectUtils.toString(but_object.get("btnUrl"), "");
         			if (url.equals(but_url)) {
         				log.setId(UUID.randomUUID().toString().replace("-", ""));
-        				log.setType("2");//功能访问日志
+        				log.setType("2");//功能操作日志
         				log.setSystemIdentify(system_index);//标识
         				log.setUserId(Integer.parseInt(user_map.get("userId")));//用户ID
         				log.setUserZh(ObjectUtils.toString(user_map.get("username"),""));//账号
         				log.setUserName(ObjectUtils.toString(user_map.get("realName"),""));//名称
-        				log.setDeviceIp(getClientIpAddress(request));//操作IP
+        				String device_ip = getClientIpAddress(request);
+        				log.setDeviceIp(device_ip);//操作IP
         				String f_name = ObjectUtils.toString(but_object.get("funcName"), "");
         				String b_name = ObjectUtils.toString(but_object.get("btnName"), "");
         				String ramark = ObjectUtils.toString(but_object.get("remark"), "");
@@ -244,9 +297,11 @@ public class LogercostInterceptor implements HandlerInterceptor {
         				} else {
         					sbf.append(f_name).append("功能").append(b_name).append("操作");
         				}
+        				log.setFuncId(Integer.parseInt(but_object.get("funcId").toString()));//功能ID
         				log.setFuncName(ObjectUtils.toString(sbf.toString(), ""));//菜单名称
         				HandlerMethod h = (HandlerMethod) handler;  
         				log.setMethodName(h.getMethod().getName());//方法名
+        				log.setBtnId(Integer.parseInt(but_object.get("btnId").toString()));//按钮ID
         				log.setUserRole(ObjectUtils.toString(user_map.get("roleName"),""));//角色
         				log.setOperationTime(new Date());//操作时间
         				StringBuilder param = new StringBuilder();
@@ -265,7 +320,15 @@ public class LogercostInterceptor implements HandlerInterceptor {
         					log.setRtnParam("请求失败");//返回参数
         				}
         				log.setOrgId(Integer.parseInt(user_map.get("orgId")));//所属机构
-        				log.setUserAddress(user_map.get("areaName"));//行政区划
+        				String enumid = ObjectUtils.toString(user_map.get("areaCode"), "0");
+        				if (!"0".equals(enumid)) {
+        					String httpurl = "http://"+device_ip+":9022/Enum/findByEnum?id="+Integer.parseInt(enumid);
+        					String strResult = doGet(httpurl);
+        					if (!"".equals(strResult)) {
+        						JSONObject enum_obj = JSONObject.parseObject(strResult);
+        						log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
+        					}
+        				}
 
         				//添加保存日志
         				systemLogMapper.insert(log);

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

@@ -1,15 +1,28 @@
 package com.chinaitop.depot.system.controller;
 
+import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 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.service.UserOperationlogService;
 import com.github.pagehelper.PageHelper;
@@ -60,4 +73,97 @@ public class SystemLogController {
 		return pageInfo;
 	}
 
+	@RequestMapping(value="/save", method = RequestMethod.POST)
+	@ApiOperation(value="插入日志信息", notes = "插入日志信息")
+	@ApiImplicitParams({})
+	public Map<String, Object> save(HttpServletRequest request) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		//获取用户信息和单位信息
+        String userJson = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
+        String orgInfoJson = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
+
+        if (!"".equals(userJson) && !"".equals(orgInfoJson)) {
+        	JSONObject userinfo = JSONObject.parseObject(userJson);
+        	JSONObject orginfo = JSONObject.parseObject(orgInfoJson);
+
+        	SystemLog log = new SystemLog();
+        	log.setId(UUID.randomUUID().toString().replace("-", ""));
+        	log.setType("3");//功能访问日志
+        	log.setSystemIdentify("库级系统");//标识
+        	log.setUserId(Integer.parseInt(userinfo.get("userId").toString()));//用户ID
+        	log.setUserZh(ObjectUtils.toString(userinfo.get("username").toString(),""));//账号
+        	log.setUserName(ObjectUtils.toString(userinfo.get("realName"),""));//名称
+        	String device_ip = getClientIpAddress(request);
+        	log.setDeviceIp(device_ip);//操作IP
+        	log.setFuncId(0);//功能ID
+        	log.setFuncName("出入库");//功能名称
+        	log.setOperationTime(new Date());//操作时间
+        	log.setUserRole(ObjectUtils.toString(userinfo.get("roleNames"),""));//角色
+        	log.setOrgId(Integer.parseInt(userinfo.get("orgId").toString()));//单位
+
+        	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 strResult = doGet(httpurl);
+        		if (!"".equals(strResult)) {
+        			JSONObject enum_obj = JSONObject.parseObject(strResult);
+        			log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
+        		}
+        	}
+
+        	//添加保存日志
+        	userOperationlogService.AddSystemLog(log);
+        }
+
+		return map;
+	}
+
+	/**
+     * 获取客户端IP
+     * 
+     * @param request
+     * @return
+     */
+    private String getClientIpAddress(HttpServletRequest request) {  
+        String clientIp = request.getHeader("x-forwarded-for");  
+        if(clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) {  
+            clientIp = request.getHeader("Proxy-Client-IP");  
+        }  
+        if(clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) {  
+            clientIp = request.getHeader("WL-Proxy-Client-IP");  
+        }  
+        if(clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) {  
+            clientIp = request.getRemoteAddr();  
+        }  
+        return "0:0:0:0:0:0:0:1".equals(clientIp) ? "127.0.0.1" : clientIp;  
+    }
+
+    /**
+     * get请求
+     * @return
+     */
+    @SuppressWarnings("deprecation")
+	public static String doGet(String url) {
+        try {
+            HttpClient client = new DefaultHttpClient();
+            //发送get请求
+            HttpGet request = new HttpGet(url);
+            HttpResponse response = client.execute(request);
+
+            /**请求发送成功，并得到响应**/
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                /**读取服务器返回过来的json字符串数据**/
+                String strResult = EntityUtils.toString(response.getEntity());
+
+                return strResult;
+            }
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.chinaitop.depot.system.service;
 import java.util.HashMap;
 import java.util.List;
 
+import com.chinaitop.depot.system.model.SystemLog;
 import com.chinaitop.depot.system.model.UserOperationlog;
 
 public interface UserOperationlogService {
@@ -18,4 +19,10 @@ public interface UserOperationlogService {
      * @param UserOperationlog userOperationlog对象
      */
     void AddLogMsg(UserOperationlog userOperationlog);
+    
+    /**
+     * 插入systemlog
+     * @param systemLog SystemLog对象
+     */
+    void AddSystemLog(SystemLog systemLog);
 }

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

@@ -1,6 +1,8 @@
 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.UserOperationlog;
 import com.chinaitop.depot.system.service.UserOperationlogService;
 
@@ -20,6 +22,9 @@ public class UserOperationlogServiceImpl implements UserOperationlogService {
 
     @Resource
     private UserOperationlogMapper userOperationlogMapper;
+    
+    @Resource
+    private SystemLogMapper systemLogMapper;
 
 	@Override
 	public List<UserOperationlog> queryAll(HashMap<Object, Object> map) {
@@ -31,4 +36,9 @@ public class UserOperationlogServiceImpl implements UserOperationlogService {
 		userOperationlogMapper.insertSelective(userOperationlog);
 	}
 
+	@Override
+	public void AddSystemLog(SystemLog systemLog) {
+		systemLogMapper.insertSelective(systemLog);
+	}
+
 }