协议上传

src/main/java/com/jkcredit/invoice/hub/service/contract/ContractServiceImpl.java

@@ -1,5 +1,8 @@
 package com.jkcredit.invoice.hub.service.contract;
 
+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.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.hub.mapper.ContractMapper;
@@ -7,11 +10,16 @@ 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.ApiRequestException;
+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:
@@ -27,53 +35,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

src/main/java/com/jkcredit/invoice/hub/service/contractQuery/ContractQueryServiceImpl.java

@@ -1,13 +1,21 @@
 package com.jkcredit.invoice.hub.service.contractQuery;
 
+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.ApiRequestException;
+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:
@@ -23,35 +31,34 @@ 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("协议查询失败");
-//        }
-        return null;
+        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("协议查询失败");
+        }
     }
 }