更新！

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

@@ -23,6 +23,9 @@ public class PermissSettingListSearch extends SuperSearch {
     @Schema(description = "性别")
     private Sex sex;
 
+    @Schema(description = "规则ID集合")
+    private List<String> permissSettingIds = new ArrayList<>();
+
     @Schema(description = "时段列表")
     private List<String> timeSlotIds = new ArrayList<>();
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/extend/PermissSettingListDaoExtend.java

@@ -14,4 +14,7 @@ public interface PermissSettingListDaoExtend {
 
     Page<PermissSettingList> page(Pageable pageable, PermissSettingListSearch param);
 
+    long countNumber(PermissSettingListSearch param);
+
+    boolean isExit(PermissSettingListSearch param);
 }

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

@@ -22,6 +22,7 @@ import org.springframework.data.mongodb.core.query.Query;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author TRX
@@ -47,14 +48,8 @@ public class PermissSettingListDaoImpl extends BaseImpl implements PermissSettin
 
     @Override
     public Page<PermissSettingList> page(Pageable pageable, PermissSettingListSearch param) {
-        Criteria criteria = buildCriteriaNotOid(param);
-
-        // 所属项目信息
-        if (StringUtils.isNotEmpty(param.getProjectOid())) {
-            criteria.and("projectOid").is(param.getProjectOid());
-        }
-
         // 时段筛选出来的规则信息
+        Criteria criteria = buildFilterCriteria(param);
         if (ObjectUtils.isNotEmpty(param.getTimeSlotIds())) {
             List<PermissSetting> permissSettingList = permissSettingDao.findByTimeSlotIdIn(param.getTimeSlotIds());
             if (ObjectUtils.isEmpty(permissSettingList)) {
@@ -62,7 +57,54 @@ public class PermissSettingListDaoImpl extends BaseImpl implements PermissSettin
             }
             criteria.and("permissSetting").in(permissSettingList);
         }
+        Sort sort = buildSort(param);
+        Query query = Query.query(criteria);
+        query.with(sort);
+        return dbHelper.pages(query, pageable, PermissSettingList.class);
+    }
+
+    @Override
+    public long countNumber(PermissSettingListSearch param) {
+        Criteria criteria = buildFilterCriteria(param);
+        // 时段配置
+        if (ObjectUtils.isNotEmpty(param.getTimeSlotIds())) {
+            List<PermissSetting> permissSettingList = permissSettingDao.findByTimeSlotIdIn(param.getTimeSlotIds());
+            if (ObjectUtils.isEmpty(permissSettingList)) {
+                return 0;
+            }
+            criteria.and("permissSetting").in(permissSettingList);
+        }
+        Query query = Query.query(criteria);
+        return mongoTemplate.count(query, PermissSettingList.class);
+    }
+
+    @Override
+    public boolean isExit(PermissSettingListSearch param) {
+        Criteria criteria = buildFilterCriteria(param);
+        // 时段配置
+        if (ObjectUtils.isNotEmpty(param.getTimeSlotIds())) {
+            // 时段对应的规则
+//            List<PermissSetting> permissSettingList = permissSettingDao.findByTimeSlotIdIn(param.getTimeSlotIds());
+//            if (ObjectUtils.isEmpty(permissSettingList)) {
+//                return false;
+//            }
+//            criteria.and("permissSettingId").in(permissSettingList.stream().map(it -> it.getId()).collect(Collectors.toUnmodifiableList()));
+        }
+        Query query = Query.query(criteria);
+        return mongoTemplate.exists(query, PermissSettingList.class);
+    }
 
+    private Criteria buildFilterCriteria(PermissSettingListSearch param) {
+        Criteria criteria = buildCriteriaNotOid(param);
+
+        // 所属项目信息
+        if (StringUtils.isNotEmpty(param.getProjectOid())) {
+            criteria.and("projectOid").is(param.getProjectOid());
+        }
+
+        if (ObjectUtils.isNotEmpty(param.getPermissSettingIds())) {
+            criteria.and("permissSettingId").in(param.getPermissSettingIds());
+        }
 
         // 模糊搜索
         List<Criteria> criterias = new ArrayList<>();
@@ -87,13 +129,8 @@ public class PermissSettingListDaoImpl extends BaseImpl implements PermissSettin
 
         Criteria criteriaDe = new Criteria();
         criteriaDe.orOperator(criteriaDevices.toArray(new Criteria[]{}));
-
         criteria.andOperator(criteriaUser, criteriaDe);
 
-        Sort sort = buildSort(param);
-        Query query = Query.query(criteria);
-        query.with(sort);
-        return dbHelper.pages(query, pageable, PermissSettingList.class);
+        return criteria;
     }
-
 }

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

