sige 1 year ago
parent
commit
462c1767ce
  1. BIN
      app.db
  2. 14
      src/main/java/com/iflytop/digester/controller/DeviceController.java
  3. 2
      src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
  4. 17
      src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java
  5. 2
      web

BIN
app.db

14
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();
}
}

2
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() {

17
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);
}
}

2
web

@ -1 +1 @@
Subproject commit a0d8ec7bb580f571a3a054e186628bee1effbb40
Subproject commit c02d1dcba08ea7ff724791e191264cb70ea90435
Loading…
Cancel
Save