diff --git a/app.db b/app.db index cb50140..2929be2 100644 Binary files a/app.db and b/app.db differ 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