From 9e64b2df66a7ab69b9daf258999d88844cccecce Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 03 二月 2026 18:02:18 +0800
Subject: [PATCH] 抓拍和ai事件回显逻辑调整
---
fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
index be31851..3c38737 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
@@ -1,6 +1,8 @@
package com.fzzy.inout;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.igds.camera.data.ApiCameraData;
+import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.*;
@@ -20,8 +22,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.net.URLDecoder;
import java.util.Date;
import java.util.List;
@@ -44,17 +48,18 @@
/**
* 鐧昏锛屽嚭鍏ュ簱鍏辩敤
+ *
* @param httpRequest
- * @param sort 閰嶅鍙�
- * @param type 涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱
+ * @param sort 閰嶅鍙�
+ * @param type 涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱
* @param view
* @return
*/
@RequestMapping("/register")
public String register(HttpServletRequest httpRequest,
- @RequestParam(value = "sort", required = false) String sort,
- @RequestParam(value = "type", required = false) String type,
- ModelMap view) {
+ @RequestParam(value = "sort", required = false) String sort,
+ @RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
SysUser user = ContextUtil.getLoginUser();
view.put(Constant.MODEL_KEY_LOGIN_USER, user);
@@ -92,11 +97,16 @@
InoutConf conf = inoutManager.getInoutConf(listInoutConf, sort, Constant.CONF_TYPE_10, Constant.PROGRESS_REGISTER, 1);
view.put("lprDto", conf);
+ //搴撳尯缃戝叧淇℃伅
+ GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
+ view.put("gatewaySer", gatewaySer);
+
return prefix + "/register";
}
/**
* 璐ㄦ椤甸潰
+ *
* @return
*/
@RequestMapping("/check")
@@ -140,6 +150,7 @@
/**
* 鍑哄叆搴撳�间粨
+ *
* @param httpRequest
* @param sort
* @param type
@@ -148,9 +159,9 @@
*/
@RequestMapping("/handle")
public String handle(HttpServletRequest httpRequest,
- @RequestParam(value = "sort", required = false) String sort,
- @RequestParam(value = "type", required = false) String type,
- ModelMap view) {
+ @RequestParam(value = "sort", required = false) String sort,
+ @RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
//濡傛灉娌℃湁鎸囧畾鍦扮锛屼粠鐢ㄦ埛涓婁竴涓�夋嫨涓幏鍙�
if (StringUtils.isEmpty(sort)) {
@@ -278,6 +289,9 @@
view.put("endTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
view.put("startTime", DateFormatUtils.format(DateUtil.getNewByDay(null, -30), "yyyy-MM-dd"));
+ //搴撳尯缃戝叧淇℃伅
+ GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
+ view.put("gatewaySer", gatewaySer);
String viewStr = prefix + "/weight";
if ("1".equals(viewTag)) {
@@ -328,6 +342,7 @@
/**
* 鏍规嵁鏉′欢鏌ヨ寰呯О閲嶇殑鏁版嵁
+ *
* @param param
* @return
*/
@@ -354,6 +369,7 @@
/**
* 鍑哄叆搴撳寲楠屼俊鎭彁浜�
+ *
* @param data
* @return
*/
@@ -366,6 +382,7 @@
/**
* 鍑哄叆搴撶О閲嶇幆鑺傛彁浜�
+ *
* @param data
* @return
*/
@@ -427,4 +444,48 @@
public PageResponse<List<InoutNoticeOut>> listNoticeOut(@RequestBody NoticeParam param) {
return inoutManager.listNoticeOut(param);
}
+
+
+ /**
+ * 鍑哄叆搴撹鍗曢〉闈㈢殑鍙鍖栬拷韪〉闈�
+ *
+ * @return
+ */
+ @RequestMapping("/inout-img")
+ public String inoutImg(@RequestParam(value = "id", required = true) String id,
+ @RequestParam(value = "plateNum", required = false) String plateNum,
+ @RequestParam(value = "user", required = false) String userName,
+ ModelMap view) {
+ try {
+ if (StringUtils.isNotEmpty(plateNum)) {
+ view.put("plateNum", URLDecoder.decode(plateNum, "UtF-8"));
+ }
+ if (StringUtils.isNotEmpty(userName)) {
+ view.put("userName", URLDecoder.decode(userName, "UtF-8"));
+ }
+
+ List<FileInfo> files = inoutManager.cutImgList(id);
+ view.put("files", files);
+ } catch (Exception e) {
+ log.error("鍚庡彴寮傚父:{}", e);
+ }
+ return prefix + "/inout-img";
+ }
+
+
+
+
+ /**
+ * 鑾峰彇瑙嗛鎾斁鍦板潃
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/get-media")
+ @ResponseBody
+ public ApiCameraResp getMedia(@RequestBody InoutConf param) {
+ //鑾峰彇璇锋眰鏂笽P
+ return inoutManager.getPlayAddr(param);
+ }
+
}
--
Gitblit v1.9.3