Merge branch 'master' of http://hefeng@124.193.70.90:1001/r/depot-system-yunnan.git

pom.xml

@@ -118,6 +118,19 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- 阿里巴巴json -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.37</version>
+		</dependency>
+        <!-- 加载mybatis逆向生成工具包 -->
+        <dependency>
+		    <groupId>org.mybatis.generator</groupId>
+		    <artifactId>mybatis-generator-core</artifactId>
+		    <!-- 注意版本.这里我使用的是1.3.2 -->
+		    <version>1.3.2</version>
+		</dependency>
     </dependencies>
 
     <dependencyManagement>

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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,309 @@
+package com.chinaitop.depot;
+
+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.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);
+    	}
+    	
+        //System.out.println(butn_list);
+        
+        //System.out.println("Interception cost="+(System.currentTimeMillis()-start));
+        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("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"),""));//名称
+			log.setDeviceIp(getClientIpAddress(request));
+			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"));//行政区划
+			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));
+        		}
+        	}
+    		
+    	}
+    }
+    
+    /**
+     * 操作日志实现思路：
+     * 1、URL要是可以在菜单里面找到对应菜单，那么当前这个操作属于功能操作日志
+     * 2、如果没在菜单里面找到对应菜单，却在按钮中找到了，那么就是功能访问日志
+     * 3、如果菜单和按钮中都没有找到对应的URL，那么说明当前这个方位没在功能管理里面配置正确，或者没有加入到功能管理中
+     * 
+     * @param request
+     * @param response
+     * @param url
+     */
+    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"),""));//名称
+    				log.setDeviceIp(getClientIpAddress(request));//操作IP
+    				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"));//行政区划
+
+    				//添加保存日志
+    				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"),""));//名称
+        				log.setDeviceIp(getClientIpAddress(request));//操作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.setFuncName(ObjectUtils.toString(sbf.toString(), ""));//菜单名称
+        				HandlerMethod h = (HandlerMethod) handler;  
+        				log.setMethodName(h.getMethod().getName());//方法名
+        				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")));//所属机构
+        				log.setUserAddress(user_map.get("areaName"));//行政区划
+
+        				//添加保存日志
+        				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/mapper/RoleButtonMapper.java

