rk
12 小时以前 1fb6ce7f165e85cb9458d6e8d1b6bf7debc1e665
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
@@ -29,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.
@@ -64,6 +61,9 @@
    @Autowired
    private JkVersionService jkVersionService;
    @Autowired
    private JkCabinetGridServiceImpl impl;
    @LoginNoRequired
    @ApiOperation("获取钥匙柜APK最新版本")
@@ -140,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("操作成功");
    }
@@ -154,7 +158,6 @@
        return ApiResponse.success("操作成功");
    }
    @LoginNoRequired
    @ApiOperation("获取钥匙柜人脸数据")
    @GetMapping("/getCabinetFaceVO")
@@ -164,8 +167,6 @@
        return ApiResponse.success(cabinetFaceVO);
    }
    @LoginNoRequired
    @ApiOperation("获取可操作柜格 - 司机")
    @PostMapping("/getDriverGrid")
@@ -174,7 +175,6 @@
        this.saveInterfaceLog(JSONObject.toJSONString(dto), JSONObject.toJSONString(jkCabinetGridList),"getDriverGrid","获取可操作柜格 - 司机");
        return ApiResponse.success(jkCabinetGridList);
    }
    @LoginNoRequired
    @ApiOperation("开启柜格 - 司机")
@@ -229,7 +229,8 @@
    @LoginNoRequired
    @ApiOperation("钥匙柜心跳接口")
    @GetMapping("/heartbeat")
    public ApiResponse heartbeat() {
    public ApiResponse heartbeat(@RequestParam String code) {
        jkCabinetService.updHeartbeat(code);
        return ApiResponse.success("链接成功");
    }
@@ -243,9 +244,6 @@
        return ApiResponse.success("操作成功");
    }
    @Autowired
    private JkCabinetGridServiceImpl impl;
    @LoginNoRequired
    @ApiOperation("testTimeOutBackAlarm")