From fbd0824816e6c9e895ab2c68874977298ba919bf Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 12 十二月 2025 11:41:09 +0800
Subject: [PATCH] 电子巡更修改
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java | 13 ++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java | 12 ++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java | 10 ++-
fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html | 57 ++++++++++++-------
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java | 14 ++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java | 10 ++
fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 8 ++
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java | 10 +-
10 files changed, 99 insertions(+), 41 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
index 36be5ee..b9a4aa3 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
@@ -32,9 +32,13 @@
private String userId;
@Id
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
- @TableField("batch_id")
- private String batchId;
+ @Column(name = "conf_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
+ @TableField("conf_id")
+ private String confId;
+
+ @Column(name = "conf_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
+ @TableField("conf_name")
+ private String confName;
@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
@TableField("dept_id")
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
index d4edf4c..fed9ce2 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
@@ -27,10 +27,10 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
- @TableId(value = "batch_id", type = IdType.NONE)
- @TableField("batch_id")
- private String batchId;
+ @Column(name = "id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
+ @TableId(value = "id", type = IdType.NONE)
+ @TableField("id")
+ private String id;
@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
@TableField("dept_id")
@@ -38,7 +38,7 @@
@Column(name = "batch_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
@TableField("batch_name")
- private String batchName;
+ private String name;
@Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
@TableField("user_name")
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
index b144087..0b55833 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
@@ -18,7 +18,7 @@
private String userId;
- private String batchId;
+ private String confId;
public PatrolKey(){
super();
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
index 643000f..663365c 100644
--- 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
@@ -38,11 +38,17 @@
*/
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());
+ }
// 鎸夊垱寤烘椂闂村�掑簭鎺掑簭
@@ -68,8 +74,8 @@
* @return 褰卞搷琛屾暟
*/
public int insertData(PatrolConf param) {
- if (StringUtils.isEmpty(param.getBatchId())) {
- param.setBatchId(ContextUtil.generateId());
+ if (StringUtils.isEmpty(param.getId())) {
+ param.setId(ContextUtil.generateId());
}
return patrolConfMapper.insert(param);
}
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 b4463ec..26c57c1 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
@@ -38,6 +38,14 @@
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;
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
index 8444397..0be99d7 100644
--- 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
@@ -33,7 +33,7 @@
* 宸℃洿閰嶇疆椤甸潰
*/
@GetMapping()
- public String patrolConf() {
+ public String patrolConf(ModelMap mmap) {
return prefix + "/patrolConf";
}
@@ -86,8 +86,8 @@
}
param.setCreateBy(getLoginName());
param.setCreateTime(new Date());
- if (StringUtils.isEmpty(param.getBatchId())) {
- param.setBatchId(ContextUtil.generateId());
+ if (StringUtils.isEmpty(param.getId())) {
+ param.setId(ContextUtil.generateId());
}
return toAjax(patrolConfManager.insertData(param));
}
@@ -114,9 +114,9 @@
}
param.setUpdateBy(getLoginName());
param.setUpdateTime(new Date());
- PatrolConf patrolConf = patrolConfManager.selectById(param.getBatchId());
+ PatrolConf patrolConf = patrolConfManager.selectById(param.getId());
if (patrolConf == null) {
- param.setBatchId(ContextUtil.generateId());
+ param.setId(ContextUtil.generateId());
return toAjax(patrolConfManager.insertData(param));
}
@@ -130,7 +130,7 @@
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids) {
- patrolConfManager.deleteDataById( 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
index b794068..52e6795 100644
--- 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
@@ -1,7 +1,10 @@
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;
@@ -29,6 +32,12 @@
@Resource
private PatrolManager patrolManager;
+ @Resource
+ private PatrolConfManager patrolConfManager;
+
+
+ @Resource
+ private CommonManager commonManager;
/**
* 鐢靛瓙宸℃洿椤甸潰
*
@@ -36,7 +45,9 @@
* @date 2025/12/06
*/
@GetMapping()
- public String patrol() {
+ public String patrol(ModelMap mmap) {
+ //鑾峰彇搴撳尯鍥炴樉鍒楄〃
+ mmap.put("deptList", commonManager.listDeptData());
return prefix + "/patrol";
}
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/sys/manager/common/CommonManager.java
index da79a92..4bdb0b3 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -2,6 +2,8 @@
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.domain.Depot;
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.DicService;
import com.fzzy.igds.utils.ContextUtil;
@@ -24,6 +26,8 @@
private DepotService depotService;
@Resource
private DicService dicService;
+ @Resource
+ private CoreDeptService coreDeptService;
/**
* 鏍规嵁瀛楀吀绫诲瀷鑾峰彇瀛楀吀鍒楄〃
@@ -58,6 +62,16 @@
}
+ /**
+ * 鑾峰彇鍒嗗簱鍒楄〃
+ *
+ * @author sgj
+ * @date 2025/12/12
+
+ */
+ public List<Dept> listDeptData() {
+ return coreDeptService.getDeptData();
+ }
/**
* 鏍规嵁浠撳簱缂栫爜鑾峰彇浠撳簱绫诲瀷
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
index 2fc1e4e..fb0e75d 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html
@@ -23,7 +23,7 @@
<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"
+ <input name="confId" id="confId" placeholder="璇疯緭鍏�" class="form-control " type="text"
maxlength="30">
</div>
</div>
@@ -34,7 +34,7 @@
<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"
+ <input name="userId" id="userId" placeholder="璇疯緭鍏�" class="form-control " type="text"
maxlength="30" required>
</div>
</div>
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
index 99cf153..b82cf56 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html
@@ -12,7 +12,10 @@
<div class="select-list">
<ul>
<li>
- 鍚嶇О锛�<input type="text" name="name"/>
+ 宸￠�讳汉锛�<input type="text" name="userName"/>
+ </li>
+ <li>
+ 鐝鍚嶇О锛�<input type="text" name="confName"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
@@ -24,18 +27,18 @@
</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="$.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>
@@ -49,7 +52,7 @@
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var prefix = ctx + "security/patrol";
-
+ var deptList = [[${deptList}]];
$(function() {
var options = {
@@ -61,6 +64,10 @@
sortName: "id",
sortOrder: "asc",
modalName: "鍙傛暟",
+ showSearch:false,
+ showRefresh:false,
+ showColumns:false,
+ showToggle:false,
columns: [{
checkbox: true
},
@@ -73,13 +80,21 @@
field: 'deptId',
title: '鎵�灞炲簱鍖�',
align: 'left',
- // formatter: function(value, row, index) {
- // return $.table.tooltip(value);
- // }
+ //鏍规嵁deptList鍥炴樉璇楀彞
+ formatter: function(value, row, index) {
+ var deptName = '';
+ deptList.forEach(function (item) {
+ if (item.id == value) {
+ deptName = item.kqmc;
+ }
+ })
+ return $.table.tooltip(deptName);
+ }
+
},
{
- field: 'batchId',
- title: '鐝缂栧彿',
+ field: 'confName',
+ title: '鐝鍚嶇О',
align: 'left',
// formatter: function(value, row, index) {
// return $.table.tooltip(value);
@@ -97,8 +112,8 @@
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-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('');
}
--
Gitblit v1.9.3