topic列表接口返回数据调整

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -168,12 +168,12 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                 throw new BusinessException("设备uuid“deviceUuid“不能为空！");
             }*/
 
-            DmpTopicResponseVO add = new DmpTopicResponseVO();
+/*            DmpTopicResponseVO add = new DmpTopicResponseVO();
             add.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.ADD_REMARKS.getLetter());
             add.setPublisher(TopicInfo.GATEWAY_DEVICE.getValue());
             add.setSubscriber(TopicInfo.IOT_PLATFORM.getValue());
             add.setRemarks(TopicInfo.ADD_REMARKS.getValue());
-            responseVOList.add(add);
+            responseVOList.add(add);*/
 
             DmpTopicResponseVO info = new DmpTopicResponseVO();
             info.setTopic("/" + productCode + "/" + deviceId + "/" + TopicInfo.INFO_REMARKS.getLetter());
@@ -303,6 +303,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
         alarmPayloadJson.put("alarmAddress", "上海市青浦区华徐公路628号C幢");
         String alarmPayload = alarmPayloadJson.toString();
         responseVO.setAlarmPayload(alarmPayload);
+        responseVO.setAlarmHttpUrl(ALARM_HTTP_URL);
         return responseVO;
     }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/DmpHttpAlarmResponseVO.java

@@ -14,7 +14,7 @@ public class DmpHttpAlarmResponseVO {
     /**
      * 报警事件数据上报http地址
      **/
-    private static final String ALARM_HTTP_URL = "/prod-api/service-alarm/baseAlarm/alarmInfo";
+    private String alarmHttpUrl;
 
     /**
      * 报警事件数据上报参数body