From 08d8933d3fe66fb83f1e2e7e4038e62b3c5143e1 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 11:10:43 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
index 9d95094..cbaf7ad 100644
--- a/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
@@ -9,6 +9,7 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Service("deviceErrorService")
 public class DeviceErrorServiceImpl extends ServiceImpl<DeviceErrorMapper, DeviceError> implements DeviceErrorService {
@@ -20,21 +21,37 @@
 
     @Override
     public Boolean addDeviceError(String device, Integer deviceId, String msg) {
-        DeviceError error = this.selectByDeviceAndDeviceId(device, deviceId);
-        if (error == null) {
+//        DeviceError error = this.selectByDeviceAndDeviceId(device, deviceId);
+//        if (error == null) {
             DeviceError deviceError = new DeviceError();
             deviceError.setDevice(device);
             deviceError.setDeviceId(deviceId);
             deviceError.setMsg(msg);
             deviceError.setCreateTime(new Date());
-            return this.baseMapper.insert(deviceError) > 0;
-        }
+            Integer insert = 0;
+            try{
+                insert = this.baseMapper.insert(deviceError);
+            } catch (Exception e){
 
-        return true;
+            }
+            return  insert> 0;
+//        }
+
+//        return true;
     }
 
     @Override
     public Integer deleteDeviceError(String device, Integer deviceId) {
         return this.baseMapper.deleteByDeviceAndDeviceId(device, deviceId);
     }
+
+    @Override
+    public List<DeviceError> selectDeviceErrorList(Long id, String device, Integer deviceId, Integer curr, Integer limit) {
+        return this.baseMapper.selectDeviceErrorList(id,device, deviceId,curr,limit);
+    }
+
+    @Override
+    public Long selectDeviceErrorListTotal(Long id,String device, Integer deviceId) {
+        return this.baseMapper.selectDeviceErrorListTotal(id,device, deviceId);
+    }
 }

--
Gitblit v1.9.1