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 1/5] =?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()); From e749a30ba7eb6edd8810552b97d9a73ea1f85a05 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 25 Mar 2025 13:52:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E5=88=9D=E5=A7=8B=E5=8C=96=E6=99=BA?= =?UTF-8?q?=E6=85=A7=E9=80=9A=E8=A1=8C=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pjcloud-pass/.editorconfig | 18 +++ pjcloud-pass/README.md | 22 +++ pjcloud-pass/pjcloud-pass-api/pom.xml | 42 ++++++ .../pjcloud-pass/api/feign/packge-info.java | 6 + .../pjcloud-pass/constant/packge-info.java | 6 + .../pjcloud/pjcloud-pass/dto/packge-info.java | 6 + .../pjcloud-pass/entity/packge-info.java | 6 + pjcloud-pass/pjcloud-pass-biz/pom.xml | 134 ++++++++++++++++++ .../com/bsd/pjcloud/pjcloud-pass/PassApp.java | 24 ++++ .../pjcloud-pass/controller/packge-info.java | 4 + .../pjcloud-pass/mapper/packge-info.java | 6 + .../pjcloud-pass/service/packge-info.java | 4 + .../src/main/resources/application.yml | 25 ++++ .../src/main/resources/logback-spring.xml | 70 +++++++++ pjcloud-pass/pom.xml | 21 +++ pom.xml | 1 + 16 files changed, 395 insertions(+) create mode 100644 pjcloud-pass/.editorconfig create mode 100644 pjcloud-pass/README.md create mode 100644 pjcloud-pass/pjcloud-pass-api/pom.xml create mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java create mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java create mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java create mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java create mode 100644 pjcloud-pass/pjcloud-pass-biz/pom.xml create mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/PassApp.java create mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java create mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java create mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java create mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/resources/application.yml create mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/resources/logback-spring.xml create mode 100644 pjcloud-pass/pom.xml diff --git a/pjcloud-pass/.editorconfig b/pjcloud-pass/.editorconfig new file mode 100644 index 000000000..2f2262bb1 --- /dev/null +++ b/pjcloud-pass/.editorconfig @@ -0,0 +1,18 @@ +# 开发组IDE 编辑器标准 V2.1.0 +root = true + +[*.{adoc, bat, groovy, html, java, js, jsp, kt, kts, md, properties, py, rb, sh, sql, svg, txt, xml, xsd}] +charset = utf-8 + +[*.{groovy, java, kt, kts, xml, xsd}] +indent_style = tab +indent_size = 4 +continuation_indent_size = 8 +end_of_line = lf + +[*.{js, html}] +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/pjcloud-pass/README.md b/pjcloud-pass/README.md new file mode 100644 index 000000000..a504b7b82 --- /dev/null +++ b/pjcloud-pass/README.md @@ -0,0 +1,22 @@ + +智慧通行模块 + + + + +| 姓名 | 角色 | 时间 | +| ---- | ---- |---------| +| xxx | 开发 | 2023-01 | +| | | | +| | | | + + + + +``` +项目根目录 +├── xxx-api -- 业务接口(实体,DTO,utils,feign接口) +├── xxx-biz -- 业务实现[默认服务端口 : 6066] +``` + + diff --git a/pjcloud-pass/pjcloud-pass-api/pom.xml b/pjcloud-pass/pjcloud-pass-api/pom.xml new file mode 100644 index 000000000..13859c06b --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-api/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.bsd + pjcloud-pass + 5.6.0 + + + pjcloud-pass-api + + + + + com.github.yulichang + mybatis-plus-join-annotation + + + + com.bsd + pjcloud-common-core + + + + com.baomidou + mybatis-plus-extension + + + + com.bsd + pjcloud-common-feign + + + + com.bsd + pjcloud-common-excel + + + diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java new file mode 100644 index 000000000..76e11201a --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java @@ -0,0 +1,6 @@ +/* + @author pigx archetype + *

