Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
策略分组功能提交

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java

@@ -0,0 +1,15 @@
+package com.nis.web.dao.basics;
+
+import java.util.List;
+
+
+import com.nis.domain.basics.PolicyGroupInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
+	List<PolicyGroupInfo> findPolicyGroupInfoList(PolicyGroupInfo policyGroupInfo);
+	PolicyGroupInfo getById(int id);
+	
+}

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml

@@ -0,0 +1,110 @@
+<?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.nis.web.dao.basics.PolicyGroupInfoDao" >
+  
+  <resultMap id="PolicyGroupInfoMap" type="com.nis.domain.basics.PolicyGroupInfo" >
+    <id column="group_id" property="groupId" jdbcType="INTEGER" />
+    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
+    <result column="group_type" property="groupType" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+  </resultMap>
+    <sql id="PolicyGroupInfoColumns">
+		r.group_id,r.group_name,r.group_type,r.is_valid,
+		r.create_time,r.edit_time,r.creator_id,r.editor_id
+	</sql>
+  
+   <!-- 查出所有 有效数据-->
+      <select id="findPolicyGroupInfoList" resultMap="PolicyGroupInfoMap">
+		SELECT
+			<include refid="PolicyGroupInfoColumns"/>
+		<trim prefix="," prefixOverrides=",">
+			, s.name as creator_name
+			,e.name as editor_name
+		</trim>
+	    FROM policy_group_info r
+	    left join sys_user s on r.creator_id=s.id
+		left join sys_user e on r.editor_id=e.id
+		
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
+	    	<if test="groupName != null and groupName != ''">
+	    		AND r.group_name like concat(concat('%',#{groupName,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<if test="groupType != null">
+	    		AND r.group_type =#{groupType }
+	    	</if>
+    		AND r.IS_VALID =1
+	    	<if test="creatorName != null and creatorName != ''">
+	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editorName != null and editorName != ''">
+	    		AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY r.group_id desc
+			</otherwise>
+		</choose>
+		
+	</select>
+	<insert id="insert" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
+    insert into policy_group_info(
+     IS_VALID,
+     CREATOR_ID,
+    CREATE_TIME,
+    GROUP_NAME,
+    GROUP_TYPE
+    )values (
+    	1,
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+    	#{groupName,jdbcType=VARCHAR}, 
+    	#{groupType,jdbcType=INTEGER}
+    )
+  </insert>
+  <update id="update" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
+    update policy_group_info
+    <set >
+      <trim suffixOverrides=",">
+      <if test="groupName != null and groupName != ''" >
+        group_name = #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="groupType != null" >
+        group_type = #{groupType,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+       <if test="editTime != null  and editTime != ''" >
+      	edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      </trim>
+    </set>
+    <where>
+    	<if test="groupId != null" >
+        	and group_id =  #{groupId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </update>
+  
+  <select id="getById" resultType="com.nis.domain.basics.PolicyGroupInfo">
+  	select <include refid="PolicyGroupInfoColumns"/> 
+  	from policy_group_info r
+  	where r.group_id =#{groupId}
+  </select>
+</mapper>