日志框架更改

@@ -199,7 +199,7 @@ public class GatherInfoHandle implements GatherInfoService {
 
 
         }catch (Exception e){
         }catch (Exception e){
             log.error("放行判定异常",e);
             log.error("放行判定异常",e);
-            CommandClient.Client(gatherInfo, "放行判定异常");
+            CommandClient.Client(gatherInfo, "放行判定程序异常");
         }
         }
 
 
 
 
@@ -452,7 +452,7 @@ public class GatherInfoHandle implements GatherInfoService {
                         }else {
                         }else {
                             //有运单未放行
                             //有运单未放行
                             log.error("[进口提货]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList());
                             log.error("[进口提货]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList());
-                            sendBw(info,false,FANGXING+landBusinessTypeList.getMasterList(),landBusinessTypeList,listinfos);
+                            sendBw(info,false,FANGXING,landBusinessTypeList,listinfos);
                             return false;
                             return false;
                         }
                         }
                     }
                     }

@@ -2,6 +2,7 @@ package com.sy.socket;
 
 
 import com.sy.model.CommandInfoX22;
 import com.sy.model.CommandInfoX22;
 import com.sy.model.GatherInfo;
 import com.sy.model.GatherInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
@@ -11,10 +12,8 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.net.UnknownHostException;
 
 
 @Component
 @Component
+@Slf4j
 public class CommandClient {
 public class CommandClient {
-
-    private static final Logger logger = Logger.getLogger(CommandClient.class);
-
     private static final String GATHER_TEMPLATE = "<GATHER_INFO AREA_ID=\"${AREA_ID}\" CHNL_NO=\"${CHNL_NO}\" I_E_TYPE=\"${I_E_TYPE}\" SEQ_NO=\"${SEQ_NO}\">\n" +
     private static final String GATHER_TEMPLATE = "<GATHER_INFO AREA_ID=\"${AREA_ID}\" CHNL_NO=\"${CHNL_NO}\" I_E_TYPE=\"${I_E_TYPE}\" SEQ_NO=\"${SEQ_NO}\">\n" +
             "\t<IC>\n" +
             "\t<IC>\n" +
             "\t\t<DR_IC_NO/>\n" +
             "\t\t<DR_IC_NO/>\n" +
@@ -122,14 +121,14 @@ public class CommandClient {
             op.write(allByte);
             op.write(allByte);
             op.flush();
             op.flush();
             op.close();
             op.close();
-            logger.info("发送完毕");
+            log.info("发送完毕");
             socket.close();
             socket.close();
         } catch (UnknownHostException e) {
         } catch (UnknownHostException e) {
             e.printStackTrace();
             e.printStackTrace();
-            logger.info("创建连接失败"+e.getMessage());
+            log.info("创建连接失败"+e.getMessage());
         } catch (IOException e) {
         } catch (IOException e) {
             e.printStackTrace();
             e.printStackTrace();
-            logger.info("文件发送失败"+e.getMessage());
+            log.info("文件发送失败"+e.getMessage());
         }
         }
     }
     }
     /**
     /**

@@ -141,7 +141,7 @@ public class GatherInfoHandleImplTest {
      */
      */
     private static String CHCEK_RESULT_CODE_E_SUC= "00000000100000000000";
     private static String CHCEK_RESULT_CODE_E_SUC= "00000000100000000000";
 
 
-    private static String RESULT_CODE_DES_SUC = "直接放行";
+    private static String RESULT_CODE_DES_SUC = "海关放行";
 
 
     private static String RESULT_CODE_DES_ERR = "不放行";
     private static String RESULT_CODE_DES_ERR = "不放行";
 
 
@@ -216,11 +216,11 @@ public class GatherInfoHandleImplTest {
         //车牌号
         //车牌号
         String voNo = "豫A61CR7";
         String voNo = "豫A61CR7";
         //过卡重量
         //过卡重量
-        String cross_weight= String.valueOf(4300+3100);
+        String cross_weight= String.valueOf(1660+24255);
         //场站编号
         //场站编号
         String areaID = AREA_BEIHUO;
         String areaID = AREA_BEIHUO;
         //通道编号
         //通道编号
-        String chnlNo = CHANEL_BEIHUO_C1_E2;
+        String chnlNo = CHANEL_BEIHUO_C1_E1;
         //进出场类型I/E
         //进出场类型I/E
         String ie = "E";
         String ie = "E";
         //二维码
         //二维码