Browse Source

修改计算逻辑

tianboguang 3 năm trước cách đây
mục cha
commit
b3be866683

+ 26 - 2
4dkankan-center-scene/src/test/java/com/fdkankan/SceneApplicationTests.java

@@ -25,8 +25,32 @@ class SceneApplicationTests {
 
 
     @Test
     @Test
     public void test(){
     public void test(){
+        // 74ee2ac0175a_202112311529172840:;
+        // /mnt/data/74ee2ac0175a_202112311529172840:;
+        // 74ee2ac0175a/926501950155915264/74ee2ac0175a_202112311529172840/:;
+        // :;
+        // t-cwleTdSN6Q:;
+        // 0:;15676860886:;
+        // 11:;
+        // slam:;
+        // 926501950155915264:;
+        // 4DKKPRO_74EE2AC0175A:;
+        // 0:;
+        // V3
         BuildSceneMqMessage message = new BuildSceneMqMessage();
         BuildSceneMqMessage message = new BuildSceneMqMessage();
-        mqSendMessage.sendMessage(JSONObject.toJSONString(message));
+        message.setUnicode("74ee2ac0175a_202112311529172840");
+        message.setPath("/mnt/data/74ee2ac0175a_202112311529172840");
+        message.setPrefix("74ee2ac0175a/926501950155915264/74ee2ac0175a_202112311529172840/");
+        message.setImgsName(null);
+        message.setSceneNum("t-cwleTdSN6Q");
+        message.setIsModel("0");
+        message.setUserName("15676860886");
+        message.setCameraType("11");
+        message.setAlgorithm("slam");
+        message.setFileId("926501950155915264");
+        message.setCameraName("4DKKPRO_74EE2AC0175A");
+        message.setResolution("0");
+        message.setBuildType("V3");
+        mqSendMessage.sendMessage(message);
     }
     }
-
 }
 }

+ 3 - 1
4dkankan-common-mq/src/main/java/com/fdkankan/mq/message/BaseMQMessage.java

@@ -1,6 +1,8 @@
 package com.fdkankan.mq.message;
 package com.fdkankan.mq.message;
 
 
-public class BaseMQMessage {
+import java.io.Serializable;
+
+public class BaseMQMessage implements Serializable {
     /**
     /**
      * 0:第一次计算;1:重新构建
      * 0:第一次计算;1:重新构建
      */
      */

+ 1 - 10
4dkankan-common-mq/src/main/java/com/fdkankan/mq/message/BuildSceneMqMessage.java

@@ -18,9 +18,7 @@ public class BuildSceneMqMessage extends BaseMQMessage {
     private String resolution;
     private String resolution;
 
 
     //判断调用V2还是V3版本的算法
     //判断调用V2还是V3版本的算法
-    private String buildType = "V2";
-
-    private String rebuild = "0";
+    private String buildType;
 
 
     public String getUnicode() {
     public String getUnicode() {
         return unicode;
         return unicode;
@@ -126,11 +124,4 @@ public class BuildSceneMqMessage extends BaseMQMessage {
         this.buildType = buildType;
         this.buildType = buildType;
     }
     }
 
 
-    public String getRebuild() {
-        return rebuild;
-    }
-
-    public void setRebuild(String rebuild) {
-        this.rebuild = rebuild;
-    }
 }
 }

+ 1 - 1
4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/producer/MqSendMessage.java

@@ -29,7 +29,7 @@ public class MqSendMessage {
     private String tagName;
     private String tagName;
 
 
 
 
-    public void sendMessage(String context){
+    public void sendMessage(Object context){
         long currentTimeMillis = System.currentTimeMillis();
         long currentTimeMillis = System.currentTimeMillis();
         String keys = topicName + "_"+ currentTimeMillis;
         String keys = topicName + "_"+ currentTimeMillis;
         Message msg = new Message(
         Message msg = new Message(