From 5790d7573a83278667878e0f73104f8fc8ec5cf3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 11:03:51 +0800
Subject: [PATCH] 巡检统计信息纠正
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..efe8be5 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,16 +4,22 @@
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;
-import com.fzzy.igds.domain.*;
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
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;
+
import javax.annotation.Resource;
import java.util.*;
@@ -49,7 +55,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();
@@ -57,7 +63,7 @@
if(null != weekList && weekList.size() > 0){
PatrolSuperData patrolSuperData;
Date start = DateUtil.getCurZero(DateUtil.getNewByDay(new Date(), -1)); //鏄ㄥぉ闆剁偣闆跺垎
- Date end = DateUtil.getCurZero(new Date()); //浠婂ぉ闆剁偣闆跺垎
+ Date end = DateUtil.getCurZero(new Date()); //浠婂ぉ闆剁偣闆跺垎
for (Patrol patrol : weekList) {
patrolSuperData = map.get(patrol.getDeptId());
@@ -72,12 +78,19 @@
//鏄ㄥぉ缁熻
if(patrol.getCreateTime().after(start) && patrol.getCreateTime().before(end)){
- patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1);
+ patrolSuperData.setYesterdayNum(patrolSuperData.getYesterdayNum() + 1);
}
}
}
- 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 +153,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