From 48d06fac940e6f28d599eb7fbf05c2cce41ecb30 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 10:35:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 bd343db..f9f1183 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
@@ -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("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3