fix bug：清单发送到电子订单报文机

src/main/java/com/emato/file/tunnel/config/properties/CPortProperties.java

@@ -13,12 +13,15 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @Data
 public class CPortProperties {
 
-    private String pushDir;
+    // 清单、撤单、退单、电子税单上报目录
+    private String qhdyPushDir;
 
+    // 报文回执目录，通用
     private String pullDir;
 
-    private Integer scanHandleSize;
-
-    private Boolean ceb621;
+    // 电子订单上报目录
+    private String zwPushDir;
 
+    // 单次处理回执报文个数
+    private Integer scanHandleSize;
 }

src/main/java/com/emato/file/tunnel/listener/ReportMessageListener.java

@@ -65,7 +65,9 @@ public class ReportMessageListener implements MessageListener, ChannelAwareMessa
             String msgFileName = jsonObject.get("msgFileName", String.class);
             String content = jsonObject.get("msgFileContent", String.class);
             String orderSn = jsonObject.get("orderSn", String.class);
-            String path = cPortProperties.getPushDir()  + "\\" + msgFileName;
+            // 电子订单与清单是不同的报文机，目录也不同
+            String pushDir = msgFileName.contains(MessageTypeEnum.CEB311.getType()) ? cPortProperties.getZwPushDir() : cPortProperties.getQhdyPushDir();
+            String path =  pushDir + "\\" + msgFileName;
             // 去除空格和换行符
             content = XmlUtil.cleanComment(content);
             content = XmlUtil.cleanInvalid(content);

src/main/java/com/emato/file/tunnel/scheduler/ScanPullDirectoryTask.java

@@ -7,11 +7,9 @@ import cn.hutool.core.util.XmlUtil;
 import cn.hutool.json.JSONUtil;
 import com.emato.file.tunnel.common.constant.MessageTypeEnum;
 import com.emato.file.tunnel.config.properties.CPortProperties;