+ * feign client 存放目录，注意 @EnablePigxFeignClients 的扫描范围 + */ +package com.bsd.pjcloud.pjcloud-pass.api.feign; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java new file mode 100644 index 000000000..8f420884d --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * 常量和枚举定义 + */ +package com.bsd.pjcloud.pjcloud-pass.constant; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java new file mode 100644 index 000000000..5effff35f --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * DTO 存放目录 + */ +package com.bsd.pjcloud.pjcloud-pass.dto; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java new file mode 100644 index 000000000..87b43ac00 --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * 实体 存放目录 + */ +package com.bsd.pjcloud.pjcloud-pass.entity; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-biz/pom.xml b/pjcloud-pass/pjcloud-pass-biz/pom.xml new file mode 100644 index 000000000..53b428642 --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-biz/pom.xml @@ -0,0 +1,134 @@ + + + 4.0.0 + + com.bsd + pjcloud-pass + 5.6.0 + + + pjcloud-pass-biz + + + + + org.springframework.boot + spring-boot-starter-undertow + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.bsd + pjcloud-common-data + + + + com.bsd + pjcloud-common-security + + + + com.bsd + pjcloud-common-xss + + + + com.bsd + pjcloud-common-sentinel + + + + com.bsd + pjcloud-common-feign + + + + com.bsd + pjcloud-pass-api + 5.6.0 + + + + com.bsd + pjcloud-common-log + + + + com.baomidou + mybatis-plus-spring-boot3-starter + + + + com.alibaba + druid-spring-boot-3-starter + + + + com.mysql + mysql-connector-j + + + + com.bsd + pjcloud-common-swagger + + + + org.springframework.boot + spring-boot-starter-test + + + + + cloud + + true + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + CLASSIC + + + + + + io.fabric8 + docker-maven-plugin + + false + + + + + + + boot + + + diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/PassApp.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/PassApp.java new file mode 100644 index 000000000..39f388b8e --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/PassApp.java @@ -0,0 +1,24 @@ +package com.bsd.pjcloud.pjcloud-pass; + +import com.bsd.pjcloud.common.feign.annotation.EnablePjcloudFeignClients; +import com.bsd.pjcloud.common.security.annotation.EnablePjcloudResourceServer; +import com.bsd.pjcloud.common.swagger.annotation.EnableOpenApi; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +/** + * @author archetype auto + *

+ * 项目启动类 + */ +@EnableOpenApi("pjcloud-pass") +@EnablePjcloudFeignClients +@EnableDiscoveryClient +@EnablePjcloudResourceServer +@SpringBootApplication +public class PassApp { + public static void main(String[] args) { + SpringApplication.run(PassApp.class, args); + } +} diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java new file mode 100644 index 000000000..e846365d1 --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java @@ -0,0 +1,4 @@ +/* + * @author pigx archetype + */ +package com.bsd.pjcloud.pjcloud-pass.controller; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java new file mode 100644 index 000000000..d4df79984 --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * Mybatis Mapper 存放目录 + */ +package com.bsd.pjcloud.pjcloud-pass.mapper; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java new file mode 100644 index 000000000..9489fa20d --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java @@ -0,0 +1,4 @@ +/* + * @author pigx archetype + */ +package com.bsd.pjcloud.pjcloud-pass.service; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/resources/application.yml b/pjcloud-pass/pjcloud-pass-biz/src/main/resources/application.yml new file mode 100644 index 000000000..f6f00ae1d --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-biz/src/main/resources/application.yml @@ -0,0 +1,25 @@ +server: + port: 6066 + +spring: + application: + name: @artifactId@ + cloud: + nacos: + username: @nacos.username@ + password: @nacos.password@ + discovery: + server-addr: pjcloud-register:8848 + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + config: + import: + - optional:nacos:application-@profiles.active@.yml + - optional:nacos:${spring.application.name}-@profiles.active@.yml + datasource: + type: com.alibaba.druid.pool.DruidDataSource + druid: + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: root + url: jdbc:mysql://pjcloud-mysql:2881/pjcloud_pass?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/resources/logback-spring.xml b/pjcloud-pass/pjcloud-pass-biz/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..964ca8735 --- /dev/null +++ b/pjcloud-pass/pjcloud-pass-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pjcloud-pass/pom.xml b/pjcloud-pass/pom.xml new file mode 100644 index 000000000..ba6dceb0c --- /dev/null +++ b/pjcloud-pass/pom.xml @@ -0,0 +1,21 @@ + + + + 4.0.0 + + + com.bsd + pjcloud + 5.6.0 + + + pjcloud-pass + pom + + + + pjcloud-pass-api + pjcloud-pass-biz + + diff --git a/pom.xml b/pom.xml index ee9dadc19..cf4a3c0d3 100644 --- a/pom.xml +++ b/pom.xml @@ -124,6 +124,7 @@ pjcloud-supermarket pjcloud-hardware pjcloud-mqtt + pjcloud-pass From f6a496d82fa52daeea59339eea4637fb22c5512c Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 25 Mar 2025 13:57:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E5=88=9D=E5=A7=8B=E5=8C=96=E6=99=BA?= =?UTF-8?q?=E6=85=A7=E9=80=9A=E8=A1=8C=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pjcloud-pass/pjcloud-pass-api/pom.xml | 2 +- .../com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java | 6 ------ .../com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java | 6 ------ .../java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java | 6 ------ .../com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java | 6 ------ pjcloud-pass/pjcloud-pass-biz/pom.xml | 4 ++-- .../com/bsd/pjcloud/{pjcloud-pass => pass}/PassApp.java | 2 +- .../bsd/pjcloud/pjcloud-pass/controller/packge-info.java | 4 ---- .../com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java | 6 ------ .../com/bsd/pjcloud/pjcloud-pass/service/packge-info.java | 4 ---- pjcloud-pass/pom.xml | 2 +- 11 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java delete mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java delete mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java delete mode 100644 pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java rename pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/{pjcloud-pass => pass}/PassApp.java (95%) delete mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java delete mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java delete mode 100644 pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java diff --git a/pjcloud-pass/pjcloud-pass-api/pom.xml b/pjcloud-pass/pjcloud-pass-api/pom.xml index 13859c06b..5ddd30db8 100644 --- a/pjcloud-pass/pjcloud-pass-api/pom.xml +++ b/pjcloud-pass/pjcloud-pass-api/pom.xml @@ -7,7 +7,7 @@ com.bsd pjcloud-pass - 5.6.0 + 5.7.0 pjcloud-pass-api diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java deleted file mode 100644 index 76e11201a..000000000 --- a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/api/feign/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - @author pigx archetype - *

