发送确认信息到航通

sp-core/sp-api/src/main/java/com/pj/api/client/async_server/AsyncServerInterface.java

@@ -5,6 +5,7 @@ import com.pj.api.consts.FeignConsts;
 import com.pj.api.dto.ImportDeclarePeopleDto;
 import com.pj.api.dto.OrderDto;
 import com.pj.api.dto.OrdersDto;
+import com.pj.api.dto.PeopleConfirmDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,7 +40,14 @@ public interface AsyncServerInterface {
     @RequestMapping("/async/rpc/sendLevelTwoOrdersDto")
     public void sendLevelTwoOrdersDto(@RequestBody OrdersDto t, @RequestParam("dataType")String dataType);
 
+    /**
+     * 发送边民确认信息
+     */
+    @RequestMapping("async/rpc/sendConfirm")
+    void sendConfirm(@RequestBody PeopleConfirmDTO confirmDTO);
+
     /** 远程调用: 根据便民身份证号 和 进出口结算单号查询[进口申报单边民确认] 将该对象返还航通 */
     @RequestMapping("/HtImportDeclarePeople/rpc/getByIdNoAndPreleportNo")
     public ImportDeclarePeopleDto getByIdNoAndPreleportNo(@RequestParam("idNo")String idNo, @RequestParam("preleportNo")String preleportNo);
+
 }

sp-core/sp-api/src/main/java/com/pj/api/client/async_server/AsyncServerInterfaceFallback.java

@@ -4,6 +4,7 @@ import com.pj.api.client.cfg.SpCfgInterfaceFallback;
 import com.pj.api.dto.ImportDeclarePeopleDto;
 import com.pj.api.dto.OrderDto;
 import com.pj.api.dto.OrdersDto;
+import com.pj.api.dto.PeopleConfirmDTO;
 import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,6 +34,11 @@ public class AsyncServerInterfaceFallback implements FallbackFactory<AsyncServer
             }
 
             @Override
+            public void sendConfirm(PeopleConfirmDTO confirmDTO) {
+
+            }
+
+            @Override
             public ImportDeclarePeopleDto getByIdNoAndPreleportNo(String idNo, String preleportNo) {
                 log.error("边民身份证:{},进出口预申报单号:{}",idNo,preleportNo);
                 return null;

sp-core/sp-api/src/main/java/com/pj/api/dto/PeopleConfirmDTO.java

@@ -0,0 +1,96 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+
+public class PeopleConfirmDTO {
+
+    /**
+     * 边民身份证
+     */
+    private String idno;
+    /**
+     * 边民备案编号(可选)
+     */
+    private String borderPutrecNo;
+    /**
+     * : "边民姓名不能为空"
+     */
+    private String borderName;
+    /**
+     * "结算单号"
+     */
+    private String settleBillNo;
+    /**
+     * "进出口预申报单号",
+     */
+    @JsonProperty("preIeportNo")
+    private String preIeportNo;
+    /**
+     * : "购买申报确认状态：Y->确认购买申报，N->不购买申报",
+     */
+    @JsonProperty("buyConfirmStatus")
+    private String buyConfirmStatus="Y";
+    /**
+     * "支付状态：01->未支付，02->已支付"
+     */
+    @JsonProperty("payStatus")
+    private String payStatus="02";
+
+    public String getIdno() {
+        return idno;
+    }
+
+    public void setIdno(String idno) {
+        this.idno = idno;
+    }
+
+    public String getBorderPutrecNo() {
+        return borderPutrecNo;
+    }
+
+    public void setBorderPutrecNo(String borderPutrecNo) {
+        this.borderPutrecNo = borderPutrecNo;
+    }
+
+    public String getBorderName() {
+        return borderName;
+    }
+
+    public void setBorderName(String borderName) {
+        this.borderName = borderName;
+    }
+
+    public String getSettleBillNo() {
+        return settleBillNo;
+    }
+
+    public void setSettleBillNo(String settleBillNo) {
+        this.settleBillNo = settleBillNo;
+    }
+
+    public String getPreIeportNo() {
+        return preIeportNo;
+    }
+
+    public void setPreIeportNo(String preIeportNo) {
+        this.preIeportNo = preIeportNo;
+    }
+
+    public String getBuyConfirmStatus() {
+        return buyConfirmStatus;
+    }
+
+    public void setBuyConfirmStatus(String buyConfirmStatus) {
+        this.buyConfirmStatus = buyConfirmStatus;
+    }
+
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+}

sp-service/async-server/src/main/java/com/pj/feign/AmqpTemplateController.java

@@ -3,6 +3,7 @@ package com.pj.feign;
 
 import com.pj.api.dto.OrderDto;
 import com.pj.api.dto.OrdersDto;
+import com.pj.api.dto.PeopleConfirmDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,4 +44,12 @@ public class AmqpTemplateController {
         amqpTemplateFeign.sendObject(t,dataType);
     }
 
+    /**
+     * 边民确认-->发给航通
+     * @param confirmDTO
+     */
+    @RequestMapping("rpc/sendConfirm")
+    public void sendConfirm(@RequestBody PeopleConfirmDTO confirmDTO){
+        amqpTemplateFeign.sendObject(confirmDTO,"008");
+    }
 }

sp-service/async-server/src/main/java/com/pj/feign/AmqpTemplateFeign.java

