增加给九州的数据类型CLR类型

@@ -5,6 +5,7 @@
 
 
 package com.airport;
 package com.airport;
 
 
+import com.airport.core.AgentSender;
 import com.airport.core.IMFReader;
 import com.airport.core.IMFReader;
 import com.airport.core.IMFSender;
 import com.airport.core.IMFSender;
 import com.airport.util.ConfigUtils;
 import com.airport.util.ConfigUtils;
@@ -14,12 +15,15 @@ import com.caac.imf.api.IMFClientFactory;
 import java.util.Timer;
 import java.util.Timer;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.PropertyConfigurator;
+import sun.management.Agent;
 
 
 public class Main {
 public class Main {
     private static final Logger logger = Logger.getLogger(Main.class);
     private static final Logger logger = Logger.getLogger(Main.class);
     public static boolean LOGIN_OK = false;
     public static boolean LOGIN_OK = false;
+    public static boolean isSuc = true;
     public static IMFClient client = null;
     public static IMFClient client = null;
 
 
+
     public Main() {
     public Main() {
     }
     }
 
 
@@ -40,11 +44,16 @@ public class Main {
             loginIMF(client, ConfigUtils.IMF_USERNAME, ConfigUtils.IMF_PASSWORD, "config/imf_config.properties");
             loginIMF(client, ConfigUtils.IMF_USERNAME, ConfigUtils.IMF_PASSWORD, "config/imf_config.properties");
             if (LOGIN_OK && client != null) {
             if (LOGIN_OK && client != null) {
                 logger.info("start run Timer,client hasocde=" + client.hashCode());
                 logger.info("start run Timer,client hasocde=" + client.hashCode());
+
+                //代理人发送程序
+//                AgentSender send = new AgentSender(client);
+//                send.start();
+
+                //数据仓库给九州的发送程序
                 Timer timer = new Timer();
                 Timer timer = new Timer();
-//                SendMessageTask sender = new SendMessageTask(client, "data/fid_index.txt");
-                IMFSender imfSender = new IMFSender(client,"data/fid_index.txt");
-//                timer.schedule(sender, 30000L, 1200000L);
-                timer.schedule(imfSender,30000L,1200000L);
+                IMFSender CangKu2Jiuzhou = new IMFSender(client,"data/fid_index.txt");
+                timer.schedule(CangKu2Jiuzhou, 30000L, 1200000L);
+
             }
             }
         }
         }
 
 
@@ -83,6 +92,7 @@ public class Main {
                 if (!LOGIN_OK) {
                 if (!LOGIN_OK) {
                     logger.info("多次尝试登录失败，退出登陆");
                     logger.info("多次尝试登录失败，退出登陆");
                     client.disconnect();
                     client.disconnect();
+                    isSuc =false;
                     System.exit(-1);
                     System.exit(-1);
                 }
                 }
             }
             }

+package com.airport.core;
+
+import com.airport.Main;
+import org.apache.log4j.Logger;
+import com.caac.imf.api.IMFClient;
+
+import redis.clients.jedis.Jedis;
+
+import java.util.Properties;
+
+public class AgentSender extends Thread{
+
+    private static final Logger logger = Logger.getLogger(AgentSender.class);
+    private static final String stype = "/MSG/META/STYP";
+
+    public volatile boolean bool = false;
+    Jedis jedis = new Jedis("10.50.3.73", 6379);
+    //	Jedis jedis = new Jedis("192.168.0.253", 6379);
+    public String str ;
+
+    private IMFClient client;
+
+    public AgentSender(IMFClient client){
+        this.client = client;
+    }
+
+    public AgentSender(){
+    }
+
+    public void run(){
+        logger.info(jedis);
+
+        while(!bool){
+            if(Main.isSuc){
+                if(Main.LOGIN_OK){
+                    String SendMsg = jedis.rpoplpush("task-queue", "tmp-queue"); //取队列消息
+
+                    //9是发送成功
+                    if(SendMsg !=null){
+                        logger.debug("<<发送的报文内容为:"+SendMsg+">>");
+
+                        String returnMsg = client.sendMSG(SendMsg);
+                        logger.debug("<<发送返回的信息:"+returnMsg+">>");
+
+                        if(returnMsg.indexOf("<CODE>9</CODE>")>=0){
+                            jedis.rpop("tmp-queue");
+                            logger.debug("<<移除队列>>");
+                        }else{
+                            //如果发送不成功继续发送
+                            jedis.rpoplpush("tmp-queue", "task-queue");
+                            logger.info("！！<<执行未成功发送的消息返回到发送消息队列>>！！");
+                        }
+                    }
+
+                }else{
+                    logger.info("---------登陆中");
+                }
+
+                try {
+                    Thread.sleep(5000);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public String getStr() {
+        return str;
+    }
+
+    public void setStr(String str) {
+        this.str = str;
+    }
+}

@@ -112,11 +112,11 @@ public class DaoImpl implements Dao {
     }
     }
 
 
     public int getMaxFID() {
     public int getMaxFID() {
-        return this.jdbcTemplate.queryForInt("select max(FID) from MESSAGE_BAK where SNDR='CFPS'");
+        return this.jdbcTemplate.queryForInt("select max(FID) from MESSAGE_BAK where SNDR='CFPS' OR TYPE='CLR'");
     }
     }
 
 
     public List<MessageBak> getRecordByFID(int fid) {
     public List<MessageBak> getRecordByFID(int fid) {
-        String SQL_FMT = "select FID,CONTENT from MESSAGE_BAK where (FID>%s and FID<%s+%s)  and (SNDR='CFPS')  order by FID";
+        String SQL_FMT = "select FID,CONTENT from MESSAGE_BAK where (FID>%s and FID<%s+%s)  and (SNDR='CFPS' OR TYPE='CLR'))  order by FID";
         String sql = String.format(SQL_FMT, fid, fid, ConfigUtils.RECORD_COUNT);
         String sql = String.format(SQL_FMT, fid, fid, ConfigUtils.RECORD_COUNT);
         logger.info(sql);
         logger.info(sql);
         final LobHandler lobHandler = new DefaultLobHandler();
         final LobHandler lobHandler = new DefaultLobHandler();