Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabAuthStoreLogMapper.java

@@ -55,7 +55,7 @@ public interface TabAuthStoreLogMapper {
     int updateByPrimaryKey(TabAuthStoreLog record);
 
     List<TabAuthStoreLog> listLogByKey(@Param("key") String key,
-                                       @Param("status") int status);
+                                       @Param("status") Integer status);
 
     List<TabAuthStoreLog> listFailedStore(@Param("key") String key);
 

gic-store-service/src/main/java/com/gic/store/entity/TabAuthStoreLog.java

@@ -27,7 +27,7 @@ public class TabAuthStoreLog {
     /**
      * 
      */
-    private String key;
+    private String authKey;
 
     /**
      * 1 授权成功  2 授权失败
@@ -66,14 +66,6 @@ public class TabAuthStoreLog {
         this.toEnterpriseId = toEnterpriseId;
     }
 
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
     public Integer getStatus() {
         return status;
     }
@@ -81,4 +73,12 @@ public class TabAuthStoreLog {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public String getAuthKey() {
+        return authKey;
+    }
+
+    public void setAuthKey(String authKey) {
+        this.authKey = authKey;
+    }
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/impl/AuthStoreLogServiceImpl.java

@@ -23,7 +23,7 @@ public class AuthStoreLogServiceImpl implements AuthStoreLogService {
         TabAuthStoreLog log = new TabAuthStoreLog();
         log.setStoreInfoId(storeInfoId);
         log.setFromEnterpriseId(fromEnterpriseId);
-        log.setKey(key);
+        log.setAuthKey(key);
         log.setToEnterpriseId(toEnterpriseId);
         log.setStatus(0);
         this.tabAuthStoreLogMapper.insertSelective(log);

gic-store-service/src/main/resources/mapper/TabAuthStoreLogMapper.xml

@@ -6,11 +6,11 @@
     <result column="store_info_id" jdbcType="INTEGER" property="storeInfoId" />
     <result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
     <result column="to_enterprise_id" jdbcType="INTEGER" property="toEnterpriseId" />
-    <result column="key" jdbcType="VARCHAR" property="key" />
+    <result column="auth_key" jdbcType="VARCHAR" property="authKey" />
     <result column="status" jdbcType="INTEGER" property="status" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, store_info_id, from_enterprise_id, to_enterprise_id, key, status
+    id, store_info_id, from_enterprise_id, to_enterprise_id, auth_key, status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,14 +27,14 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into tab_auth_store_log (id, store_info_id, from_enterprise_id, 
-      to_enterprise_id, key, status
+      to_enterprise_id, auth_key, status
       )
     values (#{id,jdbcType=INTEGER}, #{storeInfoId,jdbcType=INTEGER}, #{fromEnterpriseId,jdbcType=INTEGER}, 
-      #{toEnterpriseId,jdbcType=INTEGER}, #{key,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}
+      #{toEnterpriseId,jdbcType=INTEGER}, #{authKey,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabAuthStoreLog">
-    <selectKey keyProperty="storeInfoId" order="AFTER" resultType="java.lang.Integer">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into tab_auth_store_log
@@ -51,8 +51,8 @@
       <if test="toEnterpriseId != null">
         to_enterprise_id,
       </if>
-      <if test="key != null">
-        key,
+      <if test="authKey != null">
+        auth_key,
       </if>
       <if test="status != null">
         status,
@@ -71,8 +71,8 @@
       <if test="toEnterpriseId != null">
         #{toEnterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="key != null">
-        #{key,jdbcType=VARCHAR},
+      <if test="authKey != null">
+        #{authKey,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
@@ -91,8 +91,8 @@
       <if test="toEnterpriseId != null">
         to_enterprise_id = #{toEnterpriseId,jdbcType=INTEGER},
       </if>
-      <if test="key != null">
-        key = #{key,jdbcType=VARCHAR},
+      <if test="authKey != null">
+        auth_key = #{key,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
@@ -105,7 +105,7 @@
     set store_info_id = #{storeInfoId,jdbcType=INTEGER},
       from_enterprise_id = #{fromEnterpriseId,jdbcType=INTEGER},
       to_enterprise_id = #{toEnterpriseId,jdbcType=INTEGER},
-      key = #{key,jdbcType=VARCHAR},
+      auth_key = #{authKey,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -113,7 +113,7 @@
   select
   <include refid="Base_Column_List" />
   from tab_auth_store_log
-  where key = #{key}
+  where auth_key = #{key}
   <if test="status != null">
     and status = #{status}
   </if>
@@ -122,12 +122,12 @@
     select
     <include refid="Base_Column_List" />
     from tab_auth_store_log
-    where key = #{key} and (status =0 or status = 2)
+    where auth_key = #{key} and (status =0 or status = 2)
   </select>
   <select id="listLog"  resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_auth_store_log
-    where key = #{key} and to_enterprise_id=#{toEnterpriseId} and store_info_id=#{storeInfoId}
+    where auth_key = #{key} and to_enterprise_id=#{toEnterpriseId} and store_info_id=#{storeInfoId}
   </select>
 </mapper>
\ No newline at end of file