更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/common/CommonController.java

@@ -0,0 +1,53 @@
+package com.zhongshu.card.server.core.controller.common;
+
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.types.deviceUse.DeviceCategory;
+import com.github.microservice.types.deviceUse.DeviceType;
+import com.github.microservice.types.deviceUse.OnLineState;
+import com.zhongshu.card.server.core.service.base.CommonService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 通用服务
+ *
+ * @author TRX
+ * @date 2024/3/21
+ */
+@RequestMapping("/common")
+@RestController
+@Validated
+@Tag(name = "通用功能管理")
+public class CommonController {
+
+    @Autowired
+    private CommonService commonService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "设备类型 选择项")
+    @RequestMapping(value = "getDeviceType", method = {RequestMethod.GET})
+    public ResultContent getDeviceType() {
+        return ResultContent.buildSuccess(commonService.getEnums(DeviceType.values()));
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "设备节点 选择项")
+    @RequestMapping(value = "getDeviceCategory", method = {RequestMethod.GET})
+    public ResultContent getDeviceCategory() {
+        return ResultContent.buildSuccess(commonService.getEnums(DeviceCategory.values()));
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "设备状态 选择项")
+    @RequestMapping(value = "getOnLineState", method = {RequestMethod.GET})
+    public ResultContent getOnLineState() {
+        return ResultContent.buildSuccess(commonService.getEnums(OnLineState.values()));
+    }
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dataConfig/CardSystemDefault.java

@@ -28,8 +28,7 @@ public class CardSystemDefault {
     public static final String DEFAULT_ROLE_NAME = "管理员";
 
     // 系统默认头像 （闸机当头像为空时不能下发，所以设置个默认的）
-    public static final String defaultPermissFaceUrl = "https://zswl-dev.oss-cn-chengdu.aliyuncs.com/665fc0386b0724481afc56d9/store/665fc0386b0724481afc56d9/01457397-2a17-41ae-a6e3-118511e96d13" +
-            ".jpg/1730191730919.jpg";
+    public static final String defaultPermissFaceUrl = "https://zswl-dev.oss-cn-chengdu.aliyuncs.com/665fc0386b0724481afc56d9/store/665fc0386b0724481afc56d9/01457397-2a17-41ae-a6e3-118511e96d13.jpg/1730191730919.jpg";
 
     public static final List<RoleInit> initRoles = new ArrayList<RoleInit>();
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/CommonService.java

@@ -2,7 +2,9 @@ package com.zhongshu.card.server.core.service.base;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.core.util.net.HttpClient;
+import com.github.microservice.models.common.EnumListModel;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.types.common.CommonEnum;
 import com.mongodb.client.result.UpdateResult;
 import com.zhongshu.card.client.type.OrganizationState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
@@ -38,6 +40,21 @@ public class CommonService {
     @Autowired
     private OrganizationDao organizationDao;
 
+    public EnumListModel getEnums(Enum[] enums) {
+        EnumListModel model = new EnumListModel();
+        if (enums != null) {
+            for (Enum _enum : enums) {
+                String value = _enum.name();
+                String name = "";
+                if (_enum instanceof CommonEnum) {
+                    name = ((CommonEnum) _enum).getRemark();
+                }
+                model.add(name, value);
+            }
+        }
+        return model;
+    }
+
     /**
      * 检查和程序项目信息
      * @param projectCode

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

@@ -24,6 +24,7 @@ import com.zhongshu.card.server.core.domain.school.CardInfo;
 import com.zhongshu.card.server.core.service.projectAbout.CardInfoServiceImpl;
 import com.zhongshu.card.server.core.service.projectAbout.OrgUserFaceService;
 import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
+import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;