union_type扩字段

@@ -5,6 +5,10 @@ public class UnionDepartmentUrl {
 
     private String unionType;
 
+    private Integer divisionCode;
+
+    private Integer channelCode;
+
     private String deptId;
 
     private String createId;
@@ -35,6 +39,22 @@ public class UnionDepartmentUrl {
         this.unionType = unionType == null ? null : unionType.trim();
     }
 
+    public Integer getDivisionCode() {
+        return divisionCode;
+    }
+
+    public void setDivisionCode(Integer divisionCode) {
+        this.divisionCode = divisionCode;
+    }
+
+    public Integer getChannelCode() {
+        return channelCode;
+    }
+
+    public void setChannelCode(Integer channelCode) {
+        this.channelCode = channelCode;
+    }
+
     public String getDeptId() {
         return deptId;
     }

@@ -13,7 +13,7 @@ public class UnionLogs {
 
     private Byte isActivate;
 
-    private Integer unionType;
+    private String unionType;
 
     private String addParams;
 
@@ -75,11 +75,11 @@ public class UnionLogs {
         this.isActivate = isActivate;
     }
 
-    public Integer getUnionType() {
+    public String getUnionType() {
         return unionType;
     }
 
-    public void setUnionType(Integer unionType) {
+    public void setUnionType(String unionType) {
         this.unionType = unionType;
     }
 

+<?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.yoho.unions.dal.IUnionDepartmentUrlDAO" >
+  <resultMap id="BaseResultMap" type="com.yoho.unions.dal.model.UnionDepartmentUrl" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="union_type" property="unionType" jdbcType="VARCHAR" />
+    <result column="division_code" property="divisionCode" jdbcType="INTEGER" />
+    <result column="channel_code" property="channelCode" jdbcType="INTEGER" />
+    <result column="dept_id" property="deptId" jdbcType="VARCHAR" />
+    <result column="create_id" property="createId" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="src_url" property="srcUrl" jdbcType="VARCHAR" />
+    <result column="dest_url" property="destUrl" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, union_type, division_code, channel_code, dept_id, create_id, name, src_url, dest_url, 
+    status, create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from union_department_url
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByUnionType" resultMap="BaseResultMap">
+    select  <include refid="Base_Column_List" />
+    from union_department_url
+    where union_type = #{union_type}
+  </select>
+
+
+
+
+</mapper>
\ No newline at end of file

@@ -8,7 +8,7 @@
 		<result column="idfa" property="idfa" jdbcType="VARCHAR" />
 		<result column="imei" property="imei" jdbcType="VARCHAR" />
 		<result column="is_activate" property="isActivate" jdbcType="TINYINT" />
-		<result column="union_type" property="unionType" jdbcType="INTEGER" />
+		<result column="union_type" property="unionType" jdbcType="VARCHAR" />
 		<result column="add_params" property="addParams" jdbcType="VARCHAR" />
 		<result column="activate_params" property="activateParams"
 			jdbcType="VARCHAR" />

@@ -195,7 +195,7 @@ public class GDTServiceImpl implements MainUnionService {
 		} else {
 			unionLogs.setImei(request.getImei());
 		}
-		unionLogs.setUnionType(UnionTypeEnum.GUANGDIANTONG.getValue());
+		unionLogs.setUnionType(String.valueOf(UnionTypeEnum.GUANGDIANTONG.getValue()));
 		unionLogs.setActivateParams(JSON.toJSONString(request));
 		// 如果status是200，证明发送成功
 		if (pair.getLeft() == HttpStatus.SC_OK) {

@@ -433,7 +433,7 @@ public class UnionServiceImpl implements IUnionService {
 			logs.setIsActivate((byte) 1);
 			logs.setCreateTime(DateUtil.getCurrentTimeSecond());
 			logs.setUpdateTime(logs.getCreateTime());
-			logs.setUnionType(Integer.valueOf(click.getUnion_type()));
+			logs.setUnionType(click.getUnion_type());
 			logs.setAddParams(value);
 			logs.setTd(request.getTd());
 			logs.setAppKey(request.getAppkey());

@@ -35,4 +35,6 @@ datasources:
         - com.yoho.unions.dal.IUnionTypeDAO
         - com.yoho.unions.dal.IUnionTypeManageDAO
         - com.yoho.unions.dal.IUnionOrderPushDAO
+        - com.yoho.unions.dal.IUnionDepartmentUrlDAO
+
 readOnlyInSlave: true
\ No newline at end of file

@@ -36,4 +36,5 @@ datasources:
         - com.yoho.unions.dal.IUnionTypeDAO
         - com.yoho.unions.dal.IUnionTypeManageDAO
         - com.yoho.unions.dal.IUnionOrderPushDAO
+        - com.yoho.unions.dal.IUnionDepartmentUrlDAO
 readOnlyInSlave: true
\ No newline at end of file