@@ -5,6 +5,7 @@ import com.chinaitop.depot.system.model.RoleButtonExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface RoleButtonMapper {
     int countByExample(RoleButtonExample example);
@@ -30,4 +31,11 @@ public interface RoleButtonMapper {
     int updateByPrimaryKey(RoleButton record);
     
     int batchInsert(List<RoleButton> list);
+
+    /**
+     * 查询按钮权限和按钮对应菜单和URL
+     * @param example
+     * @return
+     */
+    List<RoleButton> selectByExampleNew(Map<String, Object> param);
 }

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

@@ -185,4 +185,17 @@
       btn_id = #{btnId,jdbcType=INTEGER}
     where rb_id = #{rbId,jdbcType=INTEGER}
   </update>
+  <!-- 查询按钮权限和按钮对应菜单和URL -->
+  <select id="selectByExampleNew" resultMap="BaseResultMap" parameterType="java.util.Map" >
+    SELECT 
+    a.rb_id, a.role_id, a.btn_id, b.func_id funcId, c.func_name funcName, b.btn_name btnName, b.remark,b.btn_url btnUrl 
+    FROM role_button a
+	LEFT JOIN button_info b on b.btn_id=a.btn_id 
+	LEFT JOIN func_info c ON c.func_id=b.func_id 
+	WHERE 1=1 
+    <if test="roleIds != null" >
+	AND a.role_id in ${roleIds}
+    </if>
+  </select>
+  
 </mapper>

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

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.system.mapper;
+
+import com.chinaitop.depot.system.model.SystemLog;
+import com.chinaitop.depot.system.model.SystemLogExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SystemLogMapper {
+    int countByExample(SystemLogExample example);
+
+    int deleteByExample(SystemLogExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(SystemLog record);
+
+    int insertSelective(SystemLog record);
+
+    List<SystemLog> selectByExample(SystemLogExample example);
+
+    SystemLog selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") SystemLog record, @Param("example") SystemLogExample example);
+
+    int updateByExample(@Param("record") SystemLog record, @Param("example") SystemLogExample example);
+
+    int updateByPrimaryKeySelective(SystemLog record);
+
+    int updateByPrimaryKey(SystemLog record);
+}

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

@@ -0,0 +1,465 @@
+<?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.SystemLogMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.system.model.SystemLog" >
+    <id 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.SystemLogExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from system_log
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from system_log
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.system.model.SystemLogExample" >
+    delete from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.system.model.SystemLog" >
+    insert into system_log (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.SystemLog" >
+    insert into system_log
+    <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.SystemLogExample" resultType="java.lang.Integer" >
+    select count(*) from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update system_log
+    <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
+    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>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.system.model.SystemLog" >
+    update system_log
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userZh != null" >
+        user_zh = #{userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null" >
+        user_role = #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null" >
+        user_address = #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="dlTime != null" >
+        dl_time = #{dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zxTime != null" >
+        zx_time = #{zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="funcId != null" >
+        func_id = #{funcId,jdbcType=INTEGER},
+      </if>
+      <if test="funcName != null" >
+        func_name = #{funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="btnId != null" >
+        btn_id = #{btnId,jdbcType=INTEGER},
+      </if>
+      <if test="methodName != null" >
+        method_name = #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="operResult != null" >
+        oper_result = #{operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null" >
+        parameter = #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="rtnParam != null" >
+        rtn_param = #{rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="describes != null" >
+        describes = #{describes,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceIp != null" >
+        device_ip = #{deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="systemIdentify != null" >
+        system_identify = #{systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null" >
+        operation_time = #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.system.model.SystemLog" >
+    update system_log
+    set org_id = #{orgId,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
+      user_zh = #{userZh,jdbcType=VARCHAR},
+      user_name = #{userName,jdbcType=VARCHAR},
+      user_role = #{userRole,jdbcType=VARCHAR},
+      user_address = #{userAddress,jdbcType=VARCHAR},
+      dl_time = #{dlTime,jdbcType=TIMESTAMP},
+      zx_time = #{zxTime,jdbcType=TIMESTAMP},
+      func_id = #{funcId,jdbcType=INTEGER},
+      func_name = #{funcName,jdbcType=VARCHAR},
+      btn_id = #{btnId,jdbcType=INTEGER},
+      method_name = #{methodName,jdbcType=VARCHAR},
+      oper_result = #{operResult,jdbcType=VARCHAR},
+      parameter = #{parameter,jdbcType=VARCHAR},
+      rtn_param = #{rtnParam,jdbcType=VARCHAR},
+      describes = #{describes,jdbcType=VARCHAR},
+      type = #{type,jdbcType=VARCHAR},
+      device_ip = #{deviceIp,jdbcType=VARCHAR},
+      system_identify = #{systemIdentify,jdbcType=VARCHAR},
+      operation_time = #{operationTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -13,6 +13,13 @@ public class RoleButton implements Serializable{
     private Integer roleId;
 
     private Integer btnId;
+    
+    //特殊处理添加
+    private Integer funcId;
+    private String btnName;
+    private String btnUrl;
+    private String remark;
+    private String funcName;
 
     /**
      * 编号
@@ -61,4 +68,45 @@ public class RoleButton implements Serializable{
     public void setBtnId(Integer btnId) {
         this.btnId = btnId;
     }
+
+	public Integer getFuncId() {
+		return funcId;
+	}
+
+	public void setFuncId(Integer funcId) {
+		this.funcId = funcId;
+	}
+
+	public String getBtnName() {
+		return btnName;
+	}
+
+	public void setBtnName(String btnName) {
+		this.btnName = btnName;
+	}
+
+	public String getBtnUrl() {
+		return btnUrl;
+	}
+
+	public void setBtnUrl(String btnUrl) {
+		this.btnUrl = btnUrl;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getFuncName() {
+		return funcName;
+	}
+
+	public void setFuncName(String funcName) {
+		this.funcName = funcName;
+	}
+    
 }

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

@@ -0,0 +1,383 @@
+package com.chinaitop.depot.system.model;
+
+import java.util.Date;
+
+public class SystemLog {
+    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/impl/RoleButtonServiceImpl.java

@@ -4,11 +4,18 @@ import com.chinaitop.depot.system.mapper.RoleButtonMapper;
 import com.chinaitop.depot.system.mapper.UserRoleMapper;
 import com.chinaitop.depot.system.model.*;
 import com.chinaitop.depot.system.service.RoleButtonService;
+import com.chinaitop.depot.utils.RedisUtil;
+import com.google.gson.Gson;
+
+import org.json.JSONArray;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class RoleButtonServiceImpl implements RoleButtonService {
@@ -19,6 +26,9 @@ public class RoleButtonServiceImpl implements RoleButtonService {
 	@Resource
 	private UserRoleMapper userRoleMapper;
 
+	@Autowired
+	private RedisUtil redisUtil;
+
 	@Override
 	public List<RoleButton> queryByExample(RoleButtonExample example) {
 		// TODO Auto-generated method stub
@@ -72,9 +82,17 @@ public class RoleButtonServiceImpl implements RoleButtonService {
 			if(urList!=null){
 				urList.forEach(ur -> roleIds.add(ur.getRoleId()));
 			}
-			RoleButtonExample rbExample = new RoleButtonExample();
-			rbExample.createCriteria().andRoleIdIn(roleIds);
-			List<RoleButton> rbList = roleButtonMapper.selectByExample(rbExample );
+//			RoleButtonExample rbExample = new RoleButtonExample();
+//			rbExample.createCriteria().andRoleIdIn(roleIds);
+			Map<String, Object> param = new HashMap<String, Object>();
+			Gson gson=new Gson();
+			String jsonids = gson.toJson(roleIds);
+			jsonids = jsonids.replace("[", "(");
+			jsonids = jsonids.replace("]", ")");
+			param.put("roleIds", jsonids);
+			List<RoleButton> rbList = roleButtonMapper.selectByExampleNew(param);
+			String json = gson.toJson(rbList);
+			redisUtil.set("permissionList", json);
 			return rbList;
 	}
 

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

@@ -5,6 +5,10 @@ import com.chinaitop.depot.system.mapper.RoleFuncMapper;
 import com.chinaitop.depot.system.mapper.UserRoleMapper;
 import com.chinaitop.depot.system.model.*;
 import com.chinaitop.depot.system.service.RoleFuncService;
+import com.chinaitop.depot.utils.RedisUtil;
+import com.google.gson.Gson;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +26,9 @@ public class RoleFuncServiceImpl implements RoleFuncService {
 	
 	@Resource
 	private FuncInfoMapper funcInfoMapper;
+	
+	@Autowired
+	private RedisUtil redisUtil;
 
 	@Override
 	public List<RoleFunc> queryByRoleId(Integer roleId) {
@@ -85,6 +92,9 @@ public class RoleFuncServiceImpl implements RoleFuncService {
 				funclist = funcInfoMapper.selectByExample(funcInfoExample);
 			}
 		}
+		Gson gson=new Gson();
+		String json = gson.toJson(funclist);
+		redisUtil.set("hasFuncList", json);
 		return funclist;
 	}
 

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

@@ -1,8 +1,11 @@
 package com.chinaitop.depot.system.service.impl;
 
+import com.chinaitop.depot.system.mapper.RoleInfoMapper;
 import com.chinaitop.depot.system.mapper.UserBusinessMapper;
 import com.chinaitop.depot.system.mapper.UserInfoMapper;
 import com.chinaitop.depot.system.mapper.UserRoleMapper;
+import com.chinaitop.depot.system.model.RoleInfo;
+import com.chinaitop.depot.system.model.RoleInfoExample;
 import com.chinaitop.depot.system.model.UserInfo;
 import com.chinaitop.depot.system.model.UserInfoExample;
 import com.chinaitop.depot.system.model.UserInfoExample.Criteria;
@@ -31,6 +34,9 @@ public class UserInfoServiceImpl implements UserInfoService {
 	
 	@Resource
 	private UserBusinessMapper userBusinessMapper;
+	
+	@Resource
+	private RoleInfoMapper roleInfoMapper;
 
 	@Override
 	public UserInfo valid(String UserInfoName, String password) {
@@ -49,11 +55,45 @@ public class UserInfoServiceImpl implements UserInfoService {
 				roleIds.add(String.valueOf(userRole.getRoleId()));
 			}
 			userInfo.setRoleIds(roleIds);
+			//获取所属角色
+			List<Integer> new_roleIds = new ArrayList<Integer>();
+			for (UserRole userRole : urList) {
+				new_roleIds.add(userRole.getRoleId());
+			}
+			String roleNames = "";
+			if (new_roleIds.size() > 0) {
+				roleNames = getRoleNames(new_roleIds);
+			}
+			userInfo.setRoleNames(roleNames);
 			return userInfo;
 		}
 		return null;
 	}
 
+	/**
+	 * 获取角色名称
+	 * 
+	 * @param new_roleIds 角色ID集合
+	 * @return
+	 */
+	private String getRoleNames(List<Integer> new_roleIds) {
+		String roleNames = "";
+		//获取所属角色
+		RoleInfoExample roleinfoExample = new RoleInfoExample();
+		RoleInfoExample.Criteria roleinfo_criteria = roleinfoExample.createCriteria();
+		roleinfo_criteria.andRoleIdIn(new_roleIds);
+		List<RoleInfo> roleinfo_list = roleInfoMapper.selectByExample(roleinfoExample);
+		//组装成string返回
+		StringBuffer sbf = new StringBuffer();
+		for (RoleInfo roleinfo : roleinfo_list) {
+			sbf.append(roleinfo.getRoleName()).append(",");
+		}
+		if (sbf.toString().length() > 0) {
+			roleNames = sbf.toString().substring(0, sbf.toString().length() - 1);
+		}
+		return roleNames;
+	}
+
 	@Override
 	public List<UserInfo> queryByExample(UserInfoExample example) {
 		// TODO Auto-generated method stub

src/main/java/com/chinaitop/depot/utils/GeneratorSqlmap.java

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.utils;
+
+import org.mybatis.generator.api.MyBatisGenerator;
+import org.mybatis.generator.config.Configuration;
+import org.mybatis.generator.config.xml.ConfigurationParser;
+import org.mybatis.generator.internal.DefaultShellCallback;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GeneratorSqlmap {
+
+	public void generator() throws Exception{
+
+		List<String> warnings = new ArrayList<String>();
+		boolean overwrite = true;
+		//指定 逆向工程配置文件(写自己电脑的路径)F:\LsProject\depot-basic\src\main\resources
+		File configFile = new File("D:\\git_10.10.1.25\\depot-system-yunnan\\src\\main\\resources\\generatorConfig.xml");
+		ConfigurationParser cp = new ConfigurationParser(warnings);
+		Configuration config = cp.parseConfiguration(configFile);
+		DefaultShellCallback callback = new DefaultShellCallback(overwrite);
+		MyBatisGenerator myBatisGenerator = new MyBatisGenerator(config,
+				callback, warnings);
+		myBatisGenerator.generate(null);
+	} 
+	public static void main(String[] args) throws Exception {
+		try {
+			GeneratorSqlmap generatorSqlmap = new GeneratorSqlmap();
+			generatorSqlmap.generator();
+			System.out.println("生成成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			System.out.println("生成失败");
+		}
+		
+	}
+
+}

src/main/java/com/chinaitop/depot/utils/MyCommentGenerator.java

@@ -0,0 +1,242 @@
+package com.chinaitop.depot.utils;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+
+import static org.mybatis.generator.internal.util.StringUtility.isTrue;
+import org.mybatis.generator.api.CommentGenerator;
+import org.mybatis.generator.api.IntrospectedColumn;
+import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.dom.java.CompilationUnit;
+import org.mybatis.generator.api.dom.java.Field;
+import org.mybatis.generator.api.dom.java.InnerClass;
+import org.mybatis.generator.api.dom.java.InnerEnum;
+import org.mybatis.generator.api.dom.java.JavaElement;
+import org.mybatis.generator.api.dom.java.Method;
+import org.mybatis.generator.api.dom.java.Parameter;
+import org.mybatis.generator.api.dom.xml.XmlElement;
+import org.mybatis.generator.config.MergeConstants;
+import org.mybatis.generator.config.PropertyRegistry;
+
+public class MyCommentGenerator implements CommentGenerator {
+
+	private Properties properties;
+	private Properties systemPro;
+	private boolean suppressDate;
+	private boolean suppressAllComments;
+	private String currentDateStr;
+
+	public MyCommentGenerator() {
+	    super();
+	    properties = new Properties();
+	    systemPro = System.getProperties();
+	    suppressDate = false;
+	    suppressAllComments = false;
+	    currentDateStr = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
+	}
+
+	
+	@Override
+	public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable) {
+		if (suppressAllComments) {
+	        return;
+	    }
+	    StringBuilder sb = new StringBuilder();
+	    innerClass.addJavaDocLine("/**");
+	    sb.append(" * ");
+	    sb.append(introspectedTable.getFullyQualifiedTable());
+	    sb.append(" ");
+	    sb.append(getDateString());
+	    innerClass.addJavaDocLine(sb.toString());
+	    innerClass.addJavaDocLine(" */");
+
+	}
+
+	@Override
+	public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable, boolean arg2) {
+		if (suppressAllComments) {
+	        return;
+	    }
+
+	    StringBuilder sb = new StringBuilder();
+
+	    innerClass.addJavaDocLine("/**");
+	    sb.append(" * ");
+	    sb.append(introspectedTable.getFullyQualifiedTable());
+	    innerClass.addJavaDocLine(sb.toString());
+
+	    sb.setLength(0);
+	    sb.append(" * @author ");
+	    sb.append(systemPro.getProperty("user.name"));
+	    sb.append(" ");
+	    sb.append(currentDateStr);
+
+	    //      addJavadocTag(innerClass, markAsDoNotDelete);
+
+	    innerClass.addJavaDocLine(" */");
+
+	}
+
+	@Override
+	public void addComment(XmlElement arg0) {
+		return;
+	}
+
+	@Override
+	public void addConfigurationProperties(Properties properties) {
+		this.properties.putAll(properties);
+
+	    suppressDate = isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_DATE));
+
+	    suppressAllComments = isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_ALL_COMMENTS));
+
+	}
+	
+	/**
+	 * This method adds the custom javadoc tag for. You may do nothing if you do
+	 * not wish to include the Javadoc tag - however, if you do not include the
+	 * Javadoc tag then the Java merge capability of the eclipse plugin will
+	 * break.
+	 * 
+	 * @param javaElement
+	 *            the java element
+	 */
+	protected void addJavadocTag(JavaElement javaElement, boolean markAsDoNotDelete) {
+	    javaElement.addJavaDocLine(" *");
+	    StringBuilder sb = new StringBuilder();
+	    sb.append(" * ");
+	    sb.append(MergeConstants.NEW_ELEMENT_TAG);
+	    if (markAsDoNotDelete) {
+	        sb.append(" do_not_delete_during_merge");
+	    }
+	    String s = getDateString();
+	    if (s != null) {
+	        sb.append(' ');
+	        sb.append(s);
+	    }
+	    javaElement.addJavaDocLine(sb.toString());
+	}
+	
+	protected String getDateString() {
+	    String result = null;
+	    if (!suppressDate) {
+	        result = currentDateStr;
+	    }
+	    return result;
+	}
+
+
+	@Override
+	public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable) {
+		if (suppressAllComments) {
+	        return;
+	    }
+
+	    StringBuilder sb = new StringBuilder();
+
+	    innerEnum.addJavaDocLine("/**");
+	    //      addJavadocTag(innerEnum, false);
+	    sb.append(" * ");
+	    sb.append(introspectedTable.getFullyQualifiedTable());
+	    innerEnum.addJavaDocLine(sb.toString());
+	    innerEnum.addJavaDocLine(" */");
+
+	}
+
+	@Override
+	public void addFieldComment(Field field, IntrospectedTable introspectedTable) {
+		if (suppressAllComments) {
+	        return;
+	    }
+
+	    StringBuilder sb = new StringBuilder();
+
+	    field.addJavaDocLine("/**");
+	    sb.append(" * ");
+	    sb.append(introspectedTable.getFullyQualifiedTable());
+	    field.addJavaDocLine(sb.toString());
+	    field.addJavaDocLine(" */");
+
+	}
+
+	@Override
+	public void addFieldComment(Field arg0, IntrospectedTable arg1, IntrospectedColumn arg2) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void addGeneralMethodComment(Method arg0, IntrospectedTable arg1) {
+		if (suppressAllComments) {
+	        return;
+	    }
+	    //      method.addJavaDocLine("/**");
+	    //      addJavadocTag(method, false);
+	    //      method.addJavaDocLine(" */");
+
+	}
+
+	@Override
+	public void addGetterComment(Method method, IntrospectedTable arg1, IntrospectedColumn introspectedColumn) {
+		if (suppressAllComments) {
+	        return;
+	    }
+
+	    method.addJavaDocLine("/**");
+
+	    StringBuilder sb = new StringBuilder();
+	    sb.append(" * ");
+	    sb.append(introspectedColumn.getRemarks());
+	    method.addJavaDocLine(sb.toString());
+
+	    sb.setLength(0);
+	    sb.append(" * @return ");
+	    sb.append(introspectedColumn.getActualColumnName());
+	    sb.append(" ");
+	    sb.append(introspectedColumn.getRemarks());
+	    method.addJavaDocLine(sb.toString());
+
+	    //      addJavadocTag(method, false);
+
+	    method.addJavaDocLine(" */");
+
+	}
+
+	@Override
+	public void addJavaFileComment(CompilationUnit arg0) {
+		return;
+	}
+
+	@Override
+	public void addRootComment(XmlElement arg0) {
+		return;
+	}
+
+	@Override
+	public void addSetterComment(Method method, IntrospectedTable arg1, IntrospectedColumn introspectedColumn) {
+		if (suppressAllComments) {
+	        return;
+	    }
+
+
+	    method.addJavaDocLine("/**");
+	    StringBuilder sb = new StringBuilder();
+	    sb.append(" * ");
+	    sb.append(introspectedColumn.getRemarks());
+	    method.addJavaDocLine(sb.toString());
+
+	    Parameter parm = method.getParameters().get(0);
+	    sb.setLength(0);
+	    sb.append(" * @param ");
+	    sb.append(parm.getName());
+	    sb.append(" ");
+	    sb.append(introspectedColumn.getRemarks());
+	    method.addJavaDocLine(sb.toString());
+
+	    //      addJavadocTag(method, false);
+
+	    method.addJavaDocLine(" */");
+
+	}
+
+}

