From 462c1767cedf1f1bde093f84e4610ee17aee345e Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 11 Apr 2024 16:24:21 +0800
Subject: [PATCH] ~

---
 app.db                                             | Bin 299008 -> 299008 bytes
 .../digester/controller/DeviceController.java      |  14 ++++++++++++++
 .../connection/UfZcancmderWebsocket.java           |   2 +-
 .../UfApiControllerExceptionHandler.java           |  17 +++++++++++++++++
 web                                                |   2 +-
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java

diff --git a/app.db b/app.db
index 77c5b27ee7ba66bab478bb2e9e3d4972b05c1bb1..b26e3ec9b935a91bdaae5661124e60573e2ecdb7 100644
GIT binary patch
delta 33
ncmZozAk?rxXo3_IE8j#JCm`9F(3-&5n!wbWz`QkqWkEjxq$mmo

delta 33
ncmZozAk?rxXo3_I%b$rdPC&9Tp*4ZAHG!!$fq82J%YuFY$u0}v

diff --git a/src/main/java/com/iflytop/digester/controller/DeviceController.java b/src/main/java/com/iflytop/digester/controller/DeviceController.java
index beeeb2d..ad5d970 100644
--- a/src/main/java/com/iflytop/digester/controller/DeviceController.java
+++ b/src/main/java/com/iflytop/digester/controller/DeviceController.java
@@ -28,4 +28,18 @@ public class DeviceController extends UfApiControllerBase {
     public UfApiResponse statusGet() {
         return this.success(this.device.getStatus());
     }
+
+    @ResponseBody
+    @PostMapping("/api/device/door-open")
+    public UfApiResponse doorOpen() {
+        this.device.door.open();
+        return this.success();
+    }
+
+    @ResponseBody
+    @PostMapping("/api/device/door-close")
+    public UfApiResponse doorClose() {
+        this.device.door.close();
+        return this.success();
+    }
 }
diff --git a/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java b/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
index 7201e59..43efb43 100644
--- a/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
+++ b/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
@@ -156,7 +156,7 @@ public class UfZcancmderWebsocket extends UfConnectionBase {
         TsMdbActuator actuator = TsMdbActuator.findOne(TsMdbActuator.class, actuatorCmd.actuatorId);
         LOG.info("[Command-Executor:{}] {}({}) => {}", actuator.name, actuatorCmd.cmdKey, actuatorCmd.parameters, cmd);
         if ( !this.client.isOpen() ) {
-            throw new RuntimeException("Connection is not open.");
+            throw new RuntimeException("ZCanCmder 连接已断开");
         }
 
         TimerTask task = new TimerTask() {
diff --git a/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java b/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java
new file mode 100644
index 0000000..be5c68d
--- /dev/null
+++ b/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java
@@ -0,0 +1,17 @@
+package com.iflytop.digester.underframework.controller;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+@ControllerAdvice
+public class UfApiControllerExceptionHandler {
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseEntity<Object> handleException(RuntimeException ex) {
+        var response = new UfApiResponse();
+        response.success = false;
+        response.code = "500";
+        response.message = ex.getMessage();
+        response.data = null;
+        return new ResponseEntity<>(response, HttpStatus.OK);
+    }
+}
diff --git a/web b/web
index a0d8ec7..c02d1dc 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit a0d8ec7bb580f571a3a054e186628bee1effbb40
+Subproject commit c02d1dcba08ea7ff724791e191264cb70ea90435