Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

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

@@ -8,12 +8,10 @@
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.JkVersionMapper;
import com.doumee.dao.business.dto.CloseGridDTO;
import com.doumee.dao.business.dto.GetDriverGridDTO;
import com.doumee.dao.business.dto.OpenGridDriverDTO;
import com.doumee.dao.business.dto.OptGridDTO;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.JkCabinetGrid;
import com.doumee.dao.business.model.JkInterfaceLog;
import com.doumee.dao.business.model.JkVersion;
import com.doumee.dao.business.vo.AdminCabinetVO;
import com.doumee.dao.business.vo.CabinetDetailVO;
@@ -55,7 +53,7 @@
    private JkCabinetGridService jkCabinetGridService;

    @Autowired
    private InterfaceLogService interfaceLogService;
    private JkInterfaceLogService interfaceLogService;

    @Autowired
    private JkIccardService jkIccardService;
@@ -89,8 +87,6 @@
        this.saveInterfaceLog(Constants.strToJson("id",id.toString()), null,"updateRunStatusById","更新钥匙柜在线状态");
        return ApiResponse.success("更新成功");
    }



    @ApiOperation("获取可管理的钥匙柜列表 - 管理员")
    @GetMapping("/getAdminCabinetInfo")
@@ -136,6 +132,7 @@
        return ApiResponse.success("操作成功");
    }

    @LoginNoRequired
    @ApiOperation("关闭柜门")
    @PostMapping("/closeGrid")
    public ApiResponse closeGrid(@RequestBody CloseGridDTO dto) {
@@ -154,6 +151,7 @@
    }


    @LoginNoRequired
    @ApiOperation("获取钥匙柜人脸数据")
    @GetMapping("/getCabinetFaceVO")
    public ApiResponse<CabinetFaceVO> getCabinetFaceVO(@RequestParam String code) {
@@ -164,6 +162,7 @@



    @LoginNoRequired
    @ApiOperation("获取可操作柜格 - 司机")
    @PostMapping("/getDriverGrid")
    public ApiResponse<List<JkCabinetGrid>> getDriverGrid(@RequestBody GetDriverGridDTO dto) {
@@ -172,6 +171,7 @@
        return ApiResponse.success(jkCabinetGridList);
    }

    @LoginNoRequired
    @ApiOperation("开启柜格 - 司机")
    @PostMapping("/openGridDriver")
    public ApiResponse openGridDriver(@RequestBody OpenGridDriverDTO dto) {
@@ -180,6 +180,7 @@
        return ApiResponse.success("操作成功");
    }

    @LoginNoRequired
    @ApiOperation("获取IC卡用户主键 - 司机")
    @PostMapping("/getMemberIdByCode")
    public ApiResponse<Integer> getMemberIdByCode(@RequestParam String code) {
@@ -188,7 +189,7 @@
    }

    private void saveInterfaceLog(String s, String result,String url,String name) {
        InterfaceLog hkMonitoryLogDO=new InterfaceLog();
        JkInterfaceLog hkMonitoryLogDO=new JkInterfaceLog();
        hkMonitoryLogDO.setType(0);
        hkMonitoryLogDO.setCreateDate(new Date());
        hkMonitoryLogDO.setIsdeleted(0);
@@ -199,5 +200,23 @@
        interfaceLogService.create(hkMonitoryLogDO);
    }

    @LoginNoRequired
    @ApiOperation("酒精检测告警")
    @PostMapping("/alcoholTestAlarm")
    public ApiResponse alcoholTestAlarm(@RequestBody AlcoholTestAlarmDTO dto) {
        jkCabinetGridService.alcoholTestAlarm(dto);
        return ApiResponse.success("操作成功");
    }



    @LoginNoRequired
    @ApiOperation("柜格开门超时未关闭告警")
    @PostMapping("/timeOutUnCloseAlarm")
    public ApiResponse timeOutUnCloseAlarm(@RequestBody TimeOutCloseGridDTO dto) {
        jkCabinetGridService.timeOutUnCloseAlarm(dto);
        return ApiResponse.success("操作成功");
    }


}