更新！

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

@@ -1,7 +1,8 @@
-package com.zhongshu.card.client.model.devices;
+package com.zhongshu.card.client.model.devices.permiss;
 
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.model.devices.DeviceInfoModel;
 import com.zhongshu.card.client.model.org.DepartmentModel;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountSimpleModel;

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

@@ -1,9 +1,7 @@
-package com.zhongshu.card.client.model.devices;
+package com.zhongshu.card.client.model.devices.permiss;
 
 import com.zhongshu.card.client.model.base.ProjectOidParam;
-import com.zhongshu.card.client.model.base.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.devices;
+package com.zhongshu.card.client.model.devices.permiss;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.models.type.DeviceType;

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

@@ -0,0 +1,40 @@
+package com.zhongshu.card.client.model.devices.permiss;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.type.device.TimeSlotType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/12/19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PermissTimeSlotModel extends SuperModel {
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "时间段类型")
+    private TimeSlotType type;
+
+    private String typeStr;
+
+    public String getTypeStr() {
+        if (type != null) {
+            return type.getRemark();
+        }
+        return "";
+    }
+
+    @Schema(description = "星期数据")
+    private List<TimeSlotWeekModel> timeSlotWeekModels = new ArrayList<>();
+
+}

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

@@ -0,0 +1,30 @@
+package com.zhongshu.card.client.model.devices.permiss;
+
+import com.zhongshu.card.client.model.base.SuperParam;
+import com.zhongshu.card.client.type.device.TimeSlotType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/12/19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PermissTimeSlotParam extends SuperParam {
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "时间段类型")
+    private TimeSlotType type = TimeSlotType.Week;
+
+    @Schema(description = "星期数据")
+    private List<TimeSlotWeekModel> timeSlotWeekModels = new ArrayList<>();
+}

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

@@ -0,0 +1,25 @@
+package com.zhongshu.card.client.model.devices.permiss;
+
+import com.zhongshu.card.client.model.base.SuperSearch;
+import com.zhongshu.card.client.type.device.TimeSlotType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/12/19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PermissTimeSlotSearch extends SuperSearch {
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "时间段类型")
+    private TimeSlotType type;
+
+}

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

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.devices.permiss;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/12/19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TimeSlotModel {
+
+    private String startTime;
+
+    private String endTime;
+
+}

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

@@ -0,0 +1,37 @@
+package com.zhongshu.card.client.model.devices.permiss;
+
+import com.zhongshu.card.client.type.device.WeekDayType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 星期数据
+ *
+ * @author TRX
+ * @date 2024/12/19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TimeSlotWeekModel {
+
+    @Schema(description = "星期几")
+    private WeekDayType weekDayType;
+
+    private String weekDayTypeStr;
+
+    public String getWeekDayTypeStr() {
+        if (weekDayType != null) {
+            return weekDayType.getRemark();
+        }
+        return "";
+    }
+
+    @Schema(description = "时间段数据")
+    private List<TimeSlotModel> timeSlots = new ArrayList<>();
+}

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

