修改input的配置属性。

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/server/EartagServerHandler2.java

@@ -2,6 +2,7 @@ package com.huimv.eartag2.server;
 
 import com.alibaba.fastjson.JSONArray;
 import com.huimv.eartag2.common.mq.Const;
+import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.service.IDataService;
 import com.huimv.eartag2.service.IDeviceService;
 import com.huimv.eartag2.utils.DateUtil2;
@@ -64,8 +65,7 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
         ByteBuf data = (ByteBuf) msg;
         String clientAskText = data.toString(CharsetUtil.UTF_8);
-//        System.out.println((++num)+"次, 客户端消息clientAskText>>"+clientAskText);
-        System.out.println("############################### 客户端消-接收消息 clientAskText>>"+clientAskText);
+        System.out.println("############################### 开始接收硬件设备上传数据 clientAskText>>"+clientAskText);
         //保存实例内的客户端请求
 //        appendClientAsk(clientAskText);
 
@@ -107,12 +107,8 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
      */
     private void handleClientEartagMessage(String clientAskText, ChannelHandlerContext ctx) throws ParseException, IOException {
         clientAskText = clientAskText.replaceAll("\r", "").replaceAll("\n", "");
-        System.out.println("### 服务端接收数据 >>" + clientAskText);
-        //TEST-saveRawData()
-//        if(dataTestInput == 1){
-//            deviceService.saveRawData(clientAskText);
-//        }
-        //{}
+        System.out.println("### 服务端初步处理接收的数据 >>" + clientAskText);
+        //{判断是否完整数据}
         int countPlus = regexUtil.countPlus(clientAskText);
         if (countPlus < 4) {
             System.out.println("当前数据为不完整数据，故丢弃.>>" + clientAskText);
@@ -145,6 +141,16 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
         String cmd = dataArray[2];
         Map map = new HashMap();
         map.put("askText", askText);
+
+        DateUtil dateUtil = new DateUtil();
+        //--抓取特定基站数据
+        if(idCode.trim().equalsIgnoreCase("867699060002756")){
+            writeTxt(dateUtil.getTodayMissionText()+" "+askText,"device_867699060002756");
+        }
+        if(cmdHeader.trim().equalsIgnoreCase("zj") && idCode.trim().equalsIgnoreCase("330110004000010")){
+            writeTxt(dateUtil.getTodayMissionText()+" "+askText,"earmark_330110004000010");
+        }
+
         if (cmdHeader.trim().equalsIgnoreCase("hm")) {
             //采集器应答数据
             if (cmd.trim().equalsIgnoreCase("0")) {
@@ -211,8 +217,11 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
             System.out.println("==>耳标命令请求 askText>>" + askText);
             //测试-临时写入耳标数据到文件
 //            if(askText.trim().indexOf("330110002000002") != -1){
-//                writeTxt(askText,"input");
+//                writeTxt(dateUtil.getTodayMissionText()+" "+askText,"all");
 //            }
+            if(cmdHeader.trim().equalsIgnoreCase("zj") && idCode.trim().equalsIgnoreCase("330110004000010")){
+                writeTxt(dateUtil.getTodayMissionText()+" "+askText,"##earmark_330110004000010");
+            }
             //耳标应答数据（不需要应答）
 //            if (checkValidEarmark(cmd)) {
 //                log.error(">>舍弃掉未配置耳标号的耳标，" + askText + "");

huimv-eartag2-platform/huimv-eartag2-input/src/main/resources/application-prod2.yml

@@ -19,24 +19,24 @@ spring:
     open-in-view: true
 
   rabbitmq:
-#    host: 121.36.134.218
+    #    host: 121.36.134.218
     host: 10.0.0.14
     port: 5672
     username: admin
     password: admin
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
-
     #确认消息已发送到交换机(Exchange)
-#    publisher-confirms: true #(过时、弃用)
-#    publisher-confirm-type: correlated
+    #    publisher-confirms: true #(过时、弃用)
+    publisher-confirm-type: correlated
     #确认消息已发送到队列(Queue)
-#    publisher-returns: true
+    publisher-returns: true
+
 
   #redis
   redis:
     database: 0
-#    host: 121.36.134.218
+    #    host: 121.36.134.218
     host: 10.0.0.14
     port: 6379
     password: hm123456