增加checkType

tax-token/token-dao/src/main/java/com/tax/token/mapper/TkRealTokenLogMapper.xml

@@ -157,13 +157,13 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Jun 03 17:29:21 CST 2022.
       This element was generated on Fri Jun 03 17:29:21 CST 2022.
     -->
     -->
-    insert into tk_real_token_log (id, taxno, token, 
+    insert into tk_real_token_log (taxno, token,
       token_status, req_date, res_date, 
       token_status, req_date, res_date, 
       key_code, secert, zone_code, 
       key_code, secert, zone_code, 
       user_code, server_no, times, 
       user_code, server_no, times, 
       is_valid, ip_server_no, lost_time, 
       is_valid, ip_server_no, lost_time, 
       remarks, res_context, time_flag)
       remarks, res_context, time_flag)
-    values (#{id,jdbcType=INTEGER}, #{taxno,jdbcType=VARCHAR}, #{token,jdbcType=VARCHAR}, 
+    values (#{taxno,jdbcType=VARCHAR}, #{token,jdbcType=VARCHAR},
       #{tokenStatus,jdbcType=CHAR}, #{reqDate,jdbcType=TIMESTAMP}, #{resDate,jdbcType=TIMESTAMP}, 
       #{tokenStatus,jdbcType=CHAR}, #{reqDate,jdbcType=TIMESTAMP}, #{resDate,jdbcType=TIMESTAMP}, 
       #{keyCode,jdbcType=VARCHAR}, #{secert,jdbcType=VARCHAR}, #{zoneCode,jdbcType=VARCHAR}, 
       #{keyCode,jdbcType=VARCHAR}, #{secert,jdbcType=VARCHAR}, #{zoneCode,jdbcType=VARCHAR}, 
       #{userCode,jdbcType=VARCHAR}, #{serverNo,jdbcType=VARCHAR}, #{times,jdbcType=INTEGER}, 
       #{userCode,jdbcType=VARCHAR}, #{serverNo,jdbcType=VARCHAR}, #{times,jdbcType=INTEGER}, 
@@ -178,9 +178,6 @@
     -->
     -->
     insert into tk_real_token_log
     insert into tk_real_token_log
     <trim prefix="(" suffix=")" suffixOverrides="," >
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
       <if test="taxno != null" >
       <if test="taxno != null" >
         taxno,
         taxno,
       </if>
       </if>
@@ -228,9 +225,6 @@
       </if>
       </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="taxno != null" >
       <if test="taxno != null" >
         #{taxno,jdbcType=VARCHAR},
         #{taxno,jdbcType=VARCHAR},
       </if>
       </if>

tax-token/token-service/src/main/java/com/tax/token/service/impl/TkRealTokenLogServiceImpl.java

@@ -33,7 +33,7 @@ public class TkRealTokenLogServiceImpl implements TkRealTokenLogService {
             tokenLog.setToken(token.getToken());
             tokenLog.setToken(token.getToken());
             tokenLog.setTokenStatus(token.getTokenStatus());
             tokenLog.setTokenStatus(token.getTokenStatus());
             if(null!=token.getTaxUserInfo()) {
             if(null!=token.getTaxUserInfo()) {
-                tokenLog.setSecert(JSON.toJSONString(token.getTaxUserInfo()));
+                tokenLog.setSecert(token.getTaxUserInfo());
             }
             }
             tokenLog.setUserCode(token.getUserCode());
             tokenLog.setUserCode(token.getUserCode());
             tokenLog.setRemarks(token.getTokenMessage());
             tokenLog.setRemarks(token.getTokenMessage());
@@ -50,7 +50,7 @@ public class TkRealTokenLogServiceImpl implements TkRealTokenLogService {
             }
             }
             tokenLog.setLostTime(DateUtils.getMillSecondsDiff(tokenLog.getReqDate(),tokenLog.getResDate()));
             tokenLog.setLostTime(DateUtils.getMillSecondsDiff(tokenLog.getReqDate(),tokenLog.getResDate()));
             tokenLog.setTimeFlag(uuId);
             tokenLog.setTimeFlag(uuId);
-            realTokenLogMapper.insert(tokenLog);
+            realTokenLogMapper.insertSelective(tokenLog);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             logger.error(uuId + " saveRealTokenLog is error! " + e.getMessage());
             logger.error(uuId + " saveRealTokenLog is error! " + e.getMessage());

tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java

@@ -247,6 +247,7 @@ public class TkTokenServiceImpl implements TkTokenService {
         tkToken.setReqDate(DateUtils.getDate());
         tkToken.setReqDate(DateUtils.getDate());
         tkToken.setZoneCode(zoneCode);
         tkToken.setZoneCode(zoneCode);
         tkToken.setUserCode(userCode);
         tkToken.setUserCode(userCode);
+        tkToken.setCheckType(checkType);
         if(StringUtil.isNotEmpty(checkType)) {
         if(StringUtil.isNotEmpty(checkType)) {
             tkToken.setUserType(checkType);
             tkToken.setUserType(checkType);
         } else {
         } else {