更新！

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

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
+import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.device.PermissSettingDeviceType;
 import com.zhongshu.card.client.type.device.PermissSettingType;
@@ -53,7 +54,10 @@ public class PermissSettingConfigModel {
         return "";
     }
 
-    @Schema(description = "设备列表")
+    @Schema(description = "设备类型")
+    private List<DeviceType> deviceTypes = new ArrayList<>();
+
+    @Schema(description = "设备关联数据ID")
     private List<String> deviceIds = new ArrayList<>();
 
     private String deviceNames = "";

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

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
+import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.device.PermissSettingDeviceType;
 import com.zhongshu.card.client.type.device.PermissSettingType;
@@ -32,9 +33,12 @@ public class PermissSettingConfigParam {
     @Schema(description = "关联配置的数据id，如：角色id集合")
     private List<String> dataIds = new ArrayList<>();
 
-    @Schema(description = "设备类型--分组、设备")
+    @Schema(description = "设备类型--分组、设备、区域、类型")
     private PermissSettingDeviceType permissSettingDeviceType;
 
+    @Schema(description = "设备类型")
+    private List<DeviceType> deviceTypes = new ArrayList<>();
+
     @Schema(description = "设备列表")
     private List<String> deviceIds = new ArrayList<>();
 

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

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
+import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.Sex;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -30,4 +31,8 @@ public class PermissSettingListSearch extends SuperSearch {
 
     @Schema(description = "设备")
     private List<String> deviceIds = new ArrayList<>();
+
+    @Schema(description = "设备类型")
+    private List<DeviceType> deviceTypes = new ArrayList<>();
+
 }

FullCardClient/src/main/java/com/zhongshu/card/client/type/device/PermissSettingDeviceType.java

@@ -7,6 +7,7 @@ import lombok.Getter;
  */
 public enum PermissSettingDeviceType {
     Device("设备"),
+    DeviceType("设备类型"),
     DeviceGroup("设备分组"),
     Area("区域"),
     ;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/impl/PermissSettingListDaoImpl.java

@@ -78,6 +78,10 @@ public class PermissSettingListDaoImpl extends BaseImpl implements PermissSettin
             criteria.and("deviceIds").in(param.getDeviceIds());
         }
 
+        if (ObjectUtils.isNotEmpty(param.getDeviceTypes())) {
+            criteria.and("deviceTypes").in(param.getDeviceTypes());
+        }
+
         Sort sort = buildSort(param);
         Query query = Query.query(criteria);
         query.with(sort);

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

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.domain.devices.permiss;
 
+import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.device.PermissSettingDeviceType;
 import com.zhongshu.card.client.type.device.PermissSettingType;
@@ -45,7 +46,10 @@ public class PermissSettingList extends SuperMain {
     @Schema(description = "设备类型--分组、设备、区域")
     private PermissSettingDeviceType permissSettingDeviceType;
 
-    @Schema(description = "设备列表")
+    @Schema(description = "设备类型")
+    private List<DeviceType> deviceTypes = new ArrayList<>();
+
+    @Schema(description = "设备关联数据ID")
     @Indexed
     private List<String> deviceIds = new ArrayList<>();
 

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

@@ -191,6 +191,9 @@ public class DevicePermissVerifyService {
                     }
                 }
                 stopWatch.stop();
+
+                // 设备类型
+                search.setDeviceTypes(List.of(deviceInfo.getDeviceType()));
                 // 设备所在的分组
                 search.setDeviceIds(deviceIds);
 

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

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.service.devices.permiss;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
+import com.github.microservice.models.type.DeviceType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.model.devices.permiss.*;
@@ -228,6 +229,11 @@ public class PermissSettingService extends SuperService {
                     if (ObjectUtils.isNotEmpty(areas)) {
                         names = areas.stream().map(it -> it.getName()).toList();
                     }
+                } else if (param.getPermissSettingDeviceType() == PermissSettingDeviceType.DeviceType) {
+                    List<DeviceType> deviceTypes = param.getDeviceTypes();
+                    if (ObjectUtils.isNotEmpty(deviceTypes)) {
+                        names = deviceTypes.stream().map(it -> it.getRemark()).collect(Collectors.toList());
+                    }
                 }
                 if (ObjectUtils.isNotEmpty(names)) {
                     deviceNames = StringUtils.join(names, ",");