xusonglin před 5 roky
rodič
revize
8dc70ca860

+ 4 - 4
pom.xml

@@ -29,8 +29,8 @@
         <jackson.core.version>2.8</jackson.core.version>
         <jackson.databind.version>2.8</jackson.databind.version>
         <jackson.datatype.version>2.8</jackson.datatype.version>
-        <sdk.common.version>1.1</sdk.common.version>
-        <waybill.protocol.version>1.3.5</waybill.protocol.version>
+        <sdk.common.version>1.0</sdk.common.version>
+        <waybill.protocol.version>1.3.4</waybill.protocol.version>
         <slf4j.api.version>1.7</slf4j.api.version>
         <validation.api.version>1.1.0</validation.api.version>
         <jsonwebtoken.version>0.9.0</jsonwebtoken.version>
@@ -211,14 +211,14 @@
             <artifactId>etc-common</artifactId>
             <version>${sdk.common.version}</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/sdk-common-1.1.jar</systemPath>
+            <systemPath>${project.basedir}/src/main/resources/lib/sdk-common-1.0.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>sdk.waybill.protocol</groupId>
             <artifactId>sdk-waybill-protocol</artifactId>
             <version>${waybill.protocol.version}</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/sdk-waybill-protocol-1.3.5.jar</systemPath>
+            <systemPath>${project.basedir}/src/main/resources/lib/sdk-waybill-protocol-1.3.4.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>slf4j.api</groupId>

+ 47 - 57
src/main/java/com/jkcredit/invoice/hub/service/contract/ContractServiceImpl.java

@@ -1,27 +1,17 @@
 package com.jkcredit.invoice.hub.service.contract;
 
-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.B2bContractAddRequest;
-import cn.com.taiji.sdk.model.comm.protocol.eoms.company.B2bContractAddResponse;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jkcredit.invoice.hub.enums.ApiResponseCodeEnum;
 import com.jkcredit.invoice.hub.mapper.ContractMapper;
 import com.jkcredit.invoice.hub.model.dto.contract.ContractDto;
 import com.jkcredit.invoice.hub.model.po.contract.ContractPo;
 import com.jkcredit.invoice.hub.model.vo.contract.ContractVo;
 import com.jkcredit.invoice.hub.service.base.BaseService;
