docs/api/machine.md
New file @@ -0,0 +1,45 @@ # 设备接口类 ## 说明 文档说明设备相关接口协议 ## 远程开门 ## 设备重启 ## 人脸开门记录上报 ## 物联网指令执行结果反馈（当和物联网系统异步交互时有效） 说明：当和物联网系统异步交互时 或者物联网系统采用mqtt 协议时，执行结果 需要异步方式上报，需要物联网系统配置地址 请求方式： POST 请求地址：/api/machine/cmdResult 请求参数： | 名称 | 类型 | 是否必填 | 示例值 | 描述 | | :----:| :----: | :----: | :----: | :----: | | taskId | String | 是 | 702020042194860037 | 任务ID，第三方系统调用结果时传递 | | code | Integer | 是 | 0 | 指令执行状态码 0 成功 其他失败 | | msg | String | 是 | 成功 | 指令执行说明 | 请求示例： ```json { "taskId": "702020042194860037", "code": 0, "msg": "成功" } ``` 返回示例： ```json { "code":0, "msg":"成功", "data":"" } ``` docs/document/services/payFeeDetailDiscount/DeletePayFeeDetailDiscountInfo.md
File was deleted docs/document/services/payFeeDetailDiscount/SavePayFeeDetailDiscountInfo.md
File was deleted docs/document/services/payFeeDetailDiscount/UpdatePayFeeDetailDiscountInfo.md
File was deleted java110-bean/src/main/java/com/java110/po/machine/MachineTranslatePo.java
@@ -20,6 +20,7 @@ private String objName; private String state; private String updateTime; private String remark; public String getMachineTranslateId() { @@ -93,4 +94,12 @@ public void setUpdateTime(String updateTime) { this.updateTime = updateTime; } public String getRemark() { return remark; } public void setRemark(String remark) { this.remark = remark; } } 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); } } service-common/src/main/java/com/java110/common/bmo/machine/ISaveMachineRecordBMO.java
File was renamed from service-common/src/main/java/com/java110/common/bmo/machineRecord/ISaveMachineRecordBMO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.common.bmo.machineRecord; package com.java110.common.bmo.machine; import com.java110.dto.machine.MachineRecordDto; import com.java110.po.machine.MachineRecordPo; service-common/src/main/java/com/java110/common/bmo/machine/IUpdateMachineTransactionStateBMO.javacopy from service-common/src/main/java/com/java110/common/bmo/machineRecord/ISaveMachineRecordBMO.java copy to service-common/src/main/java/com/java110/common/bmo/machine/IUpdateMachineTransactionStateBMO.java
File was copied from service-common/src/main/java/com/java110/common/bmo/machineRecord/ISaveMachineRecordBMO.java @@ -13,26 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.common.bmo.machineRecord; package com.java110.common.bmo.machine; import com.java110.dto.machine.MachineRecordDto; import com.java110.po.machine.MachineRecordPo; import com.java110.dto.machine.MachineTranslateDto; import org.springframework.http.ResponseEntity; /** * 开门记录 存储 * 修改状态 * <p> * add by wuxw 2020-12-27 * <p> * 协议：https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md */ public interface ISaveMachineRecordBMO { public interface IUpdateMachineTransactionStateBMO { /** * 保存开门记录 * 修改指令执行情况 * * @param machineRecordDto * @param machineTranslateDto * @return */ ResponseEntity<String> saveRecord(MachineRecordDto machineRecordDto); ResponseEntity<String> update(MachineTranslateDto machineTranslateDto); } service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java
File was renamed from service-common/src/main/java/com/java110/common/bmo/machineRecord/impl/SaveMachineRecordBMOImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.common.bmo.machineRecord.impl; package com.java110.common.bmo.machine.impl; import com.java110.common.bmo.machineRecord.ISaveMachineRecordBMO; import com.java110.common.bmo.machine.ISaveMachineRecordBMO; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.file.FileDto; import com.java110.dto.machine.MachineRecordDto; service-common/src/main/java/com/java110/common/bmo/machine/impl/UpdateMachineTransactionStateBMOImpl.java
New file @@ -0,0 +1,61 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.common.bmo.machine.impl; import com.java110.common.bmo.machine.ISaveMachineRecordBMO; import com.java110.common.bmo.machine.IUpdateMachineTransactionStateBMO; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.file.FileDto; import com.java110.dto.machine.MachineRecordDto; import com.java110.dto.machine.MachineTranslateDto; import com.java110.intf.common.IFileInnerServiceSMO; import com.java110.intf.common.IFileRelInnerServiceSMO; import com.java110.intf.common.IMachineRecordInnerServiceSMO; import com.java110.intf.common.IMachineTranslateInnerServiceSMO; import com.java110.po.file.FileRelPo; import com.java110.po.machine.MachineRecordPo; import com.java110.po.machine.MachineTranslatePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; /** * 保存 开门记录 * * @desc add by 吴学文 17:37 */ @Service public class UpdateMachineTransactionStateBMOImpl implements IUpdateMachineTransactionStateBMO { @Autowired private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl; @Override public ResponseEntity<String> update(MachineTranslateDto machineTranslateDto) { int count = machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(machineTranslateDto); if (count > 0) { return ResultVo.success(); } return ResultVo.error("上传记录失败"); } }
