取出写入文件测试代码。

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/producer/Producer.java

@@ -36,12 +36,8 @@ public class Producer {
      */
     public String sendClientAsk(String askText){
         Map map = new HashMap();
-//        System.out.println("000000000000000000 >>"+askText);
         map.put("askText",askText);
-//        System.out.println("111111111111111111>>"+map.toString());
-//        rabbitTemplate.convertAndSend("askExchange", "topic.askText.key", map);
         rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK, Const.ROUTING_KEY_ASK, map);
-//        System.out.println("保存原始数据到rabbitMQ>>"+map.toString());
         return "ok";
     }
 

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

@@ -173,7 +173,7 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
                     log.error("检测到未注册的采集器设备,已舍弃请求.");
                 }
             } else if (cmd.trim().equalsIgnoreCase("2")) {
-                System.out.println("==>命令2请求 askText>>" + askText);
+                System.out.println("==>命令2获取服务器时间请求 askText>>" + askText);
                 if (dataService.isEffectiveDevice(idCode)) {
                     //处理服务器时间命令
                     String answer = "hm+2+" + dateUtil.getNowText() + "+4+end";
@@ -183,7 +183,7 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
                     System.out.println("##获取服务器时间-无效设备编码 idCode=" + idCode);
                 }
             } else if (cmd.trim().equalsIgnoreCase("3")) {
-                System.out.println("==>命令3请求 askText>>" + askText);
+                System.out.println("==>命令3心跳包请求 askText>>" + askText);
                 //处理心跳包命令
                 //{设备心跳应答}
                 if (dataService.isEffectiveDevice(idCode)) {
@@ -198,7 +198,7 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
                     System.out.println("##心跳包-无效设备编码(" + idCode+")，请求拒绝。");
                 }
             } else if (cmd.trim().equalsIgnoreCase("4")) {
-                System.out.println("==>命令4请求 askText>>" + askText);
+                System.out.println("==>命令4环境温度请求 askText>>" + askText);
                 //处理设备环境温度命令
                 //{设备环境温度应答}
                 if (dataService.isEffectiveDevice(idCode)) {

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/impl/DataServiceImpl.java

@@ -289,11 +289,6 @@ public class DataServiceImpl implements IDataService {
 
     @Override
     public void sendEartagMQ(Map map) throws IOException, ParseException {
-        String askText = map.get("askText").toString();
-        FileUtil fileUtil= new FileUtil();
-        if(askText.trim().indexOf("330110002000002") != -1){
-            fileUtil.writeTxt(askText,"/opt/log/log_mq_20220809.txt");
-        }
         //发送到耳标处理消息队列
         rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_ASK_EARTAG, map);
     }
@@ -559,19 +554,23 @@ public class DataServiceImpl implements IDataService {
     }
 
     @Override
-    public boolean isEffectiveDevice(String idCode) {
+    public boolean isEffectiveDevice(String deviceCode) {
+        // 正常的代码
         //{检查有效设备集合}
-        if(cacheService.checkEffectiveDeviceSet(idCode)){
-            return true;
-        }else{
-            EartagDeviceRegisterEntity eartagDeviceRegisterEntity = eartagDeviceRegisterRepo.getByChipId(idCode);
-            if(eartagDeviceRegisterEntity == null){
-                return false;
-            }else{
-                cacheService.putEffectiveDeviceSet(idCode);
-                return true;
-            }
-        }
+//        if(cacheService.checkEffectiveDeviceSet(deviceCode)){
+//            return true;
+//        }else{
+//            EartagDeviceRegisterEntity eartagDeviceRegisterEntity = eartagDeviceRegisterRepo.getByDeviceCode(deviceCode);
+//            if(eartagDeviceRegisterEntity == null){
+//                return false;
+//            }else{
+//                cacheService.putEffectiveDeviceSet(deviceCode);
+//                return true;
+//            }
+//        }
+
+        // 临时处理（部分老基站的嵌入式程序未更新代码情况）
+        return true;
     }
 
     /**
@@ -599,18 +598,14 @@ public class DataServiceImpl implements IDataService {
                 log.info("##获取设备编码-应答数据>>" + answer);
             } else if (cmd.trim().equalsIgnoreCase("2")) {
                 //获取服务器时间命令
-//                answer = "hm+2+0+"+dateUtil.getNowText()+"+4+end";
                 answer = "hm+2+" + dateUtil.getNowText() + "+4+end";
                 log.info("##获取服务器时间-应答数据>>" + answer);
             } else if (cmd.trim().equalsIgnoreCase("3")) {
                 //心跳包命令
-//                heartbeatMap = new HashMap();
-//                answer = "hm+3+0+6+end";
                 answer = "hm+3+6+end";
                 log.info("##心跳包-应答数据>>" + answer);
             } else if (cmd.trim().equalsIgnoreCase("4")) {
                 //环境温度-设备、数值、上传时间
-//                answer = "hm+4+0+7+end";
                 answer = "hm+4+7+end";
                 log.info("##环境温度-应答数据>>" + answer);
             } else {
@@ -654,14 +649,11 @@ public class DataServiceImpl implements IDataService {
             } else if (cmd.trim().equalsIgnoreCase("2")) {
                 //获取服务器时间命令
                 //应答数据
-//                answer = "hm+2+0+"+dateUtil.getNowText()+"+4+end";
                 answer = "hm+2+" + dateUtil.getNowText() + "+4+end";
                 log.info("##获取服务器时间-应答数据>>" + answer);
             } else if (cmd.trim().equalsIgnoreCase("3")) {
                 //心跳包命令
-//                heartbeatMap = new HashMap();
                 heartbeatMap.put("device", device);
-//                answer = "hm+3+0+6+end";
                 answer = "hm+3+6+end";
                 log.info("##心跳包-应答数据>>" + answer);
             } else if (cmd.trim().equalsIgnoreCase("4")) {
@@ -670,7 +662,6 @@ public class DataServiceImpl implements IDataService {
                 envTempMap.put("temp", dataArray[4]);
                 envTempMap.put("askTime", dataArray[5]);
                 //应答数据
-//                answer = "hm+4+0+7+end";
                 answer = "hm+4+7+end";
                 log.info("##环境温度-应答数据>>" + answer);
             } else {