From 5e0d835fcf76cbd2f94fba1d589dea79a23ed15e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 28 十二月 2020 01:01:56 +0800
Subject: [PATCH] 加入物联网上报功能
---
service-common/src/main/java/com/java110/common/api/MachineApi.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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
index 0e2f9da..7ed714b 100644
--- a/service-common/src/main/java/com/java110/common/api/MachineApi.java
+++ b/service-common/src/main/java/com/java110/common/api/MachineApi.java
@@ -2,9 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
-import com.java110.common.bmo.machineRecord.ISaveMachineRecordBMO;
+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.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;
@@ -17,7 +19,11 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-
+/**
+ * 璁惧鐩稿叧鎺ュ彛绫�
+ * <p>
+ * add by 鍚村鏂� 2020-12-28
+ */
@RestController
@RequestMapping(value = "/machine")
public class MachineApi {
@@ -31,6 +37,9 @@
@Autowired
private ISaveMachineRecordBMO saveMachineRecordBMOImpl;
+
+ @Autowired
+ private IUpdateMachineTransactionStateBMO updateMachineTransactionStateBMOImpl;
/**
* 璁惧寮�闂ㄥ姛鑳�
@@ -128,4 +137,25 @@
return saveMachineRecordBMOImpl.saveRecord(machineRecordDto);
}
+ /**
+ * 鐗╄仈缃戠郴缁熸寚浠ゆ墽琛屾儏鍐�
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /machine/cmdResult
+ * @path /app/machine/cmdResult
+ */
+ @RequestMapping(value = "/cmdResult", method = RequestMethod.POST)
+ public ResponseEntity<String> cmdResult(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "taskId", "鏈寘鍚换鍔′俊鎭�");
+ Assert.hasKeyAndValue(reqJson, "code", "鏈寘鍚粨鏋滅紪鐮�");
+ Assert.hasKeyAndValue(reqJson, "msg", "鏈寘鍚粨鏋滆鏄�");
+ MachineTranslateDto machineRecordDto = new MachineTranslateDto();
+ machineRecordDto.setMachineTranslateId(reqJson.getString("taskId"));
+ machineRecordDto.setState(reqJson.getIntValue("code") == 0
+ ? MachineTranslateDto.STATE_SUCCESS : MachineTranslateDto.STATE_ERROR);
+ machineRecordDto.setRemark(reqJson.getString("msg"));
+ return updateMachineTransactionStateBMOImpl.update(machineRecordDto);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0