From 401c66c7f09edab3385a3bbcd5f07c973af90181 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 25 Mar 2025 13:29:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=9A=E8=AE=AE=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3,flow=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=8D=95=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bsd/pjcloud/flow/task/dto/TaskDto.java | 8 ++++++++ .../com/bsd/pjcloud/flow/task/entity/Process.java | 6 +++--- .../pjcloud/flow/task/entity/ProcessGroup.java | 1 + .../flow/task/entity/ProcessInstanceRecord.java | 5 +++++ .../controller/ProcessInstanceController.java | 2 +- .../service/impl/ProcessInstanceServiceImpl.java | 1 + .../flow/task/service/impl/RemoteServiceImpl.java | 2 +- .../integrated/vo/common/SelectSimpleVo.java | 15 +++++++++++++++ pjcloud-integrated/pjcloud-integrated-biz/pom.xml | 2 +- .../controller/MeetingEquipmentController.java | 11 +++++++++++ .../controller/MeetingRoomController.java | 15 ++++++++++++++- .../integrated/entity/MeetingRoomEntity.java | 6 ++++++ .../integrated/service/FeedbackService.java | 10 ++++++++++ .../service/MeetingEquipmentService.java | 9 +++++++++ .../integrated/service/MeetingRoomService.java | 10 ++++++++++ .../service/impl/FeedbackServiceImpl.java | 7 +++++++ .../service/impl/MeetingEquipmentServiceImpl.java | 13 +++++++++++++ .../service/impl/MeetingRoomServiceImpl.java | 7 +++++++ .../service/ThirdPartyOAuth2Service.java | 2 +- 19 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/common/SelectSimpleVo.java diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/TaskDto.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/TaskDto.java index e85ef8f44..a54924883 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/TaskDto.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/TaskDto.java @@ -1,5 +1,7 @@ package com.bsd.pjcloud.flow.task.dto; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @@ -94,4 +96,10 @@ public class TaskDto { */ private String processName; + + /** + * 表单详情路由 + */ + private String formDetail; + } diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java index 8d4d66e0e..0e0233f33 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java @@ -142,7 +142,7 @@ public class Process { private String businessKey; -// @Schema(description = "表单详情路由") -// @TableField("form_detail") -// private String formDetail; + @Schema(description = "表单详情路由") + @TableField("form_detail") + private String formDetail; } diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessGroup.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessGroup.java index 95d547bc5..973b3d0e4 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessGroup.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessGroup.java @@ -35,6 +35,7 @@ public class ProcessGroup { @TableField("sort") private Integer sort; + /** * 用户id */ diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessInstanceRecord.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessInstanceRecord.java index 9ed22d26c..b95b3d0dc 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessInstanceRecord.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/ProcessInstanceRecord.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.flow.task.entity; import com.baomidou.mybatisplus.annotation.*; import com.bsd.pjcloud.common.core.util.TenantTable; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; @@ -72,6 +73,10 @@ public class ProcessInstanceRecord { @TableField("group_name") private String groupName; + + @TableField("form_detail") + private String formDetail; + /** * 状态 */ diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java index ce85ae583..f6ff977ee 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java @@ -46,7 +46,7 @@ public class ProcessInstanceController { /** * 查询当前登录用户的待办任务 - * @param pageDto + * @param queryParamDto * @return */ @SneakyThrows diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java index e612c8abb..1f3a08bc8 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java @@ -132,6 +132,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService { record.setRootUserId(processInstanceRecord.getUserId()); record.setGroupName(processInstanceRecord.getGroupName()); + record.setFormDetail(processInstanceRecord.getFormDetail()); record.setRootUserName(startUser.getUsername()); record.setRootUserAvatarUrl(startUser.getAvatar()); record.setStartTime(processInstanceRecord.getCreateTime()); diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/RemoteServiceImpl.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/RemoteServiceImpl.java index 50c1c27eb..b6cf822dd 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/RemoteServiceImpl.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/RemoteServiceImpl.java @@ -199,7 +199,7 @@ public class RemoteServiceImpl implements IRemoteService { entity.setGroupId(oaFormGroups.getId()); entity.setGroupName(oaFormGroups.getGroupName()); entity.setStatus(NodeStatusEnum.JXZ.getCode()); - + entity.setFormDetail(oaForms.getFormDetail()); processInstanceRecordService.save(entity); return R.ok(); diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/common/SelectSimpleVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/common/SelectSimpleVo.java new file mode 100644 index 000000000..0a10b190c --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/common/SelectSimpleVo.java @@ -0,0 +1,15 @@ +package com.bsd.pjcloud.integrated.vo.common; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "下拉返回") +public class SelectSimpleVo { + + @Schema(description = "id") + private Long id; + + @Schema(description = "名称") + private String name; +} diff --git a/pjcloud-integrated/pjcloud-integrated-biz/pom.xml b/pjcloud-integrated/pjcloud-integrated-biz/pom.xml index 4330f3a39..7177e7482 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/pom.xml +++ b/pjcloud-integrated/pjcloud-integrated-biz/pom.xml @@ -61,7 +61,7 @@ com.bsd - pjcloud-supermarket-erp-api + pjcloud-integrated-api 5.7.0 diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingEquipmentController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingEquipmentController.java index 4d9ed9a63..240a6a041 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingEquipmentController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MeetingEquipmentController.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.MeetingEquipmentEntity; import com.bsd.pjcloud.integrated.service.MeetingEquipmentService; +import com.bsd.pjcloud.integrated.vo.common.SelectSimpleVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -124,4 +126,13 @@ public class MeetingEquipmentController { + + + @Operation(summary = "设备下拉数量" , description = "设备下拉数量,可根据参数设备名称模糊查询" ) + @GetMapping("/simpleAll" ) + public R getSimpleAll(@RequestParam(required = false,value = "name")String name) { + List list=meetingEquipmentService.listScope(name); + List bean = BeanUtils.toBean(list, SelectSimpleVo.class); + return R.ok(bean); + } } \ 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 d271a2c96..bd955e54a 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 @@ -9,6 +9,8 @@ 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.MeetingRoomEntity; +import com.bsd.pjcloud.integrated.entity.MeetingRoomEquipmentEntity; +import com.bsd.pjcloud.integrated.service.MeetingRoomEquipmentService; import com.bsd.pjcloud.integrated.service.MeetingRoomService; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; @@ -18,6 +20,7 @@ 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.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -38,6 +41,8 @@ public class MeetingRoomController { private final MeetingRoomService meetingRoomService; + private final MeetingRoomEquipmentService meetingRoomEquipmentService; + /** * 分页查询 * @param page 分页对象 @@ -49,7 +54,7 @@ public class MeetingRoomController { @PreAuthorize("@pms.hasPermission('integrated_meetingRoom_view')" ) public R getMeetingRoomPage(@ParameterObject Page page, @ParameterObject MeetingRoomEntity meetingRoom) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - return R.ok(meetingRoomService.page(page, wrapper)); + return R.ok(meetingRoomService.pageScope(page, wrapper)); } @@ -74,8 +79,16 @@ public class MeetingRoomController { @SysLog("新增会议室信息表" ) @PostMapping @PreAuthorize("@pms.hasPermission('integrated_meetingRoom_add')" ) + @Transactional public R save(@RequestBody MeetingRoomEntity meetingRoom) { meetingRoom.setDeptId(SecurityUtils.getUser().getDeptId()); + List meetingRoomEquipmentEntityList = meetingRoom.getMeetingRoomEquipmentEntityList(); + if (CollUtil.isNotEmpty(meetingRoomEquipmentEntityList)) { + meetingRoomEquipmentEntityList.forEach(meetingRoomEquipmentEntity -> { + meetingRoomEquipmentEntity.setRoomId(meetingRoom.getId()); + }); + meetingRoomEquipmentService.saveBatch(meetingRoomEquipmentEntityList); + } return R.ok(meetingRoomService.save(meetingRoom)); } 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 4f89cbf46..1091d53a8 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 @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import com.bsd.pjcloud.common.core.util.TenantTable; import java.time.LocalDateTime; +import java.util.List; /** * 会议室信息表 @@ -130,4 +131,9 @@ public class MeetingRoomEntity extends Model { */ @Schema(description="租户编号") private Long tenantId; + + + @TableField(exist = false) + @Schema(description="设备会议室关联") + private List meetingRoomEquipmentEntityList; } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackService.java index 0368586ba..ff4a28aff 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackService.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackService.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.FeedbackEntity; public interface FeedbackService 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/MeetingEquipmentService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingEquipmentService.java index 02a84bf15..b50081331 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingEquipmentService.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingEquipmentService.java @@ -3,6 +3,15 @@ package com.bsd.pjcloud.integrated.service; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.integrated.entity.MeetingEquipmentEntity; +import java.util.List; + public interface MeetingEquipmentService extends IService { + + /** + * 数据查询所有list + * @param name 设备名称 + * @return + */ + List listScope(String name); } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingRoomService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingRoomService.java index 7d7ffb0a3..036b31fb0 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingRoomService.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/MeetingRoomService.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.MeetingRoomEntity; public interface MeetingRoomService 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/FeedbackServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackServiceImpl.java index c77b00510..3b40b42ac 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackServiceImpl.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.FeedbackEntity; import com.bsd.pjcloud.integrated.mapper.FeedbackMapper; import com.bsd.pjcloud.integrated.service.FeedbackService; @@ -13,4 +16,8 @@ import org.springframework.stereotype.Service; */ @Service public class FeedbackServiceImpl extends ServiceImpl implements FeedbackService { + @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/java/com/bsd/pjcloud/integrated/service/impl/MeetingEquipmentServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingEquipmentServiceImpl.java index f548cef00..9eb7cbad2 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingEquipmentServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingEquipmentServiceImpl.java @@ -1,10 +1,16 @@ package com.bsd.pjcloud.integrated.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.integrated.entity.MeetingEquipmentEntity; import com.bsd.pjcloud.integrated.mapper.MeetingEquipmentMapper; import com.bsd.pjcloud.integrated.service.MeetingEquipmentService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 设备表 * @@ -13,4 +19,11 @@ import org.springframework.stereotype.Service; */ @Service public class MeetingEquipmentServiceImpl extends ServiceImpl implements MeetingEquipmentService { + @Override + public List listScope(String name) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(name),MeetingEquipmentEntity::getName, name); + List list = baseMapper.selectListByScope(wrapper, DataScope.of()); + return list; + } } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java index 9667fbdfb..379a913dc 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.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.MeetingRoomEntity; import com.bsd.pjcloud.integrated.mapper.MeetingRoomMapper; import com.bsd.pjcloud.integrated.service.MeetingRoomService; @@ -13,4 +16,8 @@ import org.springframework.stereotype.Service; */ @Service public class MeetingRoomServiceImpl extends ServiceImpl implements MeetingRoomService { + @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-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java index 198d1115b..bc4ac5892 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java @@ -399,7 +399,7 @@ public class ThirdPartyOAuth2Service { url, HttpMethod.GET, requestEntity, responseType ); if (response.getBody().getCode().equals("-1")){ - log.error("获取浙政钉用户信息失败"); + log.error("获取浙政钉/诗画用户信息失败"); log.error("token",zzdToken); log.error("response",response.getBody().getDescription()); log.error("response",response.getBody());