From 2d079ac843ebcb335f2ef7d6952f9700a16fddde Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 05 五月 2021 14:11:00 +0800
Subject: [PATCH] 游湖阿底阿妈
---
service-common/src/main/java/com/java110/common/api/MachineApi.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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 7ed714b..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
@@ -1,23 +1,21 @@
package com.java110.common.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.common.bmo.machine.IMachineHeartbeatBMO;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
import com.java110.common.bmo.machine.ISaveMachineRecordBMO;
import com.java110.common.bmo.machine.IUpdateMachineTransactionStateBMO;
import com.java110.common.bmo.machineTranslateError.IGetMachineTranslateErrorBMO;
+import com.java110.dto.machine.MachineDto;
import com.java110.dto.machine.MachineRecordDto;
import com.java110.dto.machine.MachineTranslateDto;
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.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* 璁惧鐩稿叧鎺ュ彛绫�
@@ -41,6 +39,9 @@
@Autowired
private IUpdateMachineTransactionStateBMO updateMachineTransactionStateBMOImpl;
+ @Autowired
+ private IMachineHeartbeatBMO machineHeartbeatBMOImpl;
+
/**
* 璁惧寮�闂ㄥ姛鑳�
*
@@ -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);
}
@@ -134,6 +135,16 @@
MachineRecordDto machineRecordDto = BeanConvertUtil.covertBean(reqJson, MachineRecordDto.class);
machineRecordDto.setCommunityId(reqJson.getString("extCommunityId"));
machineRecordDto.setName(reqJson.getString("userName"));
+ if (reqJson.containsKey("idNumber")) {
+ machineRecordDto.setIdCard(reqJson.getString("idNumber"));
+ } else {
+ machineRecordDto.setIdCard("-1");
+ }
+ if (reqJson.containsKey("tel")) {
+ machineRecordDto.setTel(reqJson.getString("tel"));
+ } else {
+ machineRecordDto.setTel("-1");
+ }
return saveMachineRecordBMOImpl.saveRecord(machineRecordDto);
}
@@ -158,4 +169,27 @@
return updateMachineTransactionStateBMOImpl.update(machineRecordDto);
}
+ /**
+ * 鐗╄仈缃戠郴缁熻澶囧績璺�
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /machine/heartbeat
+ * @path /app/machine/heartbeat
+ */
+ @RequestMapping(value = "/heartbeat", method = RequestMethod.POST)
+ public ResponseEntity<String> heartbeat(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "taskId", "鏈寘鍚换鍔′俊鎭�");
+ Assert.hasKeyAndValue(reqJson, "machineCode", "鏈寘鍚澶囩紪鐮�");
+ Assert.hasKeyAndValue(reqJson, "heartbeatTime", "鏈寘鍚績璺虫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "extCommunityId", "鏈寘鍚皬鍖篒D");
+ MachineDto machineDto = new MachineDto();
+ machineDto.setMachineCode(reqJson.getString("machineCode"));
+ machineDto.setCommunityId(reqJson.getString("extCommunityId"));
+ //machineDto.setHeartbeatTime(reqJson.getString("heartbeatTime"));
+ machineDto.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));//杩欓噷鑷繁鐢熸垚 涓嶈幏鍙栦紶閫掓椂闂� 鍥犱负鍙兘鏃堕挓涓嶄竴鑷� 瀵艰嚧鍓嶅彴鐘舵�佹樉绀轰笉姝ｅ父
+
+ return machineHeartbeatBMOImpl.heartbeat(machineDto);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0