耳标平台

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

@@ -1,23 +0,0 @@
-spring:
-  application:
-    name: huimv-eartag2-device
-  profiles:
-    active: dev
-  cloud:
-    nacos:
-      config:
-        # 配置中心的地址
-       # server-addr: 47.98.40.154:8848
-        server-addr: 127.0.0.1:8848
-        # 配置文件prefix
-        prefix: ${spring.application.name}
-        # 配置文件的格式
-        file-extension: yaml
-        # 配置文件的环境
-        group: DEFAULT_GROUP
-        # 命名空间
-        namespace: public
-        username: nacos
-        password: nacos
-server:
-  port: 8090

huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/listener/EartagListener.java

@@ -62,8 +62,7 @@ public class EartagListener {
     @RabbitListener(queues = "#{'direct.askEartag.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void processRawdata(Map RawMap) throws ParseException, IOException {
-        System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 处理耳标 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
-        System.out.println(RawMap);
+         log.info("开始处理耳标数据------>"+RawMap);
         String askText = RawMap.get("askText").toString();
 
         //本模块主要执行保存以下4类数据：（其他注册数据，在线数据，状态数据等都是由其他模块工程执行处理-process2模块工程）
@@ -72,14 +71,6 @@ public class EartagListener {
         //--保存设备环境流水数据（设备温度流水表）
         //--保存耳标流水数据（耳标流水表）
 
-        //测试-临时写入耳标数据到文件
-//        DateUtil dateUtil = new DateUtil();
-//        if(askText.trim().indexOf("330110004000010") != -1){
-//            writeTxt(dateUtil.getTodayMissionText()+" "+askText,"eartag");
-//        }
-        //写入所有接收到的耳标数据
-//        writeTxt(dateUtil.getTodayMissionText()+" "+askText,"all_eartag");
-
         //{处理请求报文}
         Map askMap = handleAskText(askText);
         if (askMap == null){

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

@@ -305,8 +305,7 @@ public class DataServiceImpl implements IDataService {
 //            correlationData.setId("100");
             //发送到耳标处理消息队列
             //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 ;
+        int i = Math.abs(eartag.hashCode()) % queues;
         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) {
@@ -314,6 +313,15 @@ public class DataServiceImpl implements IDataService {
 //        }
     }
 
+    public static void main(String[] args) {
+        String eartag = "13320241020005";
+        int i = eartag.hashCode();
+        int s = i % 2;
+        System.out.println("eartag: " + eartag);
+        System.out.println("hashCode: " + i);
+        System.out.println("mod 2: " + s); // 直接打印s的值
+    }
+
 
     public String handleClientAsk_1(String askText) throws ParseException {
 //        System.out.println("000拆分粘包之后数据>>"+askText);

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

@@ -1,23 +0,0 @@
-spring:
-  application:
-    name: huimv-eartag2-input
-  profiles:
-    active: dev
-  cloud:
-    nacos:
-      config:
-        # 配置中心的地址
-        server-addr: 47.98.40.154:8848
-#        server-addr: 127.0.0.1:8848
-        # 配置文件prefix
-        prefix: ${spring.application.name}
-        # 配置文件的格式
-        file-extension: yaml
-        # 配置文件的环境
-        group: DEFAULT_GROUP
-        # 命名空间
-        namespace: public
-        username: nacos
-        password: nacos
-server:
-  port: 8090

huimv-eartag2-manage2/src/main/resources/application.properties

@@ -9,10 +9,6 @@ device.online.access_mode=mysql
 # ��ӻ������豸����ʱ��
 cache.chipIdExpire=48
 
-#
-service.farmAllStatus.url=/deviceController/updateFarmAllStatus
-service.farmAllStatus.host=192.168.1.68
-service.farmAllStatus.ip=8092
 
 ###################################################����undertowȡ��tomcat
 # �Ƿ�� undertow ��־��Ĭ��Ϊ false

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

@@ -21,3 +21,7 @@ spring:
         password: nacos
 server:
   port: 8090
+farmer:
+  pig:
+    price: 11.84
+