-import com.emato.file.tunnel.config.properties.RabbitMQProperties;
 import com.emato.file.tunnel.router.ReceiptMessageRouter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -47,6 +45,7 @@ public class ScanPullDirectoryTask {
     @Scheduled(fixedRate = 3000)
     public void scanDirectory() {
         try {
+            // 回执目录都一样
             String pullDir = cPortProperties.getPullDir();
             List<String> fileNames = FileUtil.listFileNames(pullDir);
             // 根据设置的值处理多少个文件
@@ -254,10 +253,12 @@ public class ScanPullDirectoryTask {
     public void init () {
 
         String pullDir = cPortProperties.getPullDir();
-        String pushDir = cPortProperties.getPushDir();
+        String pushDir = cPortProperties.getQhdyPushDir();
+        String zwPushDir = cPortProperties.getZwPushDir();
 
         File pullDirName = new File(pullDir);
         File pushDirName = new File(pushDir);
+        File zwPushDirName = new File(zwPushDir);
 
         if (!pullDirName.exists()) {
             pullDirName.mkdirs();
@@ -268,6 +269,11 @@ public class ScanPullDirectoryTask {
             pushDirName.mkdirs();
             log.info("----- 检测到目录未创建， 创建目录: {} -----", pushDirName);
         }
+
+        if (!zwPushDirName.exists()) {
+            pushDirName.mkdirs();
+            log.info("----- 检测到目录未创建， 创建目录: {} -----", zwPushDirName);
+        }
     }
 
 }

src/main/resources/application.properties

@@ -1,41 +1,47 @@
 server.port=11111
-# \u5F00\u53D1\u73AF\u5883mq\u76F8\u5173\u914D\u7F6E
+## \u5F00\u53D1\u73AF\u5883mq\u76F8\u5173\u914D\u7F6E
 spring.rabbitmq.port=5672
 spring.rabbitmq.host=127.0.0.1
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
 spring.rabbitmq.virtual-host=/
-#\u4E0A\u62A5\u76EE\u5F55
-cport.push_dir=D:\\report\\report
-#\u56DE\u6267\u76EE\u5F55
+## \u6E05\u5355\u3001\u64A4\u5355\u3001\u9000\u5355\u3001\u7535\u5B50\u7A0E\u5355\u4E0A\u62A5\u76EE\u5F55
+cport.qhdy_push_dir=D:\\report\\report
+## \u6E05\u5355\u3001\u64A4\u5355\u3001\u9000\u5355\u3001\u7535\u5B50\u7A0E\u5355\u3001\u7535\u5B50\u8BA2\u5355\u56DE\u6267\u76EE\u5F55\uFF0C\u901A\u7528
 cport.pull_dir=D:\\report\\receipt
-# \u6D4B\u8BD5\u73AF\u5883mq\u76F8\u5173\u914D\u7F6E
+## \u7535\u5B50\u8BA2\u5355\u4E0A\u62A5\u76EE\u5F55
+cport.zw_push_dir=D:\\report311\\report
+## \u6D4B\u8BD5\u73AF\u5883mq\u76F8\u5173\u914D\u7F6E
 #spring.rabbitmq.port=5672
 #spring.rabbitmq.host=120.24.174.90
 #spring.rabbitmq.username=admin
 #spring.rabbitmq.password=Abc-123#
 #spring.rabbitmq.virtual-host=/
-#\u4E0A\u62A5\u76EE\u5F55
-#cport.push_dir=D:\\report\\report
-#\u56DE\u6267\u76EE\u5F55
+## \u6E05\u5355\u3001\u64A4\u5355\u3001\u9000\u5355\u3001\u7535\u5B50\u7A0E\u5355\u4E0A\u62A5\u76EE\u5F55
+#cport.qhdy_push_dir=D:\\report\\report
+## \u6E05\u5355\u3001\u64A4\u5355\u3001\u9000\u5355\u3001\u7535\u5B50\u7A0E\u5355\u3001\u7535\u5B50\u8BA2\u5355\u56DE\u6267\u76EE\u5F55\uFF0C\u901A\u7528
 #cport.pull_dir=D:\\report\\receipt
+## \u7535\u5B50\u8BA2\u5355\u4E0A\u62A5\u76EE\u5F55
+#cport.zw_push_dir=D:\\report311\\report
 
-# \u751F\u4EA7\u73AF\u5883mq\u76F8\u5173\u914D\u7F6E
+## \u751F\u4EA7\u73AF\u5883mq\u76F8\u5173\u914D\u7F6E
 #spring.rabbitmq.port=5672
 #spring.rabbitmq.host=120.76.26.84
 #spring.rabbitmq.username=admin
 #spring.rabbitmq.password=Abc-123#
 #spring.rabbitmq.virtual-host=/
-#\u4E0A\u62A5\u76EE\u5F55
-#cport.push_dir=E:\\SZDEC\\ReportSend
-#\u56DE\u6267\u76EE\u5F55
+## \u6E05\u5355\u3001\u64A4\u5355\u3001\u9000\u5355\u3001\u7535\u5B50\u7A0E\u5355\u4E0A\u62A5\u76EE\u5F55
+#cport.qhdy_push_dir=E:\\SZDEC\\ReportSend
+## \u6E05\u5355\u3001\u64A4\u5355\u3001\u9000\u5355\u3001\u7535\u5B50\u7A0E\u5355\u3001\u7535\u5B50\u8BA2\u5355\u56DE\u6267\u76EE\u5F55\uFF0C\u901A\u7528
 #cport.pull_dir=E:\\SZDEC\\ReceiptReceive
+## \u7535\u5B50\u8BA2\u5355\u4E0A\u62A5\u76EE\u5F55
+#cport.zw_push_dir=E:\\SZDEC311\\ReportSend
 
-# \u901A\u7528\u914D\u7F6E
+## \u901A\u7528\u914D\u7F6E
 
-# \u5FC3\u8DF3\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D: s
+## \u5FC3\u8DF3\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D: s
 spring.rabbitmq.requested-heartbeat=60
-# \u4FE1\u9053\u53EF\u7F13\u5B58\u7684\u6D88\u606F\u4E2A\u6570
+## \u4FE1\u9053\u53EF\u7F13\u5B58\u7684\u6D88\u606F\u4E2A\u6570
 spring.rabbitmq.cache.channel.size=50
-# \u8BBE\u7F6E\u56DE\u6267\u5355\u6B21\u5904\u7406\u7684\u4E2A\u6570
+## \u8BBE\u7F6E\u56DE\u6267\u5355\u6B21\u5904\u7406\u7684\u4E2A\u6570
 cport.scan_handle_size=90