- * feign client 存放目录，注意 @EnablePigxFeignClients 的扫描范围 - */ -package com.bsd.pjcloud.pjcloud-pass.api.feign; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java deleted file mode 100644 index 8f420884d..000000000 --- a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/constant/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author pigx archetype - *

- * 常量和枚举定义 - */ -package com.bsd.pjcloud.pjcloud-pass.constant; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java deleted file mode 100644 index 5effff35f..000000000 --- a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/dto/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author pigx archetype - *

- * DTO 存放目录 - */ -package com.bsd.pjcloud.pjcloud-pass.dto; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java b/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java deleted file mode 100644 index 87b43ac00..000000000 --- a/pjcloud-pass/pjcloud-pass-api/src/main/java/com/bsd/pjcloud/pjcloud-pass/entity/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author pigx archetype - *

- * 实体 存放目录 - */ -package com.bsd.pjcloud.pjcloud-pass.entity; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-biz/pom.xml b/pjcloud-pass/pjcloud-pass-biz/pom.xml index 53b428642..140bbea08 100644 --- a/pjcloud-pass/pjcloud-pass-biz/pom.xml +++ b/pjcloud-pass/pjcloud-pass-biz/pom.xml @@ -7,7 +7,7 @@ com.bsd pjcloud-pass - 5.6.0 + 5.7.0 pjcloud-pass-biz @@ -62,7 +62,7 @@ com.bsd pjcloud-pass-api - 5.6.0 + 5.7.0 diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/PassApp.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pass/PassApp.java similarity index 95% rename from pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/PassApp.java rename to pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pass/PassApp.java index 39f388b8e..86744110a 100644 --- a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/PassApp.java +++ b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pass/PassApp.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.pjcloud-pass; +package com.bsd.pjcloud.pass; import com.bsd.pjcloud.common.feign.annotation.EnablePjcloudFeignClients; import com.bsd.pjcloud.common.security.annotation.EnablePjcloudResourceServer; diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java deleted file mode 100644 index e846365d1..000000000 --- a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/controller/packge-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/* - * @author pigx archetype - */ -package com.bsd.pjcloud.pjcloud-pass.controller; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java deleted file mode 100644 index d4df79984..000000000 --- a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/mapper/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author pigx archetype - *

