diff --git a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CacheConstants.java b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CacheConstants.java index a497f05ae..c1bee2b88 100644 --- a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CacheConstants.java +++ b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CacheConstants.java @@ -145,4 +145,8 @@ public interface CacheConstants { String THIRDPARTY_ZY_SELF_TOKEN = "thirdparty:zy:self_token:"; /* ************************************* end 第三方对接相关 end ************************************* */ + + + /** mfa */ + String SMS_CODE_KEY="sms_code:"; } diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/lostandfound/app/LostAndFoundPageVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/lostandfound/app/LostAndFoundPageVo.java new file mode 100644 index 000000000..444bb24cd --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/lostandfound/app/LostAndFoundPageVo.java @@ -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; + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/LostAndFoundController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/LostAndFoundController.java index f8510ad02..353939d51 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/LostAndFoundController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/LostAndFoundController.java @@ -6,11 +6,13 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.integrated.entity.LostAndFoundEntity; import com.bsd.pjcloud.integrated.service.LostAndFoundService; +import com.bsd.pjcloud.integrated.vo.lostandfound.app.LostAndFoundPageVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -49,7 +51,6 @@ public class LostAndFoundController { @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_view')" ) public R getLostAndFoundPage(@ParameterObject Page page, @ParameterObject LostAndFoundEntity lostAndFound) { - lostAndFound.setDeptId(SecurityUtils.getUser().getDeptId()); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(lostAndFound.getTitle()),LostAndFoundEntity::getTitle,lostAndFound.getTitle()); wrapper.eq(StrUtil.isNotBlank(lostAndFound.getStatus()),LostAndFoundEntity::getStatus,lostAndFound.getStatus()); @@ -79,6 +80,7 @@ public class LostAndFoundController { @PostMapping @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_add')" ) public R save(@RequestBody LostAndFoundEntity lostAndFound) { + lostAndFound.setDeptId(SecurityUtils.getUser().getDeptId()); return R.ok(lostAndFoundService.save(lostAndFound)); } @@ -121,4 +123,30 @@ public class LostAndFoundController { public List export(LostAndFoundEntity lostAndFound,Long[] ids) { return lostAndFoundService.list(Wrappers.lambdaQuery(lostAndFound).in(ArrayUtil.isNotEmpty(ids), LostAndFoundEntity::getId, ids)); } + + + /**-------------------------------APP--------------------------*/ + /** + * app分页查询 + * @param page 分页对象 + * @param lostAndFound 失物招领 + * @return + */ + @Operation(summary = "失物招领app分页查询" , description = "物招领app分页查询" ) + @GetMapping("/app/page" ) + public R getLostAndFoundAppPage(@ParameterObject Page page, @ParameterObject LostAndFoundEntity lostAndFound) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(lostAndFound.getTitle()),LostAndFoundEntity::getTitle,lostAndFound.getTitle()); + Page pageData = lostAndFoundService.page(page, wrapper); + List records = pageData.getRecords(); + + Page lostAndFoundPageVoPage = new Page<>(); + List lostAndFoundPageVos = BeanUtils.toBean(records, LostAndFoundPageVo.class); + lostAndFoundPageVoPage.setRecords(lostAndFoundPageVos); + lostAndFoundPageVoPage.setTotal(pageData.getTotal()); + lostAndFoundPageVoPage.setCurrent(pageData.getCurrent()); + lostAndFoundPageVoPage.setSize(pageData.getSize()); + return R.ok(lostAndFoundPageVoPage); + } + } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingBookingController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingBookingController.java new file mode 100644 index 000000000..86d4ebdfa --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingBookingController.java @@ -0,0 +1,121 @@ +package com.bsd.pjcloud.integrated.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; +import com.bsd.pjcloud.integrated.service.MeetingBookingService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 会议室预约 + * + * @author zjf + * @date 2025-05-20 10:51:29 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/meetingBooking" ) +@Tag(description = "meetingBooking" , name = "会议室预约管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class MeetingBookingController { + + private final MeetingBookingService meetingBookingService; + + /** + * 分页查询 + * @param page 分页对象 + * @param meetingBooking 会议室预约 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('integrated_meetingBooking_view')" ) + public R getMeetingBookingPage(@ParameterObject Page page, @ParameterObject MeetingBookingEntity meetingBooking) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StrUtil.isNotBlank(meetingBooking.getTitle()),MeetingBookingEntity::getTitle,meetingBooking.getTitle()); + return R.ok(meetingBookingService.page(page, wrapper)); + } + + + /** + * 通过id查询会议室预约 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('integrated_meetingBooking_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(meetingBookingService.getById(id)); + } + + /** + * 新增会议室预约 + * @param meetingBooking 会议室预约 + * @return R + */ + @Operation(summary = "新增会议室预约" , description = "新增会议室预约" ) + @SysLog("新增会议室预约" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('integrated_meetingBooking_add')" ) + public R save(@RequestBody MeetingBookingEntity meetingBooking) { + return R.ok(meetingBookingService.save(meetingBooking)); + } + + /** + * 修改会议室预约 + * @param meetingBooking 会议室预约 + * @return R + */ + @Operation(summary = "修改会议室预约" , description = "修改会议室预约" ) + @SysLog("修改会议室预约" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('integrated_meetingBooking_edit')" ) + public R updateById(@RequestBody MeetingBookingEntity meetingBooking) { + return R.ok(meetingBookingService.updateById(meetingBooking)); + } + + /** + * 通过id删除会议室预约 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除会议室预约" , description = "通过id删除会议室预约" ) + @SysLog("通过id删除会议室预约" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('integrated_meetingBooking_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(meetingBookingService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param meetingBooking 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('integrated_meetingBooking_export')" ) + public List export(MeetingBookingEntity meetingBooking,Long[] ids) { + return meetingBookingService.list(Wrappers.lambdaQuery(meetingBooking).in(ArrayUtil.isNotEmpty(ids), MeetingBookingEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingRoomController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingRoomController.java index bd955e54a..5d7d3186d 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingRoomController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingRoomController.java @@ -82,14 +82,15 @@ public class MeetingRoomController { @Transactional public R save(@RequestBody MeetingRoomEntity meetingRoom) { meetingRoom.setDeptId(SecurityUtils.getUser().getDeptId()); - List meetingRoomEquipmentEntityList = meetingRoom.getMeetingRoomEquipmentEntityList(); + List meetingRoomEquipmentEntityList = meetingRoom.getEquipmentList(); + boolean save = meetingRoomService.save(meetingRoom); if (CollUtil.isNotEmpty(meetingRoomEquipmentEntityList)) { meetingRoomEquipmentEntityList.forEach(meetingRoomEquipmentEntity -> { meetingRoomEquipmentEntity.setRoomId(meetingRoom.getId()); }); meetingRoomEquipmentService.saveBatch(meetingRoomEquipmentEntityList); } - return R.ok(meetingRoomService.save(meetingRoom)); + return R.ok(save); } /** diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MeetingBookingEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MeetingBookingEntity.java new file mode 100644 index 000000000..8a8237345 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MeetingBookingEntity.java @@ -0,0 +1,127 @@ +package com.bsd.pjcloud.integrated.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 会议室预约 + * + * @author zjf + * @date 2025-05-20 10:51:29 + */ +@Data +@TenantTable +@TableName("meeting_booking") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "会议室预约") +public class MeetingBookingEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 会议主题 + */ + @Schema(description="会议主题") + private String title; + + /** + * 会议室id + */ + @Schema(description="会议室id") + private Long roomId; + + /** + * 会议说明 + */ + @Schema(description="会议说明") + private String description; + + /** + * 审批状态 + */ + @Schema(description="审批状态") + private String meetingStatus; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 申请人id + */ + @Schema(description="申请人id") + private Long applicantId; + + /** + * 会议负责人id + */ + @Schema(description="会议负责人id") + private Long assigneeId; + + /** + * 开始时间 + */ + @Schema(description="开始时间") + private LocalDateTime startTime; + + /** + * 结束时间 + */ + @Schema(description="结束时间") + private LocalDateTime endTime; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建者") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新者") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MeetingRoomEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MeetingRoomEntity.java index 1091d53a8..fdd180641 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MeetingRoomEntity.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MeetingRoomEntity.java @@ -135,5 +135,5 @@ public class MeetingRoomEntity extends Model { @TableField(exist = false) @Schema(description="设备会议室关联") - private List meetingRoomEquipmentEntityList; + private List equipmentList; } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/MeetingBookingMapper.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/MeetingBookingMapper.java new file mode 100644 index 000000000..a530c5e1d --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/MeetingBookingMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.integrated.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MeetingBookingMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingBookingService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingBookingService.java new file mode 100644 index 000000000..2b04e073f --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingBookingService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.integrated.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; + +public interface MeetingBookingService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingBookingServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingBookingServiceImpl.java new file mode 100644 index 000000000..2960fb62d --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingBookingServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.integrated.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; +import com.bsd.pjcloud.integrated.mapper.MeetingBookingMapper; +import com.bsd.pjcloud.integrated.service.MeetingBookingService; +import org.springframework.stereotype.Service; +/** + * 会议室预约 + * + * @author zjf + * @date 2025-05-20 10:51:29 + */ +@Service +public class MeetingBookingServiceImpl extends ServiceImpl implements MeetingBookingService { +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/MeetingBookingMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/MeetingBookingMapper.xml new file mode 100644 index 000000000..d8dae8019 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/MeetingBookingMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file