-import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
 import com.jkcredit.invoice.hub.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import sun.misc.BASE64Encoder;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.Date;
 
 /**
  * @description:
@@ -37,53 +27,53 @@ public class ContractServiceImpl extends BaseService implements ContractService
 
     @Override
     public void uploadContract(ContractDto contractDto) {
-        String filename = contractDto.getContract().getOriginalFilename();
-        String[] args = filename.split("\\.");
-        if (!args[args.length - 1].equals("pdf")) {
-            throw new ServiceException("协议转换失败");
-        }
-        // 参数设置
-        validate(contractDto);
-        B2bContractAddRequest request = new B2bContractAddRequest();
-        request.setCompanyNum(contractDto.getCompanyNum());
-        request.setServiceType(contractDto.getServiceType());
-        request.setServiceStartTime(contractDto.getServiceStartTime());
-        request.setServiceEndTime(contractDto.getServiceEndTime());
-        request.setContractFileName(filename);
-
-        BASE64Encoder base64Encoder = new BASE64Encoder();
-        String base64Str;
-        try {
-            base64Str = base64Encoder.encode(contractDto.getContract().getBytes());
-        } catch (IOException ioe) {
-            log.error("上传协议转base64失败,失败原因:{}", ioe.getMessage());
-            throw new ServiceException("协议转换失败");
-        }
-        String fileName = request.getFilename();
-
-        // 接口调用
-        B2bContractAddResponse response;
-        try {
-            // 调用upload 发送数据
-            response = ETCCommHelper.upload(fileName, request, B2bContractAddResponse.class);
-        } catch (IOException e) {
-            log.error("[-uploadContract-] 网络错误:" + e.getMessage());
-            throw new ServiceException("上传协议失败");
-        } catch (ApiRequestException apie) {
-            log.error("[-uploadContract-] 错误信息:" + apie.getMessage());
-            throw new ServiceException("上传协议失败,失败原因:" + apie.getMessage());
-        }
-        try {
-            ContractPo contractPo = new ContractPo();
-            BeanUtil.copyProperties(contractPo, contractDto);
-            contractPo.setBase64Str(base64Str);
-            contractPo.setCreateTime(new Date());
-            contractPo.setContractNum(response.getContrantNum());
-            contractMapper.insert(contractPo);
-        } catch (Exception e) {
-            log.error("上传协议失败,失败原因:{}", e.getMessage());
-            throw new ServiceException("上传协议新增失败");
-        }
+//        String filename = contractDto.getContract().getOriginalFilename();
+//        String[] args = filename.split("\\.");
+//        if (!args[args.length - 1].equals("pdf")) {
+//            throw new ServiceException("协议转换失败");
+//        }
+//        // 参数设置
+//        validate(contractDto);
+//        B2bContractAddRequest request = new B2bContractAddRequest();
+//        request.setCompanyNum(contractDto.getCompanyNum());
+//        request.setServiceType(contractDto.getServiceType());
+//        request.setServiceStartTime(contractDto.getServiceStartTime());
+//        request.setServiceEndTime(contractDto.getServiceEndTime());
+//        request.setContractFileName(filename);
+//
+//        BASE64Encoder base64Encoder = new BASE64Encoder();
+//        String base64Str;
+//        try {
+//            base64Str = base64Encoder.encode(contractDto.getContract().getBytes());
+//        } catch (IOException ioe) {
+//            log.error("上传协议转base64失败,失败原因:{}", ioe.getMessage());
+//            throw new ServiceException("协议转换失败");
+//        }
+//        String fileName = request.getFilename();
+//
+//        // 接口调用
+//        B2bContractAddResponse response;
+//        try {
+//            // 调用upload 发送数据
+//            response = ETCCommHelper.upload(fileName, request, B2bContractAddResponse.class);
+//        } catch (IOException e) {
+//            log.error("[-uploadContract-] 网络错误:" + e.getMessage());
+//            throw new ServiceException("上传协议失败");
+//        } catch (ApiRequestException apie) {
+//            log.error("[-uploadContract-] 错误信息:" + apie.getMessage());
+//            throw new ServiceException("上传协议失败,失败原因:" + apie.getMessage());
+//        }
+//        try {
+//            ContractPo contractPo = new ContractPo();
+//            BeanUtil.copyProperties(contractPo, contractDto);
+//            contractPo.setBase64Str(base64Str);
+//            contractPo.setCreateTime(new Date());
+//            contractPo.setContractNum(response.getContrantNum());
+//            contractMapper.insert(contractPo);
+//        } catch (Exception e) {
+//            log.error("上传协议失败,失败原因:{}", e.getMessage());
+//            throw new ServiceException("上传协议新增失败");
+//        }
     }
 
     @Override

+ 30 - 37
src/main/java/com/jkcredit/invoice/hub/service/contractQuery/ContractQueryServiceImpl.java

@@ -1,21 +1,13 @@
 package com.jkcredit.invoice.hub.service.contractQuery;
 
-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.B2bContractQueryRequest;
-import cn.com.taiji.sdk.model.comm.protocol.eoms.company.B2bContractQueryResponse;
 import com.jkcredit.invoice.hub.mapper.ContractQueryMapper;
 import com.jkcredit.invoice.hub.model.dto.contractQuery.ContractQueryDto;
-import com.jkcredit.invoice.hub.model.po.contractQuery.ContractQueryPo;
 import com.jkcredit.invoice.hub.model.vo.contractQuery.ContractQueryVo;
 import com.jkcredit.invoice.hub.service.base.BaseService;
-import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
-import com.jkcredit.invoice.hub.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 
 /**
  * @description:
@@ -31,34 +23,35 @@ public class ContractQueryServiceImpl extends BaseService implements ContractQue
 
     @Override
     public ContractQueryVo queryContract(ContractQueryDto contractDto) {
-        validate(contractDto);
-        B2bContractQueryRequest request = new B2bContractQueryRequest();
-        request.setCompanyNum(contractDto.getCompanyNum());
-        request.setContractNum(contractDto.getContractNum());
-        String fileName = request.getFilename();
-
-        B2bContractQueryResponse response;
-        try {
-            response = ETCCommHelper.upload(fileName, request, B2bContractQueryResponse.class);
-        } catch (IOException e) {
-            log.error("[-queryContract-] 网络错误:" + e.getMessage());
-            throw new ServiceException("协议查询失败");
-        } catch (ApiRequestException apie) {
-            log.error("[-queryContract-] 错误信息:" + apie.getMessage());
-            throw new ServiceException("协议查询失败,失败原因:" + apie.getMessage());
-        }
-        try {
-            ContractQueryPo contractQueryPo = new ContractQueryPo();
-            BeanUtil.copyProperties(contractQueryPo, contractDto);
-            BeanUtil.copyProperties(contractQueryPo, response);
-            mapper.insert(contractQueryPo);
-
-            ContractQueryVo contractQueryVo = new ContractQueryVo();
-            BeanUtil.copyProperties(contractQueryVo, contractQueryPo);
-            return contractQueryVo;
-        } catch (Exception e) {
-            log.error("协议查询失败,失败原因:{}", e.getMessage());
-            throw new ServiceException("协议查询失败");
-        }
+//        validate(contractDto);
+//        B2bContractQueryRequest request = new B2bContractQueryRequest();
+//        request.setCompanyNum(contractDto.getCompanyNum());
+//        request.setContractNum(contractDto.getContractNum());
+//        String fileName = request.getFilename();
+//
+//        B2bContractQueryResponse response;
+//        try {
+//            response = ETCCommHelper.upload(fileName, request, B2bContractQueryResponse.class);
+//        } catch (IOException e) {
+//            log.error("[-queryContract-] 网络错误:" + e.getMessage());
+//            throw new ServiceException("协议查询失败");
+//        } catch (ApiRequestException apie) {
+//            log.error("[-queryContract-] 错误信息:" + apie.getMessage());
+//            throw new ServiceException("协议查询失败,失败原因:" + apie.getMessage());
+//        }
+//        try {
+//            ContractQueryPo contractQueryPo = new ContractQueryPo();
+//            BeanUtil.copyProperties(contractQueryPo, contractDto);
+//            BeanUtil.copyProperties(contractQueryPo, response);
+//            mapper.insert(contractQueryPo);
+//
+//            ContractQueryVo contractQueryVo = new ContractQueryVo();
+//            BeanUtil.copyProperties(contractQueryVo, contractQueryPo);
+//            return contractQueryVo;
+//        } catch (Exception e) {
+//            log.error("协议查询失败,失败原因:{}", e.getMessage());
+//            throw new ServiceException("协议查询失败");
+//        }
+        return null;
     }
 }

binární
src/main/resources/lib/sdk-common-1.0.jar


binární
src/main/resources/lib/sdk-waybill-protocol-1.3.4.jar