更新

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

@@ -4,8 +4,11 @@ import com.github.microservice.models.device.DeviceInfoSyncParam;
 import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.device.GateWaySyncParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
+import com.github.microservice.models.type.CommonState;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
+import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.utils.type.OnLineState;
 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.org.DeviceInfo;
@@ -13,6 +16,7 @@ import com.zhongshu.card.server.core.domain.school.DeviceBind;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.org.GateWayInfoServiceImpl;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;
+import com.zhongshu.card.server.core.util.CommonUtil;
 import com.zhongshu.card.server.core.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -82,8 +86,8 @@ public class DeviceSyncFromIotService {
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("lastOnlineTime", param.getLastOnlineTime());
-        map.put("onLineState", param.getOnLineState());
-        map.put("state", param.getState());
+        map.put("onLineState", CommonUtil.getEnumByName(OnLineState.class, param.getOnLineState()));
+        map.put("state", CommonUtil.getEnumByName(DataState.class, 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/test/Test.java

@@ -2,6 +2,8 @@ package com.zhongshu.card.server.core.test;
 
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.json.JSONUtil;
+import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.server.core.util.CommonUtil;
 import com.zhongshu.card.server.core.util.ValidateResult;
 import com.zhongshu.card.server.core.util.ValidateUtils;
 
@@ -20,13 +22,14 @@ public class Test {
 
         String str = "123abc@";
         ValidateResult result = ValidateUtils.validatePassWord(str);
-        System .out.println("结果：" + result.isSuccess() + " = " + result.getMsg()
-         + " == " + ValidateUtils.isPhoneNumber("18723497166"));
+        System.out.println("结果：" + result.isSuccess() + " = " + result.getMsg()
+                + " == " + ValidateUtils.isPhoneNumber("18723497166"));
 
         Map<String, Object> map = new HashMap<>();
         map.put("orderNo", orderNo);
         map.put("age", 24);
         System.out.println("map = " + JSONUtil.toJsonStr(map));
 
+        System.out.println("em: " + CommonUtil.getEnumByName(DataState.class, "Enable"));
     }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/CommonUtil.java

@@ -6,6 +6,7 @@ import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.zhongshu.card.client.utils.ITree;
+import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.Sex;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.util.exception.BusinessException;
@@ -463,6 +464,17 @@ public class CommonUtil {
         return null;
     }
 
+    public static <E extends Enum<E>> E getEnumByName(Class<E> t, String name) {
+        try {
+            if (StringUtils.isNotEmpty(name)) {
+                name = name.trim();
+                return Enum.valueOf(t, name);
+            }
+        } catch (Exception e) {
+        }
+        return null;
+    }
+
     /**
      * 月份搜索的时候转换
      *