优化 考勤任务上报

java110

2021-02-01 138d5f087e386c657d964e4e4c2b8ac65038e085

 service-common/src/main/java/com/java110/common/api/MachineApi.java

@@ -1,23 +1,27 @@
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.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.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.*;


/**
 * 设备相关接口类
 * <p>
 * add by 吴学文 2020-12-28
 */
@RestController
@RequestMapping(value = "/machine")
public class MachineApi {
@@ -31,6 +35,12 @@

    @Autowired
    private ISaveMachineRecordBMO saveMachineRecordBMOImpl;

    @Autowired
    private IUpdateMachineTransactionStateBMO updateMachineTransactionStateBMOImpl;

    @Autowired
    private IMachineHeartbeatBMO machineHeartbeatBMOImpl;

    /**
     * 设备开门功能
@@ -125,7 +135,61 @@
        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);
    }

    /**
     * 物联网系统指令执行情况
     *
     * @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);
    }

    /**
     * 物联网系统设备心跳
     *
     * @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", "未包含小区ID");
        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);
    }

}