From 1fb6ce7f165e85cb9458d6e8d1b6bf7debc1e665 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 03 十二月 2025 14:26:37 +0800
Subject: [PATCH] 功能开发
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
index c0d9d91..18e3c1a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
+++ b/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("鑾峰彇閽ュ寵鏌淎PK鏈�鏂扮増鏈�")
@@ -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")
--
Gitblit v1.9.3