git-svn-id: https://192.168.57.71/svn/jsgkj@716 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/UserModelMapper.java

@@ -1,14 +1,33 @@
 package com.xt.js.gkaq.frame.mappers;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.UserModel;
 
 public interface UserModelMapper extends BaseMapper<UserModel> {
-	/**
-	 * 根据登录名查询用户信息
-	 * 
-	 * @param loginName
-	 * @return
-	 */
-	UserModel selectByLoginName(String loginName);
+    /**
+     * 根据登录名查询用户信息
+     * 
+     * @param loginName
+     * @return
+     */
+    UserModel selectByLoginName(String loginName);
+
+    /**
+     * 根据用户ID查询授权的菜单
+     * 
+     * @param userId
+     * @return
+     */
+    List<String> selectAuthMenuByUserid(String userId);
+
+    /**
+     * 根据用户ID查询授权的功能
+     * 
+     * @param userId
+     * @return
+     */
+    List<String> selectAuthButtonByUserid(String userId);
+
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/UserService.java

@@ -1,5 +1,7 @@
 package com.xt.js.gkaq.frame.service;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.UserModel;
 
@@ -11,11 +13,27 @@ import com.xt.js.gkaq.frame.model.UserModel;
  */
 public interface UserService extends BaseUUIDModelService<UserModel> {
 
-	/**
-	 * 根据登录名查询用户
-	 * 
-	 * @param loginName
-	 * @return
-	 */
-	public UserModel findByLoginName(String loginName);
+    /**
+     * 根据登录名查询用户
+     * 
+     * @param loginName
+     * @return
+     */
+    public UserModel findByLoginName(String loginName);
+
+    /**
+     * 根据用户ID查询授权的用户菜单
+     * 
+     * @param userId
+     * @return
+     */
+    List<String> selectAuthMenuByUserid(String userId);
+
+    /**
+     * 根据用户ID查询授权的功能
+     * 
+     * @param userId
+     * @return
+     */
+    List<String> selectAuthButtonByUserid(String userId);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/UserServiceImpl.java

@@ -1,5 +1,7 @@
 package com.xt.js.gkaq.frame.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -11,15 +13,23 @@ import com.xt.js.gkaq.frame.service.UserService;
 
 @Service
 public class UserServiceImpl extends BaseUUIDModelServiceImpl<UserModel> implements UserService {
-	@Autowired
-	private UserModelMapper mapper;
+    @Autowired
+    private UserModelMapper mapper;
+
+    public UserModel findByLoginName(String loginName) {
+        return mapper.selectByLoginName(loginName);
+    }
+
+    @Override
+    protected BaseMapper<UserModel> getMapper() {
+        return mapper;
+    }
 
-	public UserModel findByLoginName(String loginName) {
-		return mapper.selectByLoginName(loginName);
-	}
+    public List<String> selectAuthMenuByUserid(String userId) {
+        return mapper.selectAuthMenuByUserid(userId);
+    }
 
-	@Override
-	protected BaseMapper<UserModel> getMapper() {
-		return mapper;
-	}
+    public List<String> selectAuthButtonByUserid(String userId) {
+        return mapper.selectAuthButtonByUserid(userId);
+    }
 }

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/UserModelMapper.xml

@@ -1,62 +1,87 @@
 <?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.xt.js.gkaq.frame.mappers.UserModelMapper">
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.UserModel">
-    <id column="ID" jdbcType="VARCHAR" property="id" />
-    <result column="REAL_NAME" jdbcType="VARCHAR" property="realName" />
-    <result column="LOGIN_NAME" jdbcType="VARCHAR" property="loginName" />
-    <result column="LOGIN_PASSWORD" jdbcType="VARCHAR" property="loginPassword" />
-    <result column="ORGID" jdbcType="VARCHAR" property="orgid" />
-    <result column="SEX" jdbcType="CHAR" property="sex" />
-    <result column="PHONE" jdbcType="VARCHAR" property="phone" />
-    <result column="EMAIL" jdbcType="VARCHAR" property="email" />
-    <result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
-    <result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
-    <result column="STATE" jdbcType="CHAR" property="state" />
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from AQ_BASIC_FRAME_USER
-    where ID = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserModel">
-    insert into AQ_BASIC_FRAME_USER (ID, REAL_NAME, LOGIN_NAME, 
-      LOGIN_PASSWORD, ORGID, SEX, 
-      PHONE, EMAIL, CREATE_TIME, 
-      UPDATE_TIME, STATE)
-    values (#{id,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
-      #{loginPassword,jdbcType=VARCHAR}, #{orgid,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR}, 
-      #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=OTHER}, 
-      #{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR})
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserModel">
-    update AQ_BASIC_FRAME_USER
-    set REAL_NAME = #{realName,jdbcType=VARCHAR},
-      LOGIN_NAME = #{loginName,jdbcType=VARCHAR},
-      LOGIN_PASSWORD = #{loginPassword,jdbcType=VARCHAR},
-      ORGID = #{orgid,jdbcType=VARCHAR},
-      SEX = #{sex,jdbcType=CHAR},
-      PHONE = #{phone,jdbcType=VARCHAR},
-      EMAIL = #{email,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=OTHER},
-      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
-      STATE = #{state,jdbcType=CHAR}
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, CREATE_TIME, 
-    UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_USER
-    where ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByLoginName" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, CREATE_TIME, 
-    UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_USER
-    where LOGIN_NAME = #{loginName,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap">
-    select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, CREATE_TIME, 
-    UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_USER
-  </select>
+	<resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.UserModel">
+		<id column="ID" jdbcType="VARCHAR" property="id" />
+		<result column="REAL_NAME" jdbcType="VARCHAR" property="realName" />
+		<result column="LOGIN_NAME" jdbcType="VARCHAR" property="loginName" />
+		<result column="LOGIN_PASSWORD" jdbcType="VARCHAR" property="loginPassword" />
+		<result column="ORGID" jdbcType="VARCHAR" property="orgid" />
+		<result column="SEX" jdbcType="CHAR" property="sex" />
+		<result column="PHONE" jdbcType="VARCHAR" property="phone" />
+		<result column="EMAIL" jdbcType="VARCHAR" property="email" />
+		<result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
+		<result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
+		<result column="STATE" jdbcType="CHAR" property="state" />
+	</resultMap>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+		delete from AQ_BASIC_FRAME_USER
+		where ID = #{id,jdbcType=VARCHAR}
+	</delete>
+	<insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserModel">
+		insert into AQ_BASIC_FRAME_USER (ID, REAL_NAME, LOGIN_NAME,
+		LOGIN_PASSWORD, ORGID, SEX,
+		PHONE, EMAIL, CREATE_TIME,
+		UPDATE_TIME, STATE)
+		values (#{id,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR},
+		#{loginName,jdbcType=VARCHAR},
+		#{loginPassword,jdbcType=VARCHAR}, #{orgid,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR},
+		#{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
+		#{createTime,jdbcType=OTHER},
+		#{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR})
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserModel">
+		update AQ_BASIC_FRAME_USER
+		set REAL_NAME = #{realName,jdbcType=VARCHAR},
+		LOGIN_NAME = #{loginName,jdbcType=VARCHAR},
+		LOGIN_PASSWORD = #{loginPassword,jdbcType=VARCHAR},
+		ORGID = #{orgid,jdbcType=VARCHAR},
+		SEX = #{sex,jdbcType=CHAR},
+		PHONE = #{phone,jdbcType=VARCHAR},
+		EMAIL = #{email,jdbcType=VARCHAR},
+		CREATE_TIME = #{createTime,jdbcType=OTHER},
+		UPDATE_TIME = #{updateTime,jdbcType=OTHER},
+		STATE = #{state,jdbcType=CHAR}
+		where ID = #{id,jdbcType=VARCHAR}
+	</update>
+	<select id="selectByPrimaryKey" parameterType="java.lang.String"
+		resultMap="BaseResultMap">
+		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
+		CREATE_TIME,
+		UPDATE_TIME, STATE
+		from AQ_BASIC_FRAME_USER
+		where ID = #{id,jdbcType=VARCHAR}
+	</select>
+	<select id="selectByLoginName" parameterType="java.lang.String"
+		resultMap="BaseResultMap">
+		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
+		CREATE_TIME,
+		UPDATE_TIME, STATE
+		from AQ_BASIC_FRAME_USER
+		where LOGIN_NAME = #{loginName,jdbcType=VARCHAR}
+	</select>
+	<select id="selectAll" resultMap="BaseResultMap">
+		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
+		CREATE_TIME,
+		UPDATE_TIME, STATE
+		from AQ_BASIC_FRAME_USER
+	</select>
+	<!-- 根据用户ID查询授权的菜单 -->
+	<select id="selectAuthMenuByUserid" parameterType="java.lang.String"  resultType="java.lang.String">
+		SELECT M.CODE||':main' FROM AQ_BASIC_FRAME_MENU M WHERE M.STATE='1'
+		AND EXISTS(
+		SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP_MENU GM
+		ON UG.GROUP_ID=GM.GROUP_ID
+		WHERE UG.USER_ID =#{userId,jdbcType=VARCHAR} AND GM.MENU_ID=M.ID
+		)
+	</select>
+	<!-- 根据用户ID查询授权的功能 -->
+	<select id="selectAuthButtonByUserid" parameterType="java.lang.String"  resultType="java.lang.String">
+		SELECT B.CODE FROM AQ_BASIC_FRAME_BUTTON B WHERE B.STATE='1'
+		AND EXISTS(
+		SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP_BUTTON
+		GB ON UG.GROUP_ID=GB.GROUP_ID
+		WHERE UG.USER_ID = #{userId,jdbcType=VARCHAR} AND GB.BUTTON_ID=B.ID
+		)
+	</select>
 </mapper>