From bc427c64d8c9066eda7a817c7c7926954e39abb0 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 26 一月 2026 14:55:26 +0800
Subject: [PATCH] 删除操作添加日志记录，系统添加定时删除操作日志
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
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 d5acbfb..aea2e71 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
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PatrolSuperData;
@@ -11,6 +12,8 @@
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.utils.DateUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -49,7 +52,7 @@
//搴撳尯杞崲
Map<String, PatrolSuperData> map = new HashMap<>();
for (Dept dept : deptList) {
- map.put(dept.getId(), new PatrolSuperData(dept.getCompanyId(), dept.getId()));
+ map.put(dept.getId(), new PatrolSuperData(dept.getId().substring(0,(dept.getId().length()-3)), dept.getId()));
}
List<Patrol> weekList = patrolService.getWeekList();
@@ -77,7 +80,14 @@
}
}
- return new ArrayList<>(map.values());
+ ArrayList<PatrolSuperData> list = new ArrayList<>(map.values());
+ Collections.sort(list, new Comparator<PatrolSuperData>() {
+ @Override
+ public int compare(PatrolSuperData o1, PatrolSuperData o2) {
+ return o1.getDeptId().compareTo(o2.getDeptId());
+ }
+ });
+ return list;
}
/*-------------------鐢靛瓙宸℃洿璁板綍涓昏〃淇℃伅--------------------*/
@@ -140,6 +150,7 @@
* @return
*/
@Expose
+ @Log(title = "宸℃閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SECURITY)
public BaseResp deletePatrolConf(PatrolConf bank){
if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
return BaseResp.success();
--
Gitblit v1.9.3