增加实时日志查询

tax-token/token-common/src/main/java/com/tax/token/model/IncomeCompletePeriod.java

+package com.tax.token.model;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ProjectName: etax-income-api
+ * @Package: com.sxc.etaxincome.domain.model.report
+ * @ClassName: IncomeCompletePeriod
+ * @Author: ddx
+ * @Description:
+ * @Date: 2024-07-02 14:25
+ * @Version: 1.0
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class IncomeCompletePeriod {
+
+    private JSONObject requestParam;
+    private JSONObject cookie;
+    private String reqContext;
+    private String resContext;
+
+}

tax-token/token-common/src/main/java/com/tax/token/utils/CleanCookieUtil.java

@@ -75,7 +75,7 @@ public class CleanCookieUtil {
         json.put("requestId", uuIdFlag);
 
         JSONArray jsonArray = new JSONArray();
-        jsonArray.add(cookieReq.getUserCode() + ":" + taxno + ":" + cookieReq.getUserInfo());
+        jsonArray.add(cookieReq.getZoneCode() + ":" + taxno + ":" + cookieReq.getUserInfo());
         json.put("keyList", jsonArray);
 
         String url = TokenConstants.CLEAN_COOKIE_URL;

tax-token/token-service/src/main/java/com/tax/token/service/api/TkRealTokenLogService.java

@@ -12,4 +12,7 @@ public interface TkRealTokenLogService {
     void saveRealTokenLog(String uuId, Date reqDate, CleanCookieVo cleanCookieVo, CookieReq cookieReq, JsonResult result);
 
     PageInfo<TkRealTokenLog> selectRealTokenListPage(TokenReportReq tokenReportReq);
+    String queryRealTokenById(String applyId);
+
+    CleanCookieVo cleanTokenById(String applyId);
 }

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

 package com.tax.token.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tax.token.mapper.TkRealTokenLogMapper;
 import com.tax.token.model.*;
 import com.tax.token.service.api.TkRealTokenLogService;
+import com.tax.token.utils.CleanCookieUtil;
 import com.yxcheng.token.common.model.JsonResult;
 import com.yxcheng.token.utils.DateUtils;
 import com.yxcheng.token.utils.StringUtil;
+import com.yxcheng.token.utils.UUIDGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,8 +102,7 @@ public class TkRealTokenLogServiceImpl implements TkRealTokenLogService {
             tokenLog.setTimeFlag(uuId);
             realTokenLogMapper.insertSelective(tokenLog);
         } catch (Exception e) {
-            e.printStackTrace();
-            logger.error(uuId + " saveRealTokenLog is error! " + e.getMessage());
+            logger.error(uuId + " saveRealTokenLog clean taxno " + cookieReq.getTaxno() + " is error! " ,e);
         }
     }
 
@@ -112,4 +114,55 @@ public class TkRealTokenLogServiceImpl implements TkRealTokenLogService {
         PageInfo<TkRealTokenLog> pageinfo = new PageInfo<TkRealTokenLog>(tokenList);
         return pageinfo;
     }
