diff --git a/app.db b/app.db index 5254919..a794361 100644 Binary files a/app.db and b/app.db differ diff --git a/digester.zip b/digester.zip new file mode 100644 index 0000000..737dcc8 Binary files /dev/null and b/digester.zip differ diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java index d0ad3ec..21b7252 100644 --- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java +++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java @@ -31,11 +31,11 @@ public class StartResetTaskThread extends Thread { // this.setupErrorTubeRack(); // } - this.setProgressMessage("设备初始化 : 相机"); - device.camera.enable(); +// this.setProgressMessage("设备初始化 : 相机"); +// device.camera.enable(); - this.setProgressMessage("设备初始化 : 定时刷新加热盘温度"); - device.heatingTurntable.temperatureMonitorStart(); +// this.setProgressMessage("设备初始化 : 定时刷新加热盘温度"); +// device.heatingTurntable.temperatureMonitorStart(); UfCmdSnippetExecutor.execute("StatusLampRunning"); this.setProgressMessage("设备初始化 : 完成"); diff --git a/src/main/java/com/iflytop/digester/StopResetTaskThread.java b/src/main/java/com/iflytop/digester/StopResetTaskThread.java new file mode 100644 index 0000000..51937e0 --- /dev/null +++ b/src/main/java/com/iflytop/digester/StopResetTaskThread.java @@ -0,0 +1,8 @@ +package com.iflytop.digester; +import com.iflytop.digester.underframework.UfCmdSnippetExecutor; +public class StopResetTaskThread extends Thread { + @Override + public void run() { + UfCmdSnippetExecutor.execute("StopResetSetup"); + } +} diff --git a/src/main/java/com/iflytop/digester/controller/DeviceController.java b/src/main/java/com/iflytop/digester/controller/DeviceController.java index 1497044..5fa5ed5 100644 --- a/src/main/java/com/iflytop/digester/controller/DeviceController.java +++ b/src/main/java/com/iflytop/digester/controller/DeviceController.java @@ -1,5 +1,6 @@ package com.iflytop.digester.controller; import com.iflytop.digester.StartResetTaskThread; +import com.iflytop.digester.StopResetTaskThread; import com.iflytop.digester.deviceinstance.Device; import com.iflytop.digester.underframework.controller.UfApiControllerBase; import com.iflytop.digester.underframework.controller.UfApiResponse; @@ -68,4 +69,12 @@ public class DeviceController extends UfApiControllerBase { this.device.transferArm.moveTubeRackToHeatingTurntable(slot.index); return this.success(); } + + @ResponseBody + @PostMapping("/api/device/stop") + public UfApiResponse stop() { + var stopReset = new StopResetTaskThread(); + stopReset.start(); + return this.success(); + } } diff --git a/src/main/java/com/iflytop/digester/underframework/controller/UfApiUser.java b/src/main/java/com/iflytop/digester/underframework/controller/UfApiUser.java index 37ce8f2..45c40d4 100644 --- a/src/main/java/com/iflytop/digester/underframework/controller/UfApiUser.java +++ b/src/main/java/com/iflytop/digester/underframework/controller/UfApiUser.java @@ -49,21 +49,19 @@ public class UfApiUser extends UfApiControllerBase { @ResponseBody @PostMapping("/api/user/save") - public UfApiResponse save( HttpServletRequest request, @RequestBody Map params ) { + public UfApiResponse save( HttpServletRequest request, @RequestBody UfMdbUser edit ) { UfMdbUser curUser = this.getUserFromRequest(request); - String id = (String)params.get("id"); - Map data = (Map)params.get("data"); var user = new UfMdbUser(); user.password = ""; user.salt = UUID.randomUUID().toString().substring(0, 8); user.createdAt = (int)(System.currentTimeMillis() / 1000); user.createdBy = curUser.id; - if ( null != id ) { - user = UfActiveRecord.findOne(UfMdbUser.class, id); + if ( null != edit.id ) { + user = UfActiveRecord.findOne(UfMdbUser.class, edit.id); } - - user.setAttributes(data); + user.account = edit.account; + user.isAdmin = edit.isAdmin; user.save(); return this.success(); } diff --git a/web b/web index bdddf3e..8f8478b 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit bdddf3ebad65ae4cccdf4d01b7ee9fb6b57c8965 +Subproject commit 8f8478b2d3693a513fd62506369b5d9a7ad5a142