From 0a1cd59e7718968a7d19ddfba69eddac16392dde Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 1 Jul 2025 18:51:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=AC=E5=91=8A=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NoticeController.java | 171 ++++++++++++++++++ .../integrated/entity/NoticeEntity.java | 115 ++++++++++++ .../integrated/mapper/NoticeMapper.java | 11 ++ .../integrated/service/NoticeService.java | 8 + .../service/impl/NoticeServiceImpl.java | 16 ++ .../main/resources/mapper/NoticeMapper.xml | 22 +++ 6 files changed, 343 insertions(+) create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/NoticeEntity.java create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/NoticeMapper.java create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/NoticeService.java create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/NoticeServiceImpl.java create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/NoticeMapper.xml diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java new file mode 100644 index 000000000..5d695e2cd --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java @@ -0,0 +1,171 @@ +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.common.security.util.SecurityUtils; +import com.bsd.pjcloud.integrated.entity.NoticeEntity; +import com.bsd.pjcloud.integrated.service.NoticeService; +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-07-01 13:49:09 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/notice" ) +@Tag(description = "notice" , name = "通知公告管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class NoticeController { + + private final NoticeService noticeService; + + /** + * 分页查询 + * @param page 分页对象 + * @param notice 通知公告 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('integrated_notice_view')" ) + public R getNoticePage(@ParameterObject Page page, @ParameterObject NoticeEntity notice) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(notice.getTitle()),NoticeEntity::getTitle,notice.getTitle()); + return R.ok(noticeService.page(page, wrapper)); + } + + + /** + * 通过id查询通知公告 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('integrated_notice_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(noticeService.getById(id)); + } + + /** + * 新增通知公告 + * @param notice 通知公告 + * @return R + */ + @Operation(summary = "新增通知公告" , description = "新增通知公告" ) + @SysLog("新增通知公告" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('integrated_notice_add')" ) + public R save(@RequestBody NoticeEntity notice) { + notice.setDeptId(SecurityUtils.getUser().getDeptId()); + return R.ok(noticeService.save(notice)); + } + + /** + * 修改通知公告 + * @param notice 通知公告 + * @return R + */ + @Operation(summary = "修改通知公告" , description = "修改通知公告" ) + @SysLog("修改通知公告" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('integrated_notice_edit')" ) + public R updateById(@RequestBody NoticeEntity notice) { + return R.ok(noticeService.updateById(notice)); + } + + /** + * 通过id删除通知公告 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除通知公告" , description = "通过id删除通知公告" ) + @SysLog("通过id删除通知公告" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('integrated_notice_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(noticeService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param notice 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('integrated_notice_export')" ) + public List export(NoticeEntity notice,Long[] ids) { + return noticeService.list(Wrappers.lambdaQuery(notice).in(ArrayUtil.isNotEmpty(ids), NoticeEntity::getId, ids)); + } + + /** + * App分页公告列表 + * @param page 分页对象 + * @param title 公告标题（可选） + * @return R + */ + @Operation(summary = "App分页公告列表", description = "App分页公告列表") + @GetMapping("/app/page") + public R getAppNoticePage(@ParameterObject Page page, @RequestParam(required = false) String title) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(NoticeEntity::getStatus, "0"); // 只查已发布 + wrapper.like(StrUtil.isNotBlank(title), NoticeEntity::getTitle, title); + wrapper.orderByDesc(NoticeEntity::getIsTop, NoticeEntity::getCreateTime); // 置顶优先，时间倒序 + return R.ok(noticeService.page(page, wrapper)); + } + + /** + * App公告详情 + * @param id 公告ID + * @return R + */ + @Operation(summary = "App公告详情", description = "App公告详情") + @GetMapping("/app/{id}") + public R getAppNoticeDetail(@PathVariable("id") Long id) { + NoticeEntity notice = noticeService.getById(id); + if (notice == null || !"0".equals(notice.getStatus())) { + return R.failed("公告不存在或已下架"); + } + return R.ok(notice); + } + + /** + * App公告浏览量+1 + * @param id 公告ID + * @return R + */ + @Operation(summary = "App公告浏览量+1", description = "App公告浏览量+1") + @PostMapping("/app/view/{id}") + public R addViewCount(@PathVariable("id") Long id) { + NoticeEntity notice = noticeService.getById(id); + if (notice == null || !"0".equals(notice.getStatus())) { + return R.failed("公告不存在或已下架"); + } + notice.setViewCount((notice.getViewCount() == null ? 0 : notice.getViewCount()) + 1); + noticeService.updateById(notice); + return R.ok(); + } +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/NoticeEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/NoticeEntity.java new file mode 100644 index 000000000..9e2992449 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/NoticeEntity.java @@ -0,0 +1,115 @@ +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-07-01 13:49:09 + */ +@Data +@TenantTable +@TableName("notice") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "通知公告") +public class NoticeEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 公告详情 + */ + @Schema(description="公告详情") + private String description; + + /** + * 状态 0已发布，1已下架 + */ + @Schema(description="状态 0已发布，1已下架") + private String status; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 公告标题 + */ + @Schema(description="公告标题") + private String title; + + /** + * 公告图片 + */ + @Schema(description="公告图片") + private String picUrl; + + /** + * 是否置顶 + */ + @Schema(description="是否置顶") + private String isTop; + + /** + * 浏览次数 + */ + @Schema(description="浏览次数") + private Integer viewCount; + + /** + * 创建者 + */ + @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/mapper/NoticeMapper.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/NoticeMapper.java new file mode 100644 index 000000000..d38f43a4a --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/NoticeMapper.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.NoticeEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface NoticeMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/NoticeService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/NoticeService.java new file mode 100644 index 000000000..1ca066a74 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/NoticeService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.integrated.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.integrated.entity.NoticeEntity; + +public interface NoticeService 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/NoticeServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/NoticeServiceImpl.java new file mode 100644 index 000000000..d7048b1ff --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/NoticeServiceImpl.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.NoticeEntity; +import com.bsd.pjcloud.integrated.mapper.NoticeMapper; +import com.bsd.pjcloud.integrated.service.NoticeService; +import org.springframework.stereotype.Service; +/** + * 通知公告 + * + * @author zjf + * @date 2025-07-01 13:49:09 + */ +@Service +public class NoticeServiceImpl extends ServiceImpl implements NoticeService { +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/NoticeMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/NoticeMapper.xml new file mode 100644 index 000000000..cafa90cef --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/NoticeMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 62e136f22a02ec707e68341267f6f079bbc9088d Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 2 Jul 2025 18:18:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BB=A3=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/feign/RemoteFlowApiFlowService.java | 9 +++ .../integrated/controller/TaskController.java | 77 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/TaskController.java diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java index 5ce0bb7d6..bf97b7ddf 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java @@ -61,6 +61,15 @@ public interface RemoteFlowApiFlowService { @PostMapping("/process-instance/queryMineTask") R> queryMineTask(@RequestBody TaskQueryParamDto queryParamDto); + /** + * 查询当前用户的已任务 + * + * @param queryParamDto + * @return {@link R } 流程实例ID {@link String} + */ + @PostMapping("/process-instance/queryMineEndTask") + R> queryMineEndTask(@RequestBody TaskQueryParamDto queryParamDto); + /** * 获取流程数据 * @param businessKey 业务key diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/TaskController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/TaskController.java new file mode 100644 index 000000000..d204270fd --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/TaskController.java @@ -0,0 +1,77 @@ +package com.bsd.pjcloud.integrated.controller; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +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.excel.annotation.ResponseExcel; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; +import com.bsd.pjcloud.flow.task.dto.TaskDto; +import com.bsd.pjcloud.flow.task.dto.TaskQueryParamDto; +import com.bsd.pjcloud.integrated.entity.NoticeEntity; +import com.bsd.pjcloud.integrated.service.NoticeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 审批提醒，代办事项 + * + * @author zjf + * @date 2025-07-01 13:49:09 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/task" ) +@Tag(description = "task" , name = "审批提醒，代办事项" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class TaskController { + + private final NoticeService noticeService; + + private final RemoteFlowApiFlowService remoteFlowApiFlowService; + + /** + * 我的待办 + * @param page 分页对象 + * @return + */ + @Operation(summary = "我的待办" , description = "我的待办" ) + @GetMapping("/process-instance/queryMineTask" ) + public R getMineTask(@ParameterObject Page page) { + TaskQueryParamDto taskQueryParamDto = new TaskQueryParamDto(); + taskQueryParamDto.setCurrent((int) page.getCurrent()); + taskQueryParamDto.setSize((int) page.getSize()); + R> pageR = remoteFlowApiFlowService.queryMineTask(taskQueryParamDto); + return pageR; + } + + + /** + * 我的已办 + * @param page 分页对象 + * @return + */ + @Operation(summary = "我的已办" , description = "我的已办" ) + @GetMapping("/process-instance/queryMineEndTask" ) + public R getMineEndTask(@ParameterObject Page page) { + TaskQueryParamDto taskQueryParamDto = new TaskQueryParamDto(); + taskQueryParamDto.setCurrent((int) page.getCurrent()); + taskQueryParamDto.setSize((int) page.getSize()); + R> pageR = remoteFlowApiFlowService.queryMineEndTask(taskQueryParamDto); + return pageR; + } + +} \ No newline at end of file From b05665afd50d871b23ab98782c34ad0e68ca3389 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 3 Jul 2025 18:14:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/IntegratedFlowConstant.java | 7 ++- .../controller/MeetingBookingController.java | 4 +- .../controller/MeetingRoomController.java | 62 ++++++++++++++++++- .../integrated/dto/flow/MeetingFlowDto.java | 14 +++++ .../entity/MeetingBookingEntity.java | 6 ++ .../service/MeetingBookingService.java | 10 +++ .../impl/MeetingBookingServiceImpl.java | 7 +++ .../resources/mapper/MeetingBookingMapper.xml | 2 + 8 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/dto/flow/MeetingFlowDto.java diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedFlowConstant.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedFlowConstant.java index 0fe22e2e9..4274f1b49 100644 --- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedFlowConstant.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedFlowConstant.java @@ -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"; } 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 index 86d4ebdfa..0f4b1e151 100644 --- 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 @@ -8,6 +8,7 @@ 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.common.security.util.SecurityUtils; import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; import com.bsd.pjcloud.integrated.service.MeetingBookingService; import org.springframework.security.access.prepost.PreAuthorize; @@ -50,7 +51,7 @@ public class MeetingBookingController { 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)); + return R.ok(meetingBookingService.pageScope(page, wrapper)); } @@ -76,6 +77,7 @@ public class MeetingBookingController { @PostMapping @PreAuthorize("@pms.hasPermission('integrated_meetingBooking_add')" ) public R save(@RequestBody MeetingBookingEntity meetingBooking) { + meetingBooking.setDeptId(SecurityUtils.getUser().getDeptId()); return R.ok(meetingBookingService.save(meetingBooking)); } 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 bcb11ae78..4165d5cd6 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 @@ -3,13 +3,24 @@ package com.bsd.pjcloud.integrated.controller; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; +import com.bsd.pjcloud.common.core.exception.ServiceException; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; +import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto; +import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto; +import com.bsd.pjcloud.flow.task.entity.Process; +import com.bsd.pjcloud.flow.task.utils.GetCheckReasonUtils; +import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo; +import com.bsd.pjcloud.integrated.constant.IntegratedFlowConstant; +import com.bsd.pjcloud.integrated.dto.flow.MeetingFlowDto; import com.bsd.pjcloud.integrated.dto.meeting.app.MeetingPageDto; import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; import com.bsd.pjcloud.integrated.entity.MeetingRoomEntity; @@ -32,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; import java.util.Objects; import java.time.LocalTime; import java.time.LocalDate; @@ -58,6 +70,8 @@ public class MeetingRoomController { private final MeetingBookingService meetingBookingService; + private final RemoteFlowApiFlowService remoteFlowApiFlowService; + /** * 分页查询 * @param page 分页对象 @@ -235,6 +249,7 @@ public class MeetingRoomController { @PostMapping("/{roomId}/book") @Operation(summary = "预约会议室", description = "预约会议室") + @Transactional public R bookMeetingRoom(@PathVariable("roomId") Long roomId, @RequestBody MeetingBookingReqVo reqVo) { // 1. 验证会议室是否存在 MeetingRoomEntity room = meetingRoomService.getById(roomId); @@ -297,8 +312,29 @@ public class MeetingRoomController { booking.setBookingDate(bookingDate); booking.setStartTime(startTime); booking.setEndTime(endTime); - booking.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode()); + + //发起流程 + R processByBusinessKey = remoteFlowApiFlowService.getProcessByBusinessKey(IntegratedFlowConstant.INTEGRATED_MEETING_BOOKING); + if (!processByBusinessKey.isOk() || processByBusinessKey.getData() == null) { + throw new ServiceException("流程配置获取失败: " + processByBusinessKey.getMsg()); + } + Process process = processByBusinessKey.getData(); + + MeetingFlowDto meetingFlowDto = new MeetingFlowDto(); + meetingFlowDto.setRoomName(room.getRoomName()); + meetingFlowDto.setApplicantName(SecurityUtils.getUser().getUsername()); + meetingFlowDto.setMeetingTime(booking.getBookingDate() + " " +booking.getStartTime() + "-" + booking.getEndTime()); + Map stringObjectMap = BeanUtil.beanToMap(meetingFlowDto); + ProcessInstanceParamDto processInstanceParamDto = new ProcessInstanceParamDto(); + processInstanceParamDto.setFlowId(process.getFlowId()); + processInstanceParamDto.setParamMap(stringObjectMap); + + R stringR = remoteFlowApiFlowService.startProcessInstance(processInstanceParamDto); + + + booking.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode()); + booking.setProcessInstanceId(stringR.getData()); boolean success = meetingBookingService.save(booking); return R.ok(success); } @@ -357,4 +393,28 @@ public class MeetingRoomController { return R.ok(booking); } + + @PostMapping("/flow-callback") + @Operation(summary = "流程节点回调通知") + @Inner(value = false) + @Transactional + public R flowCallback(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) { + String processInstanceId = processNodeRecordParamDto.getProcessInstanceId(); + MeetingBookingEntity meetingBookingEntity = new MeetingBookingEntity(); +// meetingBookingEntity.setProcessInstanceId(processInstanceId); + System.out.println(processNodeRecordParamDto.getData()); + LambdaQueryWrapper boxesBookingEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + boxesBookingEntityLambdaQueryWrapper.eq(MeetingBookingEntity::getProcessInstanceId, processInstanceId); + CheckStatusAndReasonVo checkReason = GetCheckReasonUtils.getCheckReason(processNodeRecordParamDto); + meetingBookingEntity.setCheckStatus(checkReason.getCheckStatus()); + meetingBookingEntity.setCheckReason(checkReason.getCheckReason()); + meetingBookingService.update(meetingBookingEntity,boxesBookingEntityLambdaQueryWrapper); + return R.ok(); + + } + + + + + } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/dto/flow/MeetingFlowDto.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/dto/flow/MeetingFlowDto.java new file mode 100644 index 000000000..78ebd6e86 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/dto/flow/MeetingFlowDto.java @@ -0,0 +1,14 @@ +package com.bsd.pjcloud.integrated.dto.flow; + + +import lombok.Data; + +@Data +public class MeetingFlowDto { + + private String roomName; + + private String applicantName; + + private String meetingTime; +} 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 index 75273e7ca..6c54a8452 100644 --- 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 @@ -132,4 +132,10 @@ public class MeetingBookingEntity extends Model { @Schema(description = "预约日期") private LocalDate bookingDate; + @Schema(description = "流程实例id") + private String processInstanceId; + + @Schema(description = "审批原因") + private String checkReason; + } \ 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 index 2b04e073f..07bce97c3 100644 --- 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 @@ -1,8 +1,18 @@ package com.bsd.pjcloud.integrated.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; public interface MeetingBookingService extends IService { + + /** + * 分页查询 + * @param page + * @param wrapper + * @return + */ + Object pageScope(Page page, LambdaQueryWrapper wrapper); } \ 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 index 2960fb62d..d0fbb0cbe 100644 --- 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 @@ -1,6 +1,9 @@ package com.bsd.pjcloud.integrated.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.integrated.entity.MeetingBookingEntity; import com.bsd.pjcloud.integrated.mapper.MeetingBookingMapper; import com.bsd.pjcloud.integrated.service.MeetingBookingService; @@ -13,4 +16,8 @@ import org.springframework.stereotype.Service; */ @Service public class MeetingBookingServiceImpl extends ServiceImpl implements MeetingBookingService { + @Override + public Object pageScope(Page page, LambdaQueryWrapper wrapper) { + return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + } } \ 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 index 8dcf287ec..d63c4aadd 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/MeetingBookingMapper.xml +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/MeetingBookingMapper.xml @@ -21,6 +21,8 @@ + +