fzzy-igdss.git - Gitblit

sgj

2 天以前 43190865042aea5a04f86ae8707fd002e716b231

只能抓拍检索修改

已修改4个文件

	fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapRecordController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java

@@ -44,16 +44,13 @@
        param.setCompanyId(ContextUtil.getCompanyId());
        queryWrapper.eq("company_id", param.getCompanyId());

        //库区检索
        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }

        if (StringUtils.isNotBlank(param.getDepotId())) {
            queryWrapper.eq("depot_id", param.getDepotId());
        }
        //标签检索
        // 收储公司检索
        if (StringUtils.isNotBlank(param.getKey())) {
            queryWrapper.like("tags", param.getKey());
            queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
        }
        //抓拍时间检索
        if (param.getStart() != null && param.getEnd() != null) {

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapRecordController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.SnapRecord;
@@ -16,6 +17,10 @@
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


@Slf4j
@@ -46,8 +51,12 @@
        model.addAttribute("currentPage", images.getCurrent());
        model.addAttribute("totalItems", images.getTotal());
        model.addAttribute("pageSize", images.getSize());
        //设备数据
        model.addAttribute("cameraList", commonManager.listCameraData());
        //库区数据
        model.addAttribute("deptList", commonManager.listDeptData());
        //公司数据
        model.addAttribute("companyList", commonManager.listCompanyData());
        return prefix + "/snapRecord";
    }


 fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html

@@ -142,7 +142,6 @@
    var deptList = [[${deptList}]];
    var bizTypeList = [[${bizTypeList}]];
    var companyList = [[${companyList}]];

    var currentPage = [[${currentPage}]];
    var totalItems = [[${totalItems}]];
    var pageSize = [[${pageSize}]];

 fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html

@@ -1,13 +1,14 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<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">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <th:block th:include="include :: header('智能抓拍')"/>
    <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
    <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" />
</head>
<body class="gray-bg">
<div class="container-div">
@@ -18,20 +19,24 @@
                <div class="select-list">
                    <ul>
                        <li>
                            收储公司：<select name="companyId">
                            <option value="all">所有</option>
                            收储公司：<select  class="form-control" name="key">
                            <option value="">所有</option>
                            <option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.dwmc}">
                            </option>
                        </select>
                        </li>
                        <li>
                            所选库区：<select name="deptId">
                            所选库区：<select class="form-control" name="deptId">
                            <option value="">所有</option>
                            <option th:each="dept : ${deptList}" th:value="${dept.id}" th:text="${dept.kqmc}">
                            </option>
                        </select>
                        </li>
                        <li class="select-time">
                            <label style="width: 100px">抓拍时间：</label>
                            <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="开始时间" name="params[begin]"/>
                            <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="params[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
@@ -135,11 +140,13 @@
    </div>
</div>
<th:block th:include="include :: footer"/>
<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
<th:block th:include="include :: select2-js" />
<script th:src="@{/security/snap/snapRecord.js}"></script>
<script th:inline="javascript">
    var cameraList = [[${cameraList}]];
    var deptList = [[${deptList}]];
    var companyList = [[${companyList}]];
    var currentPage = [[${currentPage}]];
    var totalItems = [[${totalItems}]];
    var pageSize = [[${pageSize}]];

			@@ -44,16 +44,13 @@
			param.setCompanyId(ContextUtil.getCompanyId());
			queryWrapper.eq("company_id", param.getCompanyId());

			//库区检索
			if (StringUtils.isNotBlank(param.getDeptId())) {
			queryWrapper.eq("dept_id", param.getDeptId());
			}

			if (StringUtils.isNotBlank(param.getDepotId())) {
			queryWrapper.eq("depot_id", param.getDepotId());
			}
			//标签检索
			// 收储公司检索
			if (StringUtils.isNotBlank(param.getKey())) {
			queryWrapper.like("tags", param.getKey());
			queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
			}
			//抓拍时间检索
			if (param.getStart() != null && param.getEnd() != null) {

			@@ -2,6 +2,7 @@

			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			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.SnapRecord;
			@@ -16,6 +17,10 @@
			import org.springframework.web.bind.annotation.ResponseBody;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;


			@Slf4j
			@@ -46,8 +51,12 @@
			model.addAttribute("currentPage", images.getCurrent());
			model.addAttribute("totalItems", images.getTotal());
			model.addAttribute("pageSize", images.getSize());
			//设备数据
			model.addAttribute("cameraList", commonManager.listCameraData());
			//库区数据
			model.addAttribute("deptList", commonManager.listDeptData());
			//公司数据
			model.addAttribute("companyList", commonManager.listCompanyData());
			return prefix + "/snapRecord";
			}

			@@ -142,7 +142,6 @@
			var deptList = [[${deptList}]];
			var bizTypeList = [[${bizTypeList}]];
			var companyList = [[${companyList}]];

			var currentPage = [[${currentPage}]];
			var totalItems = [[${totalItems}]];
			var pageSize = [[${pageSize}]];

			@@ -1,13 +1,14 @@
			<!DOCTYPE html>
			<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			<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">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="renderer" content="webkit">
			<th:block th:include="include :: header('智能抓拍')"/>
			<link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
			<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" />
			</head>
			<body class="gray-bg">
			<div class="container-div">
			@@ -18,20 +19,24 @@
			<div class="select-list">
			<ul>
			<li>
			收储公司：<select name="companyId">
			<option value="all">所有</option>
			收储公司：<select class="form-control" name="key">
			<option value="">所有</option>
			<option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.dwmc}">
			</option>
			</select>
			</li>
			<li>
			所选库区：<select name="deptId">
			所选库区：<select class="form-control" name="deptId">
			<option value="">所有</option>
			<option th:each="dept : ${deptList}" th:value="${dept.id}" th:text="${dept.kqmc}">
			</option>
			</select>
			</li>
			<li class="select-time">
			<label style="width: 100px">抓拍时间：</label>
			<input type="text" class="time-input" style="width: 120px;" id="start" placeholder="开始时间" name="params[begin]"/>
			<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="params[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
			@@ -135,11 +140,13 @@
			</div>
			</div>
			<th:block th:include="include :: footer"/>
			<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
			<script th:src="@{/ajax/libs/layui/layui.js}"></script>
			<th:block th:include="include :: select2-js" />
			<script th:src="@{/security/snap/snapRecord.js}"></script>
			<script th:inline="javascript">
			var cameraList = [[${cameraList}]];
			var deptList = [[${deptList}]];
			var companyList = [[${companyList}]];
			var currentPage = [[${currentPage}]];
			var totalItems = [[${totalItems}]];
			var pageSize = [[${pageSize}]];