日志功能改造

pom.xml

@@ -131,6 +131,11 @@
 		    <!-- 注意版本.这里我使用的是1.3.2 -->
 		    <version>1.3.2</version>
 		</dependency>
+		<!-- feign -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
     </dependencies>
 
     <dependencyManagement>

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

@@ -5,10 +5,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @EnableEurekaClient
 @EnableDiscoveryClient
 @SpringBootApplication
+@EnableFeignClients
 @MapperScan(basePackages = {"com.chinaitop.depot.system.mapper"})
 public class DepotSystemApplication {
 

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

@@ -1,27 +0,0 @@
-package com.chinaitop.depot;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-
-@Configuration
-public class InterceptorConfig extends WebMvcConfigurationSupport {
-
-	@Bean
-	public LogercostInterceptor getInterceptor() {
-		return new LogercostInterceptor();
-	}
-	/**
-     * interceptor配置
-     */
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-
-    	//添加需要验证登录用户操作权限的请求
-        registry.addInterceptor(getInterceptor()).addPathPatterns("/**");
-
-        //这里可以用registry.addInterceptor添加多个拦截器实例，后面加上匹配模式
-        //super.addInterceptors(registry);//最后将register往这里塞进去就可以了
-    }
-}

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

@@ -1,372 +0,0 @@
-package com.chinaitop.depot;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-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;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.chinaitop.depot.system.mapper.SystemLogMapper;
-import com.chinaitop.depot.system.model.SystemLog;
-import com.chinaitop.depot.system.model.SystemLogExample;
-import com.chinaitop.depot.utils.RedisUtil;
-
-/**
- * 功能日志拦截器
- * 
- * @author fanxiongwei
- *
- */
-public class LogercostInterceptor implements HandlerInterceptor {
-
-	private static String system_index = "库级系统";
-
-	@Autowired
-	private RedisUtil redisUtil;
-	
-	@Autowired
-	private SystemLogMapper systemLogMapper;
-
-	/**
-     * preHandle是在请求执行前执行的
-     */
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-
-    	//获取URL
-        String url = request.getRequestURI();
-    	//注销日志
-    	if ("/userInfo/exitLogin".equals(url)) {
-    		loginLogger(request, response, url);
-    	}
-
-        return true;//返回true,postHandler和afterCompletion方法才能执行,否则false为拒绝执行，起到拦截器控制作用
-    }
-
-    /**
-     * postHandler是在请求结束之后,视图渲染之前执行的,但只有preHandle方法返回true的时候才会执行
-     */
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable ModelAndView modelAndView) throws Exception {
-    	//获取URL
-        String url = request.getRequestURI();
-        //获取用户信息和单位信息
-        String userJson = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
-        String orgInfoJson = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
-        //登录日志
-    	if (("/userInfo/login".equals(url) || "/userInfo/exitLogin".equals(url))
-    			&& !"".equals(userJson) && !"".equals(orgInfoJson)
-    			&& null != userJson && null != orgInfoJson) {
-    		loginLogger(request, response, url);
-    	}
-    	//功能操作和访问日志
-    	if (!"/userInfo/login".equals(url) && !"/userInfo/exitLogin".equals(url)
-    			&& !"".equals(userJson) && !"".equals(orgInfoJson)
-    			&& null != userJson && null != orgInfoJson) {
-    		operationLogger(request, response, url, handler);
-    	}
-    }
-
-    /**
-     * 封装登录信息
-     * 
-     * @param userJson
-     * @param orgInfoJson
-     * @return
-     */
-    private Map<String, String> getUserOrgInfo(String userJson, String orgInfoJson) {
-    	Map<String, String> user_map = new HashMap<String, String>();
-    	JSONObject userinfo = JSONObject.parseObject(userJson);
-    	JSONObject orginfo = JSONObject.parseObject(orgInfoJson);
-    	user_map.put("userId", userinfo == null ? "" : userinfo.get("userId")+"");
-    	user_map.put("username", userinfo == null ? "" : userinfo.get("username")+"");
-    	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;
-	}
-
-    /**
-     * 登录日志（包含登录与注销）
-     * @param request
-     * @param response
-     */
-    private void loginLogger(HttpServletRequest request, HttpServletResponse response, String url) {
-    	//获取用户信息和单位信息
-        String userJson = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
-        String orgInfoJson = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
-    	//登录
-        if ("/userInfo/login".equals(url)) {
-	    	SystemLog log = new SystemLog();
-	    	Map<String, String> user_map = getUserOrgInfo(userJson, orgInfoJson);
-			log.setSystemIdentify(system_index);
-			log.setUserZh(ObjectUtils.toString(user_map.get("username"),""));//账号
-			log.setUserName(ObjectUtils.toString(user_map.get("realName"),""));//名称
-			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")));//单位
-			String enumid = ObjectUtils.toString(user_map.get("areaCode"), "0");
-			if (!"0".equals(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);
-					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());//操作时间
-			log.setType("1");
-
-			//添加保存日志
-			systemLogMapper.insert(log);
-    	}
-
-        //注销
-        if ("/userInfo/exitLogin".equals(url)) {
-        	if (null != userJson && null != orgInfoJson
-        			&& !"".equals(userJson) && !"".equals(orgInfoJson)) {
-        		Map<String, String> user_map = getUserOrgInfo(userJson, orgInfoJson);
-        		//修改条件
-        		SystemLogExample example = new SystemLogExample();
-        		SystemLogExample.Criteria criteria = example.createCriteria();
-        		criteria.andUserZhEqualTo(ObjectUtils.toString(user_map.get("username"),""));
-        		criteria.andOrgIdEqualTo(Integer.parseInt(user_map.get("orgId")));
-        		criteria.andTypeEqualTo("1");
-        		example.setOrderByClause(" dl_time desc");
-        		List<SystemLog> list = systemLogMapper.selectByExample(example);
-
-        		if (null != list && list.size() > 0) {
-        			//注销时间
-        			list.get(0).setZxTime(new Date());
-        			list.get(0).setOperationTime(new Date());//操作时间
-
-        			//修改登录日志信息
-        			systemLogMapper.updateByPrimaryKey(list.get(0));
-        		}
-        	}
-    		
-    	}
-    }
-    
-    /**
-     * 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、如果没在菜单里面找到对应菜单，却在按钮中找到了，那么就是功能访问日志
-     * 3、如果菜单和按钮中都没有找到对应的URL，那么说明当前这个方位没在功能管理里面配置正确，或者没有加入到功能管理中
-     * 
-     * @param request
-     * @param response
-     * @param url
-     */
-    @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"),"");
-        Map<String, String> user_map = getUserOrgInfo(userJson, orgInfoJson);
-
-        //是否还需要继续往下执行
-        boolean flag = false;
-
-    	//获取菜单权限并且组装功能日志
-    	String func_list = (String) redisUtil.get("hasFuncList");
-    	JSONArray array = JSONArray.parseArray(func_list);
-    	if (null != array && array.size() > 4) {
-    		JSONObject object = null;
-    		SystemLog log = new SystemLog();
-    		for (Iterator iterator = array.iterator(); iterator.hasNext();) {
-    			object = (JSONObject) iterator.next();
-    			String func_url = ObjectUtils.toString(object.get("funcUrl"));
-    			if (url.equals(func_url)) {
-    				log.setId(UUID.randomUUID().toString().replace("-", ""));
-    				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"),""));//名称
-    				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")));//单位
-    				
-    				String enumid = ObjectUtils.toString(user_map.get("areaCode"), "0");
-    				if (!"0".equals(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);
-    						log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
-    					}
-    				}
-
-    				//添加保存日志
-    				systemLogMapper.insert(log);
-
-    				//已经是操作日志了，那么没必要在遍历按钮了
-    				flag = true;
-    				//也不用继续当前循环了
-    				break;
-    			}
-    		}
-    	}
-        //获取按钮权限并且组装访问日志
-    	if (!flag) {
-    		String perm_list = (String) redisUtil.get("permissionList");
-    		JSONArray but_array = JSONArray.parseArray(perm_list);
-        	if (null != but_array && but_array.size() > 4) {
-        		JSONObject but_object = null;
-        		SystemLog log = new SystemLog();
-        		for (Iterator iterator = but_array.iterator(); iterator.hasNext();) {
-        			but_object = (JSONObject) iterator.next();
-        			if (but_object == null) {
-        				continue;
-        			}
-        			String but_url = ObjectUtils.toString(but_object.get("btnUrl"), "");
-        			if (url.equals(but_url)) {
-        				log.setId(UUID.randomUUID().toString().replace("-", ""));
-        				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"),""));//名称
-        				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"), "");
-        				StringBuffer sbf = new StringBuffer();
-        				if (!"".equals(ramark)) {
-        					sbf.append(f_name).append("功能").append(ramark).append("操作");
-        				} 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();
-                        Map<String,String[]> map = request.getParameterMap();
-                        Set<String> key = map.keySet();
-                        for (String eachKey: key) {
-                            param.append(eachKey+"="+map.get(eachKey)[0]+"； ");
-                        }
-        				log.setParameter(param.toString());//传入参数
-
-        				String status = ObjectUtils.toString(response.getStatus(), "");
-        				log.setOperResult(status);//操作结果状态
-        				if ("200".equals(status)) {
-        					log.setRtnParam("请求成功");//返回参数
-        				} else {
-        					log.setRtnParam("请求失败");//返回参数
-        				}
-        				log.setOrgId(Integer.parseInt(user_map.get("orgId")));//所属机构
-        				String enumid = ObjectUtils.toString(user_map.get("areaCode"), "0");
-        				if (!"0".equals(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);
-        						log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
-        					}
-        				}
-
-        				//添加保存日志
-        				systemLogMapper.insert(log);
-
-        				//中断本次循环
-        				break;
-        			}
-        		}
-        	}
-    	}
-    }
-
-	/**
-     * afterCompletion是视图渲染完成之后才执行,同样需要preHandle返回true，
-     */
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception {
-        //该方法通常用于清理资源等工作
-    }
-
-    /**
-     * 获取客户端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;  
-    }
-
-}

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

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.system.controller;
 
-import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -11,19 +10,15 @@ 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.feignService.BasicFeignService;
 import com.chinaitop.depot.system.model.SystemLog;
 import com.chinaitop.depot.system.model.SystemLogExample;
+import com.chinaitop.depot.system.model.SystemLogTwo;
 import com.chinaitop.depot.system.service.UserOperationlogService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -46,6 +41,9 @@ public class SystemLogController {
 	@Resource
 	private UserOperationlogService userOperationlogService;
 
+	@Resource
+	private BasicFeignService basicFeignService;
+
 	/**
 	 * 查找日志信息
 	 * @param pageNum	页码
@@ -61,7 +59,7 @@ public class SystemLogController {
 	})
 	public PageInfo<SystemLog> getSystemLog(HttpServletRequest request, Integer pageNum, 
 			Integer pageSize, String username) {
-		
+
 		if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}
@@ -110,7 +108,7 @@ public class SystemLogController {
         	JSONObject userinfo = JSONObject.parseObject(userJson);
         	JSONObject orginfo = JSONObject.parseObject(orgInfoJson);
 
-        	SystemLog log = new SystemLog();
+        	SystemLogTwo log = new SystemLogTwo();
         	log.setId(UUID.randomUUID().toString().replace("-", ""));
         	log.setType("3");//功能访问日志
         	log.setSystemIdentify("库级系统");//标识
@@ -127,12 +125,11 @@ public class SystemLogController {
 
         	String enumid = ObjectUtils.toString(orginfo.get("areaCode"), "0");
         	if (!"0".equals(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);
-        			log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
-        		}
+        		String strResult = basicFeignService.getEnumData(Integer.parseInt(enumid));
+				if (null != strResult && !"".equals(strResult)) {
+					JSONObject enum_obj = JSONObject.parseObject(strResult);
+					log.setUserAddress(ObjectUtils.toString(enum_obj.get("gbcode"), ""));//行政区划
+				}
         	}
 
         	//添加保存日志
@@ -162,31 +159,4 @@ public class SystemLogController {
         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/controller/UserInfoController.java

@@ -24,6 +24,7 @@ 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.OrgInfo;
 import com.chinaitop.depot.system.model.TUrlConfig;
 import com.chinaitop.depot.system.model.UserInfo;
@@ -813,4 +814,34 @@ public class UserInfoController {
 		}
 		return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
 	}
+
+	@RequestMapping(value="/getUserData", method = RequestMethod.GET)
+	@ApiOperation(value="查询一个用户信息和角色", notes = "查询一个用户信息和角色")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "username", value = "用户名", paramType = "query"),
+			@ApiImplicitParam(name = "password", value = "密码", paramType = "query")
+	})
+	public Map<String, Object> getUserData(String username, String password) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		//查询用户
+		UserInfo userInfo = userInfoService.valid(username, password);
+		String user = "";
+		if (null != userInfo) {
+			user = JSONObject.toJSONString(userInfo);
+		} else {
+		}
+		map.put("user", user);
+		//查询单位
+		OrgInfo orgInfo = null;
+		String org = "";
+		if (null != userInfo) {
+			int orgId = userInfo.getOrgId();
+			orgInfo = orgInfoService.findById(orgId);
+			if (null != orgInfo) {
+				org = JSONObject.toJSONString(orgInfo);
+			}
+		} 
+		map.put("org", org);
+		return map;
+	}
 }

src/main/java/com/chinaitop/depot/system/feignService/BasicFeignService.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.system.feignService;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "depot-basic")
+public interface BasicFeignService {
+
+	/**
+	 * 获取一条字典数据
+	 * @param username
+	 * @param password
+	 * @return
+	 */
+	@RequestMapping(value = "/Enum/findByEnum", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	String getEnumData(@RequestParam("id") Integer id);
+}

