diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java index 3f84fb15d7a0994003a47d6e14a260150387860d..ebd7729d86a186064aab549869d7c0676f5acac0 100644 --- a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java +++ b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java @@ -1,6 +1,7 @@ package com.mortals.xhx.module.device.service.impl; import cn.hutool.core.lang.PatternPool; +import com.alibaba.fastjson.JSON; import com.mortals.framework.exception.AppException; import com.mortals.framework.model.Context; import com.mortals.framework.service.ICacheService; @@ -206,9 +207,12 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D && entity.getSwitchSend()) { if (PatternPool.URL_HTTP.matcher(platformEntity.getSendUrl()).find()) { ApiResp<String> resp = messageService.sendThirdParty(platformEntity.getSendUrl(), deviceReq); + log.info("sendThirtyis resp ==>{}", JSON.toJSONString(resp)); } else { throw new AppException("http send url 涓嶅悎娉曪紒" + platformEntity.getSendUrl()); } + }else{ + log.info("sendThirtyis null ==>{}", JSON.toJSONString(platformEntity)); } } diff --git a/doc/api.md b/doc/api.md index 54a2bfeda15a1120cc77caade455a30d802a89d8..9fe76480b1f1d56de2b3331879c3aa428482a8f8 100644 --- a/doc/api.md +++ b/doc/api.md @@ -326,6 +326,7 @@ headers|Object|娑堟伅澶磡鏄瘄-  data|Object|娑堟伅澶存暟鎹璞鏄瘄-   protocol|String|鏁版嵁鍩熷崗璁被鍨嬶紝榛樿json|鏄瘄-   messageType|String|涓婃姤娑堟伅绫诲瀷|鏄瘄HEART_BEAT +  deviceCode|String|璁惧缂栫爜淇℃伅|鏄瘄濡�:mac鍦板潃   sign|String|绛惧悕|鏄瘄-   timestamp|String|鏃堕棿鎴硘鏄瘄- data|byte[]|byte鏁扮粍锛宐ase64缂栫爜|鏄瘄- @@ -339,6 +340,7 @@ key|String|娑堟伅鍞竴鏍囪瘑|鏄瘄- "data":{ "protocol":"json", "messageType":"HEART_BEAT", + "deviceCode":"A1:A2:A3:A4:A5:A6", "sign":"abcd1234", "timestamp":"2022-04-15 09:48:05" } @@ -365,6 +367,7 @@ headers|Object|娑堟伅澶磡鏄瘄-  data|Object|娑堟伅澶存暟鎹璞鏄瘄-   protocol|String|鏁版嵁鍩熷崗璁被鍨嬶紝榛樿json|鏄瘄-   messageType|String|涓嬪彂娑堟伅绫诲瀷|鏄瘄DOWN_UPGREAD +  deviceCode|String|璁惧缂栫爜淇℃伅|鏄瘄濡�:mac鍦板潃   sign|String|绛惧悕|鏄瘄-   timestamp|String|鏃堕棿鎴硘鏄瘄- data|byte[]|byte鏁扮粍锛宐ase64缂栫爜|鏄瘄- @@ -378,6 +381,7 @@ key|String|娑堟伅鍞竴鏍囪瘑|鏄瘄- "data":{ "protocol":"json", "messageType":"UPGREAD", + "deviceCode":"A1:A2:A3:A4:A5:A6", "sign":"abcd1234", "timestamp":"2022-04-15 09:48:05" } diff --git "a/doc/\350\256\276\345\244\207\347\256\241\347\220\206\347\263\273\347\273\237.docx" "b/doc/\350\256\276\345\244\207\347\256\241\347\220\206\347\263\273\347\273\237.docx" index d4f03fea3ad028feb69bfb964607e76feaf2f8bd..c69cab6e5d2171ac33ddddde41b3b9cbc89e4427 100644 Binary files "a/doc/\350\256\276\345\244\207\347\256\241\347\220\206\347\263\273\347\273\237.docx" and "b/doc/\350\256\276\345\244\207\347\256\241\347\220\206\347\263\273\347\273\237.docx" differ