From c386374de5ff4a65904124ef839e6862518d27fa Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期三, 16 四月 2025 09:12:30 +0800
Subject: [PATCH] v2.0.2,更新时间4.16

---
 src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java
index ef66e7d..0ee3a1a 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbEvrydayweiyi2024ServiceImpl.java
@@ -373,16 +373,21 @@
             String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
             int i1 = (Integer.parseInt(dated.split("-")[2])-1) ;
             String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
-            if (tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s)!=null){
-                hd[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getTdmm();
-                ed[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getEdmm();
-                nd[i] =tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getNdmm();
-                x[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getFilename();
+            QueryWrapper queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("tagid", tagid.split(",")[i]);
+            TbEquipment tbEquipment = tbEquipmentMapper.selectOne(queryWrapper);
+
+            if (tbEquipment!=null){
+
+                hd[i] = tbEquipment.getHdmm();
+                ed[i] = tbEquipment.getEdmm();
+                nd[i] =tbEquipment.getNdmm();
+//                x[i] = tbEvrydayweiyi2024Mapper.getweiyi(datey, tagid.split(",")[i], s).getFilename();
             }else{
                 hd[i] = "0";
                 ed[i] = "0";
                 nd[i] ="0";
-                x[i] = "0";
+//                x[i] = "0";
             }
         }
         result.put("ed", ed);

--
Gitblit v1.9.3