src/main/java/com/chinaitop/depot/system/feignService/SystemFeignService.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.system.feignService;
+
+import java.util.Map;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "depot-system")
+public interface SystemFeignService {
+
+	/**
+	 * 获取登录人和登录人的单位信息
+	 * @param username
+	 * @param password
+	 * @return
+	 */
+	@RequestMapping(value = "/userInfo/getUserData", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	Map<String, Object> getUserData(@RequestParam("username") String username, @RequestParam("password") String password);
+}

src/main/java/com/chinaitop/depot/system/mapper/SystemLogMapper.java

@@ -27,4 +27,11 @@ public interface SystemLogMapper {
     int updateByPrimaryKeySelective(SystemLog record);
 
     int updateByPrimaryKey(SystemLog record);
+
+    /**
+     * 查询三个日志表中数据
+     * @param example
+     * @return
+     */
+    List<SystemLog> queryAllLog(SystemLogExample example);
 }

src/main/java/com/chinaitop/depot/system/mapper/SystemLogMapper.xml

@@ -462,4 +462,29 @@
       operation_time = #{operationTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+
+  <!-- 查询三张日志表集合 -->
+  <select id="queryAllLog" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.SystemLogExample">
+  	select
+    <include refid="Base_Column_List" />
+    from (
+	SELECT * FROM system_log
+	<if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+	UNION ALL
+	SELECT * FROM system_log_two
+	<if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+	UNION ALL
+	SELECT * FROM system_log_three
+	<if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+	) system_log
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/system/mapper/SystemLogThreeMapper.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.system.mapper;
+
+import com.chinaitop.depot.system.model.SystemLogThree;
+import com.chinaitop.depot.system.model.SystemLogThreeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SystemLogThreeMapper {
+    int countByExample(SystemLogThreeExample example);
+
+    int deleteByExample(SystemLogThreeExample example);
+
+    int insert(SystemLogThree record);
+
+    int insertSelective(SystemLogThree record);
+
+    List<SystemLogThree> selectByExample(SystemLogThreeExample example);
+
+    int updateByExampleSelective(@Param("record") SystemLogThree record, @Param("example") SystemLogThreeExample example);
+
+    int updateByExample(@Param("record") SystemLogThree record, @Param("example") SystemLogThreeExample example);
+}

src/main/java/com/chinaitop/depot/system/mapper/SystemLogThreeMapper.xml

@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.system.mapper.SystemLogThreeMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.system.model.SystemLogThree" >
+    <result column="id" property="id" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="user_zh" property="userZh" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="user_role" property="userRole" jdbcType="VARCHAR" />
+    <result column="user_address" property="userAddress" jdbcType="VARCHAR" />
+    <result column="dl_time" property="dlTime" jdbcType="TIMESTAMP" />
+    <result column="zx_time" property="zxTime" jdbcType="TIMESTAMP" />
+    <result column="func_id" property="funcId" jdbcType="INTEGER" />
+    <result column="func_name" property="funcName" jdbcType="VARCHAR" />
+    <result column="btn_id" property="btnId" jdbcType="INTEGER" />
+    <result column="method_name" property="methodName" jdbcType="VARCHAR" />
+    <result column="oper_result" property="operResult" jdbcType="VARCHAR" />
+    <result column="parameter" property="parameter" jdbcType="VARCHAR" />
+    <result column="rtn_param" property="rtnParam" jdbcType="VARCHAR" />
+    <result column="describes" property="describes" jdbcType="VARCHAR" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="device_ip" property="deviceIp" jdbcType="VARCHAR" />
+    <result column="system_identify" property="systemIdentify" jdbcType="VARCHAR" />
+    <result column="operation_time" property="operationTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, user_id, user_zh, user_name, user_role, user_address, dl_time, zx_time, 
+    func_id, func_name, btn_id, method_name, oper_result, parameter, rtn_param, describes, 
+    type, device_ip, system_identify, operation_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.SystemLogThreeExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from system_log_three
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.system.model.SystemLogThreeExample" >
+    delete from system_log_three
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.system.model.SystemLogThree" >
+    insert into system_log_three (id, org_id, user_id, 
+      user_zh, user_name, user_role, 
+      user_address, dl_time, zx_time, 
+      func_id, func_name, btn_id, 
+      method_name, oper_result, parameter, 
+      rtn_param, describes, type, 
+      device_ip, system_identify, operation_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, 
+      #{userZh,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{userRole,jdbcType=VARCHAR}, 
+      #{userAddress,jdbcType=VARCHAR}, #{dlTime,jdbcType=TIMESTAMP}, #{zxTime,jdbcType=TIMESTAMP}, 
+      #{funcId,jdbcType=INTEGER}, #{funcName,jdbcType=VARCHAR}, #{btnId,jdbcType=INTEGER}, 
+      #{methodName,jdbcType=VARCHAR}, #{operResult,jdbcType=VARCHAR}, #{parameter,jdbcType=VARCHAR}, 
+      #{rtnParam,jdbcType=VARCHAR}, #{describes,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
+      #{deviceIp,jdbcType=VARCHAR}, #{systemIdentify,jdbcType=VARCHAR}, #{operationTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.SystemLogThree" >
+    insert into system_log_three
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="userZh != null" >
+        user_zh,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="userRole != null" >
+        user_role,
+      </if>
+      <if test="userAddress != null" >
+        user_address,
+      </if>
+      <if test="dlTime != null" >
+        dl_time,
+      </if>
+      <if test="zxTime != null" >
+        zx_time,
+      </if>
+      <if test="funcId != null" >
+        func_id,
+      </if>
+      <if test="funcName != null" >
+        func_name,
+      </if>
+      <if test="btnId != null" >
+        btn_id,
+      </if>
+      <if test="methodName != null" >
+        method_name,
+      </if>
+      <if test="operResult != null" >
+        oper_result,
+      </if>
+      <if test="parameter != null" >
+        parameter,
+      </if>
+      <if test="rtnParam != null" >
+        rtn_param,
+      </if>
+      <if test="describes != null" >
+        describes,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="deviceIp != null" >
+        device_ip,
+      </if>
+      <if test="systemIdentify != null" >
+        system_identify,
+      </if>
+      <if test="operationTime != null" >
+        operation_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userZh != null" >
+        #{userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null" >
+        #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null" >
+        #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="dlTime != null" >
+        #{dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zxTime != null" >
+        #{zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="funcId != null" >
+        #{funcId,jdbcType=INTEGER},
+      </if>
+      <if test="funcName != null" >
+        #{funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="btnId != null" >
+        #{btnId,jdbcType=INTEGER},
+      </if>
+      <if test="methodName != null" >
+        #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="operResult != null" >
+        #{operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null" >
+        #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="rtnParam != null" >
+        #{rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="describes != null" >
+        #{describes,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceIp != null" >
+        #{deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="systemIdentify != null" >
+        #{systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null" >
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.system.model.SystemLogThreeExample" resultType="java.lang.Integer" >
+    select count(*) from system_log_three
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update system_log_three
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userId != null" >
+        user_id = #{record.userId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userZh != null" >
+        user_zh = #{record.userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userName != null" >
+        user_name = #{record.userName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userRole != null" >
+        user_role = #{record.userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userAddress != null" >
+        user_address = #{record.userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dlTime != null" >
+        dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.zxTime != null" >
+        zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.funcId != null" >
+        func_id = #{record.funcId,jdbcType=INTEGER},
+      </if>
+      <if test="record.funcName != null" >
+        func_name = #{record.funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.btnId != null" >
+        btn_id = #{record.btnId,jdbcType=INTEGER},
+      </if>
+      <if test="record.methodName != null" >
+        method_name = #{record.methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operResult != null" >
+        oper_result = #{record.operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parameter != null" >
+        parameter = #{record.parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rtnParam != null" >
+        rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="record.describes != null" >
+        describes = #{record.describes,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceIp != null" >
+        device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="record.systemIdentify != null" >
+        system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operationTime != null" >
+        operation_time = #{record.operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update system_log_three
+    set id = #{record.id,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
+      user_zh = #{record.userZh,jdbcType=VARCHAR},
+      user_name = #{record.userName,jdbcType=VARCHAR},
+      user_role = #{record.userRole,jdbcType=VARCHAR},
+      user_address = #{record.userAddress,jdbcType=VARCHAR},
+      dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      func_id = #{record.funcId,jdbcType=INTEGER},
+      func_name = #{record.funcName,jdbcType=VARCHAR},
+      btn_id = #{record.btnId,jdbcType=INTEGER},
+      method_name = #{record.methodName,jdbcType=VARCHAR},
+      oper_result = #{record.operResult,jdbcType=VARCHAR},
+      parameter = #{record.parameter,jdbcType=VARCHAR},
+      rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      describes = #{record.describes,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=VARCHAR},
+      device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      operation_time = #{record.operationTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/system/mapper/SystemLogTwoMapper.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.system.mapper;
+
+import com.chinaitop.depot.system.model.SystemLogTwo;
+import com.chinaitop.depot.system.model.SystemLogTwoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SystemLogTwoMapper {
+    int countByExample(SystemLogTwoExample example);
+
+    int deleteByExample(SystemLogTwoExample example);
+
+    int insert(SystemLogTwo record);
+
+    int insertSelective(SystemLogTwo record);
+
+    List<SystemLogTwo> selectByExample(SystemLogTwoExample example);
+
+    int updateByExampleSelective(@Param("record") SystemLogTwo record, @Param("example") SystemLogTwoExample example);
+
+    int updateByExample(@Param("record") SystemLogTwo record, @Param("example") SystemLogTwoExample example);
+}

src/main/java/com/chinaitop/depot/system/mapper/SystemLogTwoMapper.xml

@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.system.mapper.SystemLogTwoMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.system.model.SystemLogTwo" >
+    <result column="id" property="id" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="user_zh" property="userZh" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="user_role" property="userRole" jdbcType="VARCHAR" />
+    <result column="user_address" property="userAddress" jdbcType="VARCHAR" />
+    <result column="dl_time" property="dlTime" jdbcType="TIMESTAMP" />
+    <result column="zx_time" property="zxTime" jdbcType="TIMESTAMP" />
+    <result column="func_id" property="funcId" jdbcType="INTEGER" />
+    <result column="func_name" property="funcName" jdbcType="VARCHAR" />
+    <result column="btn_id" property="btnId" jdbcType="INTEGER" />
+    <result column="method_name" property="methodName" jdbcType="VARCHAR" />
+    <result column="oper_result" property="operResult" jdbcType="VARCHAR" />
+    <result column="parameter" property="parameter" jdbcType="VARCHAR" />
+    <result column="rtn_param" property="rtnParam" jdbcType="VARCHAR" />
+    <result column="describes" property="describes" jdbcType="VARCHAR" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="device_ip" property="deviceIp" jdbcType="VARCHAR" />
+    <result column="system_identify" property="systemIdentify" jdbcType="VARCHAR" />
+    <result column="operation_time" property="operationTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, user_id, user_zh, user_name, user_role, user_address, dl_time, zx_time, 
+    func_id, func_name, btn_id, method_name, oper_result, parameter, rtn_param, describes, 
+    type, device_ip, system_identify, operation_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.SystemLogTwoExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from system_log_two
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.system.model.SystemLogTwoExample" >
+    delete from system_log_two
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.system.model.SystemLogTwo" >
+    insert into system_log_two (id, org_id, user_id, 
+      user_zh, user_name, user_role, 
+      user_address, dl_time, zx_time, 
+      func_id, func_name, btn_id, 
+      method_name, oper_result, parameter, 
+      rtn_param, describes, type, 
+      device_ip, system_identify, operation_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, 
+      #{userZh,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{userRole,jdbcType=VARCHAR}, 
+      #{userAddress,jdbcType=VARCHAR}, #{dlTime,jdbcType=TIMESTAMP}, #{zxTime,jdbcType=TIMESTAMP}, 
+      #{funcId,jdbcType=INTEGER}, #{funcName,jdbcType=VARCHAR}, #{btnId,jdbcType=INTEGER}, 
+      #{methodName,jdbcType=VARCHAR}, #{operResult,jdbcType=VARCHAR}, #{parameter,jdbcType=VARCHAR}, 
+      #{rtnParam,jdbcType=VARCHAR}, #{describes,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
+      #{deviceIp,jdbcType=VARCHAR}, #{systemIdentify,jdbcType=VARCHAR}, #{operationTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.SystemLogTwo" >
+    insert into system_log_two
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="userZh != null" >
+        user_zh,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="userRole != null" >
+        user_role,
+      </if>
+      <if test="userAddress != null" >
+        user_address,
+      </if>
+      <if test="dlTime != null" >
+        dl_time,
+      </if>
+      <if test="zxTime != null" >
+        zx_time,
+      </if>
+      <if test="funcId != null" >
+        func_id,
+      </if>
+      <if test="funcName != null" >
+        func_name,
+      </if>
+      <if test="btnId != null" >
+        btn_id,
+      </if>
+      <if test="methodName != null" >
+        method_name,
+      </if>
+      <if test="operResult != null" >
+        oper_result,
+      </if>
+      <if test="parameter != null" >
+        parameter,
+      </if>
+      <if test="rtnParam != null" >
+        rtn_param,
+      </if>
+      <if test="describes != null" >
+        describes,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="deviceIp != null" >
+        device_ip,
+      </if>
+      <if test="systemIdentify != null" >
+        system_identify,
+      </if>
+      <if test="operationTime != null" >
+        operation_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userZh != null" >
+        #{userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null" >
+        #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null" >
+        #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="dlTime != null" >
+        #{dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zxTime != null" >
+        #{zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="funcId != null" >
+        #{funcId,jdbcType=INTEGER},
+      </if>
+      <if test="funcName != null" >
+        #{funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="btnId != null" >
+        #{btnId,jdbcType=INTEGER},
+      </if>
+      <if test="methodName != null" >
+        #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="operResult != null" >
+        #{operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null" >
+        #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="rtnParam != null" >
+        #{rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="describes != null" >
+        #{describes,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceIp != null" >
+        #{deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="systemIdentify != null" >
+        #{systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null" >
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.system.model.SystemLogTwoExample" resultType="java.lang.Integer" >
+    select count(*) from system_log_two
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update system_log_two
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userId != null" >
+        user_id = #{record.userId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userZh != null" >
+        user_zh = #{record.userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userName != null" >
+        user_name = #{record.userName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userRole != null" >
+        user_role = #{record.userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userAddress != null" >
+        user_address = #{record.userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dlTime != null" >
+        dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.zxTime != null" >
+        zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.funcId != null" >
+        func_id = #{record.funcId,jdbcType=INTEGER},
+      </if>
+      <if test="record.funcName != null" >
+        func_name = #{record.funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.btnId != null" >
+        btn_id = #{record.btnId,jdbcType=INTEGER},
+      </if>
+      <if test="record.methodName != null" >
+        method_name = #{record.methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operResult != null" >
+        oper_result = #{record.operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parameter != null" >
+        parameter = #{record.parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rtnParam != null" >
+        rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="record.describes != null" >
+        describes = #{record.describes,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceIp != null" >
+        device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="record.systemIdentify != null" >
+        system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operationTime != null" >
+        operation_time = #{record.operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update system_log_two
+    set id = #{record.id,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
+      user_zh = #{record.userZh,jdbcType=VARCHAR},
+      user_name = #{record.userName,jdbcType=VARCHAR},
+      user_role = #{record.userRole,jdbcType=VARCHAR},
+      user_address = #{record.userAddress,jdbcType=VARCHAR},
+      dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      func_id = #{record.funcId,jdbcType=INTEGER},
+      func_name = #{record.funcName,jdbcType=VARCHAR},
+      btn_id = #{record.btnId,jdbcType=INTEGER},
+      method_name = #{record.methodName,jdbcType=VARCHAR},
+      oper_result = #{record.operResult,jdbcType=VARCHAR},
+      parameter = #{record.parameter,jdbcType=VARCHAR},
+      rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      describes = #{record.describes,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=VARCHAR},
+      device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      operation_time = #{record.operationTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/system/model/SystemLogThree.java

@@ -0,0 +1,383 @@
+package com.chinaitop.depot.system.model;
+
+import java.util.Date;
+
+public class SystemLogThree {
+    private String id;
+
+    private Integer orgId;
+
+    private Integer userId;
+
+    private String userZh;
+
+    private String userName;
+
+    private String userRole;
+
+    private String userAddress;
+
+    private Date dlTime;
+
+    private Date zxTime;
+
+    private Integer funcId;
+
+    private String funcName;
+
+    private Integer btnId;
+
+    private String methodName;
+
+    private String operResult;
+
+    private String parameter;
+
+    private String rtnParam;
+
+    private String describes;
+
+    private String type;
+
+    private String deviceIp;
+
+    private String systemIdentify;
+
+    private Date operationTime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * 机构id
+     * @return org_id 机构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 机构id
+     * @param orgId 机构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 用户id
+     * @return user_id 用户id
+     */
+    public Integer getUserId() {
+        return userId;
+    }
+
+    /**
+     * 用户id
+     * @param userId 用户id
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 用户账号
+     * @return user_zh 用户账号
+     */
+    public String getUserZh() {
+        return userZh;
+    }
+
+    /**
+     * 用户账号
+     * @param userZh 用户账号
+     */
+    public void setUserZh(String userZh) {
+        this.userZh = userZh == null ? null : userZh.trim();
+    }
+
+    /**
+     * 用户名称
+     * @return user_name 用户名称
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * 用户名称
+     * @param userName 用户名称
+     */
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    /**
+     * 用户角色
+     * @return user_role 用户角色
+     */
+    public String getUserRole() {
+        return userRole;
+    }
+
+    /**
+     * 用户角色
+     * @param userRole 用户角色
+     */
+    public void setUserRole(String userRole) {
+        this.userRole = userRole == null ? null : userRole.trim();
+    }
+
+    /**
+     * 用户所属机构行政区划
+     * @return user_address 用户所属机构行政区划
+     */
+    public String getUserAddress() {
+        return userAddress;
+    }
+
+    /**
+     * 用户所属机构行政区划
+     * @param userAddress 用户所属机构行政区划
+     */
+    public void setUserAddress(String userAddress) {
+        this.userAddress = userAddress == null ? null : userAddress.trim();
+    }
+
+    /**
+     * 登录时间
+     * @return dl_time 登录时间
+     */
+    public Date getDlTime() {
+        return dlTime;
+    }
+
+    /**
+     * 登录时间
+     * @param dlTime 登录时间
+     */
+    public void setDlTime(Date dlTime) {
+        this.dlTime = dlTime;
+    }
+
+    /**
+     * 注销时间
+     * @return zx_time 注销时间
+     */
+    public Date getZxTime() {
+        return zxTime;
+    }
+
+    /**
+     * 注销时间
+     * @param zxTime 注销时间
+     */
+    public void setZxTime(Date zxTime) {
+        this.zxTime = zxTime;
+    }
+
+    /**
+     * 功能id
+     * @return func_id 功能id
+     */
+    public Integer getFuncId() {
+        return funcId;
+    }
+
+    /**
+     * 功能id
+     * @param funcId 功能id
+     */
+    public void setFuncId(Integer funcId) {
+        this.funcId = funcId;
+    }
+
+    /**
+     * 菜单名称
+     * @return func_name 菜单名称
+     */
+    public String getFuncName() {
+        return funcName;
+    }
+
+    /**
+     * 菜单名称
+     * @param funcName 菜单名称
+     */
+    public void setFuncName(String funcName) {
+        this.funcName = funcName == null ? null : funcName.trim();
+    }
+
+    /**
+     * 按钮id
+     * @return btn_id 按钮id
+     */
+    public Integer getBtnId() {
+        return btnId;
+    }
+
+    /**
+     * 按钮id
+     * @param btnId 按钮id
+     */
+    public void setBtnId(Integer btnId) {
+        this.btnId = btnId;
+    }
+
+    /**
+     * 方法名
+     * @return method_name 方法名
+     */
+    public String getMethodName() {
+        return methodName;
+    }
+
+    /**
+     * 方法名
+     * @param methodName 方法名
+     */
+    public void setMethodName(String methodName) {
+        this.methodName = methodName == null ? null : methodName.trim();
+    }
+
+    /**
+     * 操作结果
+     * @return oper_result 操作结果
+     */
+    public String getOperResult() {
+        return operResult;
+    }
+
+    /**
+     * 操作结果
+     * @param operResult 操作结果
+     */
+    public void setOperResult(String operResult) {
+        this.operResult = operResult == null ? null : operResult.trim();
+    }
+
+    /**
+     * 请求参数
+     * @return parameter 请求参数
+     */
+    public String getParameter() {
+        return parameter;
+    }
+
+    /**
+     * 请求参数
+     * @param parameter 请求参数
+     */
+    public void setParameter(String parameter) {
+        this.parameter = parameter == null ? null : parameter.trim();
+    }
+
+    /**
+     * 返回参数
+     * @return rtn_param 返回参数
+     */
+    public String getRtnParam() {
+        return rtnParam;
+    }
+
+    /**
+     * 返回参数
+     * @param rtnParam 返回参数
+     */
+    public void setRtnParam(String rtnParam) {
+        this.rtnParam = rtnParam == null ? null : rtnParam.trim();
+    }
+
+    /**
+     * 日志描述
+     * @return describes 日志描述
+     */
+    public String getDescribes() {
+        return describes;
+    }
+
+    /**
+     * 日志描述
+     * @param describes 日志描述
+     */
+    public void setDescribes(String describes) {
+        this.describes = describes == null ? null : describes.trim();
+    }
+
+    /**
+     * 日志类型：1 登录 2 访问 3 操作
+     * @return type 日志类型：1 登录 2 访问 3 操作
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 日志类型：1 登录 2 访问 3 操作
+     * @param type 日志类型：1 登录 2 访问 3 操作
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * 设备ip
+     * @return device_ip 设备ip
+     */
+    public String getDeviceIp() {
+        return deviceIp;
+    }
+
+    /**
+     * 设备ip
+     * @param deviceIp 设备ip
+     */
+    public void setDeviceIp(String deviceIp) {
+        this.deviceIp = deviceIp == null ? null : deviceIp.trim();
+    }
+
+    /**
+     * 系统标识：库级系统
+     * @return system_identify 系统标识：库级系统
+     */
+    public String getSystemIdentify() {
+        return systemIdentify;
+    }
+
+    /**
+     * 系统标识：库级系统
+     * @param systemIdentify 系统标识：库级系统
+     */
+    public void setSystemIdentify(String systemIdentify) {
+        this.systemIdentify = systemIdentify == null ? null : systemIdentify.trim();
+    }
+
+    /**
+     * 操作时间
+     * @return operation_time 操作时间
+     */
+    public Date getOperationTime() {
+        return operationTime;
+    }
+
+    /**
+     * 操作时间
+     * @param operationTime 操作时间
+     */
+    public void setOperationTime(Date operationTime) {
+        this.operationTime = operationTime;
+    }
+}

src/main/java/com/chinaitop/depot/system/model/SystemLogTwo.java

@@ -0,0 +1,383 @@
+package com.chinaitop.depot.system.model;
+
+import java.util.Date;
+
+public class SystemLogTwo {
+    private String id;
+
+    private Integer orgId;
+
+    private Integer userId;
+
+    private String userZh;
+
+    private String userName;
+
+    private String userRole;
+
+    private String userAddress;
+
+    private Date dlTime;
+
+    private Date zxTime;
+
+    private Integer funcId;
+
+    private String funcName;
+
+    private Integer btnId;
+
+    private String methodName;
+
+    private String operResult;
+
+    private String parameter;
+
+    private String rtnParam;
+
+    private String describes;
+
+    private String type;
+
+    private String deviceIp;
+
+    private String systemIdentify;
+
+    private Date operationTime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * 机构id
+     * @return org_id 机构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 机构id
+     * @param orgId 机构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 用户id
+     * @return user_id 用户id
+     */
+    public Integer getUserId() {
+        return userId;
+    }
+
+    /**
+     * 用户id
+     * @param userId 用户id
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 用户账号
+     * @return user_zh 用户账号
+     */
+    public String getUserZh() {
+        return userZh;
+    }
+
+    /**
+     * 用户账号
+     * @param userZh 用户账号
+     */
+    public void setUserZh(String userZh) {
+        this.userZh = userZh == null ? null : userZh.trim();
+    }
+
+    /**
+     * 用户名称
+     * @return user_name 用户名称
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * 用户名称
+     * @param userName 用户名称
+     */
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    /**
+     * 用户角色
+     * @return user_role 用户角色
+     */
+    public String getUserRole() {
+        return userRole;
+    }
+
+    /**
+     * 用户角色
+     * @param userRole 用户角色
+     */
+    public void setUserRole(String userRole) {
+        this.userRole = userRole == null ? null : userRole.trim();
+    }
+
+    /**
+     * 用户所属机构行政区划
+     * @return user_address 用户所属机构行政区划
+     */
+    public String getUserAddress() {
+        return userAddress;
+    }
+
+    /**
+     * 用户所属机构行政区划
+     * @param userAddress 用户所属机构行政区划
+     */
+    public void setUserAddress(String userAddress) {
+        this.userAddress = userAddress == null ? null : userAddress.trim();
+    }
+
+    /**
+     * 登录时间
+     * @return dl_time 登录时间
+     */
+    public Date getDlTime() {
+        return dlTime;
+    }
+
+    /**
+     * 登录时间
+     * @param dlTime 登录时间
+     */
+    public void setDlTime(Date dlTime) {
+        this.dlTime = dlTime;
+    }
+
+    /**
+     * 注销时间
+     * @return zx_time 注销时间
+     */
+    public Date getZxTime() {
+        return zxTime;
+    }
+
+    /**
+     * 注销时间
+     * @param zxTime 注销时间
+     */
+    public void setZxTime(Date zxTime) {
+        this.zxTime = zxTime;
+    }
+
+    /**
+     * 功能id
+     * @return func_id 功能id
+     */
+    public Integer getFuncId() {
+        return funcId;
+    }
+
+    /**
+     * 功能id
+     * @param funcId 功能id
+     */
+    public void setFuncId(Integer funcId) {
+        this.funcId = funcId;
+    }
+
+    /**
+     * 菜单名称
+     * @return func_name 菜单名称
+     */
+    public String getFuncName() {
+        return funcName;
+    }
+
+    /**
+     * 菜单名称
+     * @param funcName 菜单名称
+     */
+    public void setFuncName(String funcName) {
+        this.funcName = funcName == null ? null : funcName.trim();
+    }
+
+    /**
+     * 按钮id
+     * @return btn_id 按钮id
+     */
+    public Integer getBtnId() {
+        return btnId;
+    }
+
+    /**
+     * 按钮id
+     * @param btnId 按钮id
+     */
+    public void setBtnId(Integer btnId) {
+        this.btnId = btnId;
+    }
+
+    /**
+     * 方法名
+     * @return method_name 方法名
+     */
+    public String getMethodName() {
+        return methodName;
+    }
+
+    /**
+     * 方法名
+     * @param methodName 方法名
+     */
+    public void setMethodName(String methodName) {
+        this.methodName = methodName == null ? null : methodName.trim();
+    }
+
+    /**
+     * 操作结果
+     * @return oper_result 操作结果
+     */
+    public String getOperResult() {
+        return operResult;
+    }
+
+    /**
+     * 操作结果
+     * @param operResult 操作结果
+     */
+    public void setOperResult(String operResult) {
+        this.operResult = operResult == null ? null : operResult.trim();
+    }
+
+    /**
+     * 请求参数
+     * @return parameter 请求参数
+     */
+    public String getParameter() {
+        return parameter;
+    }
+
+    /**
+     * 请求参数
+     * @param parameter 请求参数
+     */
+    public void setParameter(String parameter) {
+        this.parameter = parameter == null ? null : parameter.trim();
+    }
+
+    /**
+     * 返回参数
+     * @return rtn_param 返回参数
+     */
+    public String getRtnParam() {
+        return rtnParam;
+    }
+
+    /**
+     * 返回参数
+     * @param rtnParam 返回参数
+     */
+    public void setRtnParam(String rtnParam) {
+        this.rtnParam = rtnParam == null ? null : rtnParam.trim();
+    }
+
+    /**
+     * 日志描述
+     * @return describes 日志描述
+     */
+    public String getDescribes() {
+        return describes;
+    }
+
+    /**
+     * 日志描述
+     * @param describes 日志描述
+     */
+    public void setDescribes(String describes) {
+        this.describes = describes == null ? null : describes.trim();
+    }
+
+    /**
+     * 日志类型：1 登录 2 访问 3 操作
+     * @return type 日志类型：1 登录 2 访问 3 操作
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 日志类型：1 登录 2 访问 3 操作
+     * @param type 日志类型：1 登录 2 访问 3 操作
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * 设备ip
+     * @return device_ip 设备ip
+     */
+    public String getDeviceIp() {
+        return deviceIp;
+    }
+
+    /**
+     * 设备ip
+     * @param deviceIp 设备ip
+     */
+    public void setDeviceIp(String deviceIp) {
+        this.deviceIp = deviceIp == null ? null : deviceIp.trim();
+    }
+
+    /**
+     * 系统标识：库级系统
+     * @return system_identify 系统标识：库级系统
+     */
+    public String getSystemIdentify() {
+        return systemIdentify;
+    }
+
+    /**
+     * 系统标识：库级系统
+     * @param systemIdentify 系统标识：库级系统
+     */
+    public void setSystemIdentify(String systemIdentify) {
+        this.systemIdentify = systemIdentify == null ? null : systemIdentify.trim();
+    }
+
+    /**
+     * 操作时间
+     * @return operation_time 操作时间
+     */
+    public Date getOperationTime() {
+        return operationTime;
+    }
+
+    /**
+     * 操作时间
+     * @param operationTime 操作时间
+     */
+    public void setOperationTime(Date operationTime) {
+        this.operationTime = operationTime;
+    }
+}

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.chinaitop.depot.system.model.SystemLog;
 import com.chinaitop.depot.system.model.SystemLogExample;
+import com.chinaitop.depot.system.model.SystemLogTwo;
 import com.chinaitop.depot.system.model.UserOperationlog;
 
 public interface UserOperationlogService {
@@ -22,10 +23,10 @@ public interface UserOperationlogService {
     void AddLogMsg(UserOperationlog userOperationlog);
     
     /**
-     * 插入systemlog
+     * 插入systemlogTwo访问日志表
      * @param systemLog SystemLog对象
      */
-    void AddSystemLog(SystemLog systemLog);
+    void AddSystemLog(SystemLogTwo systemLog);
 
     /**
      * 查询systemlog表日志

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

@@ -1,9 +1,11 @@
 package com.chinaitop.depot.system.service.impl;
 
 import com.chinaitop.depot.system.mapper.SystemLogMapper;
+import com.chinaitop.depot.system.mapper.SystemLogTwoMapper;
 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.SystemLogTwo;
 import com.chinaitop.depot.system.model.UserOperationlog;
 import com.chinaitop.depot.system.service.UserOperationlogService;
 
@@ -27,6 +29,9 @@ public class UserOperationlogServiceImpl implements UserOperationlogService {
     @Resource
     private SystemLogMapper systemLogMapper;
 
+    @Resource
+    private SystemLogTwoMapper systemLogTwoMapper;
+
 	@Override
 	public List<UserOperationlog> queryAll(HashMap<Object, Object> map) {
 		return userOperationlogMapper.queryAll(map);
@@ -38,13 +43,13 @@ public class UserOperationlogServiceImpl implements UserOperationlogService {
 	}
 
 	@Override
-	public void AddSystemLog(SystemLog systemLog) {
-		systemLogMapper.insertSelective(systemLog);
+	public void AddSystemLog(SystemLogTwo systemLog) {
+		systemLogTwoMapper.insertSelective(systemLog);
 	}
 
 	@Override
 	public List<SystemLog> findSystemLogCondition(SystemLogExample example) {
-		return systemLogMapper.selectByExample(example);
+		return systemLogMapper.queryAllLog(example);
 	}
 
 }