From 7d82d9a104f548b4d70469180ea2129372003c50 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Tue, 9 Apr 2024 09:46:00 +0800
Subject: [PATCH] 1

---
 app.db                                             | Bin 176128 -> 176128 bytes
 .../connection/UfZcancmderWebsocket.java           |   2 +-
 .../underframework/dao/model/TsMdbActuator.java    |  12 ------------
 web                                                |   2 +-
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app.db b/app.db
index cb501403e34103b6d91e5e35047300fa0a9a8f83..2929be2d3206045fd5e3e1bb608a3df53ec368a2 100644
GIT binary patch
delta 2180
zcma)-ZBSHI7{~89yL;bu_udtR%c8Kmu(-go?5;1dh{&u&ObA7eSdJ8eNH5B$EY3Kf
zqf5>>>R`aCC-aS*QU?c(Dcz<J?NfbGGiPd=tTcn_gQHeoGNsN7NBz);7}(|id;ZUJ
z&%O8j@7;Do-F8Fmn=vh05ClK|<3CsXi{^mrk(Gm6ZFbC{ULol3=oKUJIl6y&uBD;D
z>6|^Uw4^OEHxy_o3AY92wzbX+l!n?`0;Mgj;pT9pwYg+<OCoZ|oBG?{)8l=;`1h9+
zAGGG+-U3%*@N!d6-?=^j99hb^U=w!=`f2TF?UW|luiCS0H>_K%^TnO&tz`BfSR?8^
z(K^YftOVPY&gPc2s}nbmW`YR$bVPD1msCZUR=Jl(7u8m|a|lFrCxIJn9|Gr+mrj5T
zXvSwS*&n|zHasU9uUDdx(;$QROp&HA`IaNzXsu{81W9FPvhfsn-|UeK1-oTf&<|@#
z+kRV6jVkvQzr0bNEnXI5mSO46NPM?NjaR-b89pEAsX~QAzy<QqnNuJWwGQD093296
z=)f6}CN6IjjrQtC$3^X<Kut^>O-scK$nMErAsN-x;LWl}=f)S7g6moTaekTSK@K^;
zO=xr&k1u^iH0peG@dz(oM*0wNSn}~%%gN%8!B>*ag8v8l-}qDTkF4LL_xH5|SMr}A
z1deCO{dEZgg5IyEYWuWw`=GtZcGecLerjE)ex^RHe6G~Um*jfsnzT&(R&2EVXlXHz
zo0pg_n2O*5D1u!;69)R@wMv&uY5)!8J_9wmVNB`D=JI<gv$$MY2EAyj2i7Z&nS@m>
zHWJ-MUNq@}ZHi;Y6hiBA;4a0H$>n#XD?gW5oV?2u^rG_=WpG=u7w%NL4I(S>N|r6a
zT@zk>tnPHqqIs}W=}zPFB9+s*yh=J&%_1GCoQ=&Q9VuLv`-q&z<tUX7F3a*sRp;_Z
zIiB}JKAER+R$4$Tb}sJ{%k=_cv2o^Hh}nul!mON~D<o|ymurY+xt~}R&OY)Ji_GPD
zVtKI$TQ*9B1^ou9{R?=}*F~^K=@1Dkz)Y{ezUKq5TIsY97QpP?0Bl#bn29V68>pFB
z%8TI=WwVK}aEXBqP2y2w#qb4XGvo|B#B5;@vvxq33y-=^ddJqmMaS=g`X_gzGPN6F
zf#-NVbf>6zGv=yog7%a38|_uQOKnR!LU5^y);pm&@Bch<a+7b(hZ`(4WLtZLV}gD_
z&((&tr|e(Y8*R63n`|cQ9;;J*PYo)cC{^;8@(O7}+8{m<cZeyL!<H2D4$}kE1~>sb
zz$D(<>B6!8_)AiU2S2yUeF^=F7j5&vvc$S8n$+QDu$RNz1iC0B5nxty!3{CaW*A3d
z3YU8b&SIEG0uO#xj>|JKs#;7Ffk_Ajb6^nT85EOL&;gX|=voeR<6<T&(v0vX9le%I
zi%vF>gynJVA**GuMx2@_ivwQhmSP63RrpwhZu;PSqogVP>)^ieT_-0#JR2wpgk$N<
z5&aY2a^gUPdC(!n(ipz@2gj~i1W#v}28_CoP@Kx}*zeq(<s<GChRYw}LljSAc=R4~
z*GMr3BV|)$0XmeAuWU?bn8uGD%~?RkY7FB9PA&OuitP;3BvQ9gNZdAtX&5QqPqCF@
zoX4plX@25X8K$|U?!6Q%4C81rw-I{sI)?Cdl$nF3l{8{U=<$^f1w!o-b_D$_yZk0v
zkSzdp=?xLr3j8d?xVsQ_1)w3VwO}0ZlNi&(`q8}r%#b#kF)j_$I47F#cu`9+%$GV%
zn1)Mepeemo41H23WRygj(p5oBR|8C4eirHrLAc;}A9M^{6y<}0zFn8KgCp@?O<9v8
fH7NL1Z{T-*tJ38mj{^K^zzM={1~*r|S7QGHxCUL<

delta 413
zcmYMtJ4*vW5C`y^BiuW8ITbIOC-{gOAs8FAO3+5|5eqvDdlAy4lsqhL_AJ~=NFyl%
zks~DQmq_6^xI$}9D=D0biU+@4ZstEbjnHU>21~dJNs{tNM;aRWo7<2GF5C4w{?VtR
z6k11XD2-@h1!aCE@h0>d^(nuAHV|bfKaXb79HQPTqBmm5LQ#}MG($Ca1`k?DVH%c$
zX4Pr2Ap?lf0!tl9PS1X`yS5g6ji#*7yfOETto|<2ZMaebb^v13fw(O1p761N9do(m
z9jjh02e;Q;3?Ktb{J9H@d^~_G_c}0C%14TKUf@9wlH#HZPZ8R#YemU<w1xFx6^yd}
zrRTMpRt%bPjUTpQU({aUPVKv;52v3kg+GVS&h9G_5&4A4>9plDcUq{(lgxkCXIs-M
JlPAt!>>HRjSt9@d

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 76a6c99..ee8c37e 100644
--- a/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
+++ b/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
@@ -139,7 +139,7 @@ public class UfZcancmderWebsocket extends UfConnectionBase {
         }
 
         TsMdbActuator actuator = TsMdbActuator.findOne(TsMdbActuator.class, actuatorCmd.actuatorId);
-        int moduleId = actuator.aid;
+        int moduleId = 0; //actuator.aid;
 
         int cmdId = Integer.parseInt(actuatorCmd.cmdId, 16);
         int subCmdId = cmdId & 0xFF;
diff --git a/src/main/java/com/iflytop/digester/underframework/dao/model/TsMdbActuator.java b/src/main/java/com/iflytop/digester/underframework/dao/model/TsMdbActuator.java
index 3dfe4e0..4efc50d 100644
--- a/src/main/java/com/iflytop/digester/underframework/dao/model/TsMdbActuator.java
+++ b/src/main/java/com/iflytop/digester/underframework/dao/model/TsMdbActuator.java
@@ -6,9 +6,6 @@ import com.iflytop.digester.underframework.dao.record.UfActiveRecordField;
  */
 public class TsMdbActuator extends UfActiveRecord {
     @UfActiveRecordField
-    public Integer aid;
-
-    @UfActiveRecordField
     public String moduleId;
 
     @UfActiveRecordField
@@ -17,15 +14,6 @@ public class TsMdbActuator extends UfActiveRecord {
     @UfActiveRecordField
     public String name;
 
-    @UfActiveRecordField
-    public String type;
-
-    @UfActiveRecordField
-    public Integer boardId;
-
-    @UfActiveRecordField
-    public String ioIndex;
-
     // get table name
     public static String getTableName() {
         return "app_actuators";
diff --git a/web b/web
index 92cb587..6bacffe 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit 92cb587baccf83f33dd9465bb37dc815058f26a0
+Subproject commit 6bacffe10495394dfa5cf3a793d2aa7a60ef164c