@@ -0,0 +1,19 @@
+package com.zhongshu.card.client.type.device;
+
+import lombok.Getter;
+
+/**
+ * 权限添加类型
+ */
+public enum PermissDataType {
+    UserSetting("用户设置"),
+    Association("关联设置"),
+    ;
+
+    @Getter
+    private String remark;
+
+    PermissDataType(String remark) {
+        this.remark = remark;
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.zhongshu.card.client.type.device;
+
+import lombok.Getter;
+
+/**
+ * 时间段类型
+ */
+public enum TimeSlotType {
+    Week("周"),
+    Customize("自定义"),
+    ;
+
+    @Getter
+    private String remark;
+
+    TimeSlotType(String remark) {
+        this.remark = remark;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.type.device;
+
+import lombok.Getter;
+
+/**
+ *
+ */
+public enum WeekDayType {
+    Mon("周"),
+    Tues("周"),
+    Web("周"),
+    Thur("周"),
+    Fri("周"),
+    Sat("周"),
+    Sun("周"),
+    ;
+
+    @Getter
+    private String remark;
+
+    WeekDayType(String remark) {
+        this.remark = remark;
+    }
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DeviceSyncController.java

@@ -5,7 +5,7 @@ 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.net.ResultContent;
-import com.zhongshu.card.server.core.service.devices.DevicePermissSendLogService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissSendLogService;
 import com.zhongshu.card.server.core.service.devices.DeviceSyncFromIotService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DevicePermissController.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/permiss/DevicePermissController.java

@@ -1,14 +1,15 @@
-package com.zhongshu.card.server.core.controller.devices;
+package com.zhongshu.card.server.core.controller.devices.permiss;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.IDsParam;
-import com.zhongshu.card.client.model.devices.*;
-import com.zhongshu.card.client.service.school.DeviceInfoService;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissModel;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissParam;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissSearch;
 import com.zhongshu.card.client.type.DataState;
-import com.zhongshu.card.server.core.service.devices.DevicePermissService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/permiss/PermissTimeSlotController.java

@@ -0,0 +1,69 @@
+package com.zhongshu.card.server.core.controller.devices.permiss;
+
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotModel;
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotParam;
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotSearch;
+import com.zhongshu.card.server.core.service.devices.permiss.PermissTimeSlotService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.RequestBody;
+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/6/5
+ */
+@RestController
+@RequestMapping("/permissTimeSlot")
+@Tag(name = "设备权限-时间段管理")
+public class PermissTimeSlotController {
+
+    @Autowired
+    private PermissTimeSlotService permissTimeSlotService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "数据详情", description = "数据详情")
+    @RequestMapping(value = "getDetailInfo", method = {RequestMethod.POST})
+    public ResultContent<PermissTimeSlotModel> getDetailInfo(@RequestBody IDParam param) {
+        return this.permissTimeSlotService.getDetailInfo(param.getId());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "添加-编辑数据", description = "添加-编辑数据")
+    @RequestMapping(value = "saveInfo", method = {RequestMethod.POST})
+    public ResultContent saveInfo(@RequestBody PermissTimeSlotParam param) {
+        return this.permissTimeSlotService.saveInfo(param);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除数据", description = "删除数据")
+    @RequestMapping(value = "deleteInfo", method = {RequestMethod.POST})
+    public ResultContent deleteInfo(@RequestBody IDParam param) {
+        return this.permissTimeSlotService.deleteInfo(param.getId());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "数据列表-分页查询", description = "数据列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<PermissTimeSlotModel>> page(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) PermissTimeSlotSearch param) {
+        Assert.hasText(param.getProjectOid(), "projectOid不能为空");
+        return permissTimeSlotService.page(param, pageable);
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ExpenseFlowOpenApiController.java

@@ -1,33 +1,19 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
-import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.type.AuthType;
-import com.github.microservice.models.device.DevicePerQuery;
-import com.github.microservice.models.device.UserPerQuery;
 import com.github.microservice.net.ResultContent;
-import com.github.microservice.types.OrderModeType;
-import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
-import com.zhongshu.card.client.model.payment.ExpenseFlowSearch;
 import com.zhongshu.card.client.openApi.model.ExpenseFlowOpenApiModel;
 import com.zhongshu.card.client.openApi.params.ExpenseFlowOpenApiSearch;
 import com.zhongshu.card.client.openApi.params.PaymentNoParam;
-import com.zhongshu.card.server.core.service.devices.DevicePermissIotService;
-import com.zhongshu.card.server.core.service.devices.DeviceUseRecordService;
 import com.zhongshu.card.server.core.service.openAPI.ExpenseFlowOpenApiService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 /**
  * @author TRX
  * @date 2024/6/5

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ProjectOpenAPIController.java

@@ -2,13 +2,8 @@ package com.zhongshu.card.server.core.controller.openAPI;
 
 import com.github.microservice.models.device.DevicePerQuery;
 import com.github.microservice.models.device.UserPerQuery;
-import com.github.microservice.models.gateDoor.use.GateDoorUseParam;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.project.ProjectSaveParam;
-import com.zhongshu.card.client.model.school.BookInfoAddParam;
-import com.zhongshu.card.client.model.school.BookInfoModel;
-import com.zhongshu.card.client.service.school.BookInfoService;
-import com.zhongshu.card.server.core.service.devices.DevicePermissIotService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissIotService;
 import com.zhongshu.card.server.core.service.devices.DeviceUseRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

@@ -3,7 +3,7 @@ package com.zhongshu.card.server.core.dao.devices;
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.dao.devices.extend.DevicePermissDaoExtend;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 
 import java.util.List;

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

@@ -1,12 +1,8 @@
 package com.zhongshu.card.server.core.dao.devices;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.permiss.PermissSendState;
-import com.zhongshu.card.server.core.dao.devices.extend.DevicePermissDaoExtend;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
-import com.zhongshu.card.server.core.domain.devices.DevicePermissSendLog;
-import com.zhongshu.card.server.core.domain.org.OrganizationUser;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermissSendLog;
 
 import java.util.List;
 

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

@@ -0,0 +1,17 @@
+package com.zhongshu.card.server.core.dao.devices;
+
+import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.card.server.core.dao.devices.extend.PermissTimeSlotDaoExtend;
+import com.zhongshu.card.server.core.domain.devices.permiss.PermissTimeSlot;
+
+/**
+ * 权限时间段数据
+ *
+ * @author TRX
+ * @date 2024/3/21
+ */
+public interface PermissTimeSlotDao extends MongoDao<PermissTimeSlot>, PermissTimeSlotDaoExtend {
+
+    PermissTimeSlot findTopById(String id);
+
+}

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

@@ -1,9 +1,7 @@
 package com.zhongshu.card.server.core.dao.devices.extend;
 
-import com.zhongshu.card.client.model.devices.DevicePermissSearch;
-import com.zhongshu.card.client.model.org.OrganizationUserSearch;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
-import com.zhongshu.card.server.core.domain.org.OrganizationUser;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissSearch;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

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

@@ -0,0 +1,17 @@
+package com.zhongshu.card.server.core.dao.devices.extend;
+
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotSearch;
+import com.zhongshu.card.server.core.domain.devices.permiss.PermissTimeSlot;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+/**
+ * @Author TRX
+ * @CreateDate: 2023/7/7
+ * @Version: 1.0
+ */
+public interface PermissTimeSlotDaoExtend {
+
+    Page<PermissTimeSlot> page(Pageable pageable, PermissTimeSlotSearch param);
+
+}

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

@@ -1,16 +1,13 @@
 package com.zhongshu.card.server.core.dao.devices.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.card.client.model.devices.DevicePermissSearch;
-import com.zhongshu.card.client.model.org.OrganizationUserSearch;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissSearch;
 import com.zhongshu.card.server.core.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.devices.extend.DevicePermissDaoExtend;
 import com.zhongshu.card.server.core.dao.org.DepartmentDao;
 import com.zhongshu.card.server.core.dao.org.RoleDao;
-import com.zhongshu.card.server.core.dao.org.extend.OrganizationUserDaoExtend;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.Department;
-import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 import com.zhongshu.card.server.core.domain.org.Role;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -0,0 +1,62 @@
+package com.zhongshu.card.server.core.dao.devices.impl;
+
+import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotSearch;
+import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.server.core.dao.devices.extend.PermissTimeSlotDaoExtend;
+import com.zhongshu.card.server.core.domain.devices.permiss.PermissTimeSlot;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * @Author TRX
+ * @CreateDate: 2023/4/12
+ * @Version: 1.0
+ */
+public class PermissTimeSlotDaoImpl extends BaseImpl implements PermissTimeSlotDaoExtend {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Autowired
+    private DBHelper dbHelper;
+
+    @Override
+    public Page<PermissTimeSlot> page(Pageable pageable, PermissTimeSlotSearch param) {
+        Criteria criteria = buildCriteriaNotOid(param);
+
+        //
+        if (StringUtils.isNotEmpty(param.getProjectOid())) {
+            criteria.and("projectOid").is(param.getProjectOid());
+        }
+        if (param.getType() != null) {
+            criteria.and("type").is(param.getType());
+        }
+
+        // 模糊搜索
+        List<Criteria> criterias = new ArrayList<>();
+        if (StringUtils.isNotEmpty(param.getName())) {
+            Pattern pattern = Pattern.compile("^.*" + param.getName() + ".*$");
+            criterias.add(Criteria.where("name").is(pattern));
+        }
+        if (!CollectionUtils.isEmpty(criterias)) {
+            criteria.andOperator(criterias.toArray(new Criteria[]{}));
+        }
+        Sort sort = buildSort(param);
+        Query query = Query.query(criteria);
+        query.with(sort);
+        return dbHelper.pages(query, pageable, PermissTimeSlot.class);
+    }
+
+}

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

@@ -1,11 +1,13 @@
-package com.zhongshu.card.server.core.domain.devices;
+package com.zhongshu.card.server.core.domain.devices.permiss;
 
 import com.github.microservice.auth.security.type.AuthType;
 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.UserState;
+import com.zhongshu.card.client.type.device.PermissDataType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.org.Department;
 import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 import com.zhongshu.card.server.core.domain.org.Role;
@@ -16,7 +18,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -40,6 +41,9 @@ public class DevicePermiss extends SuperMain {
     @DBRef(lazy = true)
     private DeviceInfo deviceInfo;
 
+    @Schema(description = "设备用户权限设置方式")
+    private PermissDataType permissDataType = PermissDataType.UserSetting;
+
     //------------------设备冗余数据 start-------------------
     @Schema(description = "设备ID")
     private String deviceId;

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

@@ -1,6 +1,5 @@
-package com.zhongshu.card.server.core.domain.devices;
+package com.zhongshu.card.server.core.domain.devices.permiss;
 
-import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
 import com.zhongshu.card.client.type.permiss.PermissSendState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -0,0 +1,36 @@
+package com.zhongshu.card.server.core.domain.devices.permiss;
+
+import com.zhongshu.card.client.model.devices.permiss.TimeSlotWeekModel;
+import com.zhongshu.card.client.type.device.TimeSlotType;
+import com.zhongshu.card.server.core.domain.base.SuperMain;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 权限时间段
+ *
+ * @author TRX
+ * @date 2024/12/19
+ */
+@Data
+@Document
+@NoArgsConstructor
+@AllArgsConstructor
+public class PermissTimeSlot extends SuperMain {
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "时间段类型")
+    private TimeSlotType type;
+
+    @Schema(description = "星期数据")
+    private List<TimeSlotWeekModel> timeSlotWeekModels = new ArrayList<>();
+
+}

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

@@ -15,7 +15,7 @@ import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.AreaDao;
 import com.zhongshu.card.server.core.dataConfig.DeviceConfig;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.school.Area;
 import com.zhongshu.card.server.core.service.base.CommonService;

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

@@ -13,7 +13,7 @@ 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.DevicePermiss;
+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;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.service.devices;
+package com.zhongshu.card.server.core.service.devices.permiss;
 
 import cn.hutool.json.JSONObject;
 import com.github.microservice.core.util.os.SystemUtil;
@@ -10,14 +10,13 @@ import com.github.microservice.models.devicePermiss.GateWayPermissModel;
 import com.github.microservice.models.devicePermiss.ProjectUserPermiss;
 import com.github.microservice.models.iot.IotSendParam;
 import com.github.microservice.net.ResultContent;
-import com.github.microservice.types.FunctionType;
 import com.google.common.collect.Lists;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
 import com.zhongshu.card.server.core.dao.devices.DevicePermissSendLogDao;
 import com.zhongshu.card.server.core.dataConfig.TtlConfig;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
-import com.zhongshu.card.server.core.domain.devices.DevicePermissSendLog;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermissSendLog;
 import com.zhongshu.card.server.core.event.DevicePermissChangeEvent;
 import com.zhongshu.card.server.core.event.UserInfoChangeSyncEvent;
 import com.zhongshu.card.server.core.service.openAPI.OpenApiRequestService;
@@ -26,7 +25,6 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.EventListener;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.service.devices;
+package com.zhongshu.card.server.core.service.devices.permiss;
 
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.core.util.os.SystemUtil;
@@ -16,7 +16,7 @@ import com.zhongshu.card.client.type.school.CardState;
 import com.zhongshu.card.server.core.dao.devices.DevicePermissDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.projectAbout.OrgUserFace;
@@ -24,7 +24,6 @@ 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;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.service.devices;
+package com.zhongshu.card.server.core.service.devices.permiss;
 
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.models.device.DevicePermissSendResponseParam;
@@ -6,7 +6,7 @@ import com.github.microservice.models.device.DevicePermissSendResponseResult;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.type.permiss.PermissSendState;
 import com.zhongshu.card.server.core.dao.devices.DevicePermissSendLogDao;
-import com.zhongshu.card.server.core.domain.devices.DevicePermissSendLog;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermissSendLog;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.service.devices;
+package com.zhongshu.card.server.core.service.devices.permiss;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.core.util.os.SystemUtil;
@@ -6,9 +6,9 @@ import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.google.common.collect.Lists;
 import com.zhongshu.card.client.model.base.IDsParam;
-import com.zhongshu.card.client.model.devices.DevicePermissModel;
-import com.zhongshu.card.client.model.devices.DevicePermissParam;
-import com.zhongshu.card.client.model.devices.DevicePermissSearch;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissModel;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissParam;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissSearch;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.type.DataOperationType;
 import com.zhongshu.card.client.type.DataState;
@@ -17,12 +17,13 @@ import com.zhongshu.card.server.core.dao.devices.DevicePermissDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationUserDao;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.event.OrgUserBindUpdateSyncEvent;
 import com.zhongshu.card.server.core.service.base.SuperService;
+import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import com.zhongshu.card.server.core.util.CommonUtil;

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

@@ -0,0 +1,97 @@
+package com.zhongshu.card.server.core.service.devices.permiss;
+
+import com.github.microservice.components.data.base.util.PageEntityUtil;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotModel;
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotParam;
+import com.zhongshu.card.client.model.devices.permiss.PermissTimeSlotSearch;
+import com.zhongshu.card.client.type.device.TimeSlotType;
+import com.zhongshu.card.server.core.dao.devices.PermissTimeSlotDao;
+import com.zhongshu.card.server.core.dao.org.OrganizationDao;
+import com.zhongshu.card.server.core.domain.devices.permiss.PermissTimeSlot;
+import com.zhongshu.card.server.core.domain.org.Organization;
+import com.zhongshu.card.server.core.service.base.SuperService;
+import com.zhongshu.card.server.core.util.BeanUtils;
+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.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+/**
+ * 权限时间段管理
+ *
+ * @author TRX
+ * @date 2024/12/19
+ */
+@Slf4j
+@Service
+public class PermissTimeSlotService extends SuperService {
+
+    @Autowired
+    private PermissTimeSlotDao permissTimeSlotDao;
+
+    @Autowired
+    private OrganizationDao organizationDao;
+
+    public ResultContent saveInfo(PermissTimeSlotParam param) {
+        Assert.hasText(param.getProjectOid(), "projectOid不能为空");
+        if (param.getType() == null) {
+            param.setType(TimeSlotType.Week);
+        }
+
+        PermissTimeSlot entity = null;
+        if (StringUtils.isNotEmpty(param.getId())) {
+            entity = permissTimeSlotDao.findTopById(param.getId());
+            if (ObjectUtils.isEmpty(entity)) {
+                return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
+            }
+            initUpdateEntity(entity);
+        } else {
+            entity = new PermissTimeSlot();
+            initEntityNoCheckOid(entity);
+        }
+        BeanUtils.copyProperties(param, entity);
+        permissTimeSlotDao.save(entity);
+        return ResultContent.buildSuccess();
+    }
+
+    public ResultContent<Page<PermissTimeSlotModel>> page(PermissTimeSlotSearch param, Pageable pageable) {
+        String projectOid = param.getProjectOid();
+        Organization organization = organizationDao.findTopByOid(projectOid);
+        if (ObjectUtils.isEmpty(organization)) {
+            return ResultContent.buildFail("projectOid不存在");
+        }
+        Page<PermissTimeSlot> page = permissTimeSlotDao.page(pageable, param);
+        return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
+    }
+
+    public ResultContent deleteInfo(String id) {
+        PermissTimeSlot entity = permissTimeSlotDao.findTopById(id);
+        if (ObjectUtils.isEmpty(entity)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
+        }
+        permissTimeSlotDao.delete(entity);
+        return ResultContent.buildSuccess();
+    }
+
+    public ResultContent<PermissTimeSlotModel> getDetailInfo(String id) {
+        PermissTimeSlot entity = permissTimeSlotDao.findTopById(id);
+        if (ObjectUtils.isEmpty(entity)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
+        }
+        return ResultContent.buildSuccess(toModel(entity));
+    }
+
+    private PermissTimeSlotModel toModel(PermissTimeSlot entity) {
+        PermissTimeSlotModel model = new PermissTimeSlotModel();
+        if (ObjectUtils.isNotEmpty(entity)) {
+            BeanUtils.copyProperties(entity, model);
+        }
+        return model;
+    }
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/DevicePermissOpenApiService.java

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.devices.DeviceInfoSearch;
-import com.zhongshu.card.client.model.devices.DevicePermissParam;
+import com.zhongshu.card.client.model.devices.permiss.DevicePermissParam;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.openApi.model.DeviceInfoOpenApiModel;
@@ -15,12 +15,12 @@ import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
 import com.zhongshu.card.server.core.dao.devices.DevicePermissDao;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.service.base.SuperService;
-import com.zhongshu.card.server.core.service.devices.DevicePermissIotService;
-import com.zhongshu.card.server.core.service.devices.DevicePermissService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissIotService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
 import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;

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

@@ -26,7 +26,7 @@ import com.zhongshu.card.server.core.domain.school.DictInfo;
 import com.zhongshu.card.server.core.event.OrgUserBindUpdateSyncEvent;
 import com.zhongshu.card.server.core.model.org.OrgBindUserParam;
 import com.zhongshu.card.server.core.service.base.SuperService;
-import com.zhongshu.card.server.core.service.devices.DevicePermissEventService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissEventService;
 import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;
 import com.zhongshu.card.server.core.service.paySetting.ProjectPaySettingServiceImpl;
 import com.zhongshu.card.server.core.service.school.DictInfoServiceImpl;

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

@@ -37,7 +37,7 @@ import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/CardInfoServiceImpl.java

@@ -30,9 +30,8 @@ import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
 import com.zhongshu.card.server.core.domain.school.CardInfoLossRecord;
 import com.zhongshu.card.server.core.domain.school.CardInfoPool;
-import com.zhongshu.card.server.core.event.UserInfoChangeSyncEvent;
 import com.zhongshu.card.server.core.service.base.SuperService;
-import com.zhongshu.card.server.core.service.devices.DevicePermissEventService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissEventService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
 import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -12,7 +12,7 @@ import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.projectAbout.OrgUserFace;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
-import com.zhongshu.card.server.core.service.devices.DevicePermissEventService;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissEventService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;