Merge branch 'master' into pjfk

# Conflicts: # pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java # pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
2025-07-09 12:28:26 +08:00
commit dd983527f3
@@ -11,7 +11,8 @@ public  final class IntegratedFlowConstant {
    public static final String  INTEGRATED_VISITOR= "INTEGRATED_VISITOR";


-
-
-
+    /**
+     * 会议预约
+     */
+    public static final String INTEGRATED_MEETING_BOOKING = "MEETING_CHECK";
 }
@@ -52,4 +52,5 @@ public class FeedbackAppDTO {
    @Schema(description="创建时间")
    private LocalDateTime createTime;

+
 }
@@ -0,0 +1,25 @@
+package com.bsd.pjcloud.integrated.dto.meeting;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class MeetingBookingSaveDto {
+    @Schema(description = "会议主题")
+    private String title;
+
+    @Schema(description = "会议室id")
+    private Long roomId;
+
+    @Schema(description = "会议说明")
+    private String description;
+
+    @Schema(description = "预约日期，格式yyyy-MM-dd")
+    private String bookingDate;
+
+    @Schema(description = "开始时间，格式HH:mm")
+    private String startTime;
+
+    @Schema(description = "结束时间，格式HH:mm")
+    private String endTime;
+} 
@@ -0,0 +1,7 @@
+package com.bsd.pjcloud.integrated.dto.meeting.app;
+
+import lombok.Data;
+
+@Data
+public class MeetingPageDto {
+}
@@ -0,0 +1,17 @@
+package com.bsd.pjcloud.integrated.vo.feedback;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+public class FeedbackScreenVo {
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "反馈类型（中文）")
+    private String typeLabel;
+
+    @Schema(description = "反馈时间")
+    private LocalDateTime createTime;
+} 
@@ -0,0 +1,17 @@
+package com.bsd.pjcloud.integrated.vo.lostandfound;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.time.LocalDate;
+
+@Data
+public class LostAndFoundScreenVo {
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "发现地点")
+    private String foundLocation;
+
+    @Schema(description = "发现日期")
+    private LocalDate foundDate;
+} 
@@ -0,0 +1,58 @@
+package com.bsd.pjcloud.integrated.vo.lostandfound.app;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class LostAndFoundPageVo {
+
+    /**
+     * id
+     */
+    @Schema(description="id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    @Schema(description="标题")
+    private String title;
+
+    /**
+     * 图片
+     */
+    @Schema(description="图片")
+    private String picUrl;
+
+
+    /**
+     * 描述
+     */
+    @Schema(description="描述")
+    private String description;
+
+
+    /**
+     * 发现日期
+     */
+    @Schema(description="发现日期")
+    private LocalDate dateFound;
+
+
+    /**
+     * 发现地点
+     */
+    @Schema(description="发现地点")
+    private String location;
+
+    /**
+     * 状态
+     */
+    @Schema(description="状态")
+    private String status;
+
+}
@@ -0,0 +1,20 @@
+package com.bsd.pjcloud.integrated.vo.maintenance;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.time.LocalDate;
+
+@Data
+public class MaintenanceOrderScreenVo {
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "发现日期")
+    private LocalDate dateFound;
+
+    @Schema(description = "发现地点")
+    private String location;
+
+    @Schema(description = "紧急程度（中文）")
+    private String urgencyLabel;
+} 
@@ -0,0 +1,52 @@
+package com.bsd.pjcloud.integrated.vo.meeting;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+@Data
+public class MeetingBookingPageVo {
+    @Schema(description = "预约ID")
+    private Long id;
+
+    @Schema(description = "会议主题")
+    private String title;
+
+    @Schema(description = "会议室id")
+    private Long roomId;
+
+    @Schema(description = "会议室名称")
+    private String roomName;
+
+    @Schema(description = "预约日期")
+    private LocalDate bookingDate;
+
+    @Schema(description = "开始时间")
+    private LocalTime startTime;
+
+    @Schema(description = "结束时间")
+    private LocalTime endTime;
+
+    @Schema(description = "预约人ID")
+    private Long applicantId;
+
+    @Schema(description = "预约人")
+    private String assigneeName;
+
+    @Schema(description = "状态")
+    private String checkStatus;
+
+    @Schema(description = "描述")
+    private String description;
+
+    @Schema(description = "创建人")
+    private String createBy;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "审核原因")
+    private String checkReason;
+} 
@@ -0,0 +1,21 @@
+package com.bsd.pjcloud.integrated.vo.meeting.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Data
+public class EquipmentVo {
+
+    /**
+     * 设备名称
+     */
+    @Schema(description="设备名称")
+    private String name;
+
+    /**
+     * 设备数量
+     */
+    @Schema(description="设备数量")
+    private Integer quantity;
+}
@@ -0,0 +1,33 @@
+package com.bsd.pjcloud.integrated.vo.meeting.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(description = "会议室预约请求")
+public class MeetingBookingReqVo {
+
+    @Schema(description = "会议主题")
+    private String title;
+
+    @Schema(description = "会议说明")
+    private String description;
+
+    @Schema(description = "预约日期")
+    @NotNull
+    private String date;
+
+    @Schema(description = "开始时间")
+    @NotNull
+    private String startTime;
+
+    @Schema(description = "结束时间")
+    @NotNull
+    private String endTime;
+
+    @Schema(description = "参会人员ID列表")
+    private List<Long> attendees;
+} 
@@ -0,0 +1,75 @@
+package com.bsd.pjcloud.integrated.vo.meeting.app;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class MeetingRoomPageVo {
+
+
+    /**
+     * id
+     */
+    @Schema(description="id")
+    private Long id;
+
+    /**
+     * 会议室名称
+     */
+    @Schema(description="会议室名称")
+    private String roomName;
+
+    /**
+     * 图片
+     */
+    @Schema(description="图片")
+    private String picUrl;
+
+
+    /**
+     * 描述
+     */
+    @Schema(description="描述")
+    private String description;
+
+    /**
+     * 状态（0=维护中 1=可用）
+     */
+    @Schema(description="状态（0=维护中 1=可用）")
+    private String status;
+
+
+    /**
+     * 默认管理员
+     */
+    @Schema(description="默认管理员")
+    private Long adminId;
+
+    /**
+     * 位置
+     */
+    @Schema(description="位置")
+    private String location;
+
+    /**
+     * 容纳人数
+     */
+    @Schema(description="容纳人数")
+    private Integer capacity;
+
+    /**
+     * 可用时间段
+     */
+    @Schema(description="可用时间段")
+    private String availableTime;
+
+
+    @Schema(description="设备名称")
+    private List<EquipmentVo> equipmentNames;
+
+
+}
@@ -0,0 +1,30 @@
+package com.bsd.pjcloud.integrated.vo.meeting.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "会议室时间段")
+public class TimeSlotVo {
+
+    @Schema(description = "开始时间")
+    private String startTime;
+
+    @Schema(description = "结束时间")
+    private String endTime;
+
+    @Schema(description = "状态：free-空闲，booked-已预约，disabled-不可用")
+    private String status;
+
+    @Schema(description = "预约人信息")
+    private BookedByVo bookedBy;
+
+    @Data
+    public static class BookedByVo {
+        @Schema(description = "用户ID")
+        private String userId;
+
+        @Schema(description = "用户名称")
+        private String userName;
+    }
+} 
@@ -0,0 +1,20 @@
+package com.bsd.pjcloud.integrated.vo.notice;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+public class NoticeScreenVo {
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 公告详情
+     */
+    @Schema(description="公告详情")
+    private String description;
+}