sige 1 year ago
parent
commit
504bee0909
  1. 3
      src/main/java/a8k/db/AppSetting.java
  2. 2
      src/main/java/a8k/service/appsettings/AppSettingsMgr.java
  3. 5
      src/main/java/a8k/service/appsettings/settingenum/AutoLogoutTime.java
  4. 6
      src/main/java/com/iflytop/a800/device/IdChipReader.java

3
src/main/java/a8k/db/AppSetting.java

@ -6,6 +6,7 @@ import a8k.service.appsettings.base.AppSettingType;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.iflytop.uf.UfActiveRecord; import com.iflytop.uf.UfActiveRecord;
import com.iflytop.uf.UfActiveRecordField; import com.iflytop.uf.UfActiveRecordField;
import com.iflytop.uf.util.UfJsonHelper;
import java.util.Arrays; import java.util.Arrays;
@ -174,7 +175,7 @@ public class AppSetting extends UfActiveRecord {
option.type = AppSettingType.ENUM.name(); option.type = AppSettingType.ENUM.name();
option.tab = currentBuildGroup.name(); option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.valueEnumRange = Arrays.toString(valueEnumRange);
option.valueEnumRange = UfJsonHelper.objectToJson(valueEnumRange);
option.value = value; option.value = value;
option.priority = buildPriority++; option.priority = buildPriority++;
option.save(); option.save();

2
src/main/java/a8k/service/appsettings/AppSettingsMgr.java

@ -34,7 +34,7 @@ public class AppSettingsMgr {
static final int setOptionVal = 5; static final int setOptionVal = 5;
} }
static Integer settingPageVersion = 2;
static Integer settingPageVersion = 3;
@PostConstruct @PostConstruct

5
src/main/java/a8k/service/appsettings/settingenum/AutoLogoutTime.java

@ -2,10 +2,11 @@ package a8k.service.appsettings.settingenum;
public enum AutoLogoutTime { public enum AutoLogoutTime {
T00_00, T00_00,
T00_10,
T00_30,
T01_00, T01_00,
T02_00, T02_00,
T03_00,
T04_00,
T03_00
; ;

6
src/main/java/com/iflytop/a800/device/IdChipReader.java

@ -21,9 +21,9 @@ public class IdChipReader {
// 事件处理 // 事件处理
public void handleZCanCmderWebSocketEvent(Object ... args) { public void handleZCanCmderWebSocketEvent(Object ... args) {
Integer eventId = (Integer)args[0]; Integer eventId = (Integer)args[0];
if ( 0x71C8 == eventId ) { // ID 卡插入
UfMdbNotification.action("IdChipInsert");
}
// if ( 0x71C8 == eventId ) { // ID 卡插入
// UfMdbNotification.action("IdChipInsert");
// }
// if ( 0x71C9 == eventId ) { // ID 拔出 // if ( 0x71C9 == eventId ) { // ID 拔出
// UfMdbNotification.action("IdChipPullout"); // UfMdbNotification.action("IdChipPullout");
// } // }

Loading…
Cancel
Save