提前运抵

-#\u8BBE\u7F6E\u8BBF\u95EE\u7AEF\u53E3
+
 server.port=8848
 server.port=8848
-#eureka\u6CE8\u518C\u4E2D\u5FC3\u670D\u52A1\u5668\u5730\u5740
+
 #eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/
 #eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/
-#\u670D\u52A1\u540D
-#spring.application.name=AnalysisForStation
-#\u8BBE\u7F6E\u70ED\u90E8\u7F72
-#\u5F00\u542F\u70ED\u90E8\u7F72
+eureka.client.service-url.defaultZone=http://192.168.1.53:12345/eureka/
+
+spring.application.name=kako_analysisforstation
+
+
 spring.devtools.restart.enabled=true
 spring.devtools.restart.enabled=true
-#\u91CD\u542F\u8303\u56F4
+
 spring.devtools.restart.additional-paths=src/main/java
 spring.devtools.restart.additional-paths=src/main/java
-#\u6620\u5C04\u524D\u7F00
+
 spring.mvc.view.suffix=/WEB-INF/jsp/
 spring.mvc.view.suffix=/WEB-INF/jsp/
-#\u6620\u5C04\u540E\u7F00
+
 spring.mvc.view.prefix=.jsp
 spring.mvc.view.prefix=.jsp
-#\u8BBE\u7F6E\u672C\u5730\u6570\u636E\u6E90
+
 spring.datasource.username=110
 spring.datasource.username=110
 spring.datasource.password=QAHqCJf2kFYCLirM
 spring.datasource.password=QAHqCJf2kFYCLirM
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://118.31.66.166:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
 spring.datasource.url=jdbc:mysql://118.31.66.166:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
-#\u8BBE\u7F6E\u7EBF\u4E0A\u6570\u636E\u6E90
+
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://localhost:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
 #spring.datasource.url=jdbc:mysql://localhost:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
 #spring.datasource.username=station
 #spring.datasource.username=station
 #spring.datasource.password=station@10.50.7.70
 #spring.datasource.password=station@10.50.7.70
-#\u8FDE\u63A5\u6C60\u7C7B
+
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-#\u8FDE\u63A5\u6C60\u914D\u7F6E\uFF0C\u56E0\u4E3Aspringboot\u9ED8\u8BA4\u662F\u5F00\u542F\u4E86\u8FDE\u63A5\u6C60\u7684\uFF0C\u5B83\u6709\u9ED8\u8BA4\u914D\u7F6E\uFF0C\u8FD9\u4E00\u6BB5\u53EF\u4EE5\u5FFD\u7565
-# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
+
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.min-idle=5
 spring.datasource.druid.min-idle=5
 spring.datasource.druid.max-active=20
 spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+
 spring.datasource.druid.max-wait=60000
 spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
 spring.datasource.druid.time-between-eviction-runs-millis=60000
 spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
 spring.datasource.druid.min-evictable-idle-time-millis=300000
 spring.datasource.druid.min-evictable-idle-time-millis=300000
 spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
 spring.datasource.druid.test-on-return=false
-# \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
 spring.datasource.druid.pool-prepared-statements=true
 spring.datasource.druid.pool-prepared-statements=true
 spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
 spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
-# \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
 spring.datasource.druid.filters=stat,wall,log4j
 spring.datasource.druid.filters=stat,wall,log4j
