修改

huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/DeviceServiceImpl.java

@@ -102,10 +102,12 @@ public class DeviceServiceImpl implements IDeviceService {
     public String getFarmIdByDeviceCode(String deviceCode) {
         //
         String farmId = (String)cacheService.getFarmIdByDeviceCode(deviceCode);
+        System.out.println("####### farmId=" + farmId);
         if(farmId != null && farmId.trim().length()>0){
             return farmId;
         }else{
             EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(deviceCode);
+            System.out.println("####### deviceRegisterEntity=" + deviceRegisterEntity);
             //{将设备注册信息保存到缓存中}
             cacheService.putDeviceRegister(deviceCode,deviceRegisterEntity);
             return deviceRegisterEntity.getFarmId();

huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -103,6 +103,7 @@ public class EartagServiceImpl implements IEartagService {
 
     @Override
     public void handleEartag(JSONObject dataJo) throws ParseException {
+        System.out.println(dataJo);
         //设备编码
         String deviceCode = dataJo.getString("device");
         //耳标号
@@ -620,7 +621,7 @@ public class EartagServiceImpl implements IEartagService {
 //        }
         Map configMap = iBaseConfigService.getConfigValue("dropDataEartagOffLineTime", farmId, "0");
         System.out.println("configMap 11111 >>>>>>>>>>>>>>>>>>>>> " + configMap);
-        if (configMap == null) {
+        if (ObjectUtil.isEmpty(configMap)) {
             log.error("耳标离线过程丢弃数据时长属性未配置.采用默认配置参数 eartagOfflineTime=" + eartagOfflineTime);
         } else {
             eartagOfflineTime = Integer.parseInt(configMap.get("configValue") + "");

huimv-eartag2-eartag/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ spring:
     nacos:
       config:
         # 配置中心的地址
-        server-addr: 47.98.40.154:8848
+#        server-addr: 47.98.40.154:8848
 #        server-addr: 127.0.0.1:8848
         # 配置文件prefix
         prefix: ${spring.application.name}
@@ -20,4 +20,4 @@ spring:
         username: nacos
         password: nacos
 server:
-  port: 8090
+  port: 8090

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

@@ -306,7 +306,7 @@ public class DataServiceImpl implements IDataService {
             //发送到耳标处理消息队列
             //zj+330102002000003+13320241020004+87+0+10+154894+80+20240126174333+1.2#3.0#65535#10794+0+end
         int i = eartag.hashCode() %queues;
-        i = i<0? -i:i ;
+        i = Math.abs(i);
         log.info("routinKey-->"+Const.ROUTING_KEY_ASK_EARTAG+i);
         rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_ASK_EARTAG+i, map);
 //        } catch (AmqpTimeoutException e) {

huimv-eartag2-input/src/main/resources/bootstrap.yml

@@ -7,8 +7,8 @@ spring:
     nacos:
       config:
         # 配置中心的地址
-        server-addr: 47.98.40.154:8848
-#        server-addr: 127.0.0.1:8848
+#        server-addr: 47.98.40.154:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件prefix
         prefix: ${spring.application.name}
         # 配置文件的格式