调整生成Topic代码

src/main/java/com/esv/datacenter/iot/module/omodel/service/impl/InstanceTopicServiceImpl.java

@@ -14,13 +14,11 @@ import org.springframework.stereotype.Service;
 @RefreshScope
 public class InstanceTopicServiceImpl extends ServiceImpl<InstanceTopicDao, InstanceTopicEntity> implements InstanceTopicService {
 
-    @Value("${mqtt.topic.instance.data-upload}")
-    private String instanceDataUploadTopic;
+    private static final String TOPIC_PREFIX = "$esv/iot/";
 
     @Override
     public void insertTopic(Long modelId, Long instanceId) {
-        String topic = instanceDataUploadTopic.replaceFirst("[model_id]", String.valueOf(modelId))
-                .replaceFirst("[instance_id]", String.valueOf(instanceId));
+        String topic = TOPIC_PREFIX + modelId + "/" + instanceId + "/data/upload";
         InstanceTopicEntity entity = new InstanceTopicEntity();
         entity.setModelId(modelId);
         entity.setInstanceId(instanceId);

src/main/resources/application-demo.yml

@@ -85,8 +85,4 @@ timescale:
     max-lifetime: 0
   table-field:
     map: string-text,number-numeric,boolean-bit(1)
-  table-prefix: iot_model_
-mqtt:
+  table-prefix: iot_model_
\ No newline at end of file
-  topic:
-    instance:
-      data-upload: $esv/iot/[model_id]/[instance_id]/data/upload
\ No newline at end of file

src/main/resources/application-dev.yml

@@ -85,8 +85,4 @@ timescale:
     max-lifetime: 0
   table-field:
     map: string-text,number-numeric,boolean-bit(1)
-  table-prefix: iot_model_
-mqtt:
+  table-prefix: iot_model_
\ No newline at end of file
-  topic:
-    instance:
-      data-upload: $esv/iot/[model_id]/[instance_id]/data/upload
\ No newline at end of file

src/main/resources/application-local.yml

@@ -85,8 +85,4 @@ timescale:
     max-lifetime: 0
   table-field:
     map: string-text,number-numeric,boolean-bit(1)
-  table-prefix: iot_model_
-mqtt:
+  table-prefix: iot_model_
\ No newline at end of file
-  topic:
-    instance:
-      data-upload: $esv/iot/[model_id]/[instance_id]/data/upload
\ No newline at end of file

src/main/resources/application-test.yml

@@ -85,8 +85,4 @@ timescale:
     max-lifetime: 0
   table-field:
     map: string-text,number-numeric,boolean-bit(1)
-  table-prefix: iot_model_
-mqtt:
+  table-prefix: iot_model_
\ No newline at end of file
-  topic:
-    instance:
-      data-upload: $esv/iot/[model_id]/[instance_id]/data/upload
\ No newline at end of file