From a995b7c16f4f111007edbdcba1e79af969c5193a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 十二月 2025 16:06:16 +0800
Subject: [PATCH] 优化包结构，及巡更配置提交
---
fzzy-igdss-web/src/main/java/com/fzzy/common/manager/PrintManager.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainManager.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutApiController.java | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml | 13
fzzy-igdss-view/src/main/java/models/core.model.xml | 59 ++++
fzzy-igdss-web/src/main/resources/static/security/patrol-record-style.css | 0
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java | 55 ++++
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java | 26 ++
fzzy-igdss-web/src/main/resources/static/security/patrol-record.js | 0
fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java | 11
fzzy-igdss-web/src/main/resources/templates/security/patrol-record.html | 4
fzzy-igdss-web/src/main/java/com/fzzy/common/PrintController.java | 4
fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml | 211 +++++++++++++++++
fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainExportBuilder.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java | 34 ++
fzzy-igdss-web/src/main/java/com/fzzy/common/manager/FileManager.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java | 8
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 6
fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java | 6
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java | 4
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java | 5
/dev/null | 72 ------
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 160 ++++++------
fzzy-igdss-web/src/main/java/com/fzzy/common/FileController.java | 8
28 files changed, 496 insertions(+), 212 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java
deleted file mode 100644
index 663365c..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.fzzy.igds.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fzzy.igds.domain.PatrolConf;
-import com.fzzy.igds.mapper.PatrolConfMapper;
-import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@Service
-public class PatrolConfService {
-
- @Resource
- private PatrolConfMapper patrolConfMapper;
-
- /**
- * 鏌ヨ鍒楄〃鏁版嵁
- *
- * @param param 鏌ヨ鍙傛暟
- * @return 鏁版嵁鍒楄〃
- */
- public List<PatrolConf> selectList(PatrolConf param) {
- QueryWrapper<PatrolConf> queryWrapper = getQueryWrapper(param);
- return patrolConfMapper.selectList(queryWrapper);
- }
-
- /**
- * 灏佽鏌ヨ鏉′欢
- *
- * @param param 鏌ヨ鍙傛暟
- * @return 鏌ヨ鏋勯�犲櫒
- */
- public QueryWrapper<PatrolConf> getQueryWrapper(PatrolConf param) {
- QueryWrapper<PatrolConf> queryWrapper = new QueryWrapper<>();
- if (param == null) {
- param = new PatrolConf();
- }
-
- // 璁剧疆鍏徃ID骞朵綔涓烘煡璇㈡潯浠�
- param.setCompanyId(ContextUtil.getCompanyId());
- queryWrapper.eq("company_id", param.getCompanyId());
-
- if (StringUtils.isNotEmpty(param.getDeptId())) {
- queryWrapper.eq("dept_id", param.getDeptId());
- }
-
-
- // 鎸夊垱寤烘椂闂村�掑簭鎺掑簭
- queryWrapper.orderByDesc("create_time");
-
- return queryWrapper;
- }
-
- /**
- * 鏍规嵁ID鏌ヨ璇︽儏
- *
- * @param id 涓婚敭ID
- * @return 瀹炰綋瀵硅薄
- */
- public PatrolConf selectById(String id) {
- return patrolConfMapper.selectById(id);
- }
-
- /**
- * 鎻掑叆鏂版暟鎹�
- *
- * @param param 鏁版嵁瀹炰綋
- * @return 褰卞搷琛屾暟
- */
- public int insertData(PatrolConf param) {
- if (StringUtils.isEmpty(param.getId())) {
- param.setId(ContextUtil.generateId());
- }
- return patrolConfMapper.insert(param);
- }
-
- /**
- * 鏇存柊宸叉湁鏁版嵁
- *
- * @param param 鏁版嵁瀹炰綋
- * @return 褰卞搷琛屾暟
- */
- public int updateData(PatrolConf param) {
- return patrolConfMapper.updateById(param);
- }
-
- /**
- * 鍒犻櫎鎸囧畾ID鐨勬暟鎹�
- *
- * @param ids 瑕佸垹闄ょ殑璁板綍ID闆嗗悎锛堥�楀彿鍒嗛殧锛�
- */
- public void deleteDataById( String ids) {
- String[] recordIds = Convert.toStrArray(ids);
- for (String recordId : recordIds) {
- patrolConfMapper.deleteById(recordId);
- }
- }
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolRecordService.java
deleted file mode 100644
index c17fbd0..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolRecordService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.fzzy.igds.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fzzy.igds.data.BaseResp;
-import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.domain.PatrolRecord;
-import com.fzzy.igds.mapper.PatrolRecordMapper;
-import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@Service
-public class PatrolRecordService {
-
- @Resource
- private PatrolRecordMapper patrolRecordMapper;
-
- /**
- * 鍒嗛〉鏌ヨ鏁版嵁
- *
- * @param page
- * @param param
- */
- public void listPage(Page<PatrolRecord> page, IgdsBaseParam param) {
- QueryWrapper<PatrolRecord> queryWrapper = getQueryWrapper(param);
- patrolRecordMapper.selectPage(page, queryWrapper);
- }
-
- public List<PatrolRecord> listAll(IgdsBaseParam param) {
- QueryWrapper<PatrolRecord> queryWrapper = getQueryWrapper(param);
- return patrolRecordMapper.selectList(queryWrapper);
- }
-
- /**
- * 灏佽鏌ヨ鏉′欢
- *
- * @param param
- */
- public QueryWrapper<PatrolRecord> getQueryWrapper(IgdsBaseParam param) {
- QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
-
- param.setCompanyId(ContextUtil.getCompanyId());
- queryWrapper.eq("company_id", param.getCompanyId());
-
- if (StringUtils.isNotBlank(param.getName())) {
- queryWrapper.eq("point_name", param.getName());
- }
- if (StringUtils.isNotBlank(param.getKey())) {
- queryWrapper.eq("patrol_id", param.getKey());
- }
- queryWrapper.orderByDesc("id");
-
- return queryWrapper;
- }
-
-
- /**
- * 娣诲姞鏁版嵁
- *
- * @param patrolRecord
- * @author sgj
- * @date 2025/12/10
- */
- public BaseResp addData(PatrolRecord patrolRecord) {
- patrolRecord.setId(ContextUtil.generateId());
- patrolRecord.setCompanyId(ContextUtil.getCompanyId());
- patrolRecord.setUpdateBy(ContextUtil.getLoginUserName());
- patrolRecord.setUpdateTime(new Date());
- patrolRecord.setCreateBy(ContextUtil.getLoginUserName());
- patrolRecord.setCreateTime(new Date());
- return patrolRecordMapper.insert(patrolRecord) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
- }
-
- /**
- * 鏇存柊鏁版嵁
- *
- * @param patrolRecord
- * @author sgj
- * @date 2025/12/10
- */
- public BaseResp updateData(PatrolRecord patrolRecord) {
- patrolRecord.setUpdateBy(ContextUtil.getLoginUserName());
- patrolRecord.setUpdateTime(new Date());
- return patrolRecordMapper.updateById(patrolRecord) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
- }
-
- /**
- * 鍒犻櫎鏁版嵁
- *
- * @param patrolRecord
- * @author sgj
- * @date 2025/12/10
- */
- public BaseResp deleteData(PatrolRecord patrolRecord) {
- return patrolRecordMapper.deleteById(patrolRecord) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
- }
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index 3981b31..b99a3f8 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -2,12 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
+import com.fzzy.igds.domain.PatrolRecord;
+import com.fzzy.igds.mapper.PatrolConfMapper;
import com.fzzy.igds.mapper.PatrolMapper;
+import com.fzzy.igds.mapper.PatrolRecordMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
-import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -21,89 +25,13 @@
@Resource
private PatrolMapper patrolMapper;
+ @Resource
+ private PatrolRecordMapper patrolRecordMapper;
+ @Resource
+ private PatrolConfMapper patrolConfMapper;
- public List<Patrol> selectList(Patrol param) {
- QueryWrapper<Patrol> queryWrapper = getQueryWrapper(param);
- return patrolMapper.selectList(queryWrapper);
- }
- /**
- * 灏佽鏌ヨ鏉′欢
- *
- * @param param
- */
- public QueryWrapper<Patrol> getQueryWrapper(Patrol param) {
- QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
-
- 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.getUserName())) {
- queryWrapper.like("user_name", param.getUserName());
- }
- if (StringUtils.isNotBlank(param.getConfName())) {
- queryWrapper.like("conf_name", param.getConfName());
- }
-
- queryWrapper.orderByDesc("create_time");
-
- return queryWrapper;
- }
-
- /**
- * 閫氳繃id鏌ヨ鍗曟潯鏁版嵁
- *
- * @param id
- * @author sgj
- * @date 2025/12/10
- */
- public Patrol selectById(String id) {
- return patrolMapper.selectById(id);
- }
-
- /**
- * 鏂板鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public int insertData(Patrol param) {
- if (StringUtils.isEmpty(param.getId())) {
- param.setId(ContextUtil.generateId());
- }
- return patrolMapper.insert(param);
- }
-
- /**
- * 鏇存柊鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public int updateData(Patrol param) {
- return patrolMapper.updateById(param);
- }
-
- /**
- * 閫氳繃id鍒犻櫎涓�鏉℃暟鎹�
- *
- * @param ids
- * @author sgj
- * @date 2025/12/10
- */
- public void deleteDataById(String ids) {
- String[] recordIds = Convert.toStrArray(ids);
- for (String recordId : recordIds) {
- patrolMapper.deleteById(recordId);
- }
- }
-
+ /*--------------------宸℃洿涓昏〃绠＄悊------------------*/
/**
* 鏌ヨ7澶╁唴鐨勬墍鏈夊贰鏇磋褰曚俊鎭�
*
@@ -146,4 +74,72 @@
patrolMapper.selectPage(page, queryWrapper);
}
+
+ /*--------------------宸℃洿杞ㄨ抗琛ㄧ鐞�------------------*/
+ /**
+ * 鏍规嵁宸℃洿ID鏌ヨ鍏蜂綋鐐逛綅淇℃伅
+ * @param patrolId
+ * @return
+ */
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
+
+ if(StringUtils.isBlank(patrolId)){
+ return null;
+ }
+
+ QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("patrol_id", patrolId);
+ queryWrapper.orderByDesc("id");
+
+ return patrolRecordMapper.selectList(queryWrapper);
+ }
+
+
+ /*--------------------宸℃洿閰嶇疆琛ㄧ鐞�------------------*/
+ /**
+ * 鏌ヨ搴撳尯涓嬫墍鏈夐厤缃俊鎭�
+ * @param param
+ * @return
+ */
+ public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {
+
+ if(null == param){
+ param = new IgdsBaseParam();
+ }
+ QueryWrapper<PatrolConf> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotEmpty(param.getName())){
+ queryWrapper.like("name", param.getName());
+ }
+ if(StringUtils.isNotBlank(param.getDeptId())){
+ queryWrapper.like("dept_id", param.getDeptId());
+ }else {
+ if(StringUtils.isNotBlank(param.getCompanyId())){
+ queryWrapper.likeRight("dept_id", param.getCompanyId());
+ }
+ }
+ return patrolConfMapper.selectList(queryWrapper);
+ }
+
+ public BaseResp addPatrolConf(PatrolConf conf) {
+ conf.setId(ContextUtil.generateId());
+ conf.setCompanyId(ContextUtil.getCompanyId());
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ conf.setCreateBy(ContextUtil.getLoginUserName());
+ conf.setCreateTime(new Date());
+
+ return patrolConfMapper.insert(conf) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+ }
+
+ public BaseResp updatePatrolConf(PatrolConf conf) {
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ return patrolConfMapper.updateById(conf) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
+ }
+
+ public BaseResp deletePatrolConf(PatrolConf conf) {
+ return patrolConfMapper.deleteById(conf) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
+ }
+
+
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
index c1222e0..c7bb898 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
@@ -74,7 +74,7 @@
if(select){
var patrolId = select.get("id");

- var url = "/security/patrol/patrolRecord/"+patrolId+"?time="+ new Date().getTime();
+ var url = "/security/patrol-record?patrolId="+patrolId+"&time="+ new Date().getTime();

view.get("#iFrameTrack").set("path",url);
view.get("#dialogTrack").show();
@@ -96,7 +96,7 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm>
- <Property name="cols">*,*,*,*,90,90</Property>
+ <Property name="cols">*,*,*,*,90,90,120</Property>
<Property name="dataSet">dsParam</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
@@ -137,6 +137,15 @@
<Property name="exClassName">btn-q2</Property>
<Property name="iconClass">fa fa-refresh</Property>
</Button>
+ <Button>
+ <ClientEvent name="onClick">
+ var url = "/com.fzzy.igds.PatrolConf.d";
+ window.$openTab("宸℃洿閰嶇疆", url);
+ </ClientEvent>
+ <Property name="caption">宸℃洿閰嶇疆</Property>
+ <Property name="exClassName">btn-q1</Property>
+ <Property name="iconClass">fa fa-plus-square</Property>
+ </Button>
</AutoForm>
</Container>
<Container>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml
new file mode 100644
index 0000000..7e06887
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model/>
+ <View layout="padding:10">
+ <ClientEvent name="onClick">
+/**
+* 鏌ヨ
+*/
+query = function(){
+ view.get("#dsMain").flushAsync();
+}
</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="loadMode">lazy</Property>
+ <Property name="dataType">[dtPatrolConf]</Property>
+ <Property name="dataProvider">patrolPR#listPatrolConf</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});</ClientEvent>
+ <Property name="dataType">dtBaseParam</Property>
+ </DataSet>
+ <Container>
+ <Property name="className">c-param</Property>
+ <AutoForm>
+ <Property name="cols">*,90,90,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Property name="label">鐝鍚嶇О</Property>
+ <Property name="labelWidth">90</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Button>
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+console.log("param");
+view.get("#dsMian").set("parameter",param).flushAsync();
+</ClientEvent>
+ <Property name="caption">鎼滅储</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-q1</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsParam").set("data",{});</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </AutoForm>
+ </Container>
+ <Container>
+ <Property name="className">c-data</Property>
+ <ToolBar>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dsMain").insert({});
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var data = view.get("#dgMain").get("selection");
+view.get("#dialogMain").show();
+ </ClientEvent>
+ <Property name="id">btnUpdate</Property>
+ <Property name="caption">淇敼</Property>
+ <Property name="exClassName">btn2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-pencil-square-o</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var data = view.get("#dgMain").get("selection")
+if(!data){
+ $alert("璇烽�夋嫨鏁版嵁");
+ }else{
+ view.get("#ajaxDelData").set("parameter", data).execute(function(result){
+ if("200"!=result.code){
+ $alert("寮傚父淇℃伅锛�"+result.message);
+ }else{
+ $notify("鎵ц鎴愬姛");
+ query();
+ }
+ })
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </ToolBarButton>
+ </ToolBar>
+ <DataGrid id="dgMain" layoutConstraint="padding:8" selectionMode="singleRow">
+ <ClientEvent name="onDataRowClick">self.set("selection", arg.data)</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowSelectorColumn/>
+ <RowNumColumn/>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">400</Property>
+ </DataColumn>
+ <DataColumn name="start">
+ <Property name="property">start</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ <DataColumn name="end">
+ <Property name="property">end</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ <DataColumn name="remark">
+ <Property name="property">remark</Property>
+ </DataColumn>
+ <DataColumn name="updateBy">
+ <Property name="property">updateBy</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ <Property name="width">200</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">550</Property>
+ <Property name="caption">宸℃洿閰嶇疆淇℃伅</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">view.get("#saveAction").execute(function(){
+ self.get("parent").hide();
+});</ClientEvent>
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">120</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">120</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm layoutConstraint="padding:10">
+ <Property name="cols">*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateBy</Property>
+ <Property name="property">updateBy</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="saveAction">
+ <Property name="dataResolver">patrolPR#saveUpdateConf</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDelData">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゆ暟鎹箞锛�</Property>
+ <Property name="service">patrolPR#deletePatrolConf</Property>
+ </AjaxAction>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
index e5dcdc8..d5acbfb 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
@@ -1,17 +1,19 @@
package com.fzzy.igds;
import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.data.PatrolSuperData;
-import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.domain.InoutNoticeIn;
-import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.*;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.utils.DateUtil;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -28,6 +30,7 @@
@Resource
private CoreDeptService coreDeptService;
+ /*-------------------宸℃鐩戠缁熻淇℃伅--------------------*/
/**
* patrolPR#getData 宸℃鐩戠缁熻
*
@@ -77,6 +80,7 @@
return new ArrayList<>(map.values());
}
+ /*-------------------鐢靛瓙宸℃洿璁板綍涓昏〃淇℃伅--------------------*/
/**
* patrolPR#pagePatrolData 鑾峰彇宸℃璁板綍淇℃伅
*
@@ -98,4 +102,47 @@
page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
}
+
+
+ /*-------------------鐢靛瓙宸℃洿閰嶇疆淇℃伅--------------------*/
+
+ /**
+ * patrolPR#listPatrolConf
+ * 閾惰鍒楄〃
+ */
+ @DataProvider
+ public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {
+ return patrolService.listPatrolConf(param);
+ }
+
+ /**
+ * 淇濆瓨/鏇存柊
+ * patrolPR#saveUpdateConf
+ * @param bank
+ * @return
+ */
+ @Transactional
+ @DataResolver
+ public BaseResp saveUpdateConf(PatrolConf bank){
+
+ if(StringUtils.isEmpty(bank.getId())){
+ return patrolService.addPatrolConf(bank);
+ }else {
+ return patrolService.updatePatrolConf(bank);
+ }
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * patrolPR#deletePatrolConf
+ * @param bank
+ * @return
+ */
+ @Expose
+ public BaseResp deletePatrolConf(PatrolConf bank){
+ if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
+ return BaseResp.success();
+ }
+
}
diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 8eafb4e..19ae333 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -1862,4 +1862,63 @@
<Property name="label">淇敼浜�</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtPatrolConf">
+ <Property name="matchType">com.fzzy.igds.domain.PatrolConf</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鐝鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="userId">
+ <Property></Property>
+ <Property name="label">宸￠�讳汉</Property>
+ </PropertyDef>
+ <PropertyDef name="userName">
+ <Property></Property>
+ <Property name="label">宸￠�讳汉</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鐝璧峰鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鐝鎴鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ </DataType>
</Model>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/FileController.java
similarity index 86%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/common/FileController.java
index 5524ca2..bee991d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/FileController.java
@@ -1,11 +1,9 @@
-package com.fzzy.sys.controller.file;
+package com.fzzy.common;
+import com.fzzy.common.manager.CommonManager;
+import com.fzzy.common.manager.FileManager;
import com.fzzy.igds.data.PageResponse;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.file.FileManager;
-import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/print/PrintController.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/PrintController.java
similarity index 95%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/print/PrintController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/common/PrintController.java
index 86759b9..50da899 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/print/PrintController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/PrintController.java
@@ -1,5 +1,6 @@
-package com.fzzy.sys.controller.print;
+package com.fzzy.common;
+import com.fzzy.common.manager.PrintManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.InoutData;
@@ -7,7 +8,6 @@
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.InoutRecordService;
-import com.fzzy.sys.manager.print.PrintManager;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
similarity index 98%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
index a975bc5..e99201a 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.manager.common;
+package com.fzzy.common.manager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/FileManager.java
similarity index 98%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/common/manager/FileManager.java
index c7fab1c..fa72dcd 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/FileManager.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.manager.file;
+package com.fzzy.common.manager;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.PageResponse;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/print/PrintManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/PrintManager.java
similarity index 95%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/print/PrintManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/common/manager/PrintManager.java
index 29ac315..c18b82a 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/print/PrintManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/PrintManager.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.manager.print;
+package com.fzzy.common.manager;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.InoutRecordService;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/grain/GrainController.java b/fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java
similarity index 98%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/grain/GrainController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java
index c16b1f0..a2eb0de 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/grain/GrainController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java
@@ -1,5 +1,6 @@
-package com.fzzy.sys.controller.grain;
+package com.fzzy.grain;
+import com.fzzy.grain.manager.GrainManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.data.*;
@@ -7,8 +8,7 @@
import com.fzzy.igds.request.ExeBaseRequest;
import com.fzzy.igds.response.GrainResponse;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.grain.GrainManager;
+import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainExportBuilder.java b/fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainExportBuilder.java
similarity index 99%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainExportBuilder.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainExportBuilder.java
index e751048..cb5cb57 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainExportBuilder.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainExportBuilder.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.manager.grain;
+package com.fzzy.grain.manager;
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.FoodVariety;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainManager.java
similarity index 99%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainManager.java
index 77972e0..f11af80 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainManager.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.manager.grain;
+package com.fzzy.grain.manager;
import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.constant.RespCodeEnum;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
similarity index 95%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
index 0ec94b3..c316d5b 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
@@ -1,13 +1,13 @@
-package com.fzzy.sys.controller.group;
+package com.fzzy.group;
+import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.websocket.WebSocketPacket;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.gropu.GroupManager;
+import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/gropu/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
similarity index 98%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/gropu/GroupManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
index 4750ad6..6ab869d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/gropu/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.manager.gropu;
+package com.fzzy.group.manager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutApiController.java b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutApiController.java
similarity index 98%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutApiController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutApiController.java
index 79b29fb..2b8aeba 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutApiController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutApiController.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.controller.inout;
+package com.fzzy.inout;
import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.RespCodeEnum;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
similarity index 98%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
index 18b51d2..be31851 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
@@ -1,15 +1,13 @@
-package com.fzzy.sys.controller.inout;
+package com.fzzy.inout;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fzzy.common.dto.BaseParam;
import com.fzzy.igds.constant.Constant;
-import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.inout.InoutManager;
+import com.fzzy.common.manager.CommonManager;
+import com.fzzy.inout.manager.InoutManager;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java
similarity index 99%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java
index d4bba19..fe19eea 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.manager.inout;
+package com.fzzy.inout.manager;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.Constant;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/EventInfoController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
similarity index 95%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/EventInfoController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
index 35d6269..16c973d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/EventInfoController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
@@ -1,4 +1,4 @@
-package com.fzzy.sys.controller.security;
+package com.fzzy.security;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.RespCodeEnum;
@@ -6,8 +6,8 @@
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.EventInfo;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.security.EventInfoManager;
+import com.fzzy.common.manager.CommonManager;
+import com.fzzy.security.manager.EventInfoManager;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
similarity index 88%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
index 5d57da7..7c56232 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
@@ -1,26 +1,25 @@
-package com.fzzy.sys.controller.security;
+package com.fzzy.security;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.CameraPlayType;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.Camera;
+import com.fzzy.igds.domain.PatrolRecord;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.security.SecManager;
+import com.fzzy.common.manager.CommonManager;
+import com.fzzy.security.manager.SecManager;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -242,4 +241,25 @@
return prefix + "/quantity";
}
+
+
+ /*------------------宸℃洿杞ㄨ抗椤甸潰------------------*/
+ /**
+ * 鑾峰彇宸℃洿璁板綍椤甸潰
+ *
+ * @param patrolId
+ * @param view
+ * @return
+ */
+ @RequestMapping("/patrol-record")
+ public String getPatrolRecordById(@RequestParam(value = "patrolId", required = true) String patrolId,
+ ModelMap view) {
+ IgdsBaseParam param = new IgdsBaseParam();
+ param.setKey(patrolId);
+ List<PatrolRecord> trackPoints = secManager.getRecordByPatrolId(patrolId);
+ view.put("patrolRecordList", trackPoints);
+
+ return prefix + "/patrol-record";
+ }
+
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapRecordController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
similarity index 88%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapRecordController.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
index 6d12ca1..a737d91 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapRecordController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
@@ -1,13 +1,12 @@
-package com.fzzy.sys.controller.security;
+package com.fzzy.security;
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;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.security.SnapRecordManager;
+import com.fzzy.common.manager.CommonManager;
+import com.fzzy.security.manager.SnapRecordManager;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -17,10 +16,6 @@
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
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java
similarity index 91%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java
index 6f83bc0..89e6619 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java
@@ -1,12 +1,11 @@
-package com.fzzy.sys.manager.security;
+package com.fzzy.security.manager;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.EventInfo;
-import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.EventInfoService;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.sys.manager.common.CommonManager;
+import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SecManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
similarity index 89%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SecManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
index e4a03d4..0c663cd 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SecManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
@@ -1,5 +1,6 @@
-package com.fzzy.sys.manager.security;
+package com.fzzy.security.manager;
+import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.camera.ApiCameraManager;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
@@ -9,6 +10,7 @@
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolRecord;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.service.SecCameraService;
@@ -40,6 +42,8 @@
private PatrolService patrolService;
@Resource
private CoreDeptService coreDeptService;
+ @Resource
+ private CommonManager commonManager;
/**
*
@@ -206,4 +210,24 @@
return patrolSuperData;
}
+
+ /**
+ * 鏍规嵁ID鑾峰彇鐐逛綅淇℃伅
+ *
+ * @param patrolId
+ * @return
+ */
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
+
+ List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId);
+
+ if(null != patrolRecords && !patrolRecords.isEmpty()){
+ //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ for (PatrolRecord record : patrolRecords) {
+ record.setImgName(commonManager.isImgExit( record.getImgName(), null));
+ }
+ }
+
+ return patrolRecords;
+ }
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java
similarity index 93%
rename from fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java
rename to fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java
index 3d8c092..7184b91 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java
@@ -1,11 +1,11 @@
-package com.fzzy.sys.manager.security;
+package com.fzzy.security.manager;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.SnapRecordService;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.sys.manager.common.CommonManager;
+import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
deleted file mode 100644
index f9b4618..0000000
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.fzzy.sys.controller.security;
-
-import com.fzzy.igds.domain.PatrolConf;
-import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.security.PatrolConfManager;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.ShiroUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Controller
-@RequestMapping("/security/patrol/patrolConf")
-public class PatrolConfController extends BaseController {
-
- private static final String prefix = "security/patrol/patrolConf";
-
- @Resource
- private PatrolConfManager patrolConfManager;
-
- @Resource
- private CommonManager commonManager;
-
- /**
- * 宸℃洿閰嶇疆椤甸潰
- */
- @GetMapping()
- public String patrolConf(ModelMap mmap) {
- return prefix + "/patrolConf";
- }
-
- /**
- * 鏌ヨ宸℃洿閰嶇疆鍒楄〃
- */
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(PatrolConf param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- startPage();
- List<PatrolConf> list = patrolConfManager.selectList(param);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭宸℃洿閰嶇疆鍒楄〃
- */
- @Log(title = "宸℃洿閰嶇疆绠＄悊", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(PatrolConf param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- List<PatrolConf> list = patrolConfManager.selectList(param);
- ExcelUtil<PatrolConf> util = new ExcelUtil<>(PatrolConf.class);
- return util.exportExcel(list, "宸℃洿閰嶇疆鏁版嵁");
- }
-
- /**
- * 鏂板宸℃洿閰嶇疆椤甸潰
- */
- @GetMapping("/add")
- public String add(ModelMap mmap) {
- //宸￠�讳汉鍒楄〃
- mmap.put("userList", commonManager.listUserData());
- return prefix + "/add";
- }
-
- /**
- * 鏂板宸℃洿閰嶇疆鏁版嵁
- */
- @Log(title = "宸℃洿閰嶇疆绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(@Validated PatrolConf param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- param.setCreateBy(getLoginName());
- param.setCreateTime(new Date());
- if (StringUtils.isEmpty(param.getId())) {
- param.setId(ContextUtil.generateId());
- }
- return toAjax(patrolConfManager.insertData(param));
- }
-
- /**
- * 淇敼宸℃洿閰嶇疆椤甸潰
- */
- @GetMapping("/edit/{id}")
- public String edit(@PathVariable("id") String id, ModelMap mmap) {
- PatrolConf record = patrolConfManager.selectById(id);
- mmap.put("patrolConf", record);
- //宸￠�讳汉鍒楄〃
- mmap.put("userList", commonManager.listUserData());
- return prefix + "/edit";
- }
-
- /**
- * 淇敼宸℃洿閰嶇疆鏁版嵁
- */
- @Log(title = "宸℃洿閰嶇疆绠＄悊", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(@Validated PatrolConf param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- param.setUpdateBy(getLoginName());
- param.setUpdateTime(new Date());
- PatrolConf patrolConf = patrolConfManager.selectById(param.getId());
- if (patrolConf == null) {
- param.setId(ContextUtil.generateId());
- return toAjax(patrolConfManager.insertData(param));
- }
-
- return toAjax(patrolConfManager.updateData(param));
- }
-
- /**
- * 鍒犻櫎宸℃洿閰嶇疆鏁版嵁
- */
- @Log(title = "宸℃洿閰嶇疆绠＄悊", businessType = BusinessType.DELETE)
- @PostMapping("/remove")
- @ResponseBody
- public AjaxResult remove(String ids) {
- patrolConfManager.deleteDataById(ids);
- return success();
- }
-}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
deleted file mode 100644
index 52e6795..0000000
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.fzzy.sys.controller.security;
-
-import com.fzzy.igds.domain.Patrol;
-import com.fzzy.igds.domain.PatrolConf;
-import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.fzzy.sys.manager.security.PatrolConfManager;
-import com.fzzy.sys.manager.security.PatrolManager;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.ShiroUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Controller
-@RequestMapping("/security/patrol")
-public class PatrolController extends BaseController {
-
- private static final String prefix = "security/patrol";
-
- @Resource
- private PatrolManager patrolManager;
-
- @Resource
- private PatrolConfManager patrolConfManager;
-
-
- @Resource
- private CommonManager commonManager;
- /**
- * 鐢靛瓙宸℃洿椤甸潰
- *
- * @author sgj
- * @date 2025/12/06
- */
- @GetMapping()
- public String patrol(ModelMap mmap) {
- //鑾峰彇搴撳尯鍥炴樉鍒楄〃
- mmap.put("deptList", commonManager.listDeptData());
- return prefix + "/patrol";
- }
-
- /**
- * 鏌ヨ鐢靛瓙宸℃洿鍒楄〃
- */
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(Patrol param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- startPage();
- List<Patrol> list = patrolManager.selectList(param);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鐢靛瓙宸℃洿鍒楄〃
- */
- @Log(title = "鐢靛瓙宸℃洿绠＄悊", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(Patrol param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- List<Patrol> list = patrolManager.selectList(param);
- ExcelUtil<Patrol> util = new ExcelUtil<>(Patrol.class);
- return util.exportExcel(list, "鐢靛瓙宸℃洿鏁版嵁");
- }
-
- /**
- * 鏂板鐢靛瓙宸℃洿椤甸潰
- */
- @GetMapping("/add")
- public String add(ModelMap mmap) {
- return prefix + "/add";
- }
-
- /**
- * 鏂板鐢靛瓙宸℃洿鏁版嵁
- */
- @Log(title = "鐢靛瓙宸℃洿绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(@Validated Patrol param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- param.setCreateBy(getLoginName());
- param.setCreateTime(new Date());
- if (StringUtils.isEmpty(param.getId())) {
- param.setId(ContextUtil.generateId());
- }
- return toAjax(patrolManager.insertData(param));
- }
-
- /**
- * 淇敼鐢靛瓙宸℃洿椤甸潰
- */
- @GetMapping("/edit/{id}")
- public String edit(@PathVariable("id") String id, ModelMap mmap) {
- String companyId = ShiroUtils.getLoginUserCompanyId();
- Patrol record = patrolManager.selectById(id);
- mmap.put("patrol", record);
- return prefix + "/edit";
- }
-
- /**
- * 淇敼鐢靛瓙宸℃洿鏁版嵁
- */
- @Log(title = "鐢靛瓙宸℃洿绠＄悊", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(@Validated Patrol param) {
- if (null == param.getCompanyId()) {
- param.setCompanyId(ShiroUtils.getLoginUserCompanyId());
- }
- param.setUpdateBy(getLoginName());
- param.setUpdateTime(new Date());
- Patrol patrol = patrolManager.selectById(param.getId());
- if (patrol == null) {
- param.setId(ContextUtil.generateId());
- return toAjax(patrolManager.insertData(param));
- }
-
- return toAjax(patrolManager.updateData(param));
- }
-
- /**
- * 鍒犻櫎鐢靛瓙宸℃洿鏁版嵁
- */
- @Log(title = "鐢靛瓙宸℃洿绠＄悊", businessType = BusinessType.DELETE)
- @PostMapping("/remove")
- @ResponseBody
- public AjaxResult remove(String ids) {
- patrolManager.deleteDataById(ids);
- return success();
- }
-}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolRecordController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolRecordController.java
deleted file mode 100644
index 1a06e2a..0000000
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolRecordController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.fzzy.sys.controller.security;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fzzy.igds.constant.RespCodeEnum;
-import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.data.PageResponse;
-import com.fzzy.igds.domain.PatrolRecord;
-import com.fzzy.sys.manager.security.PatrolRecordManager;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@Controller
-@RequestMapping("/security/patrol/patrolRecord")
-public class PatrolRecordController {
-
- private static final String prefix = "security/patrol/patrolRecord";
-
- @Resource
- private PatrolRecordManager patrolRecordManager;
-
-
- /**
- * 鑾峰彇宸℃洿璁板綍椤甸潰
- *
- * @param patrolId
- * @param model
- * @return
- */
- @GetMapping("/{patrolId}")
- public String getPatrolRecordById(@PathVariable("patrolId") String patrolId, Model model) {
- IgdsBaseParam param = new IgdsBaseParam();
- param.setKey(patrolId);
- List<PatrolRecord> trackPoints = patrolRecordManager.listAll(param);
- model.addAttribute("patrolRecordList", trackPoints);
- return prefix + "/patrolRecord";
- }
-//
-// /**
-// * 鑾峰彇杞ㄨ抗鍥鹃〉闈�
-// */
-// @GetMapping("trajectoryMap/{patrolId}")
-// public String showTrajectoryMap(@PathVariable("patrolId") String patrolId, Model model) {
-//
-// IgdsBaseParam param = new IgdsBaseParam();
-// param.setKey(patrolId);
-// List<PatrolRecord> trackPoints = patrolRecordManager.listAll(param);
-// model.addAttribute("trackPoints", trackPoints);
-//
-// return prefix + "/trajectoryMap";
-// }
-
- /**
- * 鍒嗛〉鑾峰彇鏁版嵁
- *
- * @param param
- * @return
- */
- @RequestMapping("/pageData")
- @ResponseBody
- public PageResponse<Page<PatrolRecord>> pageData(@RequestBody IgdsBaseParam param) {
- Page<PatrolRecord> patrolRecordPage = patrolRecordManager.pageData(param);
- if (null == patrolRecordPage.getRecords() || patrolRecordPage.getRecords().isEmpty()) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(), "鑾峰彇鍒版暟鎹俊鎭负绌�");
- }
- return new PageResponse<>(RespCodeEnum.CODE_0000, patrolRecordPage);
- }
-}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolConfManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolConfManager.java
deleted file mode 100644
index bb63816..0000000
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolConfManager.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.fzzy.sys.manager.security;
-
-import com.fzzy.igds.domain.PatrolConf;
-import com.fzzy.igds.service.PatrolConfService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@Component
-public class PatrolConfManager {
-
- @Resource
- private PatrolConfService patrolConfService;
-
- /**
- * 鏌ヨ鏁版嵁
- *
- * @param param
- * @return
- */
- public List<PatrolConf> selectList(PatrolConf param) {
- return patrolConfService.selectList(param);
- }
-
- /**
- * 鏍规嵁ID鏌ヨ鏁版嵁
- *
- * @param id
- * @return
- */
- public PatrolConf selectById(String id) {
- return patrolConfService.selectById(id);
- }
-
- /**
- * 鎻掑叆鏁版嵁
- *
- * @param param
- * @return
- */
- public int insertData(PatrolConf param) {
- return patrolConfService.insertData(param);
- }
-
- /**
- * 鏇存柊鏁版嵁
- *
- * @param param
- * @return
- */
- public int updateData(PatrolConf param) {
- return patrolConfService.updateData(param);
- }
-
- /**
- * 鍒犻櫎鏁版嵁
- *
- * @param ids
- */
- public void deleteDataById( String ids) {
- patrolConfService.deleteDataById( ids);
- }
-}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolManager.java
deleted file mode 100644
index b94adcc..0000000
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolManager.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.fzzy.sys.manager.security;
-
-import com.fzzy.igds.domain.Patrol;
-import com.fzzy.igds.service.PatrolService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@Component
-public class PatrolManager {
-
- @Resource
- private PatrolService patrolService;
-
-
- /**
- * 鏌ヨ鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public List<Patrol> selectList(Patrol param) {
- return patrolService.selectList(param);
- }
-
- /**
- * 鏍规嵁id鏌ヨ鏁版嵁
- *
- * @param id
- * @author sgj
- * @date 2025/12/10
- */
- public Patrol selectById(String id) {
- return patrolService.selectById(id);
- }
-
- /**
- * 鏂板鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public int insertData(Patrol param) {
- return patrolService.insertData(param);
- }
-
- /**
- * 淇敼鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public int updateData(Patrol param) {
- return patrolService.updateData(param);
- }
-
- /**
- * 鍒犻櫎鏁版嵁
- *
- * @param ids
- * @author sgj
- * @date 2025/12/10
- */
- public void deleteDataById(String ids) {
- patrolService.deleteDataById(ids);
- }
-
-}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java
deleted file mode 100644
index fbf892f..0000000
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.fzzy.sys.manager.security;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.domain.PatrolRecord;
-import com.fzzy.igds.domain.SnapRecord;
-import com.fzzy.igds.service.PatrolRecordService;
-import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.sys.manager.common.CommonManager;
-import com.ruoyi.common.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-@Component
-public class PatrolRecordManager {
-
- @Resource
- private PatrolRecordService patrolRecordService;
- @Resource
- private CommonManager commonManager;
-
- /**
- * 鍒嗛〉鏌ヨ鏁版嵁
- *
- * @param param
- * @return
- */
- public Page<PatrolRecord> pageData(IgdsBaseParam param) {
- if (StringUtils.isEmpty(param.getCompanyId())) {
- param.setCompanyId(ContextUtil.getCompanyId());
- }
-
- Page<PatrolRecord> corePage = new Page<>(param.getPage(), param.getLimit());
- patrolRecordService.listPage(corePage, param);
-
- if (null == corePage.getRecords() || corePage.getRecords().isEmpty()) {
- return corePage.setRecords(new ArrayList<>());
- }
-
- return corePage;
- }
-
- /**
- * 鑾峰彇鎵�鏈夋暟鎹�
- *
- * @param param
- * @return
- */
- public List<PatrolRecord> listAll(IgdsBaseParam param) {
- if (StringUtils.isEmpty(param.getCompanyId())) {
- param.setCompanyId(ContextUtil.getCompanyId());
- }
-
- List<PatrolRecord> patrolRecords = patrolRecordService.listAll(param);
-
- if(null != patrolRecords && !patrolRecords.isEmpty()){
- //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
- for (PatrolRecord record : patrolRecords) {
- record.setImgName(commonManager.isImgExit( record.getImgName(), null));
- }
- }
-
- return patrolRecords;
- }
-}
diff --git a/fzzy-igdss-web/src/main/resources/static/security/patrol/patrolRecord-style.css b/fzzy-igdss-web/src/main/resources/static/security/patrol-record-style.css
similarity index 100%
rename from fzzy-igdss-web/src/main/resources/static/security/patrol/patrolRecord-style.css
rename to fzzy-igdss-web/src/main/resources/static/security/patrol-record-style.css
diff --git a/fzzy-igdss-web/src/main/resources/static/security/patrol/patrolRecord.js b/fzzy-igdss-web/src/main/resources/static/security/patrol-record.js
similarity index 100%
rename from fzzy-igdss-web/src/main/resources/static/security/patrol/patrolRecord.js
rename to fzzy-igdss-web/src/main/resources/static/security/patrol-record.js
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/patrolRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol-record.html
similarity index 92%
rename from fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/patrolRecord.html
rename to fzzy-igdss-web/src/main/resources/templates/security/patrol-record.html
index 465f376..5c14626 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/patrolRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol-record.html
@@ -6,7 +6,7 @@
<!-- Layui CSS锛堢敤浜庡熀纭�鏍峰紡锛� -->
<th:block th:include="include :: header('宸℃洿璁板綍')"/>
<link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
- <link rel="stylesheet" th:href="@{/security/patrol/patrolRecord-style.css}">
+ <link rel="stylesheet" th:href="@{/security/patrol-record-style.css}">
<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=R3FfyIEbBAWNckTqRSopHQktdkgp924F"></script>
</head>
<body>
@@ -43,7 +43,7 @@
<!-- 寮曞叆Layui JS -->
<th:block th:include="include :: footer"/>
<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
-<script th:src="@{/security/patrol/patrolRecord.js}"></script>
+<script th:src="@{/security/patrol-record.js}"></script>
<script th:inline="javascript">
var patrolRecordList = [[${patrolRecordList}]];
</script>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html
deleted file mode 100644
index 2fc1e4e..0000000
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
- <th:block th:include="include :: header('鏂板鐢靛瓙宸℃洿淇℃伅')"/>
- <th:block th:include="include :: select2-css"/>
-</head>
-<body>
-<div class="main-content">
- <form id="form-patrol-add" class="form-horizontal">
- <input name="deptId" type="hidden" id="treeId"/>
-
- <div class="row">
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">鎵�灞炲簱鍖猴細</label>
- <div class="col-sm-8">
- <input name="deptId" placeholder="璇疯緭鍏ュ悕绉�" class="form-control " type="text" maxlength="100"
- required>
- </div>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label">鐝缂栧彿锛�</label>
- <div class="col-sm-8">
- <input name="batchId" id="batchId" placeholder="璇疯緭鍏�" class="form-control " type="text"
- maxlength="30">
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
- <div class="col-sm-8">
- <input name="userName" id="userName" placeholder="璇疯緭鍏�" class="form-control " type="text"
- maxlength="30" required>
- </div>
- </div>
- </div>
- </div>
- </form>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: select2-js"/>
-<script>
- var prefix = ctx + "security/patrol";
-
- $("#form-cabinet-add").validate({
- onkeyup: false,
- rules: {},
- messages: {},
- focusCleanup: true
- });
-
- // 纭畾鎸夐挳 鎻愪氦鏁版嵁
- function submitHandler() {
- if ($.validate.form()) {
- $.operate.save(prefix + "/add", $('#form-patrol-add').serialize());
- }
- }
-
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/edit.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/edit.html
deleted file mode 100644
index ebd029f..0000000
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/edit.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
- <th:block th:include="include :: header('淇敼鐢靛瓙宸℃洿淇℃伅')"/>
- <th:block th:include="include :: select2-css"/>
-</head>
-<body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-patrol-edit" th:object="${patrol}">
- <input id="id" name="id" th:field="*{id}" type="hidden">
- <div class="row">
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">鎵�灞炲簱鍖猴細</label>
- <div class="col-sm-8">
- <input name="deptId" placeholder="璇疯緭鍏ュ悕绉�" th:field="*{deptId}" class="form-control " type="text"
- maxlength="100"
- required>
- </div>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label">鐝缂栧彿锛�</label>
- <div class="col-sm-8">
- <input name="batchId" id="batchId" th:field="*{batchId}" placeholder="璇疯緭鍏�" class="form-control "
- type="text" maxlength="30">
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
- <div class="col-sm-8">
- <input name="userName" id="userName" th:field="*{userName}" placeholder="璇疯緭鍏�" class="form-control "
- type="text"
- maxlength="30" required>
- </div>
- </div>
- </div>
- </div>
-
- </form>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: select2-js"/>
-<script type="text/javascript">
-
- var prefix = ctx + "security/patrol";
-
-
- $("#form-cabinet-edit").validate({
- onkeyup: false,
- rules: {},
- messages: {},
- focusCleanup: true
- });
-
- function submitHandler() {
- if ($.validate.form()) {
- $.operate.save(prefix + "/edit", $('#form-patrol-edit').serialize());
- }
- }
-</script>
-</body>
-</html>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html
deleted file mode 100644
index 99cf153..0000000
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
- <th:block th:include="include :: header('鍙傛暟鍒楄〃')" />
- <th:block th:include="include :: select2-css" />
-</head>
-<body class="gray-bg">
-<div class="container-div">
- <div class="row">
- <div class="col-sm-12 search-collapse">
- <form id="property-form">
- <div class="select-list">
- <ul>
- <li>
- 鍚嶇О锛�<input type="text" name="name"/>
- </li>
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 閲嶇疆</a>
- </li>
- </ul>
- </div>
- </form>
- </div>
-
- <div class="btn-group-sm" id="toolbar" role="group">
- <a class="btn btn-success" onclick="$.operate.add()" >
- <i class="fa fa-plus"></i> 鏂板
- </a>
- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" >
- <i class="fa fa-edit"></i> 淇敼
- </a>
- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" >
- <i class="fa fa-remove"></i> 鍒犻櫎
- </a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" >
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
- <a class="btn btn-success" onclick="openPatrolConf()" >
- <i class="fa fa-plus"></i> 宸℃洿閰嶇疆
- </a>
- </div>
- <div class="col-sm-12 select-table table-striped">
- <table id="bootstrap-table"></table>
- </div>
- </div>
-</div>
-<th:block th:include="include :: footer" />
-<th:block th:include="include :: select2-js" />
-<script th:inline="javascript">
- var prefix = ctx + "security/patrol";
-
- $(function() {
-
- var options = {
- url: prefix + "/list",
- createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{id}",
- removeUrl: prefix + "/remove",
- exportUrl: prefix + "/export",
- sortName: "id",
- sortOrder: "asc",
- modalName: "鍙傛暟",
- columns: [{
- checkbox: true
- },
- {
- field: 'id',
- title: '涓婚敭',
- visible: false,
- },
- {
- field: 'deptId',
- title: '鎵�灞炲簱鍖�',
- align: 'left',
- // formatter: function(value, row, index) {
- // return $.table.tooltip(value);
- // }
- },
- {
- field: 'batchId',
- title: '鐝缂栧彿',
- align: 'left',
- // formatter: function(value, row, index) {
- // return $.table.tooltip(value);
- // }
- },
- {
- field: 'userName',
- title: '宸￠�讳汉',
- // formatter: function(value, row, index) {
- // return $.table.tooltip(value);
- // }
- },
- {
- title: '鎿嶄綔',
- align: 'center',
- formatter: function(value, row, index) {
- var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>缂栬緫</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
- actions.push('<a class="btn btn-info btn-xs ' + '" href="javascript:void(0)" onclick="patrolDetail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>璇︽儏</a> ');
- return actions.join('');
- }
- }]
- };
- $.table.init(options);
- });
-
- /*璇︽儏*/
- function patrolDetail(patrolId) {
- var url = prefix + '/patrolRecord/' + patrolId;
- $.modal.openTab("宸℃洿璇︽儏", url);
- }
-
- function openPatrolConf() {
- var url = ctx + "security/patrol/patrolConf";
- $.modal.openTab("宸℃洿閰嶇疆", url);
- }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html
deleted file mode 100644
index d52ebd8..0000000
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
- <th:block th:include="include :: header('鏂板宸℃洿閰嶇疆')"/>
- <th:block th:include="include :: select2-css"/>
-</head>
-<body>
-<div class="main-content">
- <form id="form-patrol-add" class="form-horizontal">
- <input name="deptId" type="hidden" id="treeId"/>
-
- <div class="row">
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">鐝鍚嶇О锛�</label>
- <div class="col-sm-8">
- <input name="batchName" id="batchName" placeholder="璇疯緭鍏�" class="form-control " type="text"
- maxlength="30" required>
- </div>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
- <div class="col-sm-8">
- <input name="userName" id="userName" placeholder="璇疯緭鍏�" class="form-control " type="text"
- maxlength="30" required>
- </div>
- </div>
- </div>
- </div>
- </form>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: select2-js"/>
-<script>
- var prefix = ctx + "security/patrol/patrolConf";
-
- $("#form-cabinet-add").validate({
- onkeyup: false,
- rules: {},
- messages: {},
- focusCleanup: true
- });
-
- // 纭畾鎸夐挳 鎻愪氦鏁版嵁
- function submitHandler() {
- if ($.validate.form()) {
- $.operate.save(prefix + "/add", $('#form-patrol-add').serialize());
- }
- }
-
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
deleted file mode 100644
index 0bee380..0000000
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
- <th:block th:include="include :: header('淇敼宸℃洿閰嶇疆')"/>
- <th:block th:include="include :: select2-css"/>
-</head>
-<body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-patrol-edit" th:object="${patrolConf}">
- <input id="id" name="id" th:field="*{batchId}" type="hidden">
- <div class="row">
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">鐝鍚嶇О锛�</label>
- <div class="col-sm-8">
- <input name="batchName" id="batchName" th:field="*{batchName}" placeholder="璇疯緭鍏�" class="form-control "
- type="text"
- maxlength="30" required>
- </div>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="form-group">
- <label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
- <div class="col-sm-8">
- <input name="userName" id="userName" th:field="*{userName}" placeholder="璇疯緭鍏�" class="form-control "
- type="text"
- maxlength="30" required>
- </div>
- </div>
- </div>
- </div>
-
- </form>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: select2-js"/>
-<script type="text/javascript">
-
- var prefix = ctx + "security/patrol/patrolConf";
-
-
- $("#form-cabinet-edit").validate({
- onkeyup: false,
- rules: {},
- messages: {},
- focusCleanup: true
- });
-
- function submitHandler() {
- if ($.validate.form()) {
- $.operate.save(prefix + "/edit", $('#form-patrol-edit').serialize());
- }
- }
-</script>
-</body>
-</html>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html
deleted file mode 100644
index 5fdea66..0000000
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
- <th:block th:include="include :: header('鍙傛暟鍒楄〃')" />
- <th:block th:include="include :: select2-css" />
-</head>
-<body class="gray-bg">
-<div class="container-div">
- <div class="row">
- <div class="col-sm-12 search-collapse">
- <form id="property-form">
- <div class="select-list">
- <ul>
- <li>
- 鍚嶇О锛�<input type="text" name="name"/>
- </li>
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 閲嶇疆</a>
- </li>
- </ul>
- </div>
- </form>
- </div>
-
- <div class="btn-group-sm" id="toolbar" role="group">
- <a class="btn btn-success" onclick="$.operate.add()" >
- <i class="fa fa-plus"></i> 鏂板
- </a>
- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" >
- <i class="fa fa-edit"></i> 淇敼
- </a>
- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" >
- <i class="fa fa-remove"></i> 鍒犻櫎
- </a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" >
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
- </div>
- <div class="col-sm-12 select-table table-striped">
- <table id="bootstrap-table"></table>
- </div>
- </div>
-</div>
-<th:block th:include="include :: footer" />
-<th:block th:include="include :: select2-js" />
-<script th:inline="javascript">
- var prefix = ctx + "security/patrol/patrolConf";
-
- $(function() {
-
- var options = {
- url: prefix + "/list",
- createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{id}",
- removeUrl: prefix + "/remove",
- exportUrl: prefix + "/export",
- sortName: "batchId",
- sortOrder: "asc",
- modalName: "鍙傛暟",
- columns: [{
- checkbox: true
- },
- {
- field: 'batchId',
- title: '涓婚敭',
- visible: false,
- },
- {
- field: 'batchName',
- title: '鐝鍚嶇О',
- align: 'left',
- // formatter: function(value, row, index) {
- // return $.table.tooltip(value);
- // }
- },
- {
- field: 'userName',
- title: '宸￠�讳汉',
- // formatter: function(value, row, index) {
- // return $.table.tooltip(value);
- // }
- },
- {
- title: '鎿嶄綔',
- align: 'center',
- formatter: function(value, row, index) {
- var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.batchId + '\')"><i class="fa fa-edit"></i>缂栬緫</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.batchId + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
- return actions.join('');
- }
- }]
- };
- $.table.init(options);
- });
-
-
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/trajectoryMap.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/trajectoryMap.html
deleted file mode 100644
index 33effe3..0000000
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/trajectoryMap.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN" 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('杞ㄨ抗鍥惧睍绀�')"/>
- <!-- 鐧惧害鍦板浘API -->
- <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=R3FfyIEbBAWNckTqRSopHQktdkgp924F"></script>
-</head>
-<body>
-<!-- 鍦板浘瀹瑰櫒 -->
-<div class="container-div" id="map-container">
-</div>
-<th:block th:include="include :: footer"/>
-<script th:inline="javascript">
- // 1. 鑾峰彇鍚庣浼犻�掔殑杞ㄨ抗鏁版嵁
- const trackPoints = [[${trackPoints}]];
- // 杞崲涓虹櫨搴﹀湴鍥惧潗鏍囨暟缁�
- const path = trackPoints.map(point => new BMapGL.Point(point.longitude, point.latitude));
-
- // 2. 鍒濆鍖栧湴鍥�
- function initMap() {
- // 鍒涘缓鍦板浘瀹炰緥锛屼腑蹇冪偣璁句负绗竴涓建杩圭偣
- const map = new BMapGL.Map("map-container");
- const centerPoint = path[0] || new BMapGL.Point(116.404, 39.915);
- map.centerAndZoom(centerPoint, 14); // 14涓哄湴鍥剧缉鏀剧骇鍒�
- map.enableScrollWheelZoom(true); // 寮�鍚紶鏍囨粴杞缉鏀�
-
- // 3. 娣诲姞杞ㄨ抗绾�
- const polyline = new BMapGL.Polyline(path, {
- strokeColor: "#3388ff", // 绾块鑹�
- strokeWeight: 5, // 绾垮搴�
- strokeOpacity: 0.8 // 绾块�忔槑搴�
- });
- map.addOverlay(polyline);
-
- // 4. 涓烘瘡涓建杩圭偣娣诲姞鏍囪鍜屼俊鎭獥鍙�
- trackPoints.forEach((point, index) => {
- const markerPoint = new BMapGL.Point(point.longitude, point.latitude);
- // 鍒涘缓鏍囪
- const marker = new BMapGL.Marker(markerPoint);
- map.addOverlay(marker);
-
- // 鍒涘缓淇℃伅绐楀彛鍐呭
- const infoWindow = new BMapGL.InfoWindow(`
- <div style="font-size:14px;">
- <p>搴忓彿锛�${index + 1}</p>
- <p>缁忓害锛�${point.longitude}</p>
- <p>绾害锛�${point.latitude}</p>
- <p>鏃堕棿锛�${point.createTime}</p>
- </div>
- `);
-
- // 鐐瑰嚮鏍囪鏄剧ず淇℃伅绐楀彛
- marker.addEventListener("click", () => {
- map.openInfoWindow(infoWindow, markerPoint);
- });
- });
-
- // 5. 璋冩暣鍦板浘瑙嗛噹浠ユ樉绀烘暣涓建杩�
- if (path.length > 1) {
- map.setViewport(path); // 鑷姩閫傞厤杞ㄨ抗鑼冨洿
- }
- }
-
- // 椤甸潰鍔犺浇瀹屾垚鍚庡垵濮嬪寲鍦板浘
- window.onload = initMap;
-</script>
-</body>
-</html>
\ No newline at end of file
--
Gitblit v1.9.3