- * Mybatis Mapper 存放目录 - */ -package com.bsd.pjcloud.pjcloud-pass.mapper; \ No newline at end of file diff --git a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java b/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java deleted file mode 100644 index 9489fa20d..000000000 --- a/pjcloud-pass/pjcloud-pass-biz/src/main/java/com/bsd/pjcloud/pjcloud-pass/service/packge-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/* - * @author pigx archetype - */ -package com.bsd.pjcloud.pjcloud-pass.service; \ No newline at end of file diff --git a/pjcloud-pass/pom.xml b/pjcloud-pass/pom.xml index ba6dceb0c..398745982 100644 --- a/pjcloud-pass/pom.xml +++ b/pjcloud-pass/pom.xml @@ -7,7 +7,7 @@ com.bsd pjcloud - 5.6.0 + 5.7.0 pjcloud-pass From 8c60f301542fc441ef1f03418e1fabb1d19c8e66 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 25 Mar 2025 15:07:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java | 3 +++ .../src/main/resources/mapper/CanteenSpuMapper.xml | 1 + 2 files changed, 4 insertions(+) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java index 99ab8767e..51ef5acc0 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java @@ -201,4 +201,7 @@ public class CanteenSpuEntity extends Model { */ @Schema(description="租户编号") private Long tenantId; + + @Schema(description="是否显示") + private String isShow; } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml index 9da82f375..354a726c8 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenSpuMapper.xml @@ -31,6 +31,7 @@ + \ No newline at end of file From 42d40f0fd34462a3cb5876d8b45b101299d9c70b Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 25 Mar 2025 16:28:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E9=A3=9F=E5=A0=82=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/vo/app/DailyMenuAppVO.java | 5 ++++ .../impl/CanteenDailyMenuServiceImpl.java | 23 +++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java index e8ffe0722..acbae8e4c 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java @@ -40,4 +40,9 @@ public class DailyMenuAppVO { private Integer hourType; private Integer sort; + + /** + * 是否显示 + */ + private String isShow; } diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java index 9d0e67912..4a8a9c4ee 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.canteen.dto.DailyMenuAll; import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; +import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper; import com.bsd.pjcloud.canteen.service.CanteenSpuService; import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO; import com.bsd.pjcloud.canteen.vo.DailyMenuVO; @@ -48,6 +49,8 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl selectTimeFood(String time, Long merchantId, Long categoryId) { List dailyMenuAllES = new ArrayList<>(); @@ -145,16 +148,27 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl onlineFoodSpuDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + onlineFoodSpuDOLambdaQueryWrapper.eq(null != dailyMenuDTO.getCategoryId(), CanteenSpuEntity::getCategoryId, dailyMenuDTO.getCategoryId()); + onlineFoodSpuDOLambdaQueryWrapper.eq(CanteenSpuEntity::getIsShow, "1"); + List spuEntities = canteenSpuService.list(onlineFoodSpuDOLambdaQueryWrapper); + + if (CollectionUtils.isNotEmpty(spuEntities)){ + List spuIds = spuEntities.stream().map(CanteenSpuEntity::getId).collect(Collectors.toList()); + canteenDailyMenuEntityLambdaQueryWrapper.notIn(CanteenDailyMenuEntity::getSpuId, spuIds); + } + Page pageData = baseMapper.selectPage(page, canteenDailyMenuEntityLambdaQueryWrapper); List canteenDailyMenuEntities = pageData.getRecords(); if (CollectionUtils.isNotEmpty(canteenDailyMenuEntities)) { List spuIds = canteenDailyMenuEntities.stream().map(CanteenDailyMenuEntity::getSpuId).distinct().collect(Collectors.toList()); - LambdaQueryWrapper onlineFoodSpuDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); - onlineFoodSpuDOLambdaQueryWrapper.eq(null != dailyMenuDTO.getCategoryId(), CanteenSpuEntity::getCategoryId, dailyMenuDTO.getCategoryId()); + LambdaQueryWrapper spuDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); onlineFoodSpuDOLambdaQueryWrapper.in(CanteenSpuEntity::getId, spuIds); - List canteenSpuEntities = canteenSpuService.list(onlineFoodSpuDOLambdaQueryWrapper); + List list = canteenSpuService.list(spuDOLambdaQueryWrapper); // 按 id 分组成 Map - Map spuEntityMap = canteenSpuEntities.stream() + Map spuEntityMap = list.stream() .collect(Collectors.toMap(CanteenSpuEntity::getId, spu -> spu)); // 构造新的 VO 列表 List dailyMenuVOList = canteenDailyMenuEntities.stream() @@ -169,6 +183,7 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl