日志回滚+去除interType=3,防止开出存量的票，后续去除

src/main/java/com/jkcredit/invoice/annotation/annotationDes/AuthenticationInterceptor.java

@@ -5,9 +5,6 @@ import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.common.CommonConstants;
 import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.service.user.UserService;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.method.HandlerMethod;
@@ -26,7 +23,6 @@ import java.lang.reflect.Method;
  **/
 public class AuthenticationInterceptor implements HandlerInterceptor {
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
 
     @Autowired

src/main/java/com/jkcredit/invoice/component/SendMailService.java

@@ -1,8 +1,6 @@
 package com.jkcredit.invoice.component;
 
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
@@ -11,8 +9,8 @@ import org.springframework.stereotype.Component;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 @Component
+@Slf4j
 public class SendMailService {
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
     
     @Autowired
     private JavaMailSenderImpl javaMailSender;
@@ -26,8 +24,8 @@ public class SendMailService {
         helper.setTo(emailStr);
         helper.setSubject(company+"备案提交");
         helper.setText(contents,true);
-        MIX_LOG.info("before send emil");
+        log.info("before send emil");
         javaMailSender.send(message);
-        MIX_LOG.info("send emil");
+        log.info("send emil");
     }
 }

src/main/java/com/jkcredit/invoice/config/GlobalExceptionHandler.java

@@ -1,9 +1,7 @@
 package com.jkcredit.invoice.config;
 
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
@@ -18,9 +16,9 @@ import java.util.List;
  * @create: 2019-05-29 13:43
  * @version: V1.0
  **/
+@Slf4j
 @RestControllerAdvice
 public class GlobalExceptionHandler {
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
     /**
      * 全局异常
@@ -30,7 +28,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(Exception.class)
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     public RespR exception(Exception e) {
-        MIX_LOG.error("全局异常信息，异常信息为：{}", e.getMessage(), e);
+        log.error("全局异常信息，异常信息为：{}", e.getMessage(), e);
         return new RespR<>(e);
     }
 
@@ -45,7 +43,7 @@ public class GlobalExceptionHandler {
         List<FieldError> fieldErrors = exception.getBindingResult().getFieldErrors();
         RespR result = new RespR();
         result.setMsg(fieldErrors.get(0).getDefaultMessage());
-        MIX_LOG.warn(fieldErrors.get(0).getDefaultMessage());
+        log.warn(fieldErrors.get(0).getDefaultMessage());
         return result;
     }
 

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -18,13 +18,11 @@ import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.nocar.NocarInvoiceService;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.util.IOUtils;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -39,9 +37,9 @@ import java.util.List;
 @Api(tags = "无车操作")
 @RestController
 @RequestMapping(value = {"/noCar"})
+@Slf4j
 public class NoCarController {
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
     
     @Autowired
@@ -376,7 +374,7 @@ public class NoCarController {
             params.setHeadRows(1);
             params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
-            MIX_LOG.info("1111111111"+list.size());
+            log.info("1111111111"+list.size());
             buildDate(list);
             RespR respR = noCarBillWayService.batchHsitoryBillWay(list,customerName);
             return respR;
@@ -402,7 +400,7 @@ public class NoCarController {
             params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
             buildDateEnd(list);
-            MIX_LOG.info("1111111111"+list.size());
+            log.info("1111111111"+list.size());
             RespR respR = noCarBillWayService.batchBillWayEnd(list,customerName);
             return respR;
         }catch (Exception e){
@@ -425,7 +423,7 @@ public class NoCarController {
                 noCarWayBill.setBillNum(noCarWayBill.getBillNum().trim());
             }catch (Exception e){
                 sb.append(noCarWayBill.getBillNum()+"#");
-                MIX_LOG.info(noCarWayBill.getBillNum());
+                log.info(noCarWayBill.getBillNum());
                 i++;
             }
 
@@ -443,7 +441,7 @@ public class NoCarController {
                 noCarWayBill.setPredictEndTime(format.format(noCarWayBill.getActEndTimeDate()));
             }catch (Exception e){
                 sb.append(noCarWayBill.getBillNum()+"#");
-                MIX_LOG.info(noCarWayBill.getBillNum());
+                log.info(noCarWayBill.getBillNum());
                 i++;
             }
 

src/main/java/com/jkcredit/invoice/credit/InterfaceCheckServer.java

@@ -4,15 +4,13 @@ import com.jkcredit.invoice.common.DataResult;
 import com.jkcredit.invoice.credit.custInterface.CustomerInterLowerService;
 import com.jkcredit.invoice.credit.custInterface.NoCarInterService;
 import com.jkcredit.invoice.credit.custInterface.SelfCarInterService;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service("interfaceCheckServer")
+@Slf4j
 public class InterfaceCheckServer {
-    Logger JUMP_LOG = LoggerUtil.logger(LogFileName.JUMP_LOG);
 
      @Autowired
      CustomerInterLowerService customerInterLowerService;
@@ -25,7 +23,7 @@ public class InterfaceCheckServer {
     //跳转到对应的Service服务处理逻辑
     public  DataResult doJumpHandler(String appKey, String api, String data,String requestid ) {
 
-        JUMP_LOG.info("[-InterfaceCheckServer.doJumpHandler-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data + " ,requestid=" +requestid);
+        log.info("[-InterfaceCheckServer.doJumpHandler-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data + " ,requestid=" +requestid);
 
 
         DataResult result;
@@ -109,7 +107,7 @@ public class InterfaceCheckServer {
                 break;
         }
 
-        JUMP_LOG.info("[-InterfaceCheckServer.doJumpHandler-] result appKey=" + appKey + " ,api=" + api + " ,data=" +data + " ,requestid=" +requestid+ " ,result="+result);
+        log.info("[-InterfaceCheckServer.doJumpHandler-] result appKey=" + appKey + " ,api=" + api + " ,data=" +data + " ,requestid=" +requestid+ " ,result="+result);
 
         return result;
 

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -8,10 +8,8 @@ import com.jkcredit.invoice.common.RequestApi;
 import com.jkcredit.invoice.common.ResponseCode;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.*;
@@ -31,9 +29,9 @@ import java.util.regex.Pattern;
  * @Author: mashengyi
  * @Date: 2021/9/12
  */
+@Slf4j
 public class SimpleCORSFilter implements Filter {
 
-    Logger GATEWAY_LOG = LoggerUtil.logger(LogFileName.GATEWAY_LOG);
 
     @Autowired
     CustomerService customerService;
@@ -237,16 +235,16 @@ public class SimpleCORSFilter implements Filter {
             RequestApi requestApi = new RequestApi();
             ResponseCode responseCode = checkToken(httpRequest, httpResponse,startTime,flagUuid,requestApi);
             if (!Objects.equals(responseCode, ResponseCode.SUCCESS)) {
-                GATEWAY_LOG.error("FILE - SimpleCORSFilterError = {}", responseCode + " ,requestURI = {" + httpRequest.getRequestURI() +"}");
+                log.error("FILE - SimpleCORSFilterError = {}", responseCode + " ,requestURI = {" + httpRequest.getRequestURI() +"}");
                 //httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
                 httpResponse.setContentType("application/json; charset=utf-8");
                 httpResponse.setCharacterEncoding("utf-8");
                 PrintWriter writer = httpResponse.getWriter();
                 writer.write(new ObjectMapper().writeValueAsString(ApiResult.failure(responseCode,requestid)));
-                GATEWAY_LOG.error("[FILE - SimpleCORSFilter-] return result=" + responseCode.toString() + " , param is api="+  requestApi.getApi() + " , data=" + requestApi.getData() + " , appKey=" + requestApi.getAppKey() + " , appSecret=" + requestApi.getAppSecret() +  " ,timeCost=" +(System.currentTimeMillis()-startTime) + "ms" +" , flag=" + flagUuid);
+                log.error("[FILE - SimpleCORSFilter-] return result=" + responseCode.toString() + " , param is api="+  requestApi.getApi() + " , data=" + requestApi.getData() + " , appKey=" + requestApi.getAppKey() + " , appSecret=" + requestApi.getAppSecret() +  " ,timeCost=" +(System.currentTimeMillis()-startTime) + "ms" +" , flag=" + flagUuid);
                 return;
             }else{
-                GATEWAY_LOG.info("SUCCESS - SimpleCORSFilterWarn = {}", responseCode + " ,requestURI = {" + httpRequest.getRequestURI() +"}");
+                log.info("SUCCESS - SimpleCORSFilterWarn = {}", responseCode + " ,requestURI = {" + httpRequest.getRequestURI() +"}");
 
 
                 DataResult dataResult =  interfaceCheckServer.doJumpHandler(requestApi.getAppKey(),requestApi.getApi(),requestApi.getData(),requestid);
@@ -262,7 +260,7 @@ public class SimpleCORSFilter implements Filter {
                 httpResponse.setCharacterEncoding("utf-8");
                 PrintWriter writer = httpResponse.getWriter();
                 writer.write(new ObjectMapper().writeValueAsString(ApiResult.failure(dataResult)));
-                GATEWAY_LOG.info("[SUCCESS - SimpleCORSFilter-] return result=" + dataResult.toString() + " , param is api="+  requestApi.getApi() + " , data=" + requestApi.getData() + " , appKey=" + requestApi.getAppKey() + " , appSecret=" + requestApi.getAppSecret() +  " ,timeCost=" +(System.currentTimeMillis()-startTime) + "ms" +" , flag=" + flagUuid);
+                log.info("[SUCCESS - SimpleCORSFilter-] return result=" + dataResult.toString() + " , param is api="+  requestApi.getApi() + " , data=" + requestApi.getData() + " , appKey=" + requestApi.getAppKey() + " , appSecret=" + requestApi.getAppSecret() +  " ,timeCost=" +(System.currentTimeMillis()-startTime) + "ms" +" , flag=" + flagUuid);
                 return;
             }
         }
@@ -374,7 +372,7 @@ public class SimpleCORSFilter implements Filter {
             requestApi.setData(data);
             requestApi.setAppSecret(appSecret);
             requestApi.setAppKey(appKey);
-            GATEWAY_LOG.info("[-SimpleCORSFilter-] query param api=" + api + " , data=" + data + " , appKey=" + appKey + " , appSecret=" + appSecret + " , flag=" + flag);
+            log.info("[-SimpleCORSFilter-] query param api=" + api + " , data=" + data + " , appKey=" + appKey + " , appSecret=" + appSecret + " , flag=" + flag);
             if (StringUtils.isEmpty(api) || StringUtils.isEmpty(data) || StringUtils.isEmpty(appKey) || StringUtils.isEmpty(appSecret)) {
                 return ResponseCode.UNKNOWN_ERROR;
             }
@@ -399,7 +397,7 @@ public class SimpleCORSFilter implements Filter {
             }
 
         } catch (Exception e) {
-            GATEWAY_LOG.error("Token 校验失败,{}:{}", e.getClass().getName(), e.getMessage());
+            log.error("Token 校验失败,{}:{}", e.getClass().getName(), e.getMessage());
             return ResponseCode.MEDIA_TYPE_NOT_SUPPORT_ERROR;
         }
         return ResponseCode.SUCCESS;

src/main/java/com/jkcredit/invoice/credit/custInterface/CustomerInterLowerServiceImpl.java

@@ -9,8 +9,8 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
 import com.jkcredit.invoice.util.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,9 +19,9 @@ import java.util.List;
 
 
 @Service("customerInterLowerService")
+@Slf4j
 public class CustomerInterLowerServiceImpl implements CustomerInterLowerService {
 
-    Logger QUERY_LOG = LoggerUtil.logger(LogFileName.QUERY_LOG);
 
 
     @Autowired
@@ -57,7 +57,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-CustomerInterLowerServiceImpl.customeInterRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-CustomerInterLowerServiceImpl.customeInterRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
 
             Integer interType =  0;//0-接口 1-平台 3.手工录入
@@ -142,7 +142,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
             customerRecs.add(customerRec);
             RespR rs = lowerService.customeRec(customerRecs);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-CustomerInterLowerServiceImpl.customeInterRec-] result is "
+            log.info("[-CustomerInterLowerServiceImpl.customeInterRec-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
 
@@ -150,7 +150,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
             if(null != rs && rs.getCode() == 0){
 
                 RespR rs1 =  customerService.customeRec(customerRec);
-                QUERY_LOG.info("[-CustomerInterLowerServiceImpl.customeInterRecRc1-] result is "
+                log.info("[-CustomerInterLowerServiceImpl.customeInterRecRc1-] result is "
                         + rs1.toString() + ", request is " + data + " ,costtime="
                         + (System.currentTimeMillis() - costtimestart));
 
@@ -175,7 +175,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-CustomerInterLowerServiceImpl.customeInterRec-] get httpclient exception is "
+            log.error("[-CustomerInterLowerServiceImpl.customeInterRec-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -201,7 +201,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-CustomerInterLowerServiceImpl.customeInterRecQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-CustomerInterLowerServiceImpl.customeInterRecQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
         JSONObject jsonObject = JSONObject.parseObject(data);
         String companyName =  jsonObject.getString("companyName");//企业名称
         String taxpayerCode = jsonObject.getString("taxplayerCode");//企业税号
@@ -220,7 +220,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
         customerRec.setCompanyReferencenum(taxpayerCode);
         RespR rs = customerService.customerRecQuery(customerRec);
         long costtimeend = System.currentTimeMillis();
-        QUERY_LOG.info("[-CustomerInterLowerServiceImpl.customeInterRecQuery-] result is "
+        log.info("[-CustomerInterLowerServiceImpl.customeInterRecQuery-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
         if(null != rs && rs.getCode() == 0){
@@ -235,7 +235,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
             return result;
         }
         } catch (Exception e) {
-            QUERY_LOG.error("[-CustomerInterLowerServiceImpl.customeInterRecQuery-] get httpclient exception is "
+            log.error("[-CustomerInterLowerServiceImpl.customeInterRecQuery-] get httpclient exception is "
                             + e + ", request is " + data);
         }
         return result;
@@ -253,7 +253,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-CustomerInterLowerServiceImpl.customeProtocolUpLoad-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-CustomerInterLowerServiceImpl.customeProtocolUpLoad-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//公司编号
             String serviceStartTime = jsonObject.getString("serviceStartTime");//服务开始时间
@@ -311,7 +311,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
             customerRecs.add(customerRec);
             RespR rs = lowerService.customeRecUpload(customerRecs);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-CustomerInterLowerServiceImpl.customeProtocolUpLoad-] result is "
+            log.info("[-CustomerInterLowerServiceImpl.customeProtocolUpLoad-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -326,7 +326,7 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-CustomerInterLowerServiceImpl.customeProtocolUpLoad-] get httpclient exception is "
+            log.error("[-CustomerInterLowerServiceImpl.customeProtocolUpLoad-] get httpclient exception is "
                     + e + ", request is " + data);
         }
 

src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterServiceImpl.java

@@ -18,11 +18,9 @@ import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.util.DateUtil;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,10 +31,10 @@ import static java.util.stream.Collectors.toList;
 
 
 @Service("noCarInterService")
+@Slf4j
 public class NoCarInterServiceImpl implements NoCarInterService {
     
-    Logger QUERY_LOG = LoggerUtil.logger(LogFileName.QUERY_LOG);
-    
+
     @Autowired
     private NoCarService noCarService;
     @Autowired
@@ -81,7 +79,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.customerCarRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.customerCarRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyName =  jsonObject.getString("companyName");//企业名称 选输
             String plateNumber =  jsonObject.getString("plateNumber");//plateNumber 必输
@@ -123,7 +121,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
             RespR rs = noCarService.customerCarRec(customerCarRecList);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.customerCarRec-] result is "
+            log.info("[-NoCarInterServiceImpl.customerCarRec-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -138,7 +136,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.customerCarRec-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.customerCarRec-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -166,7 +164,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.customeRecUpperQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.customeRecUpperQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String waybillSource =  jsonObject.getString("waybillSource");//备案来源 选输
             String plateNumber =  jsonObject.getString("plateNumber");//plateNumber 必输
@@ -190,7 +188,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
             RespR rs = noCarService.customerCarRecQueryUpper(customerCarRec);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.customeRecUpperQuery-] result is "
+            log.info("[-NoCarInterServiceImpl.customeRecUpperQuery-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -212,7 +210,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.customeRecUpperQuery-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.customeRecUpperQuery-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -242,7 +240,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarBillStart-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.noCarBillStart-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String num =  jsonObject.getString("num");//运单编号 必选
             String plateNumber =  jsonObject.getString("plateNumber");//车牌号 必选
@@ -300,7 +298,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
 
             if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 1||noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)) {
-                QUERY_LOG.info("chongfuyundanhao:"+noCarWayBillDb.getBillNum());
+                log.info("chongfuyundanhao:"+noCarWayBillDb.getBillNum());
                 result.setMsg("运单号重复");
                 return result;
             }
@@ -331,7 +329,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             }
             RespR rs = noCarService.noCarWaybillStart(noCarWayBill,noCarWayBillDb);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarBillStart-] result is "
+            log.info("[-NoCarInterServiceImpl.noCarBillStart-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -349,7 +347,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.noCarBillStart-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.noCarBillStart-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -377,7 +375,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarBillEnd-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.noCarBillEnd-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String num =  jsonObject.getString("num");//运单号 必输
             String realDestAddr =  jsonObject.getString("realDestAddr");//运单实际目的地址 必输
@@ -393,7 +391,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
             NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(num);
             if (null == noCarWayBill1){
-                QUERY_LOG.info("chongfuyundanhao1:"+num);
+                log.info("chongfuyundanhao1:"+num);
                 result.setMsg("运单开始指令还未上传!");
                 return result;
             }
@@ -410,7 +408,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setInterfaceEndTime(DateUtil.getCurrentDateStr());
             RespR rs = noCarService.noCarWaybillEnd(noCarWayBill,noCarWayBill1);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarBillEnd-] result is "
+            log.info("[-NoCarInterServiceImpl.noCarBillEnd-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -425,7 +423,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.noCarBillEnd-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.noCarBillEnd-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -454,7 +452,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarHisWaybillStart-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data + " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.noCarHisWaybillStart-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data + " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String num =  jsonObject.getString("num");//运单编号 必选
             String plateNumber =  jsonObject.getString("plateNumber");//车牌号 必选
@@ -511,7 +509,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
 
             if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 1||noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)) {
-                QUERY_LOG.info("chongfuyundanhao1:"+noCarWayBillDb.getBillNum());
+                log.info("chongfuyundanhao1:"+noCarWayBillDb.getBillNum());
                 result.setMsg("运单号重复");
                 return result;
             }
@@ -541,7 +539,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             }
             RespR rs = noCarService.noCarHisWaybillStart(noCarWayBill,noCarWayBillDb);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarHisWaybillStart-] result is "
+            log.info("[-NoCarInterServiceImpl.noCarHisWaybillStart-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -560,7 +558,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.noCarHisWaybillStart-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.noCarHisWaybillStart-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -598,7 +596,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String num =  jsonObject.getString("num");//运单号 必输
             String realDestAddr =  jsonObject.getString("realDestAddr");//运单实际目的地址 必输
@@ -630,7 +628,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setInterfaceEndTime(DateUtil.getCurrentDateStr());
             RespR rs = noCarService.noCarHisWaybillEnd(noCarWayBill,noCarWayBill1);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] result is "
+            log.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -645,7 +643,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -674,7 +672,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarVoiceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.noCarVoiceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String num =  jsonObject.getString("num");//运单号 必输
             if(StringUtils.isEmpty(data)|| null == jsonObject || StringUtils.isEmpty(num)
@@ -693,7 +691,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill1.setCompanyName(noCarWayBill1.getCompanyName());
             RespR rs = noCarService.getInvoiceByWayBillNumReal(noCarWayBill1,true);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarVoiceQuery-] result is "
+            log.info("[-NoCarInterServiceImpl.noCarVoiceQuery-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -708,7 +706,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.noCarVoiceQuery-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.noCarVoiceQuery-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -740,7 +738,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarNoVoiceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.noCarNoVoiceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
 
 
 
@@ -764,7 +762,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             List<String> reduce1 = list1.stream().filter(item -> !list2.contains(item)).collect(toList());
 
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.noCarNoVoiceQuery-] result is "
+            log.info("[-NoCarInterServiceImpl.noCarNoVoiceQuery-] result is "
                     + reduce1.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != reduce1 && reduce1.size() > 0){
@@ -779,7 +777,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.noCarNoVoiceQuery-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.noCarNoVoiceQuery-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -809,7 +807,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-NoCarInterServiceImpl.balanceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-NoCarInterServiceImpl.balanceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
 
 
             Customer customer = customerMapper.selectByCustomerName(appKey);
@@ -817,7 +815,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
 
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-NoCarInterServiceImpl.balanceQuery-] result is "
+            log.info("[-NoCarInterServiceImpl.balanceQuery-] result is "
                     + customer.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != customer){
@@ -835,7 +833,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-NoCarInterServiceImpl.balanceQuery-] get httpclient exception is "
+            log.error("[-NoCarInterServiceImpl.balanceQuery-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;

src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterServiceImpl.java

@@ -10,11 +10,9 @@ import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
 import com.jkcredit.invoice.util.DateUtil;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,9 +21,9 @@ import java.util.List;
 
 
 @Service("selfCarInterService")
+@Slf4j
 public class SelfCarInterServiceImpl implements SelfCarInterService {
 
-    Logger QUERY_LOG = LoggerUtil.logger(LogFileName.QUERY_LOG);
     @Autowired
     SelfCarServiceL selfCarService;
 
@@ -52,7 +50,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-        QUERY_LOG.info("[-SelfCarInterServiceImpl.customerETCQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+        log.info("[-SelfCarInterServiceImpl.customerETCQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
         JSONObject jsonObject = JSONObject.parseObject(data);
         String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
         String cardId = jsonObject.getString("cardId");//卡号  非必输
@@ -83,7 +81,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             etcQueryVo.setPlateColor(plateColor);//车牌颜色 非必输
         RespR rs = selfCarService.getEtcInfo(etcQueryVo);
         long costtimeend = System.currentTimeMillis();
-        QUERY_LOG.info("[-SelfCarInterServiceImpl.customerETCQuery-] result is "
+        log.info("[-SelfCarInterServiceImpl.customerETCQuery-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
         if(null != rs && rs.getCode() == 0){
@@ -105,7 +103,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             return result;
         }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.customerETCQuery-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.customerETCQuery-] get httpclient exception is "
                             + e + ", request is " + data);
         }
         return result;
@@ -135,7 +133,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerQueryEtcInfo-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.customerQueryEtcInfo-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             JSONArray vehicleList = jsonObject.getJSONArray("vehicleList");//车牌的json字符串 必输
@@ -185,7 +183,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             RespR rs = selfCarService.queryEtcInfo(etcQueryVo);
 
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerQueryEtcInfo-] result is "
+            log.info("[-SelfCarInterServiceImpl.customerQueryEtcInfo-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -203,7 +201,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.customerQueryEtcInfo-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.customerQueryEtcInfo-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -233,7 +231,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerETCRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.customerETCRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String mobile =  jsonObject.getString("mobile");//企业预留手机号 必输
@@ -283,7 +281,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             etcQueryVo.setCards(cards);
             RespR rs = selfCarService.customerEtcRec(etcQueryVo);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerETCRec-] result is "
+            log.info("[-SelfCarInterServiceImpl.customerETCRec-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -298,7 +296,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.customerETCRec-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.customerETCRec-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -327,7 +325,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerETCRecValid-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.customerETCRecValid-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String mobile =  jsonObject.getString("mobile");//企业预留手机号 必输
@@ -360,7 +358,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
 
             RespR rs = selfCarService.customerEtcRecValid(etcValidVo);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerETCRecValid-] result is "
+            log.info("[-SelfCarInterServiceImpl.customerETCRecValid-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -375,7 +373,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.customerETCRecValid-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.customerETCRecValid-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -405,7 +403,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.getTradeList-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.getTradeList-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String cardId =  jsonObject.getString("cardId");//卡号 必输
@@ -468,7 +466,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             }
             RespR rs = selfCarService.getTradeList(tradeRequestVo);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.getTradeList-] result is "
+            log.info("[-SelfCarInterServiceImpl.getTradeList-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -486,7 +484,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.getTradeList-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.getTradeList-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -515,7 +513,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.applInvoice-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.applInvoice-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String cardId =  jsonObject.getString("cardId");//卡号 必输
@@ -562,7 +560,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             invoiceApplVo.setTradeIds(tradeIds);
             RespR rs = selfCarService.applInvoice(invoiceApplVo);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.applInvoice-] result is "
+            log.info("[-SelfCarInterServiceImpl.applInvoice-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -577,7 +575,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.applInvoice-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.applInvoice-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -606,7 +604,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.getSelfCarInvoicesByTime-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.getSelfCarInvoicesByTime-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String cardId =  jsonObject.getString("cardId");//卡号 必输
@@ -641,7 +639,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
 
             RespR rs = selfCarService.getSelfCarInvoicesByTime(selfCarDueQueryVo);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.getSelfCarInvoicesByTime-] result is "
+            log.info("[-SelfCarInterServiceImpl.getSelfCarInvoicesByTime-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -659,7 +657,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.getSelfCarInvoicesByTime-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.getSelfCarInvoicesByTime-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -689,7 +687,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.getSelfCarInvoicePackage-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.getSelfCarInvoicePackage-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String makeMonth =  jsonObject.getString("makeMonth");//发票开具月份 必输
@@ -718,7 +716,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
 
             RespR rs = selfCarService.getInvoicePackge(invoicePackageVo);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.getSelfCarInvoicePackage-] result is "
+            log.info("[-SelfCarInterServiceImpl.getSelfCarInvoicePackage-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -733,7 +731,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.getSelfCarInvoicePackage-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.getSelfCarInvoicePackage-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;
@@ -763,7 +761,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         result.setMsg("无法认证");
 
         try {
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerCarUnRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+            log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String cardId =  jsonObject.getString("cardId");//Etc卡号 必输
@@ -792,7 +790,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
 
             RespR rs = selfCarService.customerCarUnRec(customerCarRecList);
             long costtimeend = System.currentTimeMillis();
-            QUERY_LOG.info("[-SelfCarInterServiceImpl.customerCarUnRec-] result is "
+            log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
@@ -807,7 +805,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
         } catch (Exception e) {
-            QUERY_LOG.error("[-SelfCarInterServiceImpl.customerCarUnRec-] get httpclient exception is "
+            log.error("[-SelfCarInterServiceImpl.customerCarUnRec-] get httpclient exception is "
                     + e + ", request is " + data);
         }
         return result;

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerOperServiceImpl.java

@@ -9,16 +9,14 @@ import com.jkcredit.invoice.model.entity.customer.CustomerOper;
 import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.service.customer.CustomerOperService;
 import com.jkcredit.invoice.util.DateUtil;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+@Slf4j
 @Service("customerOperService")
 public class CustomerOperServiceImpl extends ServiceImpl<CustomerOperMapper,CustomerOper> implements CustomerOperService {
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
-    
+
     
     @Autowired
     CustomerOperMapper customerOperMapper;
@@ -31,7 +29,7 @@ public class CustomerOperServiceImpl extends ServiceImpl<CustomerOperMapper,Cust
 
     @Override
     public String saveCustomerOper(String customerName, int operType) {
-        MIX_LOG.info("开始保存批次信息CustomerOperServiceImpl.saveCustomerOper:("+customerName+","+operType+")");
+        log.info("开始保存批次信息CustomerOperServiceImpl.saveCustomerOper:("+customerName+","+operType+")");
         //保存批次信息
         User user = userMapper.getUserByUserName(customerName);
         String batchNumber = "YD" + System.currentTimeMillis();

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerServiceImpl.java

@@ -13,15 +13,15 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.upService.CommInterFace;
 import com.jkcredit.invoice.util.*;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service("customerService")
+@Slf4j
 public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> implements CustomerService{
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
     
     
@@ -51,7 +51,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     @Override
     public Boolean addCustomers(Customer customer) {
-        MIX_LOG.info("开始添加客户信息：CustomerServiceImpl.addCustomers{}",customer);
+        log.info("开始添加客户信息：CustomerServiceImpl.addCustomers{}",customer);
         customer.setFirstSign(DateUtil.getCurrentDateStr());
         if(customerMapper.selectByCustomerName(customer.getCustomerName())!=null){
             return false;
@@ -67,15 +67,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean customRecharge(CustomerRecharge customerRecharge) {
-        MIX_LOG.info("开始充值：CustomerServiceImpl.customRecharge{}",customerRecharge);
+        log.info("开始充值：CustomerServiceImpl.customRecharge{}",customerRecharge);
         if(null == customerRecharge.getRechargeMony() || "".equals(customerRecharge.getRechargeMony())){
-            MIX_LOG.error("充值失败：CustomerServiceImpl.getRechargeMony：" + customerRecharge.getRechargeMony());
+            log.error("充值失败：CustomerServiceImpl.getRechargeMony：" + customerRecharge.getRechargeMony());
             return false;
         }
         Customer customer = customerMapper.selectByCustomerName(customerRecharge.getCustomerName());
         Double currentMoney = MathUtil.add(customer.getAccountBalance(),customerRecharge.getRechargeMony());
         /*if(currentMoney.compareTo(0.0) < 0){
-            MIX_LOG.error("充值失败：CustomerServiceImpl.customRecharge：" + currentMoney);
+            log.error("充值失败：CustomerServiceImpl.customRecharge：" + currentMoney);
             return false;
         }*/
         customer.setAccountBalance(currentMoney);
@@ -84,11 +84,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         customerRecharge.setBeforeMony(customer.getAccountBalance());
         customerRecharge.setCompanyName(customer.getCompany());
         customerRechargeMapper.insert(customerRecharge);
-        MIX_LOG.info("充值结束：CustomerServiceImpl.customRecharge{}",customerRecharge);
+        log.info("充值结束：CustomerServiceImpl.customRecharge{}",customerRecharge);
         return true;
     }
     public RespR contractAdd(CustomerRec customerRec){
-        MIX_LOG.info("开始上传协议：CustomerServiceImpl.contractAdd{}",customerRec);
+        log.info("开始上传协议：CustomerServiceImpl.contractAdd{}",customerRec);
         if(customerRec.getRecStatus().intValue() == 2){
             return new RespR(false,"无法上传协议，未注册");
         }
@@ -104,10 +104,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         b2bContractAddRequest.setBase64Str(customerRec.getBase64Str());
         RespR<B2bContractAddResponse> responseRespR = commInterFace.b2bContractAdd(b2bContractAddRequest);
         if(responseRespR.getCode() == 1){
-            MIX_LOG.info("协议上传失败：CustomerServiceImpl.contractAdd{}---msg{}",customerRec,responseRespR.getMsg());
+            log.info("协议上传失败：CustomerServiceImpl.contractAdd{}---msg{}",customerRec,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
-            MIX_LOG.info("协议上传成功：CustomerServiceImpl.contractAdd");
+            log.info("协议上传成功：CustomerServiceImpl.contractAdd");
             customerRec.setContractSuc(1);
             customerRec.setContrantNum(responseRespR.getData().getContrantNum());
             customerRecMapper.updateByPrimaryKeySelective(customerRec);
@@ -123,7 +123,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     }
 
     public RespR customeRec(CustomerRec customerRec){
-        MIX_LOG.info("开始客户注册：CustomerServiceImpl.customeRec{}",customerRec);
+        log.info("开始客户注册：CustomerServiceImpl.customeRec{}",customerRec);
         CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
         if(null != customerRec1){
             return new RespR(false,"客户已经备案成功，无需备案");
@@ -132,7 +132,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         //主动查询上游接口，如果已经备案则更新
     /*    RespR respR1 = customerService.customerRecQuery(customerRec);
         if(respR1.getCode() == 0){
-            MIX_LOG.info("客户注册查上游成功：CustomerServiceImpl.customeRec{}",customerRec);
+            log.info("客户注册查上游成功：CustomerServiceImpl.customeRec{}",customerRec);
             List<B2bCompanyModel> b2bCompanyModels = (List<B2bCompanyModel>)respR1.getData();
             if(b2bCompanyModels.size()==1){
                 customerRec.setCompanyNum(b2bCompanyModels.get(0).getCompanyNum());
@@ -142,17 +142,17 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
             }
         }*/
         CompanyAddRequest companyAddRequest = buildCompany(customerRec);
-        MIX_LOG.info("开始客户上游注册：CustomerServiceImpl.customeRec{}",customerRec);
+        log.info("开始客户上游注册：CustomerServiceImpl.customeRec{}",customerRec);
         //注册企业
         RespR<CompanyAddResponse> respR = commInterFace.addCompany(companyAddRequest);
         if(respR.getCode() == 1){
-            MIX_LOG.info("客户上游注册失败：CustomerServiceImpl.customeRec{}，msg{}",customerRec,respR.getMsg());
+            log.info("客户上游注册失败：CustomerServiceImpl.customeRec{}，msg{}",customerRec,respR.getMsg());
             customerRec.setRecStatus(2);
             customerRec.setFileMessage(respR.getMsg());
             customerRecMapper.updateByPrimaryKeySelective(customerRec);
             return new RespR(false,respR.getMsg());
         }
-        MIX_LOG.info("客户上游注册成功：CustomerServiceImpl.customeRec{}");
+        log.info("客户上游注册成功：CustomerServiceImpl.customeRec{}");
         CompanyAddResponse response = respR.getData();
         //注册协议
         String companyNum = response.getCompanyNum();
@@ -186,7 +186,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     @Override
     public RespR customerRecQuery(CustomerRec customerRec) {
-        MIX_LOG.info("查询注册信息：CustomerServiceImpl.customerRecQuery{}",customerRec);
+        log.info("查询注册信息：CustomerServiceImpl.customerRecQuery{}",customerRec);
         CompanyQueryRequest companyQueryRequest = new CompanyQueryRequest();
         companyQueryRequest.setCompanyName(customerRec.getCompanyName());
         companyQueryRequest.setTaxpaterCode(customerRec.getCompanyReferencenum());
@@ -200,15 +200,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     @Override
     public RespR updateCustomerRecStatus(CustomerRec customerRec) {
-        MIX_LOG.info("更新注册信息：CustomerServiceImpl.customerRecQuery{}",customerRec);
+        log.info("更新注册信息：CustomerServiceImpl.customerRecQuery{}",customerRec);
         CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
         customerRec1.setRecStatus(customerRec.getRecStatus());
         int i = customerRecMapper.updateByPrimaryKey(customerRec1);
         if(i<=0){
-            MIX_LOG.info("更新注册信息失败：CustomerServiceImpl.customerRecQuery{}",customerRec);
+            log.info("更新注册信息失败：CustomerServiceImpl.customerRecQuery{}",customerRec);
             return new RespR(false);
         }
-        MIX_LOG.info("更新注册信息成功：CustomerServiceImpl.customerRecQuery{}",customerRec);
+        log.info("更新注册信息成功：CustomerServiceImpl.customerRecQuery{}",customerRec);
         return new RespR(true);
     }
 
@@ -220,7 +220,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     @Override
     public boolean checkMoneyEnough(String customerName) {
         Customer customer = customerMapper.selectByCustomerName(customerName);
-        MIX_LOG.info("客户余额查询：CustomerServiceImpl.checkMoneyEnough{}",customer);
+        log.info("客户余额查询：CustomerServiceImpl.checkMoneyEnough{}",customer);
         if(customer== null || customer.getAccountBalance()<=0){
             return false;
         }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java

@@ -1,6 +1,5 @@
 package com.jkcredit.invoice.service.lowerService.impl;
 
-import cn.com.taiji.sdk.model.comm.protocol.tts.card.server.CardBindQueryListToBResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterRequest;
@@ -27,7 +26,7 @@ import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.upService.NoCarInterface;
 import com.jkcredit.invoice.util.*;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -38,8 +37,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Repository("noCarService")
+@Slf4j
 public class NoCarServiceImpl implements NoCarService{
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
     
     
@@ -72,7 +71,7 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR customerCarRec(List<CustomerCarRec> customerCarRecs) {
-        MIX_LOG.info("车辆备案开始NoCarServiceImpl.customerCarRec{}",customerCarRecs);
+        log.info("车辆备案开始NoCarServiceImpl.customerCarRec{}",customerCarRecs);
         if(customerCarRecs== null || customerCarRecs.size()<=0){
             return new RespR(false,"无备案车辆");
         }
@@ -81,7 +80,7 @@ public class NoCarServiceImpl implements NoCarService{
         Customer customer = customerMapper.selectByCustomerName(customerCarRec2.getCustomerName());
         if(customer == null || customer.getAccstatus()!=0){
             res.append("#客户："+customerCarRec2.getCustomerName()+"不存在或状态异常");
-            MIX_LOG.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
+            log.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
             return new RespR(false,res.toString());
         }
         CustomerRec customerRecP = new CustomerRec();
@@ -90,7 +89,7 @@ public class NoCarServiceImpl implements NoCarService{
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
         if(customerRec == null){
             res.append("#客户："+customerCarRec2.getCustomerName()+"企业:"+customerCarRec2.getCompanyName()+"备案信息不存在");
-            MIX_LOG.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
+            log.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
             return new RespR(false,res.toString());
         }
         return customerCarRecForNoCar(customerCarRecs,res,customerRec);
@@ -153,10 +152,10 @@ public class NoCarServiceImpl implements NoCarService{
 
             }
             if(StringUtils.isEmpty(res.toString())){
-                MIX_LOG.info("车辆备案成功");
+                log.info("车辆备案成功");
                 return new RespR(respRResult);
             }else {
-                MIX_LOG.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
+                log.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
                 return new RespR(false,res.toString());
             }
 
@@ -170,7 +169,7 @@ public class NoCarServiceImpl implements NoCarService{
     @Override
     public RespR customerCarRecQueryUpper(CustomerCarRec customerCarRec) {
         StringBuffer res = new StringBuffer();
-        MIX_LOG.info("车辆备案查询NoCarServiceImpl.customerCarRecQueryUpper{}",customerCarRec);
+        log.info("车辆备案查询NoCarServiceImpl.customerCarRecQueryUpper{}",customerCarRec);
         Customer customer = customerMapper.selectByCustomerName(customerCarRec.getCustomerName());
         if(customer == null || customer.getAccstatus()!=0){
             res.append("#客户："+customer.getCustomerName()+"不存在或状态异常");
@@ -194,7 +193,7 @@ public class NoCarServiceImpl implements NoCarService{
 
         RespR<VehicleQueryResponse> respR = noCarInterface.vehicleQuery(vehicleQueryRequest);
         if(respR.getCode() == 1){
-            MIX_LOG.info("车辆备案查询失败NoCarServiceImpl.customerCarRecQueryUpper{},msg{}",customerCarRec,respR.getMsg());
+            log.info("车辆备案查询失败NoCarServiceImpl.customerCarRecQueryUpper{},msg{}",customerCarRec,respR.getMsg());
         }else if(8 != customerCarRec.getInterType()){//此处表示仅适用接口查询，不走业务逻辑
             customerCarRec.setRecStatus(1);
             updateCustomerCarRec(customerCarRec);
@@ -221,24 +220,24 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR noCarWaybillStart(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBillDb) {
-        MIX_LOG.info("运单上传开始：NoCarServiceImpl.noCarWaybillStart{}",noCarWayBill);
+        log.info("运单上传开始：NoCarServiceImpl.noCarWaybillStart{}",noCarWayBill);
         //如果运单时间和当前时间差了三天，直接返回
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())<-72){
             return new RespR(false,"失败，运单开始时间超72小时");
         }
         if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             return new RespR(false,"失败，承运时长超96小时");
         }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
-            MIX_LOG.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,respR.getMsg());
+            log.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,respR.getMsg());
             return  respR;
         }
         WaybillStartRequest waybillStartRequest = buildWaybillStartRequest(noCarWayBill);
         RespR<WaybillStartResponse> responseRespR = noCarInterface.waybillStart(waybillStartRequest);
         if(responseRespR.getCode() == 1){
-            MIX_LOG.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,responseRespR.getMsg());
+            log.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
@@ -304,9 +303,9 @@ public class NoCarServiceImpl implements NoCarService{
     }
     @Override
     public RespR noCarWaybillEnd(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBill1) {
-        MIX_LOG.info("运单结束开始：NoCarServiceImpl.noCarWaybillEnd{}",noCarWayBill);
+        log.info("运单结束开始：NoCarServiceImpl.noCarWaybillEnd{}",noCarWayBill);
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill1.getHisFlag() ==1 ){
-            MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
             noCarWayBill.setFailReason("当前运单状态无法结束,请检查当前指令状态");
             noCarWaybillMapper.updateByBillNumTimeRes(noCarWayBill);
             return new RespR(false,"当前运单状态无法结束,请检查当前指令状态");
@@ -319,7 +318,7 @@ public class NoCarServiceImpl implements NoCarService{
             //noCarWayBill1.setBillwayStatus(4);
             noCarWayBill1.setFailReason("失败，承运时长超96小时");
             noCarWaybillMapper.updateByBillNumTimeRes(noCarWayBill);
-            MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             return new RespR(false,"失败，承运时长超96小时");
         }
 
@@ -331,13 +330,13 @@ public class NoCarServiceImpl implements NoCarService{
         waybillEndRequest.setEndTime(DateUtil.dateFormate(noCarWayBill1.getPredictEndTime()));
         RespR<WaybillEndResponse> waybillEndResponseRespR = noCarInterface.waybillEnd(waybillEndRequest);
         if(waybillEndResponseRespR.getCode() == 1){
-            MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,waybillEndResponseRespR.getMsg());
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,waybillEndResponseRespR.getMsg());
             noCarWayBill1.setBillwayStatus(-3);
             noCarWayBill1.setFailReason(waybillEndResponseRespR.getMsg());
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
-            MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时");
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时");
             noCarWayBill1.setBillwayStatus(4);
             noCarWayBill1.setFailReason(waybillEndResponseRespR.getMsg());
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
@@ -352,29 +351,29 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBill1) {
-        MIX_LOG.info("历史运单开始上传：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"开始");
+        log.info("历史运单开始上传：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"开始");
         if(noCarWayBill1!=null && noCarWayBill1.getBillwayStatus() ==1){
             return new RespR(false,"运单号重复");
         }
         if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date())>-20){
-            MIX_LOG.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
             return new RespR(false,"失败，运单未满20天时效");
         }
         if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            MIX_LOG.info("历史运单开始上传失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             return new RespR(false,"失败，承运时长超96小时");
         }
 
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
-            MIX_LOG.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,respR.getMsg());
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,respR.getMsg());
             return  respR;
         }
         WaybillHistoryStartRequest waybillHistoryStartRequest = BuildNoCarHisWaybill(noCarWayBill);
         RespR<WaybillHistoryStartResponse> responseRespR = noCarInterface.waybillHistoryStart(waybillHistoryStartRequest);
 
         if(responseRespR.getCode() == 1){
-            MIX_LOG.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,responseRespR.getMsg());
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
@@ -409,9 +408,9 @@ public class NoCarServiceImpl implements NoCarService{
     }
     @Override
     public RespR noCarHisWaybillEnd(NoCarWayBill noCarWayBill,NoCarWayBill noCarWayBill1) {
-        MIX_LOG.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"开始");
+        log.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"开始");
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==0 || noCarWayBill1.getBillwayStatus() == -3 ){
-            MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
             noCarWayBill.setFailReason("当前运单状态无法结束,请检查当前指令状态");
             noCarWaybillMapper.updateByBillNumTimeRes(noCarWayBill);
             return new RespR(false,"当前运单状态无法结束,请检查当前指令状态");
@@ -420,7 +419,7 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
         noCarWayBill1.setInterType(noCarWayBill.getInterType());
         if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            MIX_LOG.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             noCarWayBill.setFailReason("失败，承运时长超96小时");
             noCarWaybillMapper.updateByBillNumTimeRes(noCarWayBill);
             return new RespR(false,"失败，承运时长超96小时");
@@ -436,13 +435,13 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWayBill1.setBillwayStatus(-3);
             noCarWayBill1.setFailReason(waybillEndResponseRespR.getMsg());
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
-            MIX_LOG.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill1,waybillEndResponseRespR.getMsg());
+            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill1,waybillEndResponseRespR.getMsg());
 
             return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
             noCarWayBill.setBillwayStatus(4);
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
-            MIX_LOG.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill1,"运单已经超时，请拆分");
+            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill1,"运单已经超时，请拆分");
             return new RespR(false,"运单已经超时");
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());
@@ -474,7 +473,7 @@ public class NoCarServiceImpl implements NoCarService{
     @Override
     @Transactional
     public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isInterface) {
-        MIX_LOG.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isInterface);
+        log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isInterface);
        if(noCarWayBill.getBillwayStatus() == 3){
 
             if(isInterface){
@@ -496,12 +495,12 @@ public class NoCarServiceImpl implements NoCarService{
         }
         int status = noCarWayBill.getBillwayStatus();
         if(status !=2){
-            MIX_LOG.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,"运单转态,无法开票");
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,"运单转态,无法开票");
             return new RespR(false,"运单状态无法开票");
         }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
-            MIX_LOG.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,respR.getMsg());
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,respR.getMsg());
             return  respR;
         }
 
@@ -512,7 +511,7 @@ public class NoCarServiceImpl implements NoCarService{
         waybillNumFindInvoiceRequest.setWaybillNum(noCarWayBill.getBillNum());
         RespR<WaybillNumFindInvoiceResponse> responseRespR = noCarInterface.waybillNumFindInvoice(waybillNumFindInvoiceRequest);
         if(responseRespR.getCode() == 1){
-            MIX_LOG.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,responseRespR.getMsg());
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             int tempStatus = responseRespR.getData().getWaybillStatus().intValue();
@@ -564,7 +563,7 @@ public class NoCarServiceImpl implements NoCarService{
                         calculateInforMapper.insert(calculateInfor);
                         customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),calculateInfor.getFee()));
                     }catch (Exception e){
-                        MIX_LOG.error("重复数据来啦"+calculateInfor.getTradeId());
+                        log.error("重复数据来啦"+calculateInfor.getTradeId());
                     }
 
 
@@ -592,7 +591,7 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR hCInvoiceQuery(HCInvoiceQueryVo hcInvoiceQueryVo) {
-        MIX_LOG.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}",hcInvoiceQueryVo);
+        log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}",hcInvoiceQueryVo);
         WaybillInvoiceRedQueryRequest redQueryRequest = new WaybillInvoiceRedQueryRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         redQueryRequest.setCompanyNum(companyNum);
@@ -600,7 +599,7 @@ public class NoCarServiceImpl implements NoCarService{
 
         RespR<WaybillInvoiceRedQueryResponse> respR = noCarInterface.waybillInvoiceRedQuery(redQueryRequest);
         if(respR.getCode() == 1){
-            MIX_LOG.info("取红冲票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",hcInvoiceQueryVo,respR.getMsg());
+            log.info("取红冲票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",hcInvoiceQueryVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
         if(StringUtils.isEmpty(hcInvoiceQueryVo.getCompanyName())){
@@ -612,7 +611,7 @@ public class NoCarServiceImpl implements NoCarService{
     }
     @Override
     public RespR monthAccQuery(MonthAccountQueryVo monthAccountQueryVo) {
-        MIX_LOG.info("取月票啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"开始");
+        log.info("取月票啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"开始");
         CustomerRec customerRecParm = new CustomerRec();
         customerRecParm.setCompanyName(monthAccountQueryVo.getCompanyName());
         customerRecParm.setCustomerName(monthAccountQueryVo.getCustomeName());
@@ -622,7 +621,7 @@ public class NoCarServiceImpl implements NoCarService{
             customerRec = customerRecs.get(0);
         }
         if(customerRec == null || customerRec.getRecStatus()!=1){
-            MIX_LOG.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"企业未备案成功,查询失败");
+            log.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"企业未备案成功,查询失败");
             return new RespR(false,"企业未备案成功,查询失败");
         }
         WaybillCountQueryRequest waybillCountQueryRequest = new WaybillCountQueryRequest();
@@ -634,7 +633,7 @@ public class NoCarServiceImpl implements NoCarService{
         waybillCountQueryRequest.setPageNo(monthAccountQueryVo.getPageNo());
         waybillCountQueryRequest.setPageSize(1000);
         RespR<WaybillCountQueryResponse> waybillCountQueryResponseRespR =  noCarInterface.waybillCountQuery(waybillCountQueryRequest);
-        MIX_LOG.info("取月票结束：NoCarServiceImpl.hCInvoiceQuery{},msg{}",waybillCountQueryResponseRespR,waybillCountQueryResponseRespR.getMsg());
+        log.info("取月票结束：NoCarServiceImpl.hCInvoiceQuery{},msg{}",waybillCountQueryResponseRespR,waybillCountQueryResponseRespR.getMsg());
         return waybillCountQueryResponseRespR;
     }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java

@@ -24,17 +24,17 @@ import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
 import com.jkcredit.invoice.util.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 @Service
+@Slf4j
 public class SelfCarServiceLImpl implements SelfCarServiceL {
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
     
     
@@ -58,18 +58,18 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     CustomerService customerService;
     @Override
     public RespR<List<CardTradeModel>> getTradeList(TradeRequestVo tradeRequestVo) {
-        MIX_LOG.info("获取交易开始SelfCarServiceLImpl.getTradeList{}",tradeRequestVo);
+        log.info("获取交易开始SelfCarServiceLImpl.getTradeList{}",tradeRequestVo);
         Customer customer = customerMapper.selectByCustomerName(tradeRequestVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
-            MIX_LOG.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"客户已经停用");
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"客户已经停用");
             return new RespR(false,"客户已经停用");
         }
         if(StringUtils.isEmpty(tradeRequestVo.getStartTime()) || StringUtils.isEmpty(tradeRequestVo.getEndTime())){
-            MIX_LOG.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"时间为空");
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"时间为空");
             return new RespR(false,"时间为空");
         }
         if(DateUtil.getDistanceDays(tradeRequestVo.getEndTime(),tradeRequestVo.getStartTime())>90){
-            MIX_LOG.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"不能查询大于90天的交易");
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"不能查询大于90天的交易");
             return new RespR(false,"不能查询大于90天的交易");
         }
         CustomerRec customerRec = new CustomerRec();
@@ -77,12 +77,12 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         customerRec.setCompanyName(tradeRequestVo.getCompanyName());
         customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
         if(customerRec == null || customerRec.getRecStatus().intValue() !=1 ){
-            MIX_LOG.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"客户未备案");
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"客户未备案");
             return new RespR(false,"客户未备案");
         }
         CustomerCarRec customerCarRec = customerCarRecMapper.selectByETC(tradeRequestVo.getEtcId());
         if(customerCarRec == null || customerCarRec.getRecStatus() != 1){
-            MIX_LOG.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"业务校验错误:该卡号不在该企业下绑定！\\n:803");
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"业务校验错误:该卡号不在该企业下绑定！\\n:803");
             return new RespR(false,"业务校验错误:该卡号不在该企业下绑定！\\n:803");
         }
         CardTradeRequest cardTradeRequest = new CardTradeRequest();
@@ -93,7 +93,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardTradeRequest.setTradeStatus(tradeRequestVo.getTradeStatus());
         RespR<CardTradeResponse> resp = selfCarInterface.cardTrade(cardTradeRequest);
         if(resp.getCode() == 1){
-            MIX_LOG.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,resp.getMsg());
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,resp.getMsg());
             return new RespR(false,resp.getMsg());
         }else{
             CardTradeResponse cardTradeResponse = resp.getData();
@@ -134,14 +134,14 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR<String> applInvoice(InvoiceApplVo invoiceApplVo) {
-        MIX_LOG.info("申请开票开始SelfCarServiceLImpl.applInvoice{}",invoiceApplVo);
+        log.info("申请开票开始SelfCarServiceLImpl.applInvoice{}",invoiceApplVo);
         if(!customerService.checkMoneyEnough(invoiceApplVo.getCustomerName())){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"余额不足");
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"余额不足");
             return new RespR(false,"余额不足");
         }
         Customer customer = customerMapper.selectByCustomerNameForLock(invoiceApplVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"客户已经停用");
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"客户已经停用");
             return new RespR(false,"客户已经停用");
         }
         CustomerRec customerRec = new CustomerRec();
