协议查询接口

src/main/java/com/jkcredit/invoice/hub/controller/web/contractQuery/ContractQueryResource.java

@@ -1,7 +1,12 @@
 package com.jkcredit.invoice.hub.controller.web.contractQuery;
 
 import com.jkcredit.invoice.hub.controller.base.WebResource;
+import com.jkcredit.invoice.hub.controller.web.contractQuery.fb.ContractQueryFB;
+import com.jkcredit.invoice.hub.model.dto.contractQuery.ContractQueryDto;
+import com.jkcredit.invoice.hub.model.vo.contractQuery.ContractQueryVo;
 import com.jkcredit.invoice.hub.service.contractQuery.ContractQueryService;
+import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
+import com.jkcredit.invoice.hub.spi.web.data.ResponseData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,6 +25,17 @@ public class ContractQueryResource extends WebResource {
     @Autowired
     ContractQueryService contractQueryService;
 
-//    @PostMapping("/contractQuery")
-//    @PreAuthorize("hasPermission('contract','query')")
+    @PostMapping("/contractQuery")
+    @PreAuthorize("hasPermission('contract','query')")
+    public ResponseData contractQuery(ContractQueryFB contractQueryFB) {
+        try {
+            validate(contractQueryFB);
+            ContractQueryDto contractQueryDto = mapper.map(contractQueryFB, ContractQueryDto.class);
+            ContractQueryVo contractQueryVo = contractQueryService.queryContract(contractQueryDto);
+            return ResponseData.success(contractQueryVo);
+        } catch (ServiceException e) {
+            log.error(e.getMessage());
+            return ResponseData.failed("协议查询失败，失败原因" + e.getMessage());
+        }
+    }
 }

src/main/java/com/jkcredit/invoice/hub/controller/web/contractQuery/fb/ContractQueryFB.java

@@ -0,0 +1,19 @@
+package com.jkcredit.invoice.hub.controller.web.contractQuery.fb;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/3/4 9:58
+ * @version: V1.0
+ **/
+@Data
+public class ContractQueryFB implements Serializable {
+    private static final long serialVersionUID = 823996372989867722L;
+    private String companyNum;
+    private String contractNum;
+}

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

@@ -65,7 +65,7 @@ public class ContractServiceImpl extends BaseService implements ContractService
         try {
             // 调用upload 发送数据
             response = ETCCommHelper.upload(fileName, request, B2bContractAddResponse.class);
-            log.info("[-uploadContract-]" + response.toJson());
+            log.info("[-uploadContract-] 上游返回结果：" + response.toJson());
         } catch (IOException e) {
             log.error("[-uploadContract-] 网络错误：" + e.getMessage());
             throw new ServiceException("上传协议失败");

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

@@ -40,6 +40,7 @@ public class ContractQueryServiceImpl extends BaseService implements ContractQue
         B2bContractQueryResponse response;
         try {
             response = ETCCommHelper.upload(fileName, request, B2bContractQueryResponse.class);
+            log.info("[-queryContract-] 上游返回结果：" + response.toJson());
         } catch (IOException e) {
             log.error("[-queryContract-] 网络错误：" + e.getMessage());
             throw new ServiceException("协议查询失败");