-# \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
 spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
 spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
 #\u914D\u7F6Emybatis
 #\u914D\u7F6Emybatis
 mybatis.mapper-locations=classpath:mapping/*.xml
 mybatis.mapper-locations=classpath:mapping/*.xml
-#\u5168\u5C40\u7684\u6620\u5C04\uFF0C\u4E0D\u7528\u5728xml\u6587\u4EF6\u5199\u5B9E\u4F53\u7C7B\u7684\u5168\u8DEF\u5F84
 mybatis.type-aliases-package=com.sy.model
 mybatis.type-aliases-package=com.sy.model
 #\u5F00\u542F\u9A7C\u5CF0\u6620\u5C04
 #\u5F00\u542F\u9A7C\u5CF0\u6620\u5C04
 mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.configuration.map-underscore-to-camel-case=true
@@ -59,3 +53,11 @@ pagehelper.helper-dialect=mysql
 pagehelper.reasonable=true
 pagehelper.reasonable=true
 pagehelper.support-methods-arguments=true
 pagehelper.support-methods-arguments=true
 pagehelper.params=count=countSql
 pagehelper.params=count=countSql
+# 是否启用httpclient
+feign.httpclient.enabled=false
+# 是否启用httpok（性能比httpclient高）
+feign.okhttp.enabled=true
+# 是否启用hystrix
+feign.hystrix.enabled=true
+# 请求连接超时时间（毫秒）
+feign.httpclient.connection-timeout=3000

@@ -18,6 +18,7 @@ STYP=CARM
 #\u8F7D\u91CD\u4E0E\u79F0\u91CD\u7684\u53EF\u63A7\u8303\u56F4 ?%
 #\u8F7D\u91CD\u4E0E\u79F0\u91CD\u7684\u53EF\u63A7\u8303\u56F4 ?%
 grossWt=5%
 grossWt=5%
 station=4600329012
 station=4600329012
+stationsf=4600541001
 
 
 #\u4E8C\u7EF4\u7801\u5B58\u653E\u8DEF\u5F84\uFF0C\u9879\u76EE\u542F\u52A8\u65F6\u8BBE\u7F6E\uFF0C\u540E\u671F\u4E0D\u80FD\u66F4\u6539\u3002
 #\u4E8C\u7EF4\u7801\u5B58\u653E\u8DEF\u5F84\uFF0C\u9879\u76EE\u542F\u52A8\u65F6\u8BBE\u7F6E\uFF0C\u540E\u671F\u4E0D\u80FD\u66F4\u6539\u3002
 #barCode = barcode/
 #barCode = barcode/

@@ -26,6 +26,7 @@
     </properties>
     </properties>
 
 
     <dependencies>
     <dependencies>
+
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
@@ -34,15 +35,19 @@
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         </dependency>
-<!--        <dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>-->
+        </dependency>
         <dependency>
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.2</version>
             <version>1.3.2</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
 
 
         <dependency>
         <dependency>
             <groupId>mysql</groupId>
             <groupId>mysql</groupId>
@@ -413,6 +418,16 @@
             <artifactId>httpclient</artifactId>
             <artifactId>httpclient</artifactId>
             <version>4.5.5</version>
             <version>4.5.5</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
 
 
 
     </dependencies>
     </dependencies>
@@ -457,6 +472,13 @@
                     <verbose>true</verbose>
                     <verbose>true</verbose>
                 </configuration>
                 </configuration>
             </plugin>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
     <repositories>
     <repositories>

@@ -4,8 +4,9 @@ import com.sy.bwAnalysis.AnalysisRoute;
 import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
-
+@EnableFeignClients
 @SpringBootApplication
 @SpringBootApplication
 @EnableScheduling
 @EnableScheduling
 //不连接数据库开启服务
 //不连接数据库开启服务
@@ -18,7 +19,7 @@ public class AnalysisImfApplication {
         SpringApplication.run(AnalysisImfApplication.class, args);
         SpringApplication.run(AnalysisImfApplication.class, args);
 
 
         /*String message="<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
         /*String message="<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<MSG><META><SNDR>KAO</SNDR><RCVR></RCVR><SEQN>20200924082928</SEQN><DDTM>20200924082928</DDTM><TYPE>KAKO</TYPE><STYP>CARM</STYP></META><GATHER_INFO AREA_ID=\"\t\t4600329012\" CHNL_NO=\"\t\t4600010005\" I_E_TYPE=\"E\" SEQ_NO=\"20200924082701000001\">\n" +
+                "<MSG><META><SNDR>KAO</SNDR><RCVR></RCVR><SEQN>20200924082928</SEQN><DDTM>20200924082928</DDTM><TYPE>KAKO</TYPE><STYP>CARM</STYP></META><GATHER_INFO AREA_ID=\"\t\t4600329012\" CHNL_NO=\"\t\t4600010005\" I_E_TYPE=\"I\" SEQ_NO=\"20200924082701000001\">\n" +
                 " <IC>\n" +
                 " <IC>\n" +
                 "  <DR_IC_NO/>\n" +
                 "  <DR_IC_NO/>\n" +
                 "  <IC_DR_CUSTOMS_NO/>\n" +
                 "  <IC_DR_CUSTOMS_NO/>\n" +

@@ -40,13 +40,13 @@ public class IMF_Tesk {
             /**
             /**
              * 往IMF发送报文
              * 往IMF发送报文
              */
              */
