sige 1 year ago
parent
commit
7d82d9a104
  1. BIN
      app.db
  2. 2
      src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
  3. 12
      src/main/java/com/iflytop/digester/underframework/dao/model/TsMdbActuator.java
  4. 2
      web

BIN
app.db

2
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;

12
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";

2
web

@ -1 +1 @@
Subproject commit 92cb587baccf83f33dd9465bb37dc815058f26a0
Subproject commit 6bacffe10495394dfa5cf3a793d2aa7a60ef164c
Loading…
Cancel
Save