TRX 1 gadu atpakaļ
vecāks
revīzija
3db6896f8b

+ 1 - 3
FullCardServer/src/main/java/com/zhongshu/card/server/core/httpRequest/ApiRequestService.java

@@ -16,8 +16,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-
 /**
  * @author TRX
  * @date 2024/6/25
@@ -36,7 +34,7 @@ public class ApiRequestService extends SuperService {
      * @param data
      * @return
      */
-    public APIResponseModel sendIotCenterAPI(String apiName, Map<String, Object> data) {
+    public APIResponseModel sendIotCenterAPI(String apiName, Object data) {
         APIResponseModel responseModel = new APIResponseModel();
         if (StringUtils.isEmpty(iotCenterConf.getUrl())) {
             responseModel.setIsFailed("未配置物联网平台URL");

+ 7 - 12
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/mqtt/MqttServiceImpl.java

@@ -61,23 +61,18 @@ public class MqttServiceImpl extends SuperService {
             jsonObject.addProperty("data", param.getMessage());
             jsonObject.addProperty("time", DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS));
             jsonObject.addProperty("ttl", 10 * 1000);
-//            mqClient.sendObject(param.getTopic(), jsonObject.toString());
+            mqClient.sendObject(param.getTopic(), jsonObject.toString());
             log.info("mqtt msg 发送成功");
         } catch (Exception e) {
             e.printStackTrace();
             msg = "发送失败: " + e.getMessage();
         }
-
-        Map<String, Object> data = new HashMap<>();
-        data.put("topic", "v1/23");
-        data.put("message", "测试");
-
-        APIResponseModel resultContent = apiRequestService.sendIotCenterAPI(
-                IotCenterAPIConfig.sendMessage, data);
-        if (resultContent.isSuccess()) {
-
-        }
-        log.info("是否成功: {} {}", resultContent.isSuccess(), resultContent.getContent());
+//        APIResponseModel resultContent = apiRequestService.sendIotCenterAPI(
+//                IotCenterAPIConfig.sendMessage, param);
+//        if (resultContent.isSuccess()) {
+//
+//        }
+//        log.info("是否成功: {} {}", resultContent.isSuccess(), resultContent.getContent());
         return ResultContent.buildSuccess(msg);
     }