Merge branch 'han' of uskycloud/usky-modules into server-165

service-agbox/service-agbox-biz/src/main/java/com/usky/agbox/service/listener/RabbitMQListener.java

@@ -24,19 +24,21 @@ public class RabbitMQListener {
             String str = new String(message.getBody(),"utf-8");
             JSONObject eventVO1 = JSONObject.parseObject(str);
             JSONObject eventVO = new JSONObject();
-            String timeWithT = eventVO1.get("createTime").toString();
-            eventVO.put("deviceId",eventVO1.get("deviceId"));
-            eventVO.put("triggerTime",timeWithT.replace("T", " "));
             if (eventVO1.get("eventType").equals(31)){
-                eventVO.put("eventCode",1);
+                eventVO1.put("eventCode",1);
+                PatrolAgbox.addEvent(eventVO1.toJSONString());
             }else if (eventVO1.get("eventType").equals(32)){
-                eventVO.put("eventCode",2);
+                eventVO1.put("eventCode",2);
+                PatrolAgbox.addEvent(eventVO1.toJSONString());
             }else {
                 eventVO.put("eventCode",16);
+                String timeWithT = eventVO1.get("createTime").toString();
+                eventVO.put("deviceId",eventVO1.get("deviceId"));
+                eventVO.put("triggerTime",timeWithT.replace("T", " "));
+                eventVO.put("name",eventVO1.get("createBy"));
+                eventVO.put("certifiedNo","");
+                PatrolAgbox.addEvent(eventVO.toJSONString());
             }
-            eventVO.put("name",eventVO1.get("createBy"));
-            eventVO.put("certifiedNo","");
-            PatrolAgbox.addEvent(eventVO.toJSONString());
             System.out.println("FEventReceiver消费者收到消息： " + str);
         } catch (Exception e){
             e.printStackTrace();