更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceBindModel.java

@@ -1,10 +1,10 @@
 package com.zhongshu.card.client.model.devices;
 
+import com.github.microservice.models.type.DeviceState;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.school.AreaModel;
-import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.type.PaymentModeType;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -50,7 +50,7 @@ public class DeviceBindModel extends SuperModel {
     }
 
     @Schema(description = "数据状态")
-    private DataState state;
+    private DeviceState state;
 
     public String stateStr;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoModel.java

@@ -2,12 +2,12 @@ package com.zhongshu.card.client.model.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
 import com.github.microservice.models.type.DeviceSpecType;
+import com.github.microservice.models.type.DeviceState;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;
-import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -107,7 +107,7 @@ public class DeviceInfoModel extends SuperModel {
     private String ip;
 
     @Schema(description = "数据状态")
-    private DataState state;
+    private DeviceState state;
 
     private String stateStr;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceBind.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.domain.devices;
 
+import com.github.microservice.models.type.DeviceState;
 import com.github.microservice.models.type.DeviceType;
-import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.type.PaymentModeType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
@@ -51,7 +51,7 @@ public class DeviceBind extends SuperMain {
     private OnLineState onLineState = OnLineState.OnLine;
 
     @Schema(description = "数据状态")
-    private DataState state = DataState.Enable;
+    private DeviceState state = DeviceState.Enable;
 
     @Schema(description = "最上线时间")
     private Long lastOnlineTime;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.server.core.domain.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
 import com.github.microservice.models.type.DeviceSpecType;
+import com.github.microservice.models.type.DeviceState;
 import com.github.microservice.models.type.DeviceType;
-import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.Organization;
@@ -28,6 +28,9 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @AllArgsConstructor
 public class DeviceInfo extends SuperMain {
 
+    @Schema(description = "数据状态")
+    private DeviceState state;
+
     @Indexed
     @Schema(description = "设备ID、设备号")
     private String deviceId;
@@ -72,9 +75,6 @@ public class DeviceInfo extends SuperMain {
     @Schema(description = "设备IP地址")
     private String ip;
 
-    @Schema(description = "数据状态")
-    private DataState state = DataState.Enable;
-
     @Schema(description = "区域信息")
     @DBRef(lazy = true)
     private Area area;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceInfoServiceImpl.java

@@ -90,8 +90,8 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
         String deviceId = param.getDeviceId();
         DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(deviceId);
         if (ObjectUtils.isNotEmpty(deviceInfo)) {
-            // 编辑 (不能再同步名称了，可能已改了)
-            BeanUtils.copyProperties(param, deviceInfo, "id", "deviceName");
+            // 编辑
+            BeanUtils.copyProperties(param, deviceInfo, "id");
         } else {
             // 新增
             deviceInfo = new DeviceInfo();

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceSyncFromIotService.java

@@ -6,18 +6,17 @@ import com.github.microservice.models.device.GateWaySyncParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
-import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
+import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationRelationDao;
-import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.devices.DeviceBind;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;
 import com.zhongshu.card.server.core.util.CommonUtil;
-import com.zhongshu.card.client.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,14 +89,7 @@ public class DeviceSyncFromIotService {
         HashMap<String, Object> map = new HashMap<>();
         map.put("lastOnlineTime", param.getLastOnlineTime());
         map.put("onLineState", CommonUtil.getEnumByName(OnLineState.class, param.getOnLineState()));
-        DataState state = CommonUtil.getEnumByName(DataState.class, param.getState());
-        if (state == null) {
-            DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(param.getDeviceId());
-            if (ObjectUtils.isNotEmpty(deviceInfo)) {
-                state = deviceInfo.getState();
-            }
-        }
-        map.put("state", state);
+        map.put("state", param.getState());
         map.put("lastOnlineTimeStr", DateUtils.paresTime(param.getLastOnlineTime(), DateUtils.FORMAT_LONG));
         commonService.updateData(where, map, DeviceInfo.class.getSimpleName());
         commonService.updateData(where, map, DeviceBind.class.getSimpleName());

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/DevicePermissVerifyService.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.service.devices.permiss;
 
 import com.github.microservice.models.gateDoor.use.GateDoorUseParam;
+import com.github.microservice.models.type.DeviceState;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.devices.permiss.PermissSettingListSearch;
 import com.zhongshu.card.client.model.devices.permiss.TimeSlotModel;
@@ -111,7 +112,7 @@ public class DevicePermissVerifyService {
         if (ObjectUtils.isEmpty(deviceInfo)) {
             return ResultContent.buildFail("设备不存在");
         }
-        if (deviceInfo.getState() != DataState.Enable) {
+        if (deviceInfo.getState() != DeviceState.Enable) {
             return ResultContent.buildFail("设备不可用");
         }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/UserPermissDataCacheService.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.service.devices.permiss;
 
+import com.github.microservice.models.type.DeviceState;
 import com.zhongshu.card.client.model.devices.userCache.UserCacheModel;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.UserState;
@@ -178,7 +179,7 @@ public class UserPermissDataCacheService extends SuperService {
         if (ObjectUtils.isNotEmpty(deviceInfo)) {
             dataCache.setDataName(deviceInfo.getDeviceName());
 
-            if (deviceInfo.getState() != DataState.Enable) {
+            if (deviceInfo.getState() != DeviceState.Enable) {
                 model.setFailed("设备不可用");
             } else {
                 model.add(deviceId);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.microservice.models.hxz.ConsumTransactionsResult;
 import com.github.microservice.models.hxz.QRCodeTransactionModel;
 import com.github.microservice.models.hxz.WxPayResult;
 import com.github.microservice.models.hxz.base.IotBaseResult;
+import com.github.microservice.models.type.DeviceState;
 import com.github.microservice.models.type.OrderFromType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
@@ -255,7 +256,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         }
 
         // 设备已停用
-        if (deviceInfo.getState() != null && deviceInfo.getState() == DataState.Disable) {
+        if (deviceInfo.getState() != null && deviceInfo.getState() != DeviceState.Enable) {
             entity.setVerifyError(String.format("设备%s", deviceInfo.getState().getRemark()));
             return;
         }