From 036f050847cac2ae0b72fb414b951b96b7e3d06e Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Wed, 24 Apr 2024 15:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=A0=E6=B6=B2?=
 =?UTF-8?q?=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.db                                             | Bin 385024 -> 397312 bytes
 .../com/iflytop/digester/StartResetTaskThread.java |   7 ++---
 .../digester/controller/OptionController.java      |  29 +++++++++++++++++++++
 .../underframework/dao/model/UfMdbOption.java      |  13 +++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/iflytop/digester/controller/OptionController.java

diff --git a/app.db b/app.db
index 7b79b5fa704d852c12e43c1a7f410288d63baabf..468516c0c36277e7c1b71e5544097d8f0774d7a6 100644
GIT binary patch
delta 8472
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
XAEO?G-U^*h74`699}j|-MWXV5&N9gy

delta 983
zcmX9-ZA=_R7~a{Py`BA<Ia*E{y+e?r+|kx9wy9E6q^+@j_0oeNLJmsRV$ihEs3C!*
zKvFa&CR{Vx3Dn5NUIITX$Ms?tqK3~>eo*W$>qjfCRg<Q*{xDoLB<g!~GtcZZPo8;Z
zX5ZP~#HQZqg80K5idH2_Y6dg_5VXfmZ+${8T1~ekp9wNlEScww^ZIpN=tQ$T^Xfn9
zSNJgAf{Nv*<*a;Bk}{#{uN7?Gmk#h^@BYk|XK!G$&+J25K}iYfYvQTMBS_)i7xVc_
zB&yp+cz=(lpuU2qtNfYC7oL=5yde{HD86v$p=z0-%%=Duipn6Xgn#te+kP9i_2BV3
zN=e?4j*i3a9q+caAAhI9;TwnlL`_^tM9|JmP2v~IW2rC(cZj<ugE*wrA+e^ZL4H0}
zZ^<m1%V}h5Ec>Mw{mwGkDSA~Y(`SViN4tG@t)w|-v>JO@%8W77>^COtInfeF+eLdE
z8SX$F4G`{llkV&w+UF^BNK~@At*~{)%IbqGWzX67j6KxH-Z%1%R<SvOsy)oKhgef4
zulJ7TMn}<iNmS{Ejv<1`&dPlrTvrhgEQNw@EFzB{L5@(z<=5flkGp5a<upRafVa8n
z3v%s2uZQ|2CfHW`EB%}{Q$K_fD*RO0i*|`-s+=N~&U4!!vQ%6hg-FU2%_nx3D$C+_
zP^lNbpt9_e&C0MWu7p8+FRZ*OMncN+2WQI__iQ<C{lrE>a?o+fK0&&ukJIVj#9z}m
ziP0S?EKYLxj#D$`SbjsQ;eX6@VtGZX5ij4srC4c{!u<4XWSxjt1UR+1TC98la`PO>
z{{k5Yq6T2f)Q}ofUs7ivv}FaC^Sb#(thR%r_!2nQ<)3hve|o7Ddp3gU!xb3a&y9|P
zsbC?3JvV{0Ep%e-l+-Qu&Z|K&@H1AqeHo<xU`k*Cq?<otRirQDDC!mqKfpH060F{H
z9n$I+JKd#4{FL_EcG4xWYix}5vl!dK40?-B(l~vSR#BgQ4{ADOpRk{|AGNYj=Oom-
z1}ZL@*UT}q-;9|%OvAWkOc(>Xi(};LclB9)Q18$W=!ImJERl1h3ksD_c-8VYcjSBA
zFcN%lnb-RW^f?>^<bJ_gKx6LBdxo3bA_w)bi*Xef71|^qvA5{A)UiLd{<a#-Z_GU7
Vs6MIhA_)?J71lI2FrnTq`ycklA|(I-

diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
index 46ebfc7..723e3f7 100644
--- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java
+++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
@@ -56,9 +56,7 @@ public class StartResetTaskThread extends Thread {
             UfCmdSnippetExecutor.execute(String.format("PeristalticPumpEnable.%d",i));
         }
 
-        var env = UfApplication.getApp().getEnv();
-        Boolean enableSetup = env.getProperty("app.liquidPeristalticPumpPipeSetupEnable",Boolean.class);
-        assert enableSetup != null;
+        Boolean enableSetup = UfMdbOption.getBoolean("LiquidPeristalticPumpPipeSetupEnable", false);
         if ( !enableSetup ) {
             return ;
         }
@@ -70,8 +68,7 @@ public class StartResetTaskThread extends Thread {
         UfCmdSnippetExecutor.execute("DoorClose");
 
         // 加液管充满
-        Integer liquidPipeVolume = env.getProperty("app.liquidPipeVolumn", Integer.class);
-        assert liquidPipeVolume != null;
+        int liquidPipeVolume = UfMdbOption.getInteger("LiquidPeristalticPumpPipeVolume", 1);
         Device device = Device.getInstance();
         var tubes = List.of(0,4, 3,2, 15,11, 12,13, 1,5, 6,7, 14,10, 9,8);
         for ( int i=0; i<8; i++ ) {
diff --git a/src/main/java/com/iflytop/digester/controller/OptionController.java b/src/main/java/com/iflytop/digester/controller/OptionController.java
new file mode 100644
index 0000000..b22263a
--- /dev/null
+++ b/src/main/java/com/iflytop/digester/controller/OptionController.java
@@ -0,0 +1,29 @@
+package com.iflytop.digester.controller;
+import com.iflytop.digester.underframework.controller.UfApiControllerBase;
+import com.iflytop.digester.underframework.controller.UfApiResponse;
+import com.iflytop.digester.underframework.dao.model.UfMdbOption;
+import com.iflytop.digester.underframework.dao.record.UfActiveRecord;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.Map;
+@Controller
+public class OptionController extends UfApiControllerBase {
+    @ResponseBody
+    @PostMapping("/api/option/list")
+    public UfApiResponse list() {
+        var list = UfActiveRecord.find(UfMdbOption.class, Map.of(
+            "editable", "1"
+        ));
+        return this.success(list);
+    }
+
+    @ResponseBody
+    @PostMapping("/api/option/update")
+    public UfApiResponse update( @RequestBody UfMdbOption option) {
+        option.isNewRecord = false;
+        option.save();
+        return this.success();
+    }
+}
diff --git a/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java b/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java
index 457702e..44a247f 100644
--- a/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java
+++ b/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java
@@ -9,6 +9,12 @@ public class UfMdbOption extends UfActiveRecord {
     @UfActiveRecordField
     public String value;
 
+    @UfActiveRecordField
+    public String comment;
+
+    @UfActiveRecordField
+    public String editable;
+
     // get table name
     public static String getTableName() {
         return "app_options";
@@ -34,4 +40,11 @@ public class UfMdbOption extends UfActiveRecord {
         var option = UfMdbOption.getString(key, defaultValue.toString());
         return Double.parseDouble(option);
     }
+
+    // get as boolean
+    public static Boolean getBoolean( String key, Boolean defaultValue ) {
+        var option = UfMdbOption.getString(key, defaultValue ? "1" : "0");
+        option = option.toLowerCase();
+        return "1".equals(option) || "true".equals(option) || "yes".equals(option) || "on".equals(option);
+    }
 }