20211201后端更新代码_2

src/main/java/com/jkcredit/invoice/SysInvoiceApplication.java

@@ -7,12 +7,10 @@ import org.springframework.boot.web.server.ConfigurableWebServerFactory;
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@Import({TomcatConfig.class})
 @EnableAsync
 @EnableScheduling
 @SpringBootApplication

src/main/java/com/jkcredit/invoice/TomcatConfig.java

@@ -1,52 +0,0 @@
-package com.jkcredit.invoice;
-
-import org.apache.catalina.connector.Connector;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 增加端口监听
- * @Class: TomcatConfig
- * @Author: mashengyi
- * @Date: 2021/11/28 15:56
- * @Version: 1.0
- */
-@Configuration
-public class TomcatConfig {
-
-    @Value("${server.additionalPorts}")
-    private String additionalPorts;
-
-    @Bean
-    public TomcatServletWebServerFactory servletContainer() {
-        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-        Connector[] additionalConnectors = this.additionalConnector();
-        if (additionalConnectors != null && additionalConnectors.length > 0) {
-            tomcat.addAdditionalTomcatConnectors(additionalConnectors);
-        }
-        return tomcat;
-    }
-
-    private Connector[] additionalConnector() {
-        if (StringUtils.isBlank(this.additionalPorts)) {
-            return null;
-        }
-        // 端口按,分割
-        String[] ports = this.additionalPorts.split(",");
-        List<Connector> result = new ArrayList<>();
-        for (String port : ports) {
-            Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-            connector.setScheme("http");
-            connector.setPort(Integer.parseInt(port));
-            result.add(connector);
-        }
-        return result.toArray(new Connector[] {});
-    }
-
-}

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

@@ -496,6 +496,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setHisFlag(1);
             noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
