From c6ac196d7207e64b8591f84932439214561fc446 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:56:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/TVController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 4589c83..87211a4 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.LocChartPie;
@@ -315,39 +316,40 @@
List<WrkMast> wrkMastList2 = null;
switch (ledId) {
case 1:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1014, 1022, 1025));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013, 1021, 1024));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011));
break;
case 2:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1022, 1025));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1021, 1024));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1014));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013));
break;
case 3:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1025));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1024));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1022));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1021));
break;
case 4:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1022));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1021));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1025));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1024));
break;
default:
break;
}
if (!Cools.isEmpty(wrkMastList1)) {
- String msg = "绔欑偣鍦ㄥ叆搴�";
+ String msg = "绔欑偣鍦ㄥ叆搴�;";
Set<Integer> set = new HashSet<>();
for (WrkMast wrkMast : wrkMastList1) {
set.add(wrkMast.getSourceStaNo());
}
- return R.ok().add(set.toString() + msg);
+
+ return R.ok().add(set.toString() + msg + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
}
if (!Cools.isEmpty(wrkMastList2)) {
- String msg = "绔欑偣鍦ㄥ嚭搴�";
+ String msg = "绔欑偣鍦ㄥ嚭搴�;";
Set<Integer> set = new HashSet<>();
for (WrkMast wrkMast : wrkMastList2) {
set.add(wrkMast.getStaNo());
}
- return R.ok().add(set.toString() + msg);
+ return R.ok().add(set.toString() + msg + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
}
return R.ok();
}
--
Gitblit v1.9.1