From 881f3e61567fa3c06626e68a48303cdd43bd0ad4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 01 五月 2021 21:41:52 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/api/MachineApi.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/api/MachineApi.java b/service-common/src/main/java/com/java110/common/api/MachineApi.java
old mode 100644
new mode 100755
index 97549af..a2e5c2a
--- a/service-common/src/main/java/com/java110/common/api/MachineApi.java
+++ b/service-common/src/main/java/com/java110/common/api/MachineApi.java
@@ -12,6 +12,7 @@
import com.java110.dto.machineTranslateError.MachineTranslateErrorDto;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -58,7 +59,7 @@
if (!USER_ROLE_OWNER.equals(reqJson.getString("userRole"))) { //杩欑涓� 鍛樺伐鐨勬儏鍐靛憿
reqJson.put("userId", userId);
}
- Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
return machineOpenDoorBMOImpl.openDoor(reqJson);
}
@@ -185,7 +186,8 @@
MachineDto machineDto = new MachineDto();
machineDto.setMachineCode(reqJson.getString("machineCode"));
machineDto.setCommunityId(reqJson.getString("extCommunityId"));
- machineDto.setHeartbeatTime(reqJson.getString("heartbeatTime"));
+ //machineDto.setHeartbeatTime(reqJson.getString("heartbeatTime"));
+ machineDto.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));//杩欓噷鑷繁鐢熸垚 涓嶈幏鍙栦紶閫掓椂闂� 鍥犱负鍙兘鏃堕挓涓嶄竴鑷� 瀵艰嚧鍓嶅彴鐘舵�佹樉绀轰笉姝ｅ父
return machineHeartbeatBMOImpl.heartbeat(machineDto);
}
--
Gitblit v1.8.0