Merge remote-tracking branch 'origin/ver_bh' into ver_bh

@@ -118,6 +118,7 @@ public class LiftBar {
     /**
     /**
      * @Param info 卡口采集数据
      * @Param info 卡口采集数据
      * @Result 计算卡口采集数据并发送报文
      * @Result 计算卡口采集数据并发送报文
+     * todo:有问题待解决，拉货进地磅重量<备案重量，出口送货出区过磅重量<进过磅重量
      */
      */
     public  boolean liftBar(GatherInfo info) throws InterruptedException {
     public  boolean liftBar(GatherInfo info) throws InterruptedException {
         PropertyConfigurator.configure("config/log4j.properties");
         PropertyConfigurator.configure("config/log4j.properties");
@@ -147,6 +148,7 @@ public class LiftBar {
             return result;
             return result;
         }
         }
         if("Y".equals(ve.getVeState())){
         if("Y".equals(ve.getVeState())){
+            logger.info(BLACKLIST+vaName);
             sendBw(info,false,BLACKLIST + vaName,new LandBusinessTypeList(),listinfos);
             sendBw(info,false,BLACKLIST + vaName,new LandBusinessTypeList(),listinfos);
             return result;
             return result;
         }
         }
@@ -461,7 +463,7 @@ public class LiftBar {
             flag = true;
             flag = true;
         } else {
         } else {
             CommandClient.Client(info, reason);
             CommandClient.Client(info, reason);
-            logger.info("=============>>>>>>>>重量异常报文发送成功<<<<<<<<<==============");
+            logger.info("=============>>>>>>>>"+reason+"<<<<<<<<<==============");
         }
         }
         commandlog(info,check,reason,land,list_infos);
         commandlog(info,check,reason,land,list_infos);
         return flag;
         return flag;

@@ -43,6 +43,7 @@
     from land_busineestype_list_info
     from land_busineestype_list_info
     where 1=1
     where 1=1
     and applicationFormId = #{applicationformid,jdbcType=VARCHAR}
     and applicationFormId = #{applicationformid,jdbcType=VARCHAR}
+    and ext4='B'
   </select>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from land_busineestype_list_info
     delete from land_busineestype_list_info