-            if(!KAKO_Sender.isrunning){
+            /*if(!KAKO_Sender.isrunning){
                 KAKO_Sender kako_sender = new KAKO_Sender(client);
                 KAKO_Sender kako_sender = new KAKO_Sender(client);
                 kako_sender.start();
                 kako_sender.start();
                 logger.info("<<<<<<<<<KAKO发送线程已开启>>>>>>>>>>>>");
                 logger.info("<<<<<<<<<KAKO发送线程已开启>>>>>>>>>>>>");
             }else {
             }else {
                 logger.info("<<<<<<<<<KAKO发送线程已开启-不再启动线程>>>>>>>>>>>>");
                 logger.info("<<<<<<<<<KAKO发送线程已开启-不再启动线程>>>>>>>>>>>>");
-            }
+            }*/
 
 
         }
         }
         if (!LOGIN_OK){
         if (!LOGIN_OK){

@@ -14,13 +14,13 @@ public class KAKO_Reader extends Thread{
     }
     }
 
 
     public void run() {
     public void run() {
-
         try{
         try{
             isrunning =true;
             isrunning =true;
+            logger.info("********读取线程状态true**********");
             while(true) {
             while(true) {
-                if (IMF_Tesk.LOGIN_OK) synchronized (this) {
+                if (IMF_Tesk.LOGIN_OK){
                     String message = this.client.getMSG();
                     String message = this.client.getMSG();
-
+                    logger.info("读取线程已获取到消息");
                     if (message != null) {
                     if (message != null) {
                      //   logger.info(message);
                      //   logger.info(message);
                         AnalysisRoute.analysis(message);
                         AnalysisRoute.analysis(message);
@@ -44,6 +44,8 @@ public class KAKO_Reader extends Thread{
         }catch (Exception e){
         }catch (Exception e){
             isrunning=false;
             isrunning=false;
             logger.info("****************读取线程不在了****************");
             logger.info("****************读取线程不在了****************");
+            logger.info("解析消息出错----------->"+e.toString());
         }
         }
+        isrunning=false;
     }
     }
 }
 }

@@ -86,15 +86,19 @@ public class AnalysisRoute {
                 GatherInfo info = gatherInfoAnalysis.toJavaBean(message);
                 GatherInfo info = gatherInfoAnalysis.toJavaBean(message);
                 if(info.getBarcode().length()>0){
                 if(info.getBarcode().length()>0){
                     //LogicOperation.operation(info)
                     //LogicOperation.operation(info)
-                    if(LiftBar.liftBar(info)){
-                        String type = null;
-                        if("I".equals(info.getIetype())){
-                            type="进入";
-                        }else{
-                            type="离开";
+                    try {
+                        if(LiftBar.liftBar(info)){
+                            String type = null;
+                            if("I".equals(info.getIetype())){
+                                type="进入";
+                            }else{
+                                type="离开";
+                            }
+                            logger.info("进出站业务申请成功");
+                            logger.info("------->>>>>>>"+info.getVename()+"已"+type+info.getAreaid()+"场站<<<<<<<-----");
                         }
                         }
-                        logger.info("进出站业务申请成功");
-                        logger.info("------->>>>>>>"+info.getVename()+"已"+type+info.getAreaid()+"场站<<<<<<<-----");
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
                     }
                     }
                 }else{
                 }else{
                     if("4604000000".equals(info.getAreaid())){
                     if("4604000000".equals(info.getAreaid())){

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.sy.crossDomain.buildBarCode;
 import com.sy.crossDomain.buildBarCode;
 import com.sy.model.*;
 import com.sy.model.*;
 import com.sy.relation.VeManifestRelation;
 import com.sy.relation.VeManifestRelation;
-import com.sy.service.EnterCancelServer;
-import com.sy.service.LandBusListService;
-import com.sy.service.LandRoadVeService;
-import com.sy.service.ResMessageService;
+import com.sy.service.*;
 import com.sy.socket.CommandClient;
 import com.sy.socket.CommandClient;
 import com.sy.utils.FileTool;
 import com.sy.utils.FileTool;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntity;
@@ -19,6 +16,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.apache.http.util.EntityUtils;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.PropertyConfigurator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 
 
@@ -33,6 +31,7 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -48,6 +47,10 @@ public class LiftBar {
     private ResMessageService resMessageService;//查询运单放行表
     private ResMessageService resMessageService;//查询运单放行表
     @Autowired
     @Autowired
     private EnterCancelServer enterCancelServer;//调拨业务单独记录表
     private EnterCancelServer enterCancelServer;//调拨业务单独记录表
+    @Autowired
+    private BusnesslistinfoService busnesslistinfoService;
+    @Autowired
+    BusnessViewService busnessViewService;
     private static LiftBar logic = new LiftBar();
     private static LiftBar logic = new LiftBar();
     //从配置文件中读取货物重差可控范围
     //从配置文件中读取货物重差可控范围
     private static String checkWt = FileTool.readProperties("grossWt");
     private static String checkWt = FileTool.readProperties("grossWt");
@@ -62,6 +65,8 @@ public class LiftBar {
     private static String IEPORSE = "无相对应进出场申请";
     private static String IEPORSE = "无相对应进出场申请";
     private static String FANGXING="有运单未放行";
     private static String FANGXING="有运单未放行";
 
 
+    @Autowired
+    private FeignService feignService;
     @PostConstruct
     @PostConstruct
     public void init() {
     public void init() {
         logic = this;
         logic = this;
@@ -69,13 +74,16 @@ public class LiftBar {
         logic.veService = this.veService;
         logic.veService = this.veService;
         logic.resMessageService = this.resMessageService;
         logic.resMessageService = this.resMessageService;
         logic.enterCancelServer = this.enterCancelServer;
         logic.enterCancelServer = this.enterCancelServer;
+        logic.feignService=this.feignService;
+        logic.busnesslistinfoService=this.busnesslistinfoService;
+        logic.busnessViewService=this.busnessViewService;
     }
     }
 
 
     /**
     /**
      * @Param info 卡口采集数据
      * @Param info 卡口采集数据
      * @Result 计算卡口采集数据并发送报文
      * @Result 计算卡口采集数据并发送报文
      */
      */
-    public static boolean liftBar(GatherInfo info) {
+    public static boolean liftBar(GatherInfo info) throws InterruptedException {
         PropertyConfigurator.configure("config/log4j.properties");
         PropertyConfigurator.configure("config/log4j.properties");
         //默认返回值
         //默认返回值
         boolean result = false;
         boolean result = false;
@@ -118,7 +126,9 @@ public class LiftBar {
             if("I".equals(info.getIetype())){
             if("I".equals(info.getIetype())){
                 //进场申请宽进
                 //进场申请宽进
                 checkResult=true;
                 checkResult=true;
-            }else{
+
+            }
+            else{
                 //获取对应场站进场申请的货物重量，进场过磅重量
                 //获取对应场站进场申请的货物重量，进场过磅重量
                 List<LandBusinessTypeList> listWt=logic.listService.selectwt(list.getTrailerFrameNo(),list.getBarcode(),list.getEndstation(),"I");
                 List<LandBusinessTypeList> listWt=logic.listService.selectwt(list.getTrailerFrameNo(),list.getBarcode(),list.getEndstation(),"I");
                 for(LandBusinessTypeList typeList:listWt){
                 for(LandBusinessTypeList typeList:listWt){
@@ -133,7 +143,7 @@ public class LiftBar {
                     diffVal = inWt- growssWt;
                     diffVal = inWt- growssWt;
                 }
                 }
                 //判断场站出场是否要重量校验
                 //判断场站出场是否要重量校验
-                if(FileTool.readProperties("station").equals(list.getEndstation())){
+                if(FileTool.readProperties("station").equals(list.getEndstation())||FileTool.readProperties("stationsf").equals(list.getEndstation())){
                     checkResult=true;
                     checkResult=true;
                 }else if(!"普通货".equals(list.getCocode())){
                 }else if(!"普通货".equals(list.getCocode())){
                     checkResult=true;
                     checkResult=true;
@@ -183,6 +193,38 @@ public class LiftBar {
                 if(count==0){
                 if(count==0){
                     buildBarCode.cancleBarCode(vaName);
                     buildBarCode.cancleBarCode(vaName);
                 }
                 }
+                /**
+                * 提前运抵判断
+                * 如果有提前运抵标识，判断是否分批，不分批直接通知
+                 * 分批是否最后一批，最后一批通知
+                * */
+                if("I".equals(info.getIetype())){
+                    try{
+                        List<LAND_BUSINEESTYPE_LIST_INFO> arrive_infos=logic.busnesslistinfoService.selectarrvie(info.getBarcode());//查询是否提前运抵
+                        if(arrive_infos!=null && arrive_infos.size()>0){
+                            for (LAND_BUSINEESTYPE_LIST_INFO businees:arrive_infos) {
+                                //判断运单是否分批
+                                if ("0".equals(businees.getPartialidentity())){
+                                    logger.info("运单号{}不分批，不从通知数组删除");
+                                }else { //分批后的处理
+                                    List<businesstypelistinfo_view> info_view=logic.busnessViewService.selectawb(businees.getAwba());
+                                    // 装载运单的分批车辆还有未入场的，从通知数组中删除他
+                                    if (info_view.size()>0){
+                                        arrive_infos.remove(businees);
+                                    }
+                                }
+                            }
+                            //最后发送通知数组
+                            try{
+                                new LiftBar().sendMessage(info.getVename(),arrive_infos);
+                            }catch (Exception e){
+                               logger.info("新舱单发送消息异常---"+e.toString());
+                            }
+                        }
+                    }catch (Exception e){
+                        logger.info("运单分批消息异常---"+e.toString());
+                    }
+                }
                 //调拨货冻结
                 //调拨货冻结
                 if (list.getBusinesstype().indexOf("业务") > 0) {
                 if (list.getBusinesstype().indexOf("业务") > 0) {
                     logic.inOrUpEnterCancel(list);
                     logic.inOrUpEnterCancel(list);
@@ -227,7 +269,7 @@ public class LiftBar {
      * @param IEtype
      * @param IEtype
      */
      */
     public static void sendData(String stationCode, String carNo, boolean IEtype) {
     public static void sendData(String stationCode, String carNo, boolean IEtype) {
-        String url = "http://10.50.3.73:8080/air-api/car/channelCar?stationCode=" + stationCode + "&carNo=" + carNo + "&isPickup=" + IEtype;
+        String url = "http://10.50.3.73:8881/air-api/car/channelCar?stationCode=" + stationCode + "&carNo=" + carNo + "&isPickup=" + IEtype;
         try {
         try {
             HttpClient httpClient = new DefaultHttpClient();
             HttpClient httpClient = new DefaultHttpClient();
             HttpGet httpGet = new HttpGet(url);
             HttpGet httpGet = new HttpGet(url);
@@ -262,7 +304,11 @@ public class LiftBar {
             }
             }
             //TODO:加场站判定
             //TODO:加场站判定
         }
         }
-        sendData(sationCode, list.getTrailerFrameNo(), flag);
+        try{
+            sendData(sationCode, list.getTrailerFrameNo(), flag);
+        }catch (Exception e){
+            logger.info("码头发送消息异常---"+e.toString());
+        }
     }
     }
     /**
     /**
      * 查询运单是否全部放行
      * 查询运单是否全部放行
@@ -390,7 +436,7 @@ public class LiftBar {
             logger.info("访问返回的数据重量：" + bg);
             logger.info("访问返回的数据重量：" + bg);
             in.close();
             in.close();
         } catch (MalformedURLException e) {
         } catch (MalformedURLException e) {
-            e.printStackTrace();
+            logger.info("运单放行消息异常---"+e.toString());
             logger.error(e);
             logger.error(e);
         } catch (IOException e) {
         } catch (IOException e) {
             e.printStackTrace();
             e.printStackTrace();
@@ -422,7 +468,7 @@ public class LiftBar {
         try {
         try {
             m = nf.parse(checkWt);//将百分数转换成Number类型
             m = nf.parse(checkWt);//将百分数转换成Number类型
         } catch (ParseException e) {
         } catch (ParseException e) {
-            e.printStackTrace();
+            logger.info("重量校验消息异常---"+e.toString());
             logger.info(e.getMessage());
             logger.info(e.getMessage());
         }
         }
         return m.doubleValue();
         return m.doubleValue();
@@ -478,6 +524,22 @@ public class LiftBar {
             }
             }
         }
         }
     }
     }
-
+    /**
+     * 为提前运抵服务发送数据
+     *
+     * @param
+     * @param
+     * @return
+     */
+    @Async("asyncPoolTaskExecutor")
+    public void sendMessage(String vname, List<LAND_BUSINEESTYPE_LIST_INFO> list_infos)throws InterruptedException{
+        logger.info("新舱单发送服务开始");
+        AdvanceArrive arrive=new AdvanceArrive();
+        arrive.setVname(vname);
+        arrive.setMasterList(list_infos);
+        logger.info("新舱单发送服务数据",arrive);
+        Map<String,Object> map=logic.feignService.sendMessage(arrive);
+        logger.info(""+map);
+    }
 }
 }
 
 

+package com.sy.model;
+
+import java.util.List;
+
+public class AdvanceArrive extends Throwable {
+    private String vname;
+    private List<LAND_BUSINEESTYPE_LIST_INFO> masterList;
+
+    public String getVname() {
+        return vname;
+    }
+
+    public void setVname(String vname) {
+        this.vname = vname;
+    }
+
+    public List<LAND_BUSINEESTYPE_LIST_INFO> getMasterList() {
+        return masterList;
+    }
+
+    public void setMasterList(List<LAND_BUSINEESTYPE_LIST_INFO> masterList) {
+        this.masterList = masterList;
+    }
+}

+package com.sy.service;
+
+import com.sy.model.businesstypelistinfo_view;
+
+import java.util.List;
+
+public interface BusnessViewService {
+    List<businesstypelistinfo_view> selectawb(String awba);
+}

+package com.sy.service;
+
+import com.sy.model.LAND_BUSINEESTYPE_LIST_INFO;
+
+import java.util.List;
+
+public interface BusnesslistinfoService {
+    List<LAND_BUSINEESTYPE_LIST_INFO> selectarrvie(String applicationformid);
+    List<LAND_BUSINEESTYPE_LIST_INFO> selectpartialidentity(String applicationformid);
+}

+package com.sy.service;
+
+import com.sy.model.AdvanceArrive;
+import com.sy.service.impl.MessageServiceHystrix;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.Map;
+
+@Component
+@FeignClient(value = "wlpt-nmms-manage",fallback = MessageServiceHystrix.class)
+public interface FeignService {
+    @PostMapping("/arrive/forkako")
+    Map<String,Object> sendMessage(AdvanceArrive arrive);
+}

+package com.sy.service.impl;
+
+import com.sy.mapper.businesstypelistinfo_viewMapper;
+import com.sy.model.businesstypelistinfo_view;
+import com.sy.service.BusnessViewService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class BusnessViewImpl implements BusnessViewService {
+    @Autowired
+    businesstypelistinfo_viewMapper businesstypelistinfo_viewMapper;
+    @Override
+    public List<businesstypelistinfo_view> selectawb(String awba) {
+        return businesstypelistinfo_viewMapper.selectawb(awba);
+    }
+}

+package com.sy.service.impl;
+
+import com.sy.mapper.LAND_BUSINEESTYPE_LIST_INFOMapper;
+import com.sy.model.LAND_BUSINEESTYPE_LIST_INFO;
+import com.sy.service.BusnesslistinfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class BusnesslistinfoImpl implements BusnesslistinfoService {
+    @Autowired
+    LAND_BUSINEESTYPE_LIST_INFOMapper list_infoMapper;
+    @Override
+    public List<LAND_BUSINEESTYPE_LIST_INFO> selectarrvie(String applicationformid) {
+        return list_infoMapper.selectarrive(applicationformid);
+    }
+
+    @Override
+    public List<LAND_BUSINEESTYPE_LIST_INFO> selectpartialidentity(String applicationformid) {
+        return list_infoMapper.selectpartialidentity(applicationformid);
+    }
+}

+package com.sy.service.impl;
+
+import com.sy.model.AdvanceArrive;
+import com.sy.service.FeignService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @author
+ * @time 2020-03-05 11:45
+ * @desc
+ * @email vokes0069@163.com
+ */
+@Service
+public class MessageServiceHystrix implements FeignService {
+
+    private static final Logger logger = LoggerFactory.getLogger(MessageServiceHystrix.class);
+
+
+    @Override
+    public Map<String, Object> sendMessage(AdvanceArrive arrive) {
+        logger.info("发送数据成功",arrive);
+        return null;
+    }
+}

+package com.sy.utils;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+public class Config {
+    @Bean(name = "asyncPoolTaskExecutor")
+    public ThreadPoolTaskExecutor getAsyncThreadPoolTaskExecutor() {
+        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+        taskExecutor.setCorePoolSize(20);
+        taskExecutor.setMaxPoolSize(200);
+        taskExecutor.setQueueCapacity(25);
+        taskExecutor.setKeepAliveSeconds(200);
+        taskExecutor.setThreadNamePrefix("oKong-");
+        // 线程池对拒绝任务（无线程可用）的处理策略，目前只支持AbortPolicy、CallerRunsPolicy；默认为后者
+        taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        //调度器shutdown被调用时等待当前被调度的任务完成
+        taskExecutor.setWaitForTasksToCompleteOnShutdown(true);
+        //等待时长
+        taskExecutor.setAwaitTerminationSeconds(60);
+        taskExecutor.initialize();
+        return taskExecutor;
+    }
+}

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
 <generatorConfiguration>
     <classPathEntry
     <classPathEntry
-            location="E:\java\mavenRepository\mysql\mysql-connector-java\5.1.37\mysql-connector-java-5.1.37.jar"/>
+            location="/Users/xuyonghui/XYH/MAVEN/mysql-connector-java-5.1.38.jar"/>
     <context id="DB2Tables" targetRuntime="MyBatis3">
     <context id="DB2Tables" targetRuntime="MyBatis3">
         <commentGenerator>
         <commentGenerator>
             <property name="suppressDate" value="true"/>
             <property name="suppressDate" value="true"/>
@@ -13,8 +13,8 @@
         </commentGenerator>
         </commentGenerator>
         <!--数据库链接URL，用户名、密码 -->
         <!--数据库链接URL，用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://localhost:3306/station"
-                        userId="root" password="root">
+                        connectionURL="jdbc:mysql://118.31.66.166:3306/station"
+                        userId="110" password="QAHqCJf2kFYCLirM">
         </jdbcConnection>
         </jdbcConnection>
         <javaTypeResolver>
         <javaTypeResolver>
             <property name="forceBigDecimals" value="false"/>
             <property name="forceBigDecimals" value="false"/>
@@ -78,9 +78,9 @@
                enableUpdateByExample="false"
                enableUpdateByExample="false"
                enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false">
                enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false">
         </table>-->
         </table>-->
-        <table tableName="t_air_repertory" domainObjectName="T_AIR_REPERTORY" enableCountByExample="false"
+        <table tableName="businesstypelistinfo_view" domainObjectName="businesstypelistinfo_view" enableCountByExample="false"
                enableUpdateByExample="false"
                enableUpdateByExample="false"
                enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false">
                enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false">
         </table>
         </table>
     </context>
     </context>
-</generatorConfiguration>
+</generatorConfiguration>