@@ -149,12 +149,12 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         customerRec.setCompanyName(invoiceApplVo.getCompanyName());
         customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
         if(customerRec == null || customerRec.getRecStatus().intValue() !=1 ){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"客户未备案");
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"客户未备案");
             return new RespR(false,"客户未备案");
         }
         CustomerCarRec customerCarRec = customerCarRecMapper.selectByETC(invoiceApplVo.getCardId());
         if(customerCarRec == null || customerCarRec.getRecStatus() != 1){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"业务校验错误:该卡号不在该企业下绑定！\\n:803");
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"业务校验错误:该卡号不在该企业下绑定！\\n:803");
             return new RespR(false,"业务校验错误:该卡号不在该企业下绑定！\\n:803");
         }
         B2BInvoiceApplyRequest b2BInvoiceApplyRequest = new B2BInvoiceApplyRequest();
@@ -173,7 +173,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2BInvoiceApplyRequest.setTradeIdModel(b2BInvoiceApplyModels);
         RespR<B2BInvoiceApplyResponse> respR = selfCarInterface.b2BInvoiceApply(b2BInvoiceApplyRequest);
         if(respR.getCode()==1){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,respR.getMsg());
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }else{
             B2BInvoiceApplyResponse b2BInvoiceApplyResponse = respR.getData();
@@ -222,7 +222,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR<List<SelfCarInvoice>> getSelfCarInvoicesByApplyIds(ApplQueryInvVo applQueryInvVo) {
-        MIX_LOG.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{}",applQueryInvVo);
+        log.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{}",applQueryInvVo);
         if(!customerService.checkMoneyEnough(applQueryInvVo.getCustomerName())){
             return new RespR(false,"余额不足");
         }
@@ -243,7 +243,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2BInvoiceQueryRequest.setApplyId(applQueryInvVo.getApplId());
         RespR<B2BInvoiceQueryByApplyResponse> responseRespR = selfCarInterface.b2bContractQuery(b2BInvoiceQueryRequest);
         if(responseRespR.getCode() == 1){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{},msg{}",applQueryInvVo,responseRespR.getMsg());
+            log.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{},msg{}",applQueryInvVo,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             B2BInvoiceQueryByApplyResponse response = responseRespR.getData();
@@ -270,9 +270,9 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public void getSelfCarInvoicesByApplyIds(SelfCarAppl applQueryInvVo) {
-        MIX_LOG.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{}",applQueryInvVo);
+        log.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{}",applQueryInvVo);
         if(!customerService.checkMoneyEnough(applQueryInvVo.getCustomId())){
-            MIX_LOG.info("余额不足{}",applQueryInvVo);
+            log.info("余额不足{}",applQueryInvVo);
             return ;
         }
         CustomerRec customerRecParam = new CustomerRec();
@@ -280,7 +280,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         customerRecParam.setCompanyName(applQueryInvVo.getCompanyNum());
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRecParam);
         if(customerRec == null || customerRec.getRecStatus() != 1){
-            MIX_LOG.info("备案信息不存在{}",applQueryInvVo);
+            log.info("备案信息不存在{}",applQueryInvVo);
             return;
         }
         B2BInvoiceQueryByApplyRequest b2BInvoiceQueryRequest = new B2BInvoiceQueryByApplyRequest();
@@ -290,7 +290,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2BInvoiceQueryRequest.setApplyId(applQueryInvVo.getApplId());
         RespR<B2BInvoiceQueryByApplyResponse> responseRespR = selfCarInterface.b2bContractQuery(b2BInvoiceQueryRequest);
         if(responseRespR.getCode() == 1){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{},msg{}",applQueryInvVo,responseRespR.getMsg());
+            log.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{},msg{}",applQueryInvVo,responseRespR.getMsg());
         }else{
             B2BInvoiceQueryByApplyResponse response = responseRespR.getData();
             List<B2BInvoiceQueryByApplyModel> b2BInvoiceQueryByApplyModels = response.getResult();
@@ -314,7 +314,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public RespR<List<B2BInvoiceListModel>> getSelfCarInvoicesByTime(SelfCarDueQueryVo selfCarDueQueryVo) {
-        MIX_LOG.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByTime{}",selfCarDueQueryVo);
+        log.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByTime{}",selfCarDueQueryVo);
         if(!customerService.checkMoneyEnough(selfCarDueQueryVo.getCustomername())){
             return new RespR(false,"余额不足");
         }
@@ -341,7 +341,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
         RespR<B2BInvoiceQueryResponse> responseRespR = selfCarInterface.b2BInvoiceQuery(b2BInvoiceQueryRequest);
         if(responseRespR.getCode() == 1){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByTime{},msg{}",selfCarDueQueryVo,responseRespR.getMsg());
+            log.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByTime{},msg{}",selfCarDueQueryVo,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             B2BInvoiceQueryResponse b2BInvoiceQueryResponse = responseRespR.getData();
@@ -373,7 +373,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR<List<B2bInvoicePackageModel>> getInvoicePackge(InvoicePackageVo invoicePackageVo) {
-        MIX_LOG.info("申请开票开始SelfCarServiceLImpl.getInvoicePackge{}",invoicePackageVo);
+        log.info("申请开票开始SelfCarServiceLImpl.getInvoicePackge{}",invoicePackageVo);
         Customer customer = customerMapper.selectByCustomerName(invoicePackageVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             return new RespR(false,"客户已经停用");
@@ -394,7 +394,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2bInvoicePackageRequest.setMakeMonth(invoicePackageVo.getMonth());
         RespR<B2bInvoicePackageResponse> b2bInvoicePackageResponseRespR = selfCarInterface.b2bInvoicePackage(b2bInvoicePackageRequest);
         if(b2bInvoicePackageResponseRespR.getCode() == 1){
-            MIX_LOG.info("申请开票失败SelfCarServiceLImpl.getInvoicePackge{}，msg{}",invoicePackageVo,b2bInvoicePackageResponseRespR.getMsg());
+            log.info("申请开票失败SelfCarServiceLImpl.getInvoicePackge{}，msg{}",invoicePackageVo,b2bInvoicePackageResponseRespR.getMsg());
             return new RespR(false,b2bInvoicePackageResponseRespR.getMsg());
         }else{
             return new RespR(b2bInvoicePackageResponseRespR.getData().getResult());
@@ -403,7 +403,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR getEtcInfo(EtcQueryVo etcQueryVo) {
-        MIX_LOG.info("获取etc信息：SelfCarServiceLImpl.getEtcInfo{}",etcQueryVo);
+        log.info("获取etc信息：SelfCarServiceLImpl.getEtcInfo{}",etcQueryVo);
         Customer customer = customerMapper.selectByCustomerName(etcQueryVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             return new RespR(false,"客户已经停用");
@@ -429,13 +429,13 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             return respR;
         }
         if(respR.getCode() == 1){
-            MIX_LOG.info("获取etc信息失败：SelfCarServiceLImpl.getEtcInfo{},msg{}",etcQueryVo,respR.getMsg());
+            log.info("获取etc信息失败：SelfCarServiceLImpl.getEtcInfo{},msg{}",etcQueryVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
         return new RespR(respR.getData().getResult());
     }
     public RespR queryEtcInfo(EtcBindVo etcBindVo){
-        MIX_LOG.info("获取etc信息：SelfCarServiceLImpl.queryEtcInfo{}",etcBindVo);
+        log.info("获取etc信息：SelfCarServiceLImpl.queryEtcInfo{}",etcBindVo);
         StringBuffer res = new StringBuffer();
         if(etcBindVo== null || etcBindVo.getCards() ==null || etcBindVo.getCards().size()<=0){
             return new RespR(false,"无备案Etc");
@@ -465,11 +465,11 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardQueryCardToBRequest.setVehicleList(cardQueryCardToBModels);
         RespR<CardQueryCardToBResponse> respR = selfCarInterface.cardQueryCardToB(cardQueryCardToBRequest);
         if(respR.getCode() == 1){
-            MIX_LOG.info("获取etc信息失败：SelfCarServiceLImpl.queryEtcInfo{},msg{}",etcBindVo,respR.getMsg());
+            log.info("获取etc信息失败：SelfCarServiceLImpl.queryEtcInfo{},msg{}",etcBindVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
         if(respR.getData().getResult() == null || respR.getData().getResult().size()<=0){
-            MIX_LOG.info("获取etc信息失败：SelfCarServiceLImpl.queryEtcInfo{},msg{}",etcBindVo,"没有etc卡");
+            log.info("获取etc信息失败：SelfCarServiceLImpl.queryEtcInfo{},msg{}",etcBindVo,"没有etc卡");
             return new RespR(false,"未查得");
         }
         return new RespR(respR.getData().getResult());
@@ -477,7 +477,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public RespR customerEtcRec(EtcBindVo etcBindVo) {
-        MIX_LOG.info("etc注册：SelfCarServiceLImpl.customerEtcRec{}",etcBindVo);
+        log.info("etc注册：SelfCarServiceLImpl.customerEtcRec{}",etcBindVo);
         if(etcBindVo== null || etcBindVo.getCards() ==null || etcBindVo.getCards().size()<=0){
             return new RespR(false,"无备案Etc");
         }
@@ -512,7 +512,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardBindingToBRequest.setCardIdList(cardBindingToBModels);
         RespR<CardBindingToBResponse> respR1 = selfCarInterface.cardBindingToB(cardBindingToBRequest);
         if(respR1.getCode() == 1){
-            MIX_LOG.info("etc注册失败：SelfCarServiceLImpl.customerEtcRec{},msg{}",etcBindVo,respR1.getMsg());
+            log.info("etc注册失败：SelfCarServiceLImpl.customerEtcRec{},msg{}",etcBindVo,respR1.getMsg());
             return new RespR(false,respR1.getMsg());
         }else{
             return new RespR(respR1.getData());
@@ -521,19 +521,19 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     public void updateETCRec(CustomerCarRec customerCarRec){
         //根据车牌号查询是新增还是更新
-        MIX_LOG.info("检验成功入库参数{}",customerCarRec);
+        log.info("检验成功入库参数{}",customerCarRec);
         CustomerCarRec customerCarRec1 = customerCarRecMapper.selectByETC(customerCarRec.getEtcNum());
         if (customerCarRec1 == null) {
-            MIX_LOG.info("检验成功入库新增参数{}",customerCarRec);
+            log.info("检验成功入库新增参数{}",customerCarRec);
             customerCarRecMapper.insert(customerCarRec);
         } else {
-            MIX_LOG.info("检验成功入库更新参数{}",customerCarRec);
+            log.info("检验成功入库更新参数{}",customerCarRec);
             customerCarRecMapper.updateETCByPrimaryKey(customerCarRec);
         }
     }
     @Override
     public RespR customerEtcRecValid(EtcValidVo etcValidVo) {
-        MIX_LOG.info("etc注册校验：SelfCarServiceLImpl.customerEtcRecValid{}",etcValidVo);
+        log.info("etc注册校验：SelfCarServiceLImpl.customerEtcRecValid{}",etcValidVo);
         StringBuffer res = new StringBuffer();
         Customer customer = customerMapper.selectByCustomerName(etcValidVo.getCustomerName());
         if(customer == null || customer.getAccstatus()!=0){
@@ -554,7 +554,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardValidCodeToBRequest.setValidCode(etcValidVo.getValidCode());
         RespR<CardValidCodeToBResponse> respR = selfCarInterface.cardValidCodeToB(cardValidCodeToBRequest);
         if(respR.getCode() == 1){
-            MIX_LOG.info("etc注册校验失败：SelfCarServiceLImpl.customerEtcRecValid{},msg",etcValidVo,respR.getMsg());
+            log.info("etc注册校验失败：SelfCarServiceLImpl.customerEtcRecValid{},msg",etcValidVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }else{
             /**
@@ -580,7 +580,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public RespR customerCarUnRec(List<CustomerCarRec> customerCarRecs) {
-        MIX_LOG.info("etc解绑：SelfCarServiceLImpl.customerCarUnRec{}",customerCarRecs);
+        log.info("etc解绑：SelfCarServiceLImpl.customerCarUnRec{}",customerCarRecs);
         if(customerCarRecs==null || customerCarRecs.size()<=0){
             return new RespR(false,"无解绑信息");
         }

src/main/java/com/jkcredit/invoice/service/manager/impl/ParamServiceImpl.java

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jkcredit.invoice.mapper.manager.ParamMapper;
 import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.service.manager.ParamService;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
-import org.slf4j.Logger;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,7 +20,6 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ParamServiceImpl extends ServiceImpl<ParamMapper, Param> implements ParamService {
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
 
     @Override

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayImportServiceImpl.java

@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillImprtMapper;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +13,6 @@ import java.util.List;
 
 @Service
 public class NoCarBillWayImportServiceImpl extends ServiceImpl<NoCarWaybillImprtMapper,NoCarWayBill> implements NoCarBillWayImportService{
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
 
     @Autowired

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -16,10 +16,8 @@ import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.util.DateUtil;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -28,9 +26,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 @Service
+@Slf4j
 public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCarWayBill> implements NoCarBillWayService{
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
     @Autowired
     NoCarWaybillMapper noCarWaybillMapper;
 
@@ -71,7 +69,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
     }
     @Override
     public RespR batchBillWayStart(List<NoCarWayBill> noCarWayBills,String customerName) {
-        MIX_LOG.info("开始平台指令上传NoCarBillWayServiceImpl.batchBillWayStart,上传数量"+noCarWayBills.size());
+        log.info("开始平台指令上传NoCarBillWayServiceImpl.batchBillWayStart,上传数量"+noCarWayBills.size());
         if(!customerService.checkMoneyEnough(customerName)){
             return new RespR(false,"余额不足");
         }
@@ -118,7 +116,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
                     }
                     if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-                        MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+                        log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
                         noCarWaybillMapperImprt.updateBillway(-2,"失败，承运时长超96小时#",noCarWayBill);
                         noCarWayBill.setBillwayStatus(-2);
                         noCarWayBill.setFailReason("失败，承运时长超96小时");
@@ -172,7 +170,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                     }
 
                 });
-                MIX_LOG.error("开始平台指令上传失败NoCarBillWayServiceImpl.batchBillWayStart:{}",stringBuffer.toString());
+                log.error("开始平台指令上传失败NoCarBillWayServiceImpl.batchBillWayStart:{}",stringBuffer.toString());
             }
         }).start();
 
@@ -193,7 +191,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
             public void run() {
                 noCarWayBills.parallelStream().forEach(noCarWayBill -> {
                     try {
-                        MIX_LOG.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
+                        log.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
                         //根据税号，查询备案企业
                         CustomerRec customerRec = new CustomerRec();
                         customerRec.setCustomerName(customerName);
@@ -225,7 +223,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         noCarWayBill.setCompanyName(customerRec.getCompanyName());
                         noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
                         if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date())>-20){
-                            MIX_LOG.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
+                            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
                             noCarWayBill.setBillwayStatus(-2);
                             noCarWayBill.setFailReason("失败，运单未满20天时效");
                             noCarWaybillMapperImprt.updateBillway(-2,"失败，运单未满20天时效#",noCarWayBill);
@@ -237,7 +235,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                             noCarWayBill.setFailReason("运单已经超时，请拆分");
                             insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
                             noCarWaybillMapperImprt.updateBillway(-2,"运单已经超时，请拆分#",noCarWayBill);
-                            MIX_LOG.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+                            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
                             return;
                         }
                         //1.查询是否有车辆备案 /
@@ -286,22 +284,22 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                             noCarWayBill.setBillwayStatus(-2);
                             noCarWayBill.setFailReason(respR.getMsg());
                             insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
-                            MIX_LOG.info(noCarWayBill.getBillNum()+"#开始指令失败"+respR.getMsg());
+                            log.info(noCarWayBill.getBillNum()+"#开始指令失败"+respR.getMsg());
                         }else{
-                            MIX_LOG.info(noCarWayBill.getBillNum()+"#开始指令成功"+respR.getMsg());
+                            log.info(noCarWayBill.getBillNum()+"#开始指令成功"+respR.getMsg());
                             //3.kais指令上传
                             respR = noCarService.noCarHisWaybillEnd(noCarWayBillClo,noCarWayBill);
 
                             if(respR.getCode() == 1){
                                 noCarWaybillMapperImprt.updateBillway(1,respR.getMsg(),noCarWayBill);
-                                MIX_LOG.info(noCarWayBill.getBillNum()+"#结束指令失败"+respR.getMsg());
+                                log.info(noCarWayBill.getBillNum()+"#结束指令失败"+respR.getMsg());
                                 stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
                             }else{
                                 noCarWaybillMapperImprt.updateBillway(2,respR.getMsg(),noCarWayBill);
-                                MIX_LOG.info(noCarWayBill.getBillNum()+"#结束指令成功"+respR.getMsg());
+                                log.info(noCarWayBill.getBillNum()+"#结束指令成功"+respR.getMsg());
                             }
                         }
-                        MIX_LOG.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
+                        log.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
                     }catch (Exception e){
                         e.printStackTrace();
                     }
@@ -309,7 +307,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
                 });
                 if(!StringUtils.isEmpty(stringBuffer.toString())){
-                    MIX_LOG.error(stringBuffer.toString());
+                    log.error(stringBuffer.toString());
                 }
             }
         }).start();
@@ -319,7 +317,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
     @Override
     public RespR batchBillWayEnd(List<NoCarWayBill> noCarWayBills, String customerName) {
-        MIX_LOG.error("结束平台指令上传数量NoCarBillWayServiceImpl.batchBillWayEnd:{}",noCarWayBills.size());
+        log.error("结束平台指令上传数量NoCarBillWayServiceImpl.batchBillWayEnd:{}",noCarWayBills.size());
         if(!customerService.checkMoneyEnough(customerName)){
             return new RespR(false,"余额不足");
         }
@@ -352,7 +350,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                 });
 
                 if(!StringUtils.isEmpty(stringBuffer.toString())){
-                    MIX_LOG.error("开始平台指令上传失败NoCarBillWayServiceImpl.batchBillWayEnd:{}",stringBuffer.toString());
+                    log.error("开始平台指令上传失败NoCarBillWayServiceImpl.batchBillWayEnd:{}",stringBuffer.toString());
                 }
             }
         }).start();

src/main/java/com/jkcredit/invoice/service/upService/impl/CommInterFaceImpl.java

@@ -4,38 +4,36 @@ import cn.com.taiji.common.manager.net.http.binclient.ApiRequestException;
 import cn.com.taiji.sdk.comm.ETCCommHelper;
 import cn.com.taiji.sdk.model.comm.protocol.eoms.company.*;
 import com.jkcredit.invoice.service.upService.CommInterFace;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 @Service("commInterFace")
+@Slf4j
 public class CommInterFaceImpl implements CommInterFace{
 
-    Logger XING_YUN_LOG = LoggerUtil.logger(LogFileName.XING_YUN_LOG);
     
     @Override
     public RespR<CompanyQueryResponse> companyQuery(CompanyQueryRequest companyQueryRequest) {
         String fileName = companyQueryRequest.getFilename();
         long startTime = System.currentTimeMillis();
         try {
-            XING_YUN_LOG.info("CommInterFaceImpl.companyQuery上游接口请求参数：{}",  companyQueryRequest.toString());
+            log.info("CommInterFaceImpl.companyQuery上游接口请求参数：{}",  companyQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CompanyQueryResponse response= ETCCommHelper.upload(fileName, companyQueryRequest, CompanyQueryResponse.class);
-            XING_YUN_LOG.info("CommInterFaceImpl.companyQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), companyQueryRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("CommInterFaceImpl.companyQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), companyQueryRequest.toString(),System.currentTimeMillis()-startTime);
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error("CommInterFaceImpl.companyQuery:{}",e.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.companyQuery:{}",e.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error("CommInterFaceImpl.companyQuery:{}",apie.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.companyQuery:{}",apie.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }catch (Exception e) {
-            XING_YUN_LOG.error("CommInterFaceImpl.companyQuery:{}",e.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.companyQuery:{}",e.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }
@@ -47,17 +45,17 @@ public class CommInterFaceImpl implements CommInterFace{
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("CommInterFaceImpl.addCompany请求参数：{}", companyAddRequest.toString());
+            log.info("CommInterFaceImpl.addCompany请求参数：{}", companyAddRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CompanyAddResponse response=ETCCommHelper.upload(fileName, companyAddRequest, CompanyAddResponse.class);
-            XING_YUN_LOG.info("CommInterFaceImpl.addCompany上游接口返回：{},请求参数：{},cost={}ms", response.toString(), companyAddRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("CommInterFaceImpl.addCompany上游接口返回：{},请求参数：{},cost={}ms", response.toString(), companyAddRequest.toString(),System.currentTimeMillis()-startTime);
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error("CommInterFaceImpl.addCompany：{}", e.getMessage()+ " ,请求参数："+companyAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.addCompany：{}", e.getMessage()+ " ,请求参数："+companyAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error("CommInterFaceImpl.addCompany：{}", apie.getMessage()+ " ,请求参数："+companyAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.addCompany：{}", apie.getMessage()+ " ,请求参数："+companyAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -69,18 +67,18 @@ public class CommInterFaceImpl implements CommInterFace{
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("CommInterFaceImpl.b2bContractAdd上游请求参数：{}",contractAddRequest.toString());
+            log.info("CommInterFaceImpl.b2bContractAdd上游请求参数：{}",contractAddRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractAddResponse response=ETCCommHelper.upload(fileName, contractAddRequest, B2bContractAddResponse.class);
-            XING_YUN_LOG.info("CommInterFaceImpl.b2bContractAdd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), contractAddRequest.toString(),System.currentTimeMillis()-startTime);
-            XING_YUN_LOG.info("conName"+response.getContrantNum());
+            log.info("CommInterFaceImpl.b2bContractAdd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), contractAddRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("conName"+response.getContrantNum());
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
-            XING_YUN_LOG.error("CommInterFaceImpl.b2bContractAdd：{}",e.getMessage()+ " ,请求参数："+contractAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.b2bContractAdd：{}",e.getMessage()+ " ,请求参数："+contractAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error("CommInterFaceImpl.b2bContractAdd：{}",apie.getMessage()+ " ,请求参数："+contractAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.b2bContractAdd：{}",apie.getMessage()+ " ,请求参数："+contractAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -91,19 +89,19 @@ public class CommInterFaceImpl implements CommInterFace{
         String fileName = b2bContractQueryRequest.getFilename();
         long startTime = System.currentTimeMillis();
         try {
-            XING_YUN_LOG.info("CommInterFaceImpl.b2bContractQuery上游请求参数：{}",  b2bContractQueryRequest.toString());
+            log.info("CommInterFaceImpl.b2bContractQuery上游请求参数：{}",  b2bContractQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractQueryResponse response=ETCCommHelper.upload(fileName, b2bContractQueryRequest, B2bContractQueryResponse.class);
-            XING_YUN_LOG.info("CommInterFaceImpl.b2bContractQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2bContractQueryRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("CommInterFaceImpl.b2bContractQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2bContractQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
-            XING_YUN_LOG.error("CommInterFaceImpl.b2bContractQuery：{}",  e.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.b2bContractQuery：{}",  e.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
-            XING_YUN_LOG.error("CommInterFaceImpl.b2bContractQuery：{}",  apie.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error("CommInterFaceImpl.b2bContractQuery：{}",  apie.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,apie.getMessage());
         }
     }

src/main/java/com/jkcredit/invoice/service/upService/impl/NoCarInterfaceImpl.java

@@ -7,36 +7,34 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.*;
 import com.jkcredit.invoice.service.upService.NoCarInterface;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 
 @Service("noCarInterface")
+@Slf4j
 public class NoCarInterfaceImpl implements NoCarInterface {
 
-    Logger XING_YUN_LOG = LoggerUtil.logger(LogFileName.XING_YUN_LOG);
-    
+
     @Override
     public RespR<VehicleRegisterResponse> vehicleRegister(VehicleRegisterRequest registerRequest) {
         String fileName = registerRequest.getFilename();
         long startTime = System.currentTimeMillis();
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.vehicleRegister,请求参数：{}",  registerRequest.toString());
+            log.info("NoCarInterfaceImpl.vehicleRegister,请求参数：{}",  registerRequest.toString());
             VehicleRegisterResponse response=ETCCommHelper.upload(fileName, registerRequest, VehicleRegisterResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.vehicleRegister上游接口返回：{},请求参数：{},cost={}ms", response.toString(), registerRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.vehicleRegister上游接口返回：{},请求参数：{},cost={}ms", response.toString(), registerRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
-            XING_YUN_LOG.error(e.getMessage() + " ,请求参数："+registerRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage() + " ,请求参数："+registerRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+registerRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+registerRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,apie.getMessage());
         }
     }
@@ -46,18 +44,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         String fileName = vehicleQueryRequest.getFilename();
         long startTime = System.currentTimeMillis();
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.vehicleQuery上游请求参数：{}", vehicleQueryRequest.toString());
+            log.info("NoCarInterfaceImpl.vehicleQuery上游请求参数：{}", vehicleQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             VehicleQueryResponse response=ETCCommHelper.upload(fileName, vehicleQueryRequest, VehicleQueryResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.vehicleQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), vehicleQueryRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.vehicleQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), vehicleQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
 
             return new RespR(false,apie.getMessage());
@@ -70,17 +68,17 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillStart上游请求参数：{}", waybillStartRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillStart上游请求参数：{}", waybillStartRequest.toString());
             WaybillStartResponse response=ETCCommHelper.upload(fileName, waybillStartRequest, WaybillStartResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillStart上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillStartRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.waybillStart上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillStartRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+waybillStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+waybillStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+waybillStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+waybillStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -92,17 +90,17 @@ public class NoCarInterfaceImpl implements NoCarInterface {
 
         String fileName = waybillEndRequest.getFilename();
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillEnd请求参数：{}", waybillEndRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillEnd请求参数：{}", waybillEndRequest.toString());
             WaybillEndResponse response=ETCCommHelper.upload(fileName, waybillEndRequest, WaybillEndResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillEnd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillEndRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.waybillEnd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillEndRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+waybillEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+waybillEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+waybillEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+waybillEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -114,19 +112,19 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillHistoryStart上游接口请求参数：{}", waybillHistoryStartRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillHistoryStart上游接口请求参数：{}", waybillHistoryStartRequest.toString());
 
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillHistoryStartResponse response=ETCCommHelper.upload(fileName, waybillHistoryStartRequest, WaybillHistoryStartResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillHistoryStart上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillHistoryStartRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.waybillHistoryStart上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillHistoryStartRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -138,18 +136,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillHistoryEnd请求参数：{}",  waybillHistoryEndRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillHistoryEnd请求参数：{}",  waybillHistoryEndRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillHistoryEndResponse response=ETCCommHelper.upload(fileName, waybillHistoryEndRequest, WaybillHistoryEndResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillHistoryEnd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillHistoryEndRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.waybillHistoryEnd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillHistoryEndRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -161,18 +159,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillNumFindInvoice请求参数：{}", waybillNumFindInvoiceRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillNumFindInvoice请求参数：{}", waybillNumFindInvoiceRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillNumFindInvoiceResponse response=ETCCommHelper.upload(fileName, waybillNumFindInvoiceRequest, WaybillNumFindInvoiceResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillNumFindInvoice上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillNumFindInvoiceRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.waybillNumFindInvoice上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillNumFindInvoiceRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -185,17 +183,17 @@ public class NoCarInterfaceImpl implements NoCarInterface {
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillInvoiceRedQuery请求参数：{}",  waybillInvoiceRedQueryRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery请求参数：{}",  waybillInvoiceRedQueryRequest.toString());
             WaybillInvoiceRedQueryResponse response=ETCCommHelper.upload(fileName, waybillInvoiceRedQueryRequest, WaybillInvoiceRedQueryResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillInvoiceRedQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillInvoiceRedQueryRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillInvoiceRedQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -207,18 +205,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillCountQuery上游请求参数：{}", waybillCountQueryRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillCountQuery上游请求参数：{}", waybillCountQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillCountQueryResponse response=ETCCommHelper.upload(fileName, waybillCountQueryRequest, WaybillCountQueryResponse.class);
-            XING_YUN_LOG.info("NoCarInterfaceImpl.waybillCountQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillCountQueryRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("NoCarInterfaceImpl.waybillCountQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillCountQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }

src/main/java/com/jkcredit/invoice/service/upService/impl/SelfCarInterfaceImpl.java

@@ -7,19 +7,17 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeResponse;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 
 @Service("selfCarInterface")
+@Slf4j
 public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
-    Logger XING_YUN_LOG = LoggerUtil.logger(LogFileName.XING_YUN_LOG);
-    
+
     @Override
     public RespR<CardBindQueryListToBResponse> cardBindQueryListToB(CardBindQueryListToBRequest cardBindQueryListToBRequest) {
         String fileName = cardBindQueryListToBRequest.getFilename();
@@ -27,17 +25,17 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardBindQueryListToB请求参数：{}", cardBindQueryListToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardBindQueryListToB请求参数：{}", cardBindQueryListToBRequest.toString());
             CardBindQueryListToBResponse response=ETCCommHelper.upload(fileName, cardBindQueryListToBRequest, CardBindQueryListToBResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardBindQueryListToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardBindQueryListToBRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.cardBindQueryListToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardBindQueryListToBRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -49,18 +47,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardQueryCardToB请求参数：{}", cardQueryCardToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardQueryCardToB请求参数：{}", cardQueryCardToBRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardQueryCardToBResponse response=ETCCommHelper.upload(fileName, cardQueryCardToBRequest, CardQueryCardToBResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardQueryCardToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardQueryCardToBRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.cardQueryCardToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardQueryCardToBRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -73,18 +71,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardBindingToB上游请求参数：{}", cardBindingToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardBindingToB上游请求参数：{}", cardBindingToBRequest.toString());
             CardBindingToBResponse response=ETCCommHelper.upload(fileName, cardBindingToBRequest, CardBindingToBResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardBindingToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardBindingToBRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.cardBindingToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardBindingToBRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -97,18 +95,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardValidCodeToB上游请求参数：{}", cardValidCodeToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardValidCodeToB上游请求参数：{}", cardValidCodeToBRequest.toString());
             CardValidCodeToBResponse response=ETCCommHelper.upload(fileName, cardValidCodeToBRequest, CardValidCodeToBResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardValidCodeToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardValidCodeToBRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.cardValidCodeToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardValidCodeToBRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -121,18 +119,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardUnbindToB上游请求参数：{}", cardUnbindToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardUnbindToB上游请求参数：{}", cardUnbindToBRequest.toString());
             CardUnbindToBResponse response=ETCCommHelper.upload(fileName, cardUnbindToBRequest, CardUnbindToBResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardUnbindToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardUnbindToBRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.cardUnbindToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardUnbindToBRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -145,18 +143,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardTrade上游请求参数：{}", cardTradeRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardTrade上游请求参数：{}", cardTradeRequest.toString());
             CardTradeResponse response=ETCCommHelper.upload(fileName, cardTradeRequest, CardTradeResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.cardTrade上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardTradeRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.cardTrade上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardTradeRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+cardTradeRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+cardTradeRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请稍后再试");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+cardTradeRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+cardTradeRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -169,16 +167,16 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2BInvoiceApply上游请求参数：{}",  b2BInvoiceApplyRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游请求参数：{}",  b2BInvoiceApplyRequest.toString());
             B2BInvoiceApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceApplyRequest, B2BInvoiceApplyResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2BInvoiceApply上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceApplyRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceApplyRequest.toString(),System.currentTimeMillis()-startTime);
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -190,19 +188,19 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游请求参数：{}", b2BInvoiceQueryRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游请求参数：{}", b2BInvoiceQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2BInvoiceQueryResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryRequest, B2BInvoiceQueryResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceQueryRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -215,17 +213,17 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2bContractQuery上游请求参数：{}",b2BInvoiceQueryByApplyRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2bContractQuery上游请求参数：{}",b2BInvoiceQueryByApplyRequest.toString());
             B2BInvoiceQueryByApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryByApplyRequest, B2BInvoiceQueryByApplyResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2bContractQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceQueryByApplyRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.b2bContractQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceQueryByApplyRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -237,18 +235,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         long startTime = System.currentTimeMillis();
 
         try {
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2bInvoicePackage上游请求参数：{}", b2bInvoicePackageRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游请求参数：{}", b2bInvoicePackageRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bInvoicePackageResponse response=ETCCommHelper.upload(fileName, b2bInvoicePackageRequest, B2bInvoicePackageResponse.class);
-            XING_YUN_LOG.info("SelfCarInterfaceImpl.b2bInvoicePackage上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2bInvoicePackageRequest.toString(),System.currentTimeMillis()-startTime);
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2bInvoicePackageRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            XING_YUN_LOG.error(e.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(e.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            XING_YUN_LOG.error(apie.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            log.error(apie.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }

src/main/java/com/jkcredit/invoice/service/user/impl/UserServiceImpl.java

@@ -12,10 +12,8 @@ import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.user.RoleService;
 import com.jkcredit.invoice.service.user.UserService;
 import com.jkcredit.invoice.util.DataSignUtil;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
 import com.jkcredit.invoice.util.RespR;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,9 +27,9 @@ import java.util.List;
  * @version: V1.0
  **/
 @Service
+@Slf4j
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
     @Autowired
     private RoleService roleService;

src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -10,13 +10,10 @@ import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.SelfCarDueQueryVo;
-import com.jkcredit.invoice.service.lowerService.vo.TradeRequestVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.selfCar.SelfCarTradeService;
 import com.jkcredit.invoice.util.DateUtil;
-import com.jkcredit.invoice.util.LogFileName;
-import com.jkcredit.invoice.util.LoggerUtil;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -34,8 +31,8 @@ import java.util.List;
  * @version: V1.0
  **/
 @Component
+@Slf4j
 public class ScheduledBillTask {
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
     
     
     @Autowired
@@ -68,12 +65,12 @@ public class ScheduledBillTask {
         InetAddress addr = InetAddress.getLocalHost();
         String ip  = paramService.getParamsByParamName("CURR_SELF_IP").getParamValue();
 
-        MIX_LOG.info("CURR_SELF_IP"+ip +",address:"+addr);
+        log.info("CURR_SELF_IP"+ip +",address:"+addr);
         if(!addr.getHostAddress().equals(ip)){
-          MIX_LOG.info("！bengjiqikaipao");
+          log.info("！bengjiqikaipao");
           return;
         }else{
-            MIX_LOG.info("bengjiqikaipao");
+            log.info("bengjiqikaipao");
         }
         try {
             delGetInvoce(0);
@@ -101,12 +98,12 @@ public class ScheduledBillTask {
         InetAddress addr = InetAddress.getLocalHost();
         String ip  = paramService.getParamsByParamName("HISTORY_IP").getParamValue();
 
-        MIX_LOG.info("HISTORY_IP"+ip +",address:"+addr);
+        log.info("HISTORY_IP"+ip +",address:"+addr);
         if(!addr.getHostAddress().equals(ip)){
-            MIX_LOG.info("！bengjiqikaipao");
+            log.info("！bengjiqikaipao");
             return;
         }else{
-            MIX_LOG.info("bengjiqikaipao");
+            log.info("bengjiqikaipao");
         }
         try {
             delGetInvoce(1);
@@ -120,12 +117,12 @@ public class ScheduledBillTask {
        InetAddress addr = InetAddress.getLocalHost();
        String ip  = paramService.getParamsByParamName("CURR_SELF_IP").getParamValue();
 
-       MIX_LOG.info("CURR_SELF_IP"+ip +",address:"+addr);
+       log.info("CURR_SELF_IP"+ip +",address:"+addr);
        if(!addr.getHostAddress().equals(ip)){
-           MIX_LOG.info("！bengjiqikaipao");
+           log.info("！bengjiqikaipao");
            return;
        }else{
-           MIX_LOG.info("bengjiqikaipao");
+           log.info("bengjiqikaipao");
        }
        /**
         * 1.查询所有的etc卡
@@ -155,7 +152,7 @@ public class ScheduledBillTask {
               selfCarTradeService.updateTrades(selfCarTrades);
           }catch (Exception e){
               e.printStackTrace();
-              MIX_LOG.info(customerCarRec.getEtcNum());
+              log.info(customerCarRec.getEtcNum());
           }
        });
       /*  try {

src/main/java/com/jkcredit/invoice/util/HttpUtil.java

@@ -1,7 +1,6 @@
 package com.jkcredit.invoice.util;
 
 import com.alibaba.fastjson.JSONObject;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -20,7 +19,6 @@ import java.util.Map;
  **/
 @Component
 public class HttpUtil {
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
 
     @Autowired
     private RestTemplate restTemplate;

src/main/java/com/jkcredit/invoice/util/LogFileName.java

@@ -1,37 +0,0 @@
-package com.jkcredit.invoice.util;
-
-import org.apache.commons.lang3.StringUtils;
-
-public enum LogFileName {
-
-    // 与logback.xml的logger name 相同
-    QUERY_LOG("query_log"),
-    XING_YUN_LOG("xingyun_log"),
-    JUMP_LOG("jump_log"),
-    MIX_LOG("mix_log"),
-    GATEWAY_LOG("gateway_log");
-
-    private String logFileName;
-
-    LogFileName(String fileName) {
-        this.logFileName = fileName;
-    }
-
-    public String getLogFileName() {
-        return logFileName;
-    }
-
-    public void setLogFileName(String logFileName) {
-        this.logFileName = logFileName;
-    }
-
-    public static LogFileName getAwardTypeEnum(String value) {
-        LogFileName[] arr = values();
-        for(LogFileName item : arr) {
-            if(null != item && StringUtils.isNotBlank(item.logFileName)) {
-                return item;
-            }
-        }
-        return null;
-    }
-}

src/main/java/com/jkcredit/invoice/util/LoggerUtil.java

@@ -1,19 +0,0 @@
-package com.jkcredit.invoice.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LoggerUtil {
-    public static <T> Logger logger(Class<T> clazz) {
-        return LoggerFactory.getLogger(clazz);
-    }
-
-    /**
-     * 打印到指定的文件下
-     * @param desc 日志文件名称
-     * @return
-     */
-    public static Logger logger(LogFileName desc) {
-        return LoggerFactory.getLogger(desc.getLogFileName());
-    }
-}

src/main/java/com/jkcredit/invoice/util/WebFileDownLoadUtils.java

@@ -1,7 +1,7 @@
 package com.jkcredit.invoice.util;
 
 import com.jkcredit.invoice.model.vo.SearchInvoiceResultVo;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -23,9 +23,9 @@ import java.util.Objects;
  * @version: V1.0
  **/
 @Component
+@Slf4j
 public class WebFileDownLoadUtils {
     
-    Logger MIX_LOG = LoggerUtil.logger(LogFileName.MIX_LOG);
     /**
      * 使用自定义的httpclient的restTemplate
      */
@@ -53,14 +53,14 @@ public class WebFileDownLoadUtils {
 //        Instant now = Instant.now();
         String completeUrl = addGetQueryParam(url, params);
         ResponseEntity<byte[]> rsp = httpClientTemplate.getForEntity(completeUrl, byte[].class);
-//        MIX_LOG.info("[下载文件] [状态码] code:{}", rsp.getStatusCode());
+//        log.info("[下载文件] [状态码] code:{}", rsp.getStatusCode());
         try {
             String path = getAndCreateDownloadDir(targetDir, searchInvoiceResult, batchNumber);
             Files.write(Paths.get(path), Objects.requireNonNull(rsp.getBody(), "未获取到下载文件"));
         } catch (IOException e) {
-            MIX_LOG.error("[下载文件] 写入失败:", e);
+            log.error("[下载文件] 写入失败:", e);
         }
-//        MIX_LOG.info("[下载文件] 完成,耗时:{}", ChronoUnit.MILLIS.between(now, Instant.now()));
+//        log.info("[下载文件] 完成,耗时:{}", ChronoUnit.MILLIS.between(now, Instant.now()));
     }
 
 

src/main/resources/logback-spring.xml

@@ -1,215 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration>
-    <contextName>sys_invoice</contextName>
-    <property name="log.path" value="/home/app/logs"/>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>[%d{HH:mm:ss.SSS}] [%5level] [%thread] %logger{36} %msg%n</Pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/systemInfo.log</file>
-
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!--过滤器,只打INFO级别的日志-->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>systemInfo.%i.log</fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>3</maxIndex>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+    <property name="log.path" value="/home/app"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n" />
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="FILE"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <!-- rollingPolicy:当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名。 -->
+        <!-- TimeBasedRollingPolicy： 最常用的滚动策略，它根据时间来制定滚动策略，既负责滚动也负责出发滚动 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 活动文件的名字会根据fileNamePattern的值，每隔一段时间改变一次 -->
+            <!-- 文件名：log/sys.2017-12-05.0.log -->
+            <fileNamePattern>${log.path}/logs/system.log.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 每产生一个日志文件，该日志文件的保存期限为30天 -->
+            <maxHistory>60</maxHistory>
         </rollingPolicy>
+            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+                <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            </encoder>
+            <triggeringPolicy  class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+                <!-- maxFileSize:这是活动文件的大小，默认值是10MB,本篇设置为1KB，只是为了演示 -->
+                <maxFileSize>50M</maxFileSize>
+            </triggeringPolicy>
 
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
-        </triggeringPolicy>
     </appender>
-
-
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/systemError.log</file>
-
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!--过滤器,只打ERROR级别的日志-->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>systemError.%i.log</fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>3</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-    <!--不同业务逻辑的日志打印到不同文件-->
-    <appender name="QUERY_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/query/query.log</file>
-
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>query.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>3</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-    <appender name="XINGYUN_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/xingyun/xingyun.log</file>
-
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>xingyun.%i.log</fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>3</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-
-
-    <appender name="GATEWAY_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/gateway/gateway.log</file>
-
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>gateway.%i.log</fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>3</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-
-    <appender name="JUMP_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/jump/jump.log</file>
-
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>jump.%i.log</fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>3</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-
-
-    <appender name="MIX_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/mix/mix_interface.log</file>
-
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>mix_interface.%i.log</fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>3</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-
-    　　 <!-- 不同的业务逻辑日志打印到指定文件夹-->
-    <logger name="query_log" level="info" additivity="false">
-        <appender-ref ref="QUERY_LOG"/>
-    </logger>
-    <logger name="xingyun_log" level="info" additivity="false">
-        <appender-ref ref="XINGYUN_LOG"/>
-    </logger>
-    <logger name="gateway_log" level="info" additivity="false">
-        <appender-ref ref="GATEWAY_LOG"/>
-    </logger>
-    <logger name="jump_log" level="info" additivity="false">
-        <appender-ref ref="JUMP_LOG"/>
-    </logger>
-    <logger name="mix_log" level="info" additivity="false">
-        <appender-ref ref="MIX_LOG"/>
-    </logger>
-
-
-    <!--info和error分开打印-->
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="INFO"/>
-        <appender-ref ref="ERROR"/>
+        <appender-ref ref="console" />
+        <appender-ref ref="FILE"/>
     </root>
 
-</configuration>
+
+  <logger name="com.jkcredit.invoice" level="INFO">
+        <appender-ref ref="FILE"/>
+    </logger>
+</configuration>

src/main/resources/mapper/customer/CustomerCarRecMapper.xml

@@ -23,7 +23,8 @@
     <select id="selectAllBindEtcNoGetInvoice" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from  t_customer_carRec where rec_status=1 and bussiness_type=0
+        from  t_customer_carRec where rec_status=1 and bussiness_type=0 and inter_type != 3
+      <!--TODO 临时方案处理存量数据-->
     </select>
   <select id="selectAllByPage" resultMap="BaseResultMap">
     select

src/main/resources/mapper/waybill/NoCarWaybillMapper.xml

@@ -225,20 +225,21 @@
         select
         <include refid="baseSql" />
         from t_waybill_no
-        where hisFlag = #{hisFlag,jdbcType=INTEGER} and billwayStatus = #{billwayStatus,jdbcType=INTEGER}
-    </select>
+        where hisFlag = #{hisFlag,jdbcType=INTEGER} and billwayStatus = #{billwayStatus,jdbcType=INTEGER} and interType != 3
+        <!--TODO 临时操作，不处理存量运单开票-->
+   </select>
 
 
 
-    <select id="getNoCarNoVoiceQuery" resultMap="BaseResultMap" parameterType="java.lang.String" >
-        select
-        <include refid="baseSql" />
-        from t_waybill_no
-        where  customerName = BINARY #{customerName,jdbcType=VARCHAR}
-    </select>
+   <select id="getNoCarNoVoiceQuery" resultMap="BaseResultMap" parameterType="java.lang.String" >
+       select
+       <include refid="baseSql" />
+       from t_waybill_no
+       where  customerName = BINARY #{customerName,jdbcType=VARCHAR}
+   </select>
 
-    <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
-        UPDATE t_waybill_no set companyName = #{newCompanyName} where companyName = #{oldCompanyName}
-    </update>
+   <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
+       UPDATE t_waybill_no set companyName = #{newCompanyName} where companyName = #{oldCompanyName}
+   </update>
 
 </mapper>

src/main/resources/mapper/waybill/SellCarTradeMapper.xml

@@ -137,7 +137,8 @@
         select
         <include refid="baseSql" />
         from t_SellCarTrade
-        where  cardId = BINARY #{cardId,jdbcType=VARCHAR} and  status = #{status,jdbcType=VARCHAR}
+        where  cardId = BINARY #{cardId,jdbcType=VARCHAR} and  status = #{status,jdbcType=VARCHAR} and interType != 3
+        <!--TODO 临时方案处理存量数据-->
     </select>
 
     <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">