+
+    public String queryRealTokenById(String applyId){
+        TkRealTokenLog realTokenLog = realTokenLogMapper.selectByPrimaryKey(Integer.parseInt(applyId));
+        return this.completePeriod(realTokenLog);
+    }
+
+    public String completePeriod(TkRealTokenLog realTokenLog) {
+        JSONObject requestParam = new JSONObject();
+        if (StringUtil.isNotEmpty(realTokenLog.getTokenStatus()) && realTokenLog.getTokenStatus().equals("1")) {
+            requestParam.put("cookie", realTokenLog.getToken());
+            requestParam.put("dqdm", realTokenLog.getZoneCode());
+        }
+        IncomeCompletePeriod incomeCompletePeriod = IncomeCompletePeriod.builder()
+                .requestParam(requestParam)
+                .reqContext(realTokenLog.getSecert())
+                .resContext(realTokenLog.getResContext())
+                .build();
+        return JSON.toJSONString(incomeCompletePeriod);
+    }
+
+    public CleanCookieVo cleanTokenById(String applyId) {
+        logger.info("cleanTokenById params is " + applyId);
+        TkRealTokenLog realTokenLog = realTokenLogMapper.selectByPrimaryKey(Integer.parseInt(applyId));
+        CleanCookieVo cleanMap = null;
+        String uuId = UUIDGenerator.generate();
+        try {
+            if(StringUtil.isNotEmpty(realTokenLog.getSecretMd5())) {
+                CookieReq cookieReq = new CookieReq();
+                cookieReq.setUserCode(realTokenLog.getUserCode());
+                cookieReq.setTaxno(realTokenLog.getTaxno());
+                cookieReq.setUserInfo(realTokenLog.getSecretMd5());
+                cookieReq.setZoneCode(realTokenLog.getZoneCode());
+                cleanMap = CleanCookieUtil.cleanCookiebyMd5(uuId, cookieReq, "2");
+                logger.info(uuId + " cleanTokenById taxno is " + realTokenLog.getTaxno() + " cleanCookie result is " + JSON.toJSONString(cleanMap));
+            } else {
+                cleanMap = new CleanCookieVo();
+                cleanMap.setCode("-1");
+                cleanMap.setMessage("没有md5信息");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error(uuId + " cleanTokenById cleanCookie taxno is " + realTokenLog.getTaxno() + " ,send is error!" + e.getMessage());
+        }
+        if(null==cleanMap) {
+            cleanMap = new CleanCookieVo();
+            cleanMap.setCode("-1");
+            cleanMap.setMessage("清理异常");
+        }
+
+        return cleanMap;
+    }
 }

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

@@ -1112,6 +1112,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                 if(StringUtil.isNotEmpty(tkToken.getSecretMd5())) {
                     CookieReq cookieReq = new CookieReq();
                     cookieReq.setUserCode(tkToken.getUserCode());
+                    cookieReq.setZoneCode(tkToken.getZoneCode());
                     cookieReq.setTaxno(tkToken.getTaxno());
                     cookieReq.setUserInfo(tkToken.getSecretMd5());
                     CleanCookieVo cleanMap = CleanCookieUtil.cleanCookiebyMd5(uuId, cookieReq, "2");
@@ -1141,6 +1142,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                 CookieReq cookieReq = new CookieReq();
                 cookieReq.setUserCode(tkToken.getUserCode());
                 cookieReq.setTaxno(tkToken.getTaxno());
+                cookieReq.setZoneCode(tkToken.getZoneCode());
                 cookieReq.setUserInfo(tkToken.getSecretMd5());
                 cleanMap = CleanCookieUtil.cleanCookiebyMd5(uuId, cookieReq, "2");
                 logger.info(uuId + " updateTokenByIds taxno is " + tkToken.getTaxno() + " cleanCookie result is " + JSON.toJSONString(cleanMap));
@@ -1161,4 +1163,5 @@ public class TkTokenServiceImpl implements TkTokenService {
 
         return cleanMap;
     }
+
 }

tax-token/token-web/src/main/java/com/tax/token/web/controller/TokenReportController.java

@@ -46,4 +46,16 @@ public class TokenReportController {
     public String selectRealTokenListPage(@RequestBody TokenReportReq tokenReportReq){
         return JSON.toJSONString(tkRealTokenLogService.selectRealTokenListPage(tokenReportReq));
     }
+
+    @RequestMapping(value ="/queryRealTokenById" , method = RequestMethod.GET)
+    public String queryRealTokenById(String applyId){
+        return tkRealTokenLogService.queryRealTokenById(applyId);
+    }
+
+    @RequestMapping(value ="/cleanRealTokenById" , method = RequestMethod.GET)
+    public String cleanRealTokenById(String applyId){
+        JsonResult result = new JsonResult();
+        result.setData(tkRealTokenLogService.cleanTokenById(applyId));
+        return JSON.toJSONString(result);
+    }
 }