+            noCarWayBill.setInterType(0);//接口
             NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
 
             if(noCarWayBillDb!=null && (noCarWayBillDb.getBillwayStatus() == 1||noCarWayBillDb.getBillwayStatus() == 2 || noCarWayBillDb.getBillwayStatus() == 3 || noCarWayBillDb.getBillwayStatus() == 4)) {

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

@@ -515,6 +515,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             invoiceApplVo.setCustomerName(appKey);
             invoiceApplVo.setCompanyName(customerRec1.getCompanyName());
             invoiceApplVo.setCardId(cardId);
+            invoiceApplVo.setInterType(0);//接口
 
 
             List<String> tradeIds = new ArrayList<String>();

src/main/java/com/jkcredit/invoice/model/entity/invoice/BillInvoice.java

@@ -150,6 +150,21 @@ public class BillInvoice {
 
     private String calculateTimeEnd;
 
+
+    /**
+     * 对接方式 0 接口 1平台
+     */
+    private  Integer interType = 1;
+
+    public Integer getInterType() {
+        return interType;
+    }
+
+    public void setInterType(Integer interType) {
+        this.interType = interType;
+    }
+
+
     public String getInvoiceNum() {
         return invoiceNum;
     }

src/main/java/com/jkcredit/invoice/model/entity/invoice/SelfCarAppl.java

@@ -49,6 +49,20 @@ public class SelfCarAppl {
      */
     private Integer voiceFlag =0;
 
+    /**
+     * 对接方式 0 接口 1平台
+     */
+    private  Integer interType = 1;
+
+    public Integer getInterType() {
+        return interType;
+    }
+
+    public void setInterType(Integer interType) {
+        this.interType = interType;
+    }
+
+
     public Long getId() {
         return id;
     }

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

@@ -308,6 +308,7 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
         noCarWayBill1.setBatchNumEnd(noCarWayBill.getBatchNumEnd());
+        noCarWayBill1.setInterType(noCarWayBill.getInterType());
         if((DateUtil.getDistanceHours(noCarWayBill1.getStartTime(),DateUtil.StringToDate(noCarWayBill1.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
             //noCarWayBill1.setBillwayStatus(4);
             noCarWayBill1.setFailReason("失败，承运时长超96小时");
@@ -411,6 +412,7 @@ public class NoCarServiceImpl implements NoCarService{
         }
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
+        noCarWayBill1.setInterType(noCarWayBill.getInterType());
         if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
             log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             noCarWayBill.setFailReason("失败，承运时长超96小时");

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

@@ -102,6 +102,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(cardTradeModel.getTradeId());
                     if(selfCarTrade == null){
                         selfCarTrade = new SelfCarTrade();
+                        selfCarTrade.setInterType(tradeRequestVo.getInterType());
                         selfCarTrade.setCustomId(customerRec.getCustomerName());
                         selfCarTrade.setCompanyName(customerRec.getCompanyName());
                         selfCarTrade.setCompanyReferencenum(customerRec.getCompanyReferencenum());
@@ -113,8 +114,9 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                         selfCarTrade.setStatus(tradeRequestVo.getTradeStatus());
                         sellCarTradeMapper.insert(selfCarTrade);
                     }else{
-                        if(selfCarTrade.getStatus()!=tradeRequestVo.getTradeStatus()){
+                        if(!selfCarTrade.getStatus().equals(tradeRequestVo.getTradeStatus()) ){
                             selfCarTrade.setStatus(tradeRequestVo.getTradeStatus());
+                            selfCarTrade.setInterType(tradeRequestVo.getInterType());
                             sellCarTradeMapper.updateByTradeId(selfCarTrade);
                         }
                     }
@@ -184,6 +186,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             selfCarAppl.setInvoiceAmount(b2BInvoiceApplyResponse.getInvoiceAmount());
             selfCarAppl.setInvoiceCount(b2BInvoiceApplyResponse.getInvoiceCount());
             selfCarAppl.setInvoiceTaxAmount(b2BInvoiceApplyResponse.getInvoiceTaxAmount());
+            selfCarAppl.setInterType(invoiceApplVo.getInterType());
             selfCarApplMapper.insert(selfCarAppl);
 
             //更新交易id申请开票时间，并将转态改为开票中
@@ -192,6 +195,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                 selfCarTrade.setStatus(2);
                 selfCarTrade.setAclTime(DateUtil.getCurrentDateStr());
                 selfCarTrade.setApplId(b2BInvoiceApplyResponse.getApplyId());
+                selfCarTrade.setInterType(invoiceApplVo.getInterType());
                 sellCarTradeMapper.updateByTradeId(selfCarTrade);
                 //计费
                 SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();

src/main/java/com/jkcredit/invoice/service/lowerService/vo/InvoiceApplVo.java

@@ -24,6 +24,19 @@ public class InvoiceApplVo {
      */
     private List<String> tradeIds;
 
+    /**
+     * 对接方式 0 接口 1平台
+     */
+    private  Integer interType = 1;
+
+    public Integer getInterType() {
+        return interType;
+    }
+
+    public void setInterType(Integer interType) {
+        this.interType = interType;
+    }
+
     public String getCustomerName() {
         return customerName;
     }

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

@@ -15,18 +15,19 @@ public class CommInterFaceImpl implements CommInterFace{
     @Override
     public RespR<CompanyQueryResponse> companyQuery(CompanyQueryRequest companyQueryRequest) {
         String fileName = companyQueryRequest.getFilename();
+        long startTime = System.currentTimeMillis();
         try {
             log.info("CommInterFaceImpl.companyQuery上游接口请求参数：{}",  companyQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CompanyQueryResponse response= ETCCommHelper.upload(fileName, companyQueryRequest, CompanyQueryResponse.class);
-            log.info("CommInterFaceImpl.companyQuery上游接口返回：{},请求参数：{}", response.toString(), companyQueryRequest.toString());
+            log.info("CommInterFaceImpl.companyQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), companyQueryRequest.toString(),System.currentTimeMillis()-startTime);
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error("CommInterFaceImpl.companyQuery:{}",e.getMessage()+ " ,请求参数："+companyQueryRequest.toString());
+            log.error("CommInterFaceImpl.companyQuery:{}",e.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error("CommInterFaceImpl.companyQuery:{}",apie.getMessage()+ " ,请求参数："+companyQueryRequest.toString());
+            log.error("CommInterFaceImpl.companyQuery:{}",apie.getMessage()+ " ,请求参数："+companyQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -35,18 +36,20 @@ public class CommInterFaceImpl implements CommInterFace{
     @Override
     public RespR<CompanyAddResponse> addCompany(CompanyAddRequest companyAddRequest) {
         String fileName = companyAddRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("CommInterFaceImpl.addCompany请求参数：{}", companyAddRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CompanyAddResponse response=ETCCommHelper.upload(fileName, companyAddRequest, CompanyAddResponse.class);
-            log.info("CommInterFaceImpl.addCompany上游接口返回：{},请求参数：{}", response.toString(), companyAddRequest.toString());
+            log.info("CommInterFaceImpl.addCompany上游接口返回：{},请求参数：{},cost={}ms", response.toString(), companyAddRequest.toString(),System.currentTimeMillis()-startTime);
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error("CommInterFaceImpl.addCompany：{}", e.getMessage()+ " ,请求参数："+companyAddRequest.toString());
+            log.error("CommInterFaceImpl.addCompany：{}", e.getMessage()+ " ,请求参数："+companyAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error("CommInterFaceImpl.addCompany：{}", apie.getMessage()+ " ,请求参数："+companyAddRequest.toString());
+            log.error("CommInterFaceImpl.addCompany：{}", apie.getMessage()+ " ,请求参数："+companyAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -55,19 +58,21 @@ public class CommInterFaceImpl implements CommInterFace{
     @Override
     public RespR<B2bContractAddResponse> b2bContractAdd(B2bContractAddRequest contractAddRequest) {
         String fileName = contractAddRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("CommInterFaceImpl.b2bContractAdd上游请求参数：{}",contractAddRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractAddResponse response=ETCCommHelper.upload(fileName, contractAddRequest, B2bContractAddResponse.class);
-            log.info("CommInterFaceImpl.b2bContractAdd上游接口返回：{},请求参数：{}", response.toString(), contractAddRequest.toString());
+            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();
-            log.error("CommInterFaceImpl.b2bContractAdd：{}",e.getMessage()+ " ,请求参数："+contractAddRequest.toString());
+            log.error("CommInterFaceImpl.b2bContractAdd：{}",e.getMessage()+ " ,请求参数："+contractAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error("CommInterFaceImpl.b2bContractAdd：{}",apie.getMessage()+ " ,请求参数："+contractAddRequest.toString());
+            log.error("CommInterFaceImpl.b2bContractAdd：{}",apie.getMessage()+ " ,请求参数："+contractAddRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -76,20 +81,21 @@ public class CommInterFaceImpl implements CommInterFace{
     @Override
     public RespR<B2bContractQueryResponse> b2bContractQuery(B2bContractQueryRequest b2bContractQueryRequest) {
         String fileName = b2bContractQueryRequest.getFilename();
+        long startTime = System.currentTimeMillis();
         try {
             log.info("CommInterFaceImpl.b2bContractQuery上游请求参数：{}",  b2bContractQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractQueryResponse response=ETCCommHelper.upload(fileName, b2bContractQueryRequest, B2bContractQueryResponse.class);
-            log.info("CommInterFaceImpl.b2bContractQuery上游接口返回：{},请求参数：{}", response.toString(), b2bContractQueryRequest.toString());
+            log.info("CommInterFaceImpl.b2bContractQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2bContractQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
-            log.error("CommInterFaceImpl.b2bContractQuery：{}",  e.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString());
+            log.error("CommInterFaceImpl.b2bContractQuery：{}",  e.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
-            log.error("CommInterFaceImpl.b2bContractQuery：{}",  apie.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString());
+            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

@@ -21,19 +21,20 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<VehicleRegisterResponse> vehicleRegister(VehicleRegisterRequest registerRequest) {
         String fileName = registerRequest.getFilename();
+        long startTime = System.currentTimeMillis();
         try {
             log.info("NoCarInterfaceImpl.vehicleRegister,请求参数：{}",  registerRequest.toString());
             VehicleRegisterResponse response=ETCCommHelper.upload(fileName, registerRequest, VehicleRegisterResponse.class);
-            log.info("NoCarInterfaceImpl.vehicleRegister上游接口返回：{},请求参数：{}", response.toString(), registerRequest.toString());
+            log.info("NoCarInterfaceImpl.vehicleRegister上游接口返回：{},请求参数：{},cost={}ms", response.toString(), registerRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
-            log.error(e.getMessage() + " ,请求参数："+registerRequest.toString());
+            log.error(e.getMessage() + " ,请求参数："+registerRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
-            log.error(apie.getMessage()+ " ,请求参数："+registerRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+registerRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             return new RespR(false,apie.getMessage());
         }
     }
@@ -41,19 +42,20 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<VehicleQueryResponse> vehicleQuery(VehicleQueryRequest vehicleQueryRequest) {
         String fileName = vehicleQueryRequest.getFilename();
+        long startTime = System.currentTimeMillis();
         try {
             log.info("NoCarInterfaceImpl.vehicleQuery上游请求参数：{}", vehicleQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             VehicleQueryResponse response=ETCCommHelper.upload(fileName, vehicleQueryRequest, VehicleQueryResponse.class);
-            log.info("NoCarInterfaceImpl.vehicleQuery上游接口返回：{},请求参数：{}", response.toString(), vehicleQueryRequest.toString());
+            log.info("NoCarInterfaceImpl.vehicleQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), vehicleQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
 
             return new RespR(false,apie.getMessage());
@@ -63,18 +65,20 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<WaybillStartResponse> waybillStart(WaybillStartRequest waybillStartRequest) {
         String fileName = waybillStartRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("NoCarInterfaceImpl.waybillStart上游请求参数：{}", waybillStartRequest.toString());
             WaybillStartResponse response=ETCCommHelper.upload(fileName, waybillStartRequest, WaybillStartResponse.class);
-            log.info("NoCarInterfaceImpl.waybillStart上游接口返回：{},请求参数：{}", response.toString(), waybillStartRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillStart上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillStartRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+waybillStartRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+waybillStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+waybillStartRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+waybillStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -82,19 +86,21 @@ public class NoCarInterfaceImpl implements NoCarInterface {
 
     @Override
     public RespR<WaybillEndResponse> waybillEnd(WaybillEndRequest waybillEndRequest) {
+        long startTime = System.currentTimeMillis();
+
         String fileName = waybillEndRequest.getFilename();
         try {
             log.info("NoCarInterfaceImpl.waybillEnd请求参数：{}", waybillEndRequest.toString());
             WaybillEndResponse response=ETCCommHelper.upload(fileName, waybillEndRequest, WaybillEndResponse.class);
-            log.info("NoCarInterfaceImpl.waybillEnd上游接口返回：{},请求参数：{}", response.toString(), waybillEndRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillEnd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillEndRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+waybillEndRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+waybillEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+waybillEndRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+waybillEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -103,20 +109,22 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<WaybillHistoryStartResponse> waybillHistoryStart(WaybillHistoryStartRequest waybillHistoryStartRequest) {
         String fileName = waybillHistoryStartRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("NoCarInterfaceImpl.waybillHistoryStart上游接口请求参数：{}", waybillHistoryStartRequest.toString());
 
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillHistoryStartResponse response=ETCCommHelper.upload(fileName, waybillHistoryStartRequest, WaybillHistoryStartResponse.class);
-            log.info("NoCarInterfaceImpl.waybillHistoryStart上游接口返回：{},请求参数：{}", response.toString(), waybillHistoryStartRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillHistoryStart上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillHistoryStartRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -125,19 +133,21 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<WaybillHistoryEndResponse> waybillHistoryEnd(WaybillHistoryEndRequest waybillHistoryEndRequest) {
         String fileName = waybillHistoryEndRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("NoCarInterfaceImpl.waybillHistoryEnd请求参数：{}",  waybillHistoryEndRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillHistoryEndResponse response=ETCCommHelper.upload(fileName, waybillHistoryEndRequest, WaybillHistoryEndResponse.class);
-            log.info("NoCarInterfaceImpl.waybillHistoryEnd上游接口返回：{},请求参数：{}", response.toString(), waybillHistoryEndRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillHistoryEnd上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillHistoryEndRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -146,19 +156,21 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<WaybillNumFindInvoiceResponse> waybillNumFindInvoice(WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest) {
         String fileName = waybillNumFindInvoiceRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("NoCarInterfaceImpl.waybillNumFindInvoice请求参数：{}", waybillNumFindInvoiceRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillNumFindInvoiceResponse response=ETCCommHelper.upload(fileName, waybillNumFindInvoiceRequest, WaybillNumFindInvoiceResponse.class);
-            log.info("NoCarInterfaceImpl.waybillNumFindInvoice上游接口返回：{},请求参数：{}", response.toString(), waybillNumFindInvoiceRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillNumFindInvoice上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillNumFindInvoiceRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -167,19 +179,21 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<WaybillInvoiceRedQueryResponse> waybillInvoiceRedQuery(WaybillInvoiceRedQueryRequest waybillInvoiceRedQueryRequest) {
         String fileName = waybillInvoiceRedQueryRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery请求参数：{}",  waybillInvoiceRedQueryRequest.toString());
             WaybillInvoiceRedQueryResponse response=ETCCommHelper.upload(fileName, waybillInvoiceRedQueryRequest, WaybillInvoiceRedQueryResponse.class);
-            log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery上游接口返回：{},请求参数：{}", response.toString(), waybillInvoiceRedQueryRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillInvoiceRedQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -188,19 +202,21 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     @Override
     public RespR<WaybillCountQueryResponse> waybillCountQuery(WaybillCountQueryRequest waybillCountQueryRequest) {
         String fileName = waybillCountQueryRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("NoCarInterfaceImpl.waybillCountQuery上游请求参数：{}", waybillCountQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillCountQueryResponse response=ETCCommHelper.upload(fileName, waybillCountQueryRequest, WaybillCountQueryResponse.class);
-            log.info("NoCarInterfaceImpl.waybillCountQuery上游接口返回：{},请求参数：{}", response.toString(), waybillCountQueryRequest.toString());
+            log.info("NoCarInterfaceImpl.waybillCountQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), waybillCountQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString());
+            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

@@ -20,19 +20,21 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<CardBindQueryListToBResponse> cardBindQueryListToB(CardBindQueryListToBRequest cardBindQueryListToBRequest) {
         String fileName = cardBindQueryListToBRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("SelfCarInterfaceImpl.cardBindQueryListToB请求参数：{}", cardBindQueryListToBRequest.toString());
             CardBindQueryListToBResponse response=ETCCommHelper.upload(fileName, cardBindQueryListToBRequest, CardBindQueryListToBResponse.class);
-            log.info("SelfCarInterfaceImpl.cardBindQueryListToB上游接口返回：{},请求参数：{}", response.toString(), cardBindQueryListToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardBindQueryListToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardBindQueryListToBRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -41,19 +43,21 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<CardQueryCardToBResponse> cardQueryCardToB(CardQueryCardToBRequest cardQueryCardToBRequest) {
         String fileName = cardQueryCardToBRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("SelfCarInterfaceImpl.cardQueryCardToB请求参数：{}", cardQueryCardToBRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardQueryCardToBResponse response=ETCCommHelper.upload(fileName, cardQueryCardToBRequest, CardQueryCardToBResponse.class);
-            log.info("SelfCarInterfaceImpl.cardQueryCardToB上游接口返回：{},请求参数：{}", response.toString(), cardQueryCardToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardQueryCardToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardQueryCardToBRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -62,20 +66,22 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<CardBindingToBResponse> cardBindingToB(CardBindingToBRequest cardBindingToBRequest) {
         String fileName = cardBindingToBRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("SelfCarInterfaceImpl.cardBindingToB上游请求参数：{}", cardBindingToBRequest.toString());
             CardBindingToBResponse response=ETCCommHelper.upload(fileName, cardBindingToBRequest, CardBindingToBResponse.class);
-            log.info("SelfCarInterfaceImpl.cardBindingToB上游接口返回：{},请求参数：{}", response.toString(), cardBindingToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardBindingToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardBindingToBRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -84,20 +90,22 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<CardValidCodeToBResponse> cardValidCodeToB(CardValidCodeToBRequest cardValidCodeToBRequest) {
         String fileName = cardValidCodeToBRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("SelfCarInterfaceImpl.cardValidCodeToB上游请求参数：{}", cardValidCodeToBRequest.toString());
             CardValidCodeToBResponse response=ETCCommHelper.upload(fileName, cardValidCodeToBRequest, CardValidCodeToBResponse.class);
-            log.info("SelfCarInterfaceImpl.cardValidCodeToB上游接口返回：{},请求参数：{}", response.toString(), cardValidCodeToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardValidCodeToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardValidCodeToBRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -106,20 +114,22 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<CardUnbindToBResponse> cardUnbindToB(CardUnbindToBRequest cardUnbindToBRequest) {
         String fileName = cardUnbindToBRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("SelfCarInterfaceImpl.cardUnbindToB上游请求参数：{}", cardUnbindToBRequest.toString());
             CardUnbindToBResponse response=ETCCommHelper.upload(fileName, cardUnbindToBRequest, CardUnbindToBResponse.class);
-            log.info("SelfCarInterfaceImpl.cardUnbindToB上游接口返回：{},请求参数：{}", response.toString(), cardUnbindToBRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardUnbindToB上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardUnbindToBRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -128,20 +138,22 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<CardTradeResponse> cardTrade(CardTradeRequest cardTradeRequest) {
         String fileName = cardTradeRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("SelfCarInterfaceImpl.cardTrade上游请求参数：{}", cardTradeRequest.toString());
             CardTradeResponse response=ETCCommHelper.upload(fileName, cardTradeRequest, CardTradeResponse.class);
-            log.info("SelfCarInterfaceImpl.cardTrade上游接口返回：{},请求参数：{}", response.toString(), cardTradeRequest.toString());
+            log.info("SelfCarInterfaceImpl.cardTrade上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardTradeRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+cardTradeRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+cardTradeRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请稍后再试");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+cardTradeRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+cardTradeRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -150,18 +162,20 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<B2BInvoiceApplyResponse> b2BInvoiceApply(B2BInvoiceApplyRequest b2BInvoiceApplyRequest) {
         String fileName = b2BInvoiceApplyRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游请求参数：{}",  b2BInvoiceApplyRequest.toString());
             B2BInvoiceApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceApplyRequest, B2BInvoiceApplyResponse.class);
-            log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceApplyRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceApplyRequest.toString(),System.currentTimeMillis()-startTime);
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -170,20 +184,22 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<B2BInvoiceQueryResponse> b2BInvoiceQuery(B2BInvoiceQueryRequest b2BInvoiceQueryRequest) {
         String fileName = b2BInvoiceQueryRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游请求参数：{}", b2BInvoiceQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2BInvoiceQueryResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryRequest, B2BInvoiceQueryResponse.class);
-            log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceQueryRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceQueryRequest.toString(),System.currentTimeMillis()-startTime);
 
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -192,19 +208,21 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<B2BInvoiceQueryByApplyResponse> b2bContractQuery(B2BInvoiceQueryByApplyRequest b2BInvoiceQueryByApplyRequest) {
         String fileName = b2BInvoiceQueryByApplyRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             log.info("SelfCarInterfaceImpl.b2bContractQuery上游请求参数：{}",b2BInvoiceQueryByApplyRequest.toString());
             B2BInvoiceQueryByApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryByApplyRequest, B2BInvoiceQueryByApplyResponse.class);
-            log.info("SelfCarInterfaceImpl.b2bContractQuery上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceQueryByApplyRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2bContractQuery上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2BInvoiceQueryByApplyRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }
@@ -213,19 +231,21 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
     public RespR<B2bInvoicePackageResponse> b2bInvoicePackage(B2bInvoicePackageRequest b2bInvoicePackageRequest) {
         String fileName = b2bInvoicePackageRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
         try {
             log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游请求参数：{}", b2bInvoicePackageRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bInvoicePackageResponse response=ETCCommHelper.upload(fileName, b2bInvoicePackageRequest, B2bInvoicePackageResponse.class);
-            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游接口返回：{},请求参数：{}", response.toString(), b2bInvoicePackageRequest.toString());
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游接口返回：{},请求参数：{},cost={}ms", response.toString(), b2bInvoicePackageRequest.toString(),System.currentTimeMillis()-startTime);
 
             return new RespR<>(response);
         } catch (IOException e) {
-            log.error(e.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString());
+            log.error(e.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
-            log.error(apie.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString());
+            log.error(apie.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
             apie.printStackTrace();
             return new RespR(false,apie.getMessage());
         }

src/main/resources/application.yml

@@ -1,7 +1,6 @@
 
 server:
   port: 18080
-  additionalPorts: 9999,58080
   tomcat:
     accesslog:
       enabled: true
@@ -54,9 +53,9 @@ spring:
     #url: jdbc:mysql://127.0.0.1:3306/db_invoice?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&allowPublicKeyRetrieval=true
     #username: root
     #password: root
-    url: jdbc:mysql://192.168.50.4:3306/db_invoice?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: jk@123
+    url: jdbc:mysql://39.106.56.5:3306/db_invoice?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: invoice
+    password: invoiceX%190605
     driver-class-name: com.mysql.jdbc.Driver
     # \u4F7F\u7528druid\u6570\u636E\u6E90
     type: com.alibaba.druid.pool.DruidDataSource

src/main/resources/mapper/invoice/BillInvoiceMapper.xml

@@ -36,6 +36,7 @@
         <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
         <result column="billStatus" property="billStatus"/>
         <result column="calculateTime" property="calculateTime"/>
+        <result column="interType" property="interType"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -68,7 +69,8 @@
         transactionId,
         tradeMatchTime,
         buyerName,
-        buyerTaxpayerCode
+        buyerTaxpayerCode,
+        interType
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
@@ -78,6 +80,9 @@
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
                 and  companyName = BINARY #{billInvoice.companyName}
             </if>
+            <if test="billInvoice.customerName != null and billInvoice.customerName != ''">
+                and  customerName = BINARY #{billInvoice.customerName}
+            </if>
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
                 and  instr(CONCAT(',',#{billInvoice.waybillNum},','),CONCAT(',',waybillNum,','))>0
             </if>
@@ -259,15 +264,30 @@
         <result column="feeCount" property="feeCount"/>
     </resultMap>
     <select id="findInvoiceStatics" resultMap="staticResultMap">
+
         select
-        sum(totalAmount) fee,
-        sum(totalTaxAmount) totalTaxAmount,
+
+        (CASE WHEN sum(totalAmount) = '' THEN 0
+        WHEN sum(totalAmount) is null THEN 0
+        WHEN sum(totalAmount) is not null THEN sum(totalAmount)
+        ELSE sum(totalAmount) END)as fee,
+
+
+        (CASE WHEN  sum(totalTaxAmount) = '' THEN 0
+        WHEN  sum(totalTaxAmount) is null THEN 0
+        WHEN  sum(totalTaxAmount) is not null THEN  sum(totalTaxAmount)
+        ELSE  sum(totalTaxAmount) END)as totalTaxAmount,
+
+
         count(DISTINCT(transactionId)) feeCount
         from t_billInvoice
         <where>
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
                 and  companyName = BINARY #{billInvoice.companyName}
             </if>
+            <if test="billInvoice.customerName != null and billInvoice.customerName != ''">
+                and  customerName = BINARY #{billInvoice.customerName}
+            </if>
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
                 and  waybillNum = BINARY #{billInvoice.waybillNum}
             </if>

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

@@ -50,7 +50,7 @@
         companyAdress,
         companyBank,
         companyBankAcc,
-        companyTel,companyNum,updateTime,failReason
+        companyTel,companyNum,updateTime,failReason,interType
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
@@ -145,7 +145,7 @@
             companyAdress,
             companyBank,
             companyBankAcc,
-            companyTel,companyNum,updateTime,batchNumber,batchNumEnd,failReason
+            companyTel,companyNum,updateTime,batchNumber,batchNumEnd,failReason,interType
         )
         values ( #{customerName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
         #{billNum,jdbcType=VARCHAR}, #{plateNum,jdbcType=VARCHAR}, #{plateColor,jdbcType=VARCHAR},
@@ -153,7 +153,8 @@
         #{predictEndTime,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER}, #{titleType,jdbcType=INTEGER},
         #{taxplayerCode,jdbcType=VARCHAR},#{intfaceStartTime,jdbcType=VARCHAR},#{interfaceEndTime,jdbcType=VARCHAR},
         #{billwayStatus,jdbcType=INTEGER},#{hisFlag,jdbcType=INTEGER}, #{companyAdress,jdbcType=VARCHAR}, #{companyBank,jdbcType=VARCHAR}
-        , #{companyBankAcc,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR},#{companyNum,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},#{batchNum,jdbcType=VARCHAR},#{batchNumEnd,jdbcType=VARCHAR},#{failReason,jdbcType=VARCHAR}
+        , #{companyBankAcc,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR},#{companyNum,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},#{batchNum,jdbcType=VARCHAR}
+        ,#{batchNumEnd,jdbcType=VARCHAR},#{failReason,jdbcType=VARCHAR},#{interType,jdbcType=INTEGER}
         )
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
@@ -205,13 +206,15 @@
         companyBankAcc = #{companyBankAcc,jdbcType=VARCHAR},
         companyTel = #{companyTel,jdbcType=VARCHAR},
         companyNum = #{companyNum,jdbcType=VARCHAR},
-        failReason = #{failReason,jdbcType=VARCHAR}
+        failReason = #{failReason,jdbcType=VARCHAR},
+        interType = #{interType,jdbcType=INTEGER}
         where  billNum = BINARY #{billNum,jdbcType=VARCHAR}
     </update>
     <update id="updateByBillNumTimeRes" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
         update t_waybill_no
         set interfaceEndTime = #{interfaceEndTime,jdbcType=VARCHAR},
-        failReason = #{failReason,jdbcType=VARCHAR}
+        failReason = #{failReason,jdbcType=VARCHAR},
+        interType = #{interType,jdbcType=INTEGER}
         where  billNum = BINARY #{billNum,jdbcType=VARCHAR}
     </update>
     <select id="selectByBillNum" resultMap="BaseResultMap" parameterType="java.lang.String" >

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

@@ -30,7 +30,8 @@
         applId,
         aclTime,
         companyName,
-        companyReferencenum
+        companyReferencenum,
+        interType
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
@@ -82,12 +83,12 @@
             applId,
             aclTime,
             companyName,
-            companyReferencenum
+            companyReferencenum,interType
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
          #{cardId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR}, #{exTime,jdbcType=VARCHAR},
          #{fee,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{applId,jdbcType=VARCHAR},#{aclTime,jdbcType=VARCHAR},
-         #{companyName,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR}
+         #{companyName,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR}, #{interType,jdbcType=INTEGER}
         )
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.waybill.SelfCarTrade" >
@@ -118,7 +119,8 @@
         applId = #{applId,jdbcType=VARCHAR},
         aclTime = #{aclTime,jdbcType=VARCHAR},
         companyName = #{companyName,jdbcType=VARCHAR},
-        companyReferencenum = #{companyReferencenum,jdbcType=VARCHAR}
+        companyReferencenum = #{companyReferencenum,jdbcType=VARCHAR},
+        interType = #{interType,jdbcType=INTEGER}
         where  tradeId = BINARY #{tradeId,jdbcType=INTEGER}
     </update>