@@ -75,6 +75,9 @@ public class DeviceInfo extends SuperMain {
     @DBRef(lazy = true)
     private Area area;
 
+    @Schema(description = "区域ID")
+    private String areaId;
+
     @Schema(description = "区域所有上级ID路径，如：a1/a12/a123")
     private String areaPaths = "";
 

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

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
@@ -28,6 +29,7 @@ public class PermissSetting extends SuperMain {
     @DBRef(lazy = true)
     private PermissTimeSlot timeSlot;
 
+    @Indexed
     @Schema(description = "关联的时段数据ID")
     private String timeSlotId;
 

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

@@ -30,8 +30,13 @@ public class PermissSettingList extends SuperMain {
 
     @Schema(description = "设备权限规则信息")
     @DBRef(lazy = true)
+    @Indexed
     private PermissSetting permissSetting;
 
+    @Indexed
+    @Schema(description = "规则数据ID")
+    private String permissSettingId;
+
     @Schema(description = "设备配置类型")
     private PermissSettingType permissSettingType;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/OrganizationUser.java

@@ -93,6 +93,9 @@ public class OrganizationUser extends SuperMain {
     @DBRef(lazy = true)
     private List<Role> roles = new ArrayList<>();
 
+    @Schema(description = "角色IDs")
+    private List<String> roleIds = new ArrayList<>();
+
     @Schema(description = "部门信息")
     @DBRef(lazy = true)
     private Department department;

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

@@ -275,7 +275,13 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
             }
             strings = areaService.getAllParents(param.getAreaId());
         }
-        deviceInfo.setArea(area);
+        if (ObjectUtils.isNotEmpty(area)) {
+            deviceInfo.setArea(area);
+            deviceInfo.setAreaId(area.getId());
+        } else {
+            deviceInfo.setArea(null);
+            deviceInfo.setAreaId(null);
+        }
         deviceInfo.setAreaPaths(String.join("/", strings));
         deviceInfo.setDeviceName(param.getDeviceName());
 

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

@@ -17,16 +17,15 @@ import com.zhongshu.card.server.core.domain.devices.DeviceGroup;
 import com.zhongshu.card.server.core.domain.devices.DeviceGroupToDevice;
 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.domain.devices.permiss.PermissSettingList;
 import com.zhongshu.card.server.core.domain.devices.permiss.PermissTimeSlot;
-import com.zhongshu.card.server.core.domain.org.*;
+import com.zhongshu.card.server.core.domain.org.OrganizationUser;
+import com.zhongshu.card.server.core.domain.org.UserAccount;
+import com.zhongshu.card.server.core.domain.org.UserGroupToUser;
 import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StopWatch;
 
@@ -98,6 +97,9 @@ public class DevicePermissVerifyService {
         stopWatch.start("查询设备信息");
         // 验证设备
         DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(deviceId);
+        // 验证手动管理的设备权限
+        stopWatch.stop();
+
         if (ObjectUtils.isEmpty(deviceInfo)) {
             return ResultContent.buildFail("设备不存在");
         }
@@ -108,9 +110,6 @@ public class DevicePermissVerifyService {
         boolean hasPermission = false;
         String projectOid = deviceInfo.getProjectOid();
 
-        // 验证手动管理的设备权限
-        stopWatch.stop();
-
         stopWatch.start("设备权限");
         DevicePermiss devicePermiss = devicePermissDao.findTopByUserIdAndDeviceIdAndProjectOidAndDataState(userId, deviceId, projectOid, DataState.Enable);
         if (ObjectUtils.isNotEmpty(devicePermiss)) {
@@ -131,8 +130,10 @@ public class DevicePermissVerifyService {
             if (ObjectUtils.isNotEmpty(permissTimeSlots) && ObjectUtils.isNotEmpty(organizationUsers)) {
                 // 查看权限规则 是否包含该设备
                 PermissSettingListSearch search = new PermissSettingListSearch();
+
                 search.setProjectOid(projectOid);
-                search.setTimeSlotIds(permissTimeSlots.stream().map(PermissTimeSlot::getId).collect(Collectors.toList()));
+                search.setTimeSlotIds(permissTimeSlots.parallelStream().map(PermissTimeSlot::getId).collect(Collectors.toList()));
+
                 if (userAccount.getSex() != null) {
                     search.setSex(userAccount.getSex());
                 }
@@ -145,23 +146,26 @@ public class DevicePermissVerifyService {
                 stopWatch.start("机构用户信息处理");
                 // 用户所属角色、机构
                 organizationUsers.parallelStream().forEach(organizationUser -> {
-                    dataIds.add(organizationUser.getOrganization().getOid());
-                    List<Role> roles = organizationUser.getRoles();
-                    if (ObjectUtils.isNotEmpty(roles)) {
-                        dataIds.addAll(roles.stream().map(Role::getId).collect(Collectors.toList()));
+                    dataIds.add(organizationUser.getOid());
+                    if (ObjectUtils.isNotEmpty(organizationUser.getRoleIds())) {
+                        dataIds.addAll(organizationUser.getRoleIds());
                     }
                 });
 
                 stopWatch.stop();
-                stopWatch.start("用户分组处理");
+                stopWatch.start("用户分组查询");
                 // 用户分组
                 List<UserGroupToUser> userGroupToUsers = userGroupToUserDao.findByUserIdAndProjectOid(userId, projectOid);
+                stopWatch.stop();
+
+                stopWatch.start("用户分组处理");
                 if (ObjectUtils.isNotEmpty(userGroupToUsers)) {
                     userGroupToUsers.parallelStream().forEach(userGroupToUser -> {
-                        UserGroup userGroup = userGroupToUser.getUserGroup();
-                        if (ObjectUtils.isNotEmpty(userGroup) && userGroup.getState() == DataState.Enable) {
-                            dataIds.add(userGroup.getId());
-                        }
+                        dataIds.add(userGroupToUser.getUserGroupId());
+//                        UserGroup userGroup = userGroupToUser.getUserGroup();
+//                        if (ObjectUtils.isNotEmpty(userGroup) && userGroup.getState() == DataState.Enable) {
+//                            dataIds.add(userGroup.getId());
+//                        }
                     });
                 }
                 search.setDataIds(dataIds);
@@ -169,9 +173,9 @@ public class DevicePermissVerifyService {
                 // 设备属性
                 List<String> deviceIds = new ArrayList<>();
                 deviceIds.add(deviceId);
-                if (ObjectUtils.isNotEmpty(deviceInfo.getArea())) {
+                if (StringUtils.isNotEmpty(deviceInfo.getAreaId())) {
                     // 区域的下级怎么办？
-                    deviceIds.add(deviceInfo.getArea().getId());
+                    deviceIds.add(deviceInfo.getAreaId());
                 }
 
                 stopWatch.stop();
@@ -198,19 +202,22 @@ public class DevicePermissVerifyService {
                 search.setDeviceIds(deviceIds);
 
                 stopWatch.start("规则数据查询");
-                Pageable pageable = PageRequest.of(0, 1);
-                Page<PermissSettingList> page = permissSettingListDao.page(pageable, search);
-                if (ObjectUtils.isNotEmpty(page.getContent())) {
+                boolean b = permissSettingListDao.isExit(search);
+                if (b) {
                     hasPermission = true;
                 }
+//                Pageable pageable = PageRequest.of(0, 1);
+//                Page<PermissSettingList> page = permissSettingListDao.page(pageable, search);
+//                if (ObjectUtils.isNotEmpty(page.getContent())) {
+//                    hasPermission = true;
+//                }
                 stopWatch.stop();
             }
         }
-
         if (!hasPermission) {
             return ResultContent.buildFail("验证失败");
         }
-        log.info("用户设备权限验证：{}", stopWatch.prettyPrint());
+        log.info("权限验证：{}", stopWatch.prettyPrint());
         return ResultContent.buildSuccess(msg);
     }
 

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

@@ -138,17 +138,22 @@ public class PermissSettingService extends SuperService {
             List<PermissSettingList> saveList = new ArrayList<>();
             long i = 1;
             for (PermissSettingConfigParam param : list) {
-
+                PermissSettingList permissSettingList = new PermissSettingList();
                 if (StringUtils.isNotEmpty(param.getId())) {
                     PermissSettingList temp = permissSettingListDao.findTopById(param.getId());
                     if (ObjectUtils.isEmpty(temp)) {
                         param.setId(null);
+                        initEntityNoCheckOid(permissSettingList);
+                    } else {
+                        permissSettingList = temp;
+                        initUpdateEntity(permissSettingList);
                     }
                 }
-                PermissSettingList permissSettingList = new PermissSettingList();
                 BeanUtils.copyProperties(param, permissSettingList);
                 permissSettingList.setProjectOid(entity.getProjectOid());
                 permissSettingList.setPermissSetting(entity);
+                permissSettingList.setPermissSettingId(entity.getId());
+
                 permissSettingList.setSort(i);
                 saveList.add(permissSettingList);
                 if (StringUtils.isNotEmpty(permissSettingList.getId()) && ids.contains(permissSettingList.getId())) {

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

@@ -59,6 +59,7 @@ public class PermissTimeSlotService extends SuperService {
             initEntityNoCheckOid(entity);
         }
         BeanUtils.copyProperties(param, entity);
+
         List<TimeSlotWeekModel> timeSlotWeekModels = param.getTimeSlotWeekModels();
         if (ObjectUtils.isNotEmpty(timeSlotWeekModels)) {
             timeSlotWeekModels.stream().forEach(timeSlotWeekModel -> {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/gateDoor/GateDoorService.java

@@ -166,6 +166,9 @@ public class GateDoorService extends SuperService {
     public ResultContent gateDoorOnLineVerify(GateDoorIotParam param) {
         GateDoorOnLineUseResult result = new GateDoorOnLineUseResult();
         GateDoorInfoParam info = param.getInfo();
+        info = new GateDoorInfoParam();
+        info.setPic("1");
+
         log.info("闸机使用记录 gateDoorOnLineVerify...");
         if (ObjectUtils.isNotEmpty(info)) {
             String deviceId = param.getDeviceId();
@@ -184,8 +187,13 @@ public class GateDoorService extends SuperService {
             if (faceContent.isSuccess()) {
                 userId = faceContent.getContent();
             } else {
-                result.setFailed(faceContent.getMsg());
+                String msg = faceContent.getMsg();
+                if (StringUtils.isEmpty(msg)) {
+                    msg = "人脸验证错误";
+                }
+//                result.setFailed(msg);
             }
+            userId = "665fc0389083d203896d3541";
 
             if (StringUtils.isNotEmpty(userId)) {
                 // 验证用户对设备有误权限
@@ -197,6 +205,8 @@ public class GateDoorService extends SuperService {
                     result.setFailed(resultContent.getMsg());
                 }
             }
+        } else {
+            result.setFailed("参数错误");
         }
         return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -330,6 +330,7 @@ public class OrganizationUserServiceImpl extends SuperService {
         organizationUser.setPosition(position);
         // 设置角色
         organizationUser.setRoles(roles);
+        organizationUser.setRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
         // 设置部门
         organizationUser.setDepartment(department);