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-core/src/main/java/com/fzzy/igds/timer/JobDepotStoreService.java | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobDepotStoreService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobDepotStoreService.java
index 17cb22c..7a05b9e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobDepotStoreService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobDepotStoreService.java
@@ -9,9 +9,11 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.ParseException;
import java.time.LocalDate;
import java.util.*;
@@ -37,8 +39,35 @@
@Resource
private DepotService depotService;
+ @Scheduled(cron = "0 0 1 * * ?")
public void timer() {
doExe();
+ }
+
+
+ /**
+ * 鎵嬪姩鎵ц搴撳瓨缁熻
+ * @param timeStr
+ * @throws ParseException
+ */
+ public void doExeHand(String timeStr) throws ParseException {
+
+ log.info("===============鎵嬪姩缁熻搴撳瓨淇℃伅===============");
+ //鑾峰彇鎵�鏈夌殑搴撳尯淇℃伅
+ List<Dept> listDept = deptService.listDept(null, ContextUtil.getCompanyId(), null);
+ if (null == listDept || listDept.isEmpty()) {
+ log.info("-----鏈幏鍙栧埌搴撳尯锛屼笉鎵ц搴撳瓨瀹氭椂缁熻-----");
+ return;
+ }
+
+ Date startTime = DateUtils.parseDate(timeStr, "yyyy-MM-dd");
+
+ Date endTime = new Date();
+ for (Dept dept : listDept) {
+
+ //澶氬ぉ寰幆缁熻
+ sumMoreDepotStore(startTime, endTime, dept);
+ }
}
/**
@@ -199,14 +228,8 @@
if (null == lastData) {
lastData = new DepotStore();
- //涓婚敭ID瑙勫垯锛歽yyyMMddHHmm_浠撳簱缂栫爜
- lastData.setId(DateFormatUtils.format(time, "yyyyMMddHHmm") + "_" + s);
- lastData.setCompanyId(dept.getCompanyId());
- lastData.setDeptId(dept.getId());
- lastData.setDepotId(s);
lastData.setStorageReal(0.0);
- lastData.setUpdateTime(time);
- lastData.setUpdateBy("绯荤粺瀹氭椂缁熻");
+
if (inTag) {
//璁剧疆鍏ュ簱鏃堕棿
lastData.setStoreDate(time);
@@ -215,18 +238,28 @@
//璁剧疆鍑哄簱鏃堕棿
lastData.setOutDate(time);
}
- //鑾峰彇浠撳簱淇℃伅
- depot = depotService.getCacheDepot(dept.getCompanyId(), s);
- if (null != depot) {
- lastData.setDepotStatus(depot.getDepotStatus());
- lastData.setFoodVariety(depot.getFoodVariety());
- lastData.setFoodLevel(depot.getFoodLevel());
- lastData.setFoodLocation(depot.getFoodLocation());
- lastData.setFoodLocationId(depot.getFoodLocationId());
- lastData.setFoodType(depot.getFoodType());
- lastData.setFoodYear(depot.getFoodYear());
- }
+ }
+ //涓婚敭ID瑙勫垯锛歽yyyMMddHHmm_浠撳簱缂栫爜
+ lastData.setId(DateFormatUtils.format(time, "yyyyMMddHHmm") + "_" + s);
+
+ lastData.setCompanyId(dept.getCompanyId());
+ lastData.setDeptId(dept.getId());
+ lastData.setDepotId(s);
+
+ lastData.setUpdateTime(time);
+ lastData.setUpdateBy("绯荤粺瀹氭椂缁熻");
+
+ //鑾峰彇浠撳簱淇℃伅
+ depot = depotService.getCacheDepot(dept.getCompanyId(), s);
+ if (null != depot) {
+ lastData.setDepotStatus(depot.getDepotStatus());
+ lastData.setFoodVariety(depot.getFoodVariety());
+ lastData.setFoodLevel(depot.getFoodLevel());
+ lastData.setFoodLocation(depot.getFoodLocation());
+ lastData.setFoodLocationId(depot.getFoodLocationId());
+ lastData.setFoodType(depot.getFoodType());
+ lastData.setFoodYear(depot.getFoodYear());
}
lastData.setStorageReal(lastData.getStorageReal() + sum);
--
Gitblit v1.9.3