@@ -8,6 +8,7 @@ import com.pj.rabbitmq.RabbitMQ;
 import com.pj.utils.IdWorker;
 import com.pj.utils.MD5;
 import com.pj.utils.ht.AESUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +21,7 @@ import java.util.Date;
  * @Date 2023 08 29 13 08
  **/
 @Service
+@Slf4j
 public class AmqpTemplateFeign {
 
     @Autowired
@@ -27,10 +29,12 @@ public class AmqpTemplateFeign {
 
     /**
      * 发送对象至航通
+     *
      * @param t
      * @param dataType
      */
-    public<T> void sendObject(T t, String dataType){
+    public <T> void sendObject(T t, String dataType) {
+        log.info("send data to ht:{},{}", dataType,JSON.toJSONString(t));
         //todo: 数据暂时定死
         DataDto dataDto = new DataDto();
         //msgId
@@ -56,7 +60,7 @@ public class AmqpTemplateFeign {
         dataDto.setSign(sign);
 
         //mq发送信息
-        amqpTemplate.convertAndSend(RabbitMQ.TEST_SEND_QUEUE,dataDto);
+        amqpTemplate.convertAndSend(RabbitMQ.TEST_SEND_QUEUE, dataDto);
     }
 
 

sp-service/async-server/src/main/java/com/pj/rabbitmq/RabbitMQ.java

@@ -31,21 +31,8 @@ public class RabbitMQ {
      */
     public static final String TEST_ACCEPT_ROUTING_KEY = "testSendKey";
 
-    /**
-     *  发送方MQ地址
-     */
-    public static final String MQ_ADDRESS = "192.168.0.23";
 
     /**
-     *  发送方MQ账号
-     */
-    public static final String MQ_SEND_USERNAME = "hdx";
-
-    /**
-     *  发送方MQ密码
-     */
-    public static final String MQ_SEND_PASSWORD = "hdx";
-    /**
      *  发送方MQ交换机名称
      */
     public static final String MQ_DIRECT_EXCHANGE = "test_exchange";

sp-service/async-server/src/main/java/com/pj/task/HtByteTask.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.async_server.AsyncServerInterface;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
 import com.pj.api.client.transport.TransportInterface;
+import com.pj.api.consts.FeignFactory;
 import com.pj.api.dto.*;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.dto.DataDto;
@@ -52,11 +53,7 @@ public class HtByteTask {
      */
     @Autowired
     private HtByteMapper htByteMapper;
-    /**
-     * 一级市场
-     */
-    @Autowired
-    private LevelOneServerInterface levelOneServerInterface;
+
     /**
      * 交易结算信息
      */
@@ -132,7 +129,7 @@ public class HtByteTask {
                     //对象转换
                     PeopleDto peopleDto = JSONObject.parseObject(body, PeopleDto.class);
                     //根据其内的身份证,有则新增,无则修改???
-                    flag = levelOneServerInterface.peopleDto(peopleDto);
+                    flag = FeignFactory.levelOneServerInterface.peopleDto(peopleDto);
                     methodHtByteTask.updateHtByteInfo(flag,item,dataDto);
                     if(!flag){
                         System.out.println("\n边民信息处理失败。 messageId = " + item.getMessageId() + "\n");
@@ -144,7 +141,7 @@ public class HtByteTask {
                     //商铺备案
                     ShopDto shopDto = JSONObject.parseObject(body, ShopDto.class);
                     //保存
-                    flag = levelOneServerInterface.shopDto(shopDto);
+                    flag = FeignFactory.levelOneServerInterface.shopDto(shopDto);
                     methodHtByteTask.updateHtByteInfo(flag,item,dataDto);
                     if(!flag){
                         System.out.println("\n店铺信息处理失败。 messageId = " + item.getMessageId() + "\n");
@@ -156,7 +153,7 @@ public class HtByteTask {
                     //边民互助组备案
                     GroupDto groupDto = JSONObject.parseObject(body, GroupDto.class);
                     //保存
-                    flag = levelOneServerInterface.groupDto(groupDto);
+                    flag = FeignFactory.levelOneServerInterface.groupDto(groupDto);
                     methodHtByteTask.updateHtByteInfo(flag,item,dataDto);
                     if(!flag){
                         System.out.println("\n互助组信息处理失败。 messageId = " + item.getMessageId() + "\n");
@@ -168,7 +165,7 @@ public class HtByteTask {
                     //边民合作社备案
                     CooperativeDto cooperativeDto = JSONObject.parseObject(body, CooperativeDto.class);
                     //保存
-                    flag = levelOneServerInterface.cooperativeDto(cooperativeDto);
+                    flag = FeignFactory.levelOneServerInterface.cooperativeDto(cooperativeDto);
                     methodHtByteTask.updateHtByteInfo(flag,item,dataDto);
                     if(!flag){
                         System.out.println("\n边民合作社信息处理失败。 messageId = " + item.getMessageId() + "\n");
@@ -180,7 +177,7 @@ public class HtByteTask {
                     //商品基础信息
                     GoodsDto goodsDto = JSONObject.parseObject(body, GoodsDto.class);
                     //保存
-                    flag = levelOneServerInterface.goodsDto(goodsDto);
+                    flag = FeignFactory.levelOneServerInterface.goodsDto(goodsDto);
                     methodHtByteTask.updateHtByteInfo(flag,item,dataDto);
                     if(!flag){
                         System.out.println("\n海关监管商品信息处理失败。 messageId = " + item.getMessageId() + "\n");