basf接口返回数据调整

 package com.erry.iclear.dateInterface.api;
 
-import com.alibaba.fastjson.JSON;
+
 import com.arronlong.httpclientutil.HttpClientUtil;
 import com.arronlong.httpclientutil.common.HttpConfig;
 import com.arronlong.httpclientutil.common.HttpHeader;
 import com.arronlong.httpclientutil.exception.HttpProcessException;
 import com.erry.iclear.dateInterface.api.request.*;
+import com.erry.iclear.dateInterface.api.response.BasfResultChmRS;
 import com.erry.iclear.dateInterface.api.response.BasfResultRS;
 import com.erry.iclear.dateInterface.api.response.ResultRS;
 import com.erry.iclear.dateInterface.entity.ChmConsignment;
@@ -168,10 +169,10 @@ public class BasfDataInterface {
     @ApiOperation(value = "BASF获取申报信息", httpMethod = "POST", notes = "ex:  http://192.168.1.75:8080/customs/selectDecListBasf")
     @PostMapping("/selectDecListBasf")
     @ResponseBody
-    public BasfResultRS selectDecListBasf(HttpServletRequest request
+    public BasfResultChmRS selectDecListBasf(HttpServletRequest request
             , @Validated @RequestBody ConsignmentCode consignmentCode) throws Exception {
         log.info("接收到请求数据consignmentCode:"+consignmentCode.getConsignmentCode()+" data:" + gson.toJson(consignmentCode));
-        BasfResultRS result = new BasfResultRS(Boolean.FALSE,"","","");
+        BasfResultChmRS result = new BasfResultChmRS(Boolean.FALSE,"","",null);
         //获取请求的运单号
         String[] splitConsignment = StringUtil.split(consignmentCode.getConsignmentCode(),",");
         if(splitConsignment.length > 20){
@@ -199,7 +200,7 @@ public class BasfDataInterface {
         //返回申报数据
         if(basfConsignments.size() > 0){
             result.setSuccess(Boolean.TRUE);
-            result.setConsignmentList(JSON.toJSONString(basfConsignments));
+            result.setConsignmentList(basfConsignments);
             result.setMsg("操作成功！");
         }else{
             result.setSuccess(Boolean.TRUE);
@@ -230,7 +231,7 @@ public class BasfDataInterface {
     public BasfResultRS selectChmListBasf(HttpServletRequest request
             , @Validated @RequestBody ConsignmentCode consignmentCode) throws Exception {
         log.info("接收到请求数据consignmentCode:"+consignmentCode.getConsignmentCode()+" data:" + gson.toJson(consignmentCode));
-        BasfResultRS result = new BasfResultRS(Boolean.FALSE,"","","");
+        BasfResultRS result = new BasfResultRS(Boolean.FALSE,"","",null);
         //获取请求的运单号
         String[] splitConsignment = StringUtil.split(consignmentCode.getConsignmentCode(),",");
         if(splitConsignment.length > 20){
@@ -259,7 +260,7 @@ public class BasfDataInterface {
         //返回申报数据
         if(chmConsignments.size() > 0){
             result.setSuccess(Boolean.TRUE);
-            result.setConsignmentList(JSON.toJSONString(chmConsignments));
+            result.setConsignmentList(chmConsignments);
             result.setMsg("操作成功！");
         }else{
             result.setSuccess(Boolean.TRUE);

+package com.erry.iclear.dateInterface.api.response;
+
+
+import com.erry.iclear.dateInterface.api.request.BasfConsignment;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+public class BasfResultChmRS implements Serializable {
+
+    //成功标识
+    private Boolean success = true;
+    private String code;
+
+    //错误信息
+    private String msg;
+    //Object data;
+    private List<BasfConsignment> consignmentList;
+
+}

 package com.erry.iclear.dateInterface.api.response;
 
+import com.erry.iclear.dateInterface.api.request.BasfConsignment;
+import com.erry.iclear.dateInterface.api.request.BasfcReceipt;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author Administrator
@@ -19,6 +22,6 @@ public class BasfResultRS implements Serializable {
     //错误信息
     private String msg;
     //Object data;
-    private String consignmentList;
+    private List<BasfcReceipt> consignmentList;
 
 }

@@ -20,6 +20,6 @@ public interface DeclaredInfoRepository extends JpaRepository<DeclaredInfo, Inte
      * 根据运单号在申报数据表中查询数据
      * @return
      */
-    @Query(nativeQuery = true, value = "select * from T_DECLARED_INFO where CONSIGNMENT_ID IN (SELECT MAX(ID)AS ID FROM T_CHM_CONSIGNMENT WHERE T_CHM_CONSIGNMENT.CONS_TYPE_ID = ?2 CONSIGNMENT_CODE IN ?1 group by CONSIGNMENT_CODE)")
+    @Query(nativeQuery = true, value = "select * from T_DECLARED_INFO where CONSIGNMENT_ID IN (SELECT MAX(ID)AS ID FROM T_CHM_CONSIGNMENT WHERE T_CHM_CONSIGNMENT.CONS_TYPE_ID = ?2 and CONSIGNMENT_CODE IN ?1 group by CONSIGNMENT_CODE)")
     public List<DeclaredInfo> getDeclaredInfoByAll(List<String> consignmentCodeList,Long consTypeId);
 }