售货机 推货和推送

src/main/java/com/minpay/common/action/VendingMachineAction.java

@@ -197,7 +197,7 @@ public class VendingMachineAction implements IMINAction {
 		
 		//记录操作日志
 		String logInfo = "本次总推货》》售货机:"+imeiAddr+"推货:"+cargoNo+"推货数量：" + canPushNum;
-		Service.lookup(ILogService.class).logging(null, logInfo);
+		Service.lookup(ILogService.class).logging(null, logInfo,vmEquipmentInf.getBranchid());
 		// 设置返回值
 		res.set(IMINBusinessConstant.F_QUERY_RESULT, returnData);
 		return res;
@@ -332,6 +332,7 @@ public class VendingMachineAction implements IMINAction {
 			@MINParam(key = "deliveryNo") String deliveryNo,
 			@MINParam(key = "returnUrl") String returnUrl,
 			@MINParam(key = "openId") String openId,
+			@MINParam(key = "branchid") String branchid,
 			MINHttpServletRequestContext  MINRequest
 	) throws MINBusinessException, InterruptedException {
 		MINActionResult res = new MINActionResult();
@@ -373,7 +374,7 @@ public class VendingMachineAction implements IMINAction {
 		//记录操作日志
 		String logInfo = "测试推货》》售货机:"+imeiAddr+"货单号:"+cargoNo+",货状态："+returnData.get("code");
 		Log.info(logInfo);
-		Service.lookup(ILogService.class).logging(null, logInfo);
+		Service.lookup(ILogService.class).logging(null, logInfo,branchid);
 		return res;
 	}
 

src/main/java/com/minpay/common/service/ILogService.java

@@ -19,13 +19,20 @@ public interface ILogService extends IMINLocalService {
 	/**
 	 * 设置logBean信息
 	 * @param request
-	 * @throws FAPBusinessException
+	 * @throws
 	 */
 	public void setEnvLogBean(HttpServletRequest request) throws MINBusinessException;
 	/**
 	 * 记录日志
-	 * @param value
+	 * @param
 	 * @return
 	 */
 	public void logging(MINSession session, String logInfo) throws MINBusinessException;
+
+	/**
+	 * 记录日志
+	 * @param
+	 * @return
+	 */
+	public void logging(MINSession session, String logInfo,String branchid) throws MINBusinessException;
 }

src/main/java/com/minpay/common/service/impl/LogServiceImpl.java

@@ -87,5 +87,25 @@ public class LogServiceImpl implements ILogService {
 		/*
 		db.insert(ImLogMapper.class, imLog);*/
 	}
+
+	public void logging(MINSession session,
+						String logInfo,String branchid) throws MINBusinessException {
+
+
+		String logNo = Service.lookup(IPublicService.class).getSequence("IM_LOG_NO");
+		String dateTime = (new DateTime()).toDateTimeString();
+		String errorCode = "00000000";
+		ImLog imLog = new ImLog();
+		imLog.setLogno(logNo);
+		//imLog.setBsncode(bsnCode);
+		imLog.setDatetime(dateTime);
+		imLog.setResult(errorCode);
+		imLog.setInfo(logInfo);
+		Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(ImLogMapper.class)
+				.insertSelective(imLog);
+		/*
+		db.insert(ImLogMapper.class, imLog);*/
+	}
 	
 }

src/main/java/com/minpay/db/table/model/ImLog.java

@@ -13,14 +13,6 @@ public class ImLog extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column im_log.LOG_CHANNEL
-     *
-     * @mbggenerated
-     */
-    private String channel;
-
-    /**
-     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column im_log.LOG_DATETIME
      *
      * @mbggenerated
@@ -76,51 +68,43 @@ public class ImLog extends AbstractMINBean {
     private String ip;
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column im_log.LOG_LOGNO
-     *
-     * @return the value of im_log.LOG_LOGNO
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column im_log.LOG_STATE
      *
      * @mbggenerated
      */
-    public String getLogno() {
-        return logno;
-    }
+    private String state;
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column im_log.LOG_LOGNO
-     *
-     * @param logno the value for im_log.LOG_LOGNO
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column im_log.LOG_BRANCH
      *
      * @mbggenerated
      */
-    public void setLogno(String logno) {
-        this.logno = logno == null ? null : logno.trim();
-    }
+    private String branch;
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column im_log.LOG_CHANNEL
+     * This method returns the value of the database column im_log.LOG_LOGNO
      *
-     * @return the value of im_log.LOG_CHANNEL
+     * @return the value of im_log.LOG_LOGNO
      *
      * @mbggenerated
      */
-    public String getChannel() {
-        return channel;
+    public String getLogno() {
+        return logno;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column im_log.LOG_CHANNEL
+     * This method sets the value of the database column im_log.LOG_LOGNO
      *
-     * @param channel the value for im_log.LOG_CHANNEL
+     * @param logno the value for im_log.LOG_LOGNO
      *
      * @mbggenerated
      */
-    public void setChannel(String channel) {
-        this.channel = channel == null ? null : channel.trim();
+    public void setLogno(String logno) {
+        this.logno = logno == null ? null : logno.trim();
     }
 
     /**
@@ -290,4 +274,52 @@ public class ImLog extends AbstractMINBean {
     public void setIp(String ip) {
         this.ip = ip == null ? null : ip.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column im_log.LOG_STATE
+     *
+     * @return the value of im_log.LOG_STATE
+     *
+     * @mbggenerated
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column im_log.LOG_STATE
+     *
+     * @param state the value for im_log.LOG_STATE
+     *
+     * @mbggenerated
+     */
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column im_log.LOG_BRANCH
+     *
+     * @return the value of im_log.LOG_BRANCH
+     *
+     * @mbggenerated
+     */
+    public String getBranch() {
+        return branch;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column im_log.LOG_BRANCH
+     *
+     * @param branch the value for im_log.LOG_BRANCH
+     *
+     * @mbggenerated
+     */
+    public void setBranch(String branch) {
+        this.branch = branch == null ? null : branch.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/ImLogExample.java

@@ -268,84 +268,6 @@ public class ImLogExample {
             return (Criteria) this;
         }
 
-        public Criteria andChannelIsNull() {
-            addCriterion("LOG_CHANNEL is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelIsNotNull() {
-            addCriterion("LOG_CHANNEL is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelEqualTo(String value) {
-            if(value == null ){
-                andChannelIsNull();
-            } else {
-                addCriterion("LOG_CHANNEL =", value, "channel");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelNotEqualTo(String value) {
-            if(value == null ){
-                andChannelIsNotNull();
-            } else {
-                addCriterion("LOG_CHANNEL <>", value, "channel");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelGreaterThan(String value) {
-            addCriterion("LOG_CHANNEL >", value, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelGreaterThanOrEqualTo(String value) {
-            addCriterion("LOG_CHANNEL >=", value, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelLessThan(String value) {
-            addCriterion("LOG_CHANNEL <", value, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelLessThanOrEqualTo(String value) {
-            addCriterion("LOG_CHANNEL <=", value, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelLike(String value) {
-            addCriterion("LOG_CHANNEL like", value, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelNotLike(String value) {
-            addCriterion("LOG_CHANNEL not like", value, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelIn(List<String> values) {
-            addCriterion("LOG_CHANNEL in", values, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelNotIn(List<String> values) {
-            addCriterion("LOG_CHANNEL not in", values, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelBetween(String value1, String value2) {
-            addCriterion("LOG_CHANNEL between", value1, value2, "channel");
-            return (Criteria) this;
-        }
-
-        public Criteria andChannelNotBetween(String value1, String value2) {
-            addCriterion("LOG_CHANNEL not between", value1, value2, "channel");
-            return (Criteria) this;
-        }
-
         public Criteria andDatetimeIsNull() {
             addCriterion("LOG_DATETIME is null");
             return (Criteria) this;
@@ -891,6 +813,162 @@ public class ImLogExample {
             addCriterion("LOG_IP not between", value1, value2, "ip");
             return (Criteria) this;
         }
+
+        public Criteria andStateIsNull() {
+            addCriterion("LOG_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("LOG_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            if(value == null ){
+                andStateIsNull();
+            } else {
+                addCriterion("LOG_STATE =", value, "state");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            if(value == null ){
+                andStateIsNotNull();
+            } else {
+                addCriterion("LOG_STATE <>", value, "state");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("LOG_STATE >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("LOG_STATE >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("LOG_STATE <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("LOG_STATE <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("LOG_STATE like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("LOG_STATE not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("LOG_STATE in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("LOG_STATE not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("LOG_STATE between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("LOG_STATE not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIsNull() {
+            addCriterion("LOG_BRANCH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIsNotNull() {
+            addCriterion("LOG_BRANCH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchEqualTo(String value) {
+            if(value == null ){
+                andBranchIsNull();
+            } else {
+                addCriterion("LOG_BRANCH =", value, "branch");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchNotEqualTo(String value) {
+            if(value == null ){
+                andBranchIsNotNull();
+            } else {
+                addCriterion("LOG_BRANCH <>", value, "branch");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchGreaterThan(String value) {
+            addCriterion("LOG_BRANCH >", value, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchGreaterThanOrEqualTo(String value) {
+            addCriterion("LOG_BRANCH >=", value, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchLessThan(String value) {
+            addCriterion("LOG_BRANCH <", value, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchLessThanOrEqualTo(String value) {
+            addCriterion("LOG_BRANCH <=", value, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchLike(String value) {
+            addCriterion("LOG_BRANCH like", value, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchNotLike(String value) {
+            addCriterion("LOG_BRANCH not like", value, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIn(List<String> values) {
+            addCriterion("LOG_BRANCH in", values, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchNotIn(List<String> values) {
+            addCriterion("LOG_BRANCH not in", values, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchBetween(String value1, String value2) {
+            addCriterion("LOG_BRANCH between", value1, value2, "branch");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchNotBetween(String value1, String value2) {
+            addCriterion("LOG_BRANCH not between", value1, value2, "branch");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/resources/com/minpay/db/table/mapper/ImLogMapper.xml

@@ -1,44 +1,45 @@
-<?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.minpay.db.table.mapper.ImLogMapper" >
-  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.ImLog" >
+<?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.minpay.db.table.mapper.ImLogMapper">
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.ImLog">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="LOG_LOGNO" property="logno" jdbcType="CHAR" />
-    <result column="LOG_CHANNEL" property="channel" jdbcType="VARCHAR" />
-    <result column="LOG_DATETIME" property="datetime" jdbcType="CHAR" />
-    <result column="LOG_USERID" property="userid" jdbcType="VARCHAR" />
-    <result column="LOG_BSNCODE" property="bsncode" jdbcType="VARCHAR" />
-    <result column="LOG_RESULT" property="result" jdbcType="CHAR" />
-    <result column="LOG_CONTEXTID" property="contextid" jdbcType="VARCHAR" />
-    <result column="LOG_INFO" property="info" jdbcType="VARCHAR" />
-    <result column="LOG_IP" property="ip" jdbcType="VARCHAR" />
+    <id column="LOG_LOGNO" jdbcType="CHAR" property="logno" />
+    <result column="LOG_DATETIME" jdbcType="CHAR" property="datetime" />
+    <result column="LOG_USERID" jdbcType="VARCHAR" property="userid" />
+    <result column="LOG_BSNCODE" jdbcType="VARCHAR" property="bsncode" />
+    <result column="LOG_RESULT" jdbcType="CHAR" property="result" />
+    <result column="LOG_CONTEXTID" jdbcType="VARCHAR" property="contextid" />
+    <result column="LOG_INFO" jdbcType="VARCHAR" property="info" />
+    <result column="LOG_IP" jdbcType="VARCHAR" property="ip" />
+    <result column="LOG_STATE" jdbcType="VARCHAR" property="state" />
+    <result column="LOG_BRANCH" jdbcType="VARCHAR" property="branch" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <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" >
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -49,29 +50,29 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <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" >
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -82,33 +83,33 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    LOG_LOGNO, LOG_CHANNEL, LOG_DATETIME, LOG_USERID, LOG_BSNCODE, LOG_RESULT, LOG_CONTEXTID, 
-    LOG_INFO, LOG_IP
+    LOG_LOGNO, LOG_DATETIME, LOG_USERID, LOG_BSNCODE, LOG_RESULT, LOG_CONTEXTID, LOG_INFO, 
+    LOG_IP, LOG_STATE, LOG_BRANCH
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.minpay.db.table.model.ImLogExample" >
+  <select id="selectByExample" parameterType="com.minpay.db.table.model.ImLogExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from im_log
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -118,7 +119,7 @@
     from im_log
     where LOG_LOGNO = #{logno,jdbcType=CHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -126,211 +127,225 @@
     delete from im_log
     where LOG_LOGNO = #{logno,jdbcType=CHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.ImLogExample" >
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.ImLogExample">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from im_log
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.minpay.db.table.model.ImLog" >
+  <insert id="insert" parameterType="com.minpay.db.table.model.ImLog">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into im_log (LOG_LOGNO, LOG_CHANNEL, LOG_DATETIME, 
-      LOG_USERID, LOG_BSNCODE, LOG_RESULT, 
-      LOG_CONTEXTID, LOG_INFO, LOG_IP
+    insert into im_log (LOG_LOGNO, LOG_DATETIME, LOG_USERID, 
+      LOG_BSNCODE, LOG_RESULT, LOG_CONTEXTID, 
+      LOG_INFO, LOG_IP, LOG_STATE, LOG_BRANCH
       )
-    values (#{logno,jdbcType=CHAR}, #{channel,jdbcType=VARCHAR}, #{datetime,jdbcType=CHAR}, 
-      #{userid,jdbcType=VARCHAR}, #{bsncode,jdbcType=VARCHAR}, #{result,jdbcType=CHAR}, 
-      #{contextid,jdbcType=VARCHAR}, #{info,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}
+    values (#{logno,jdbcType=CHAR}, #{datetime,jdbcType=CHAR}, #{userid,jdbcType=VARCHAR}, 
+      #{bsncode,jdbcType=VARCHAR}, #{result,jdbcType=CHAR}, #{contextid,jdbcType=VARCHAR}, 
+      #{info,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{branch,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.minpay.db.table.model.ImLog" >
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.ImLog">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into im_log
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="logno != null" >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="logno != null">
         LOG_LOGNO,
       </if>
-      <if test="channel != null" >
-        LOG_CHANNEL,
-      </if>
-      <if test="datetime != null" >
+      <if test="datetime != null">
         LOG_DATETIME,
       </if>
-      <if test="userid != null" >
+      <if test="userid != null">
         LOG_USERID,
       </if>
-      <if test="bsncode != null" >
+      <if test="bsncode != null">
         LOG_BSNCODE,
       </if>
-      <if test="result != null" >
+      <if test="result != null">
         LOG_RESULT,
       </if>
-      <if test="contextid != null" >
+      <if test="contextid != null">
         LOG_CONTEXTID,
       </if>
-      <if test="info != null" >
+      <if test="info != null">
         LOG_INFO,
       </if>
-      <if test="ip != null" >
+      <if test="ip != null">
         LOG_IP,
       </if>
+      <if test="state != null">
+        LOG_STATE,
+      </if>
+      <if test="branch != null">
+        LOG_BRANCH,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="logno != null" >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="logno != null">
         #{logno,jdbcType=CHAR},
       </if>
-      <if test="channel != null" >
-        #{channel,jdbcType=VARCHAR},
-      </if>
-      <if test="datetime != null" >
+      <if test="datetime != null">
         #{datetime,jdbcType=CHAR},
       </if>
-      <if test="userid != null" >
+      <if test="userid != null">
         #{userid,jdbcType=VARCHAR},
       </if>
-      <if test="bsncode != null" >
+      <if test="bsncode != null">
         #{bsncode,jdbcType=VARCHAR},
       </if>
-      <if test="result != null" >
+      <if test="result != null">
         #{result,jdbcType=CHAR},
       </if>
-      <if test="contextid != null" >
+      <if test="contextid != null">
         #{contextid,jdbcType=VARCHAR},
       </if>
-      <if test="info != null" >
+      <if test="info != null">
         #{info,jdbcType=VARCHAR},
       </if>
-      <if test="ip != null" >
+      <if test="ip != null">
         #{ip,jdbcType=VARCHAR},
       </if>
+      <if test="state != null">
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="branch != null">
+        #{branch,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.minpay.db.table.model.ImLogExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.minpay.db.table.model.ImLogExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select count(*) from im_log
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update im_log
-    <set >
-      <if test="record.logno != null" >
+    <set>
+      <if test="record.logno != null">
         LOG_LOGNO = #{record.logno,jdbcType=CHAR},
       </if>
-      <if test="record.channel != null" >
-        LOG_CHANNEL = #{record.channel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.datetime != null" >
+      <if test="record.datetime != null">
         LOG_DATETIME = #{record.datetime,jdbcType=CHAR},
       </if>
-      <if test="record.userid != null" >
+      <if test="record.userid != null">
         LOG_USERID = #{record.userid,jdbcType=VARCHAR},
       </if>
-      <if test="record.bsncode != null" >
+      <if test="record.bsncode != null">
         LOG_BSNCODE = #{record.bsncode,jdbcType=VARCHAR},
       </if>
-      <if test="record.result != null" >
+      <if test="record.result != null">
         LOG_RESULT = #{record.result,jdbcType=CHAR},
       </if>
-      <if test="record.contextid != null" >
+      <if test="record.contextid != null">
         LOG_CONTEXTID = #{record.contextid,jdbcType=VARCHAR},
       </if>
-      <if test="record.info != null" >
+      <if test="record.info != null">
         LOG_INFO = #{record.info,jdbcType=VARCHAR},
       </if>
-      <if test="record.ip != null" >
+      <if test="record.ip != null">
         LOG_IP = #{record.ip,jdbcType=VARCHAR},
       </if>
+      <if test="record.state != null">
+        LOG_STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branch != null">
+        LOG_BRANCH = #{record.branch,jdbcType=VARCHAR},
+      </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update im_log
     set LOG_LOGNO = #{record.logno,jdbcType=CHAR},
-      LOG_CHANNEL = #{record.channel,jdbcType=VARCHAR},
       LOG_DATETIME = #{record.datetime,jdbcType=CHAR},
       LOG_USERID = #{record.userid,jdbcType=VARCHAR},
       LOG_BSNCODE = #{record.bsncode,jdbcType=VARCHAR},
       LOG_RESULT = #{record.result,jdbcType=CHAR},
       LOG_CONTEXTID = #{record.contextid,jdbcType=VARCHAR},
       LOG_INFO = #{record.info,jdbcType=VARCHAR},
-      LOG_IP = #{record.ip,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+      LOG_IP = #{record.ip,jdbcType=VARCHAR},
+      LOG_STATE = #{record.state,jdbcType=VARCHAR},
+      LOG_BRANCH = #{record.branch,jdbcType=VARCHAR}
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.ImLog" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.ImLog">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update im_log
-    <set >
-      <if test="channel != null" >
-        LOG_CHANNEL = #{channel,jdbcType=VARCHAR},
-      </if>
-      <if test="datetime != null" >
+    <set>
+      <if test="datetime != null">
         LOG_DATETIME = #{datetime,jdbcType=CHAR},
       </if>
-      <if test="userid != null" >
+      <if test="userid != null">
         LOG_USERID = #{userid,jdbcType=VARCHAR},
       </if>
-      <if test="bsncode != null" >
+      <if test="bsncode != null">
         LOG_BSNCODE = #{bsncode,jdbcType=VARCHAR},
       </if>
-      <if test="result != null" >
+      <if test="result != null">
         LOG_RESULT = #{result,jdbcType=CHAR},
       </if>
-      <if test="contextid != null" >
+      <if test="contextid != null">
         LOG_CONTEXTID = #{contextid,jdbcType=VARCHAR},
       </if>
-      <if test="info != null" >
+      <if test="info != null">
         LOG_INFO = #{info,jdbcType=VARCHAR},
       </if>
-      <if test="ip != null" >
+      <if test="ip != null">
         LOG_IP = #{ip,jdbcType=VARCHAR},
       </if>
+      <if test="state != null">
+        LOG_STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="branch != null">
+        LOG_BRANCH = #{branch,jdbcType=VARCHAR},
+      </if>
     </set>
     where LOG_LOGNO = #{logno,jdbcType=CHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.ImLog" >
+  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.ImLog">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update im_log
-    set LOG_CHANNEL = #{channel,jdbcType=VARCHAR},
-      LOG_DATETIME = #{datetime,jdbcType=CHAR},
+    set LOG_DATETIME = #{datetime,jdbcType=CHAR},
       LOG_USERID = #{userid,jdbcType=VARCHAR},
       LOG_BSNCODE = #{bsncode,jdbcType=VARCHAR},
       LOG_RESULT = #{result,jdbcType=CHAR},
       LOG_CONTEXTID = #{contextid,jdbcType=VARCHAR},
       LOG_INFO = #{info,jdbcType=VARCHAR},
-      LOG_IP = #{ip,jdbcType=VARCHAR}
+      LOG_IP = #{ip,jdbcType=VARCHAR},
+      LOG_STATE = #{state,jdbcType=VARCHAR},
+      LOG_BRANCH = #{branch,jdbcType=VARCHAR}
     where LOG_LOGNO = #{logno,jdbcType=CHAR}
   </update>
 </mapper>