~

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("设备初始化 : 完成");

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");
+    }
+}

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

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<String,Object> params ) {
+    public UfApiResponse save( HttpServletRequest request, @RequestBody UfMdbUser edit ) {
         UfMdbUser curUser = this.getUserFromRequest(request);
-        String id = (String)params.get("id");
-        Map<String,Object> data = (Map<String,Object>)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();
     }

web

@@ -1 +1 @@
-Subproject commit bdddf3ebad65ae4cccdf4d01b7ee9fb6b57c8965
+Subproject commit 8f8478b2d3693a513fd62506369b5d9a7ad5a142