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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 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 f9f1183..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
@@ -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("鑾峰彇閽ュ寵鏌淎PK鏈�鏂扮増鏈�")
@@ -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("鎿嶄綔鎴愬姛");
+ }
+
+
+
+
}
--
Gitblit v1.9.3