功能开发

rk

12 小时以前 1fb6ce7f165e85cb9458d6e8d1b6bf7debc1e665

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java

@@ -19,6 +19,7 @@
import com.doumee.dao.business.vo.CabinetInfoVO;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.service.business.*;
import com.doumee.service.business.impl.JkCabinetGridServiceImpl;
import com.doumee.service.business.third.model.ApiResponse;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import io.swagger.annotations.Api;
@@ -28,10 +29,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * Created by IntelliJ IDEA.
@@ -53,6 +51,9 @@
    private JkCabinetGridService jkCabinetGridService;

    @Autowired
    private JkCabinetLogService jkCabinetLogService;

    @Autowired
    private JkInterfaceLogService interfaceLogService;

    @Autowired
@@ -60,6 +61,9 @@

    @Autowired
    private JkVersionService jkVersionService;

    @Autowired
    private JkCabinetGridServiceImpl impl;

    @LoginNoRequired
    @ApiOperation("获取钥匙柜APK最新版本")
@@ -136,7 +140,11 @@
    @ApiOperation("关闭柜门")
    @PostMapping("/closeGrid")
    public ApiResponse closeGrid(@RequestBody CloseGridDTO dto) {
        jkCabinetGridService.closeGrid(dto);
        JDYKeyUseByBookDTO jdyKeyUseByBookDTO = jkCabinetGridService.closeGrid(dto);
        //推送简道云 取还信息
        if(Objects.nonNull(jdyKeyUseByBookDTO)&&Objects.nonNull(jdyKeyUseByBookDTO.getId())){
            jkCabinetGridService.pushJDYKeyInfo(jdyKeyUseByBookDTO);
        }
        this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"closeGrid","关闭柜门");
        return ApiResponse.success("操作成功");
    }
@@ -150,7 +158,6 @@
        return ApiResponse.success("操作成功");
    }


    @LoginNoRequired
    @ApiOperation("获取钥匙柜人脸数据")
    @GetMapping("/getCabinetFaceVO")
@@ -159,8 +166,6 @@
        this.saveInterfaceLog(Constants.strToJson("code",code), JSONObject.toJSONString(cabinetFaceVO),"getCabinetFaceVO","获取钥匙柜人脸数据");
        return ApiResponse.success(cabinetFaceVO);
    }



    @LoginNoRequired
    @ApiOperation("获取可操作柜格 - 司机")
@@ -183,9 +188,9 @@
    @LoginNoRequired
    @ApiOperation("获取IC卡用户主键 - 司机")
    @PostMapping("/getMemberIdByCode")
    public ApiResponse<Integer> getMemberIdByCode(@RequestParam String code) {
        this.saveInterfaceLog(Constants.strToJson("code",code), null,"getMemberIdByCode","获取IC卡用户主键 - 司机");
        return ApiResponse.success(jkIccardService.getMemberIdByCode(code));
    public ApiResponse<Integer> getMemberIdByCode(@RequestBody QueryUserByCodeDTO dto) {
        this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"getMemberIdByCode","获取IC卡用户主键 - 司机");
        return ApiResponse.success(jkIccardService.getMemberIdByCode(dto));
    }

    private void saveInterfaceLog(String s, String result,String url,String name) {
@@ -205,6 +210,7 @@
    @PostMapping("/alcoholTestAlarm")
    public ApiResponse alcoholTestAlarm(@RequestBody AlcoholTestAlarmDTO dto) {
        jkCabinetGridService.alcoholTestAlarm(dto);
        this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"酒精检测告警","酒精检测告警");
        return ApiResponse.success("操作成功");
    }

@@ -215,8 +221,39 @@
    @PostMapping("/timeOutUnCloseAlarm")
    public ApiResponse timeOutUnCloseAlarm(@RequestBody TimeOutCloseGridDTO dto) {
        jkCabinetGridService.timeOutUnCloseAlarm(dto);
        this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"timeOutUnCloseAlarm","柜格开门超时未关闭告警");
        return ApiResponse.success("操作成功");
    }


    @LoginNoRequired
    @ApiOperation("钥匙柜心跳接口")
    @GetMapping("/heartbeat")
    public ApiResponse heartbeat(@RequestParam String code) {
        jkCabinetService.updHeartbeat(code);
        return ApiResponse.success("链接成功");
    }


    @LoginNoRequired
    @ApiOperation("同步柜格实际钥匙数据")
    @PostMapping("/syncGridData")
    public ApiResponse syncGridData(@RequestBody SyncCabinetDTO dto) {
        jkCabinetGridService.syncGridData(dto);
        this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"syncGridData","同步柜格实际钥匙数据");
        return ApiResponse.success("操作成功");
    }


    @LoginNoRequired
    @ApiOperation("testTimeOutBackAlarm")
    @GetMapping("/testTimeOutBackAlarm")
    public ApiResponse testTimeOutBackAlarm() {
        jkCabinetLogService.timeOutUnBackAlarm(impl);
        return ApiResponse.success("操作成功");
    }




}