src/main/resources/generatorConfig.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+  PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+  "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+	<context id="testTables" targetRuntime="MyBatis3">
+		<!-- 生成注释时，必须加type="MyCommentGenerator" -->
+		<commentGenerator type="com.chinaitop.depot.utils.MyCommentGenerator">
+			<!-- 是否去除自动生成的注释 true：是 ： false:否 -->
+			<property name="suppressAllComments" value="false" />
+		</commentGenerator>
+		
+		<!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
+		<jdbcConnection 
+			driverClass="com.mysql.jdbc.Driver"
+			connectionURL="jdbc:mysql://localhost:3306/depot_yunnan" 
+			userId="root"
+			password="123456">
+		</jdbcConnection>
+		
+		<!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和 
+			NUMERIC 类型解析为java.math.BigDecimal -->
+		<javaTypeResolver>
+			<property name="forceBigDecimals" value="false" />
+		</javaTypeResolver>
+
+		<!-- targetProject:生成PO类的位置 -->
+		<javaModelGenerator targetPackage="com.chinaitop.depot.system.model"
+			targetProject=".\src\main\java">
+			<!-- enableSubPackages:是否让schema作为包的后缀 -->
+			<property name="enableSubPackages" value="false" />
+			<!-- 从数据库返回的值被清理前后的空格 -->
+			<property name="trimStrings" value="true" />
+		</javaModelGenerator>
+		
+        <!-- targetProject:mapper映射文件生成的位置 -->
+		<sqlMapGenerator targetPackage="com.chinaitop.depot.system.mapper" 
+			targetProject=".\src\main\java">
+			<!-- enableSubPackages:是否让schema作为包的后缀 -->
+			<property name="enableSubPackages" value="false" />
+		</sqlMapGenerator>
+		
+		<!-- targetPackage：mapper接口生成的位置 -->
+		<javaClientGenerator type="XMLMAPPER"
+			targetPackage="com.chinaitop.depot.system.mapper" 
+			targetProject=".\src\main\java">
+			<!-- enableSubPackages:是否让schema作为包的后缀 -->
+			<property name="enableSubPackages" value="false" />
+		</javaClientGenerator>
+		
+		<!-- 指定要反向生成的数据库表 -->
+		<table schema="" tableName="system_log"></table>
+
+	</context>
+</generatorConfiguration>