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 @@ + +