From 5eff686e04c7395c2ff75b0861507d3ec15b0c3e Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 24 十二月 2025 10:58:20 +0800
Subject: [PATCH] ai事件、智能抓拍修改
---
fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html | 26 ++++++++----
fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js | 12 +++---
fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java | 20 +++++----
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 4 ++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 4 ++
fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js | 12 +++---
fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html | 4 ++
fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java | 17 +++++---
8 files changed, 62 insertions(+), 37 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
index 4c122d3..3947471 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
@@ -61,6 +61,10 @@
if (param.getStart() != null && param.getEnd() != null) {
queryWrapper.between("time", param.getStart(), param.getEnd());
}
+ //浜嬩欢鍚嶇О
+ if (StringUtils.isNotBlank(param.getName())) {
+ queryWrapper.like("name", param.getName());
+ }
queryWrapper.orderByDesc("create_time");
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
index a99d031..6c7cd7a 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
@@ -57,6 +57,10 @@
if (param.getStart() != null && param.getEnd() != null) {
queryWrapper.between("snap_time", param.getStart(), param.getEnd());
}
+ //鏍囩妫�绱�
+ if (StringUtils.isNotBlank(param.getName())) {
+ queryWrapper.like("tags", param.getName());
+ }
queryWrapper.orderByDesc("create_time");
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
index 16c973d..d90416b 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
@@ -1,20 +1,18 @@
package com.fzzy.security;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.constant.WarnType;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.EventInfo;
-import com.fzzy.common.manager.CommonManager;
import com.fzzy.security.manager.EventInfoManager;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -38,14 +36,12 @@
/**
* AI浜嬩欢绠＄悊椤甸潰
*
+ * @param model
* @author sgj
* @date 2025/12/10
- * @param model
-
*/
@GetMapping
- public String getEventInfo(
- Model model) {
+ public String getEventInfo(@RequestParam(value = "viewType", required = false) String viewType, Model model) {
IgdsBaseParam param = new IgdsBaseParam();
param.setPage(1);
@@ -55,6 +51,12 @@
model.addAttribute("currentPage", events.getCurrent());
model.addAttribute("totalItems", events.getTotal());
model.addAttribute("pageSize", events.getSize());
+ if (StringUtils.isEmpty(viewType)) {
+ // 1 瀹夐槻椤甸潰 2 鐩戠椤甸潰
+ viewType = "1";
+ }
+ //椤甸潰灞曠ず绫诲瀷
+ model.addAttribute("viewType", viewType);
//璁惧鏁版嵁
model.addAttribute("cameraList", commonManager.listCameraData());
//搴撳尯鏁版嵁
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
index a737d91..d82e3ca 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
@@ -1,19 +1,17 @@
package com.fzzy.security;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.SnapRecord;
-import com.fzzy.common.manager.CommonManager;
import com.fzzy.security.manager.SnapRecordManager;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -35,8 +33,7 @@
* 鑾峰彇鏅鸿兘鎶撴媿椤甸潰
*/
@GetMapping
- public String getSnapRecord(
- Model model) {
+ public String getSnapRecord(@RequestParam(value = "viewType", required = false) String viewType, Model model) {
IgdsBaseParam param = new IgdsBaseParam();
param.setPage(1);
@@ -46,6 +43,12 @@
model.addAttribute("currentPage", images.getCurrent());
model.addAttribute("totalItems", images.getTotal());
model.addAttribute("pageSize", images.getSize());
+ if (StringUtils.isEmpty(viewType)) {
+ // 1 瀹夐槻椤甸潰 2 鐩戠椤甸潰
+ viewType = "1";
+ }
+ //椤甸潰灞曠ず绫诲瀷
+ model.addAttribute("viewType", viewType);
//璁惧鏁版嵁
model.addAttribute("cameraList", commonManager.listCameraData());
//搴撳尯鏁版嵁
diff --git a/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js b/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
index 1a05e30..de824b8 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
@@ -24,9 +24,9 @@
count: typeof totalItems !== 'undefined' ? totalItems : 0,
limit: typeof pageSize !== 'undefined' ? pageSize : 6,
curr: typeof currentPage !== 'undefined' ? currentPage : 1,
- layout: ['prev', 'next'],
- prev: '<i class="layui-icon layui-icon-left"></i>',
- next: '<i class="layui-icon layui-icon-right"></i>',
+ layout: ['prev','page', 'next'],
+ // prev: '<i class="layui-icon layui-icon-left"></i>',
+ // next: '<i class="layui-icon layui-icon-right"></i>',
jump: function (obj, first) {
if (!first) {
searchRecord(obj.curr, obj.limit)
@@ -47,9 +47,9 @@
count: totalCount,
limit: pageSize,
curr: currentPage,
- layout: ['prev', 'next'],
- prev: '<i class="layui-icon layui-icon-left"></i>',
- next: '<i class="layui-icon layui-icon-right"></i>',
+ layout: ['prev', 'page','next'],
+ // prev: '<i class="layui-icon layui-icon-left"></i>',
+ // next: '<i class="layui-icon layui-icon-right"></i>',
jump: function (obj, first) {
if (!first) {
searchRecord(obj.curr, obj.limit)
diff --git a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
index 48c2a5f..fa56b5c 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
@@ -24,9 +24,9 @@
count: typeof totalItems !== 'undefined' ? totalItems : 0,
limit: typeof pageSize !== 'undefined' ? pageSize : 6,
curr: typeof currentPage !== 'undefined' ? currentPage : 1,
- layout: [ 'prev', 'next', ],
- prev: '<i class="layui-icon layui-icon-left"></i>',
- next: '<i class="layui-icon layui-icon-right"></i>',
+ layout: ['prev', 'page', 'next', ],
+ // prev: '<i class="layui-icon layui-icon-left"></i>',
+ // next: '<i class="layui-icon layui-icon-right"></i>',
jump: function (obj, first) {
if (!first) {
searchRecord(obj.curr, obj.limit)
@@ -47,9 +47,9 @@
count: totalCount,
limit: pageSize,
curr: currentPage,
- layout: ['prev', 'next', ],
- prev: '<i class="layui-icon layui-icon-left"></i>',
- next: '<i class="layui-icon layui-icon-right"></i>',
+ layout: ['prev', 'page', 'next', ],
+ // prev: '<i class="layui-icon layui-icon-left"></i>',
+ // next: '<i class="layui-icon layui-icon-right"></i>',
jump: function (obj, first) {
if (!first) {
searchRecord(obj.curr, obj.limit)
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
index c913678..3949fe4 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
@@ -32,6 +32,10 @@
</option>
</select>
</li>
+ <li th:if="${viewType == '1'}" style="display: flex">
+ <label>浜嬩欢鍚嶇О锛�</label>
+ <input class="form-control" type="text" name="name" placeholder="璇疯緭鍏ヤ簨浠跺悕绉�">
+ </li>
<li class="select-time">
<label>浜嬩欢鏃堕棿锛� </label>
<input type="text" class="time-input" style="width: 120px;" id="start" placeholder="寮�濮嬫椂闂�" name="start"/>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
index 318cc3d..7d31c5e 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -8,7 +8,7 @@
<th:block th:include="include :: header('鏅鸿兘鎶撴媿')"/>
<link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui/css/layui.css}"/>
<link rel="stylesheet" th:href="@{/security/snap/snapRecord-style.css}">
- <th:block th:include="include :: select2-css" />
+ <th:block th:include="include :: select2-css"/>
</head>
<body class="gray-bg">
<div class="container-div">
@@ -19,9 +19,10 @@
<div class="select-list">
<ul>
<li>
- 鏀跺偍鍏徃锛�<select class="form-control" name="key">
+ 鏀跺偍鍏徃锛�<select class="form-control" name="key">
<option value="">鎵�鏈�</option>
- <option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.dwmc}">
+ <option th:each="company : ${companyList}" th:value="${company.id}"
+ th:text="${company.dwmc}">
</option>
</select>
</li>
@@ -32,11 +33,16 @@
</option>
</select>
</li>
+ <li th:if="${viewType == '1'}">
+ 鏍囩锛�<input type="text" name="name" placeholder="璇疯緭鍏ユ爣绛�">
+ </li>
<li class="select-time">
<label style="width: 100px">鎶撴媿鏃堕棿锛�</label>
- <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="寮�濮嬫椂闂�" name="start"/>
+ <input type="text" class="time-input" style="width: 120px;" id="start"
+ placeholder="寮�濮嬫椂闂�" name="start"/>
<span>-</span>
- <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="缁撴潫鏃堕棿" name="end"/>
+ <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="缁撴潫鏃堕棿"
+ name="end"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i
@@ -101,11 +107,12 @@
<div class="meta-item" style="width: 50%">
<i class="layui-icon layui-icon-date"></i>
- <span th:text="${snapRecord.snapTime != null ? #dates.format(snapRecord.snapTime, 'yyyy-MM-dd HH:mm') : '鏃犳椂闂�'}"></span> </div>
+ <span th:text="${snapRecord.snapTime != null ? #dates.format(snapRecord.snapTime, 'yyyy-MM-dd HH:mm') : '鏃犳椂闂�'}"></span>
+ </div>
</div>
<div class="meta-item">
<i class="layui-icon layui-icon-home"></i>
-<!-- <span th:text="${snapRecord.deptId}"></span>-->
+ <!-- <span th:text="${snapRecord.deptId}"></span>-->
<th:block th:with="matchedDept=${deptList.?[id == #root.snapRecord.deptId]}">
<!-- 濡傛灉鏈夊尮閰嶉」锛屾樉绀虹涓�涓尮閰嶇殑鎽勫儚澶村悕绉� -->
<th:block th:if="${!#lists.isEmpty(matchedDept)}">
@@ -141,9 +148,10 @@
</div>
<th:block th:include="include :: footer"/>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
-<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: select2-js"/>
<script th:src="@{/security/snap/snapRecord.js}"></script>
<script th:inline="javascript">
+ var viewType = [[${viewType}]];
var cameraList = [[${cameraList}]];
var deptList = [[${deptList}]];
var companyList = [[${companyList}]];
--
Gitblit v1.9.3