From ad12098ca66d9d7d769b94cb5067e0eceb6647c4 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 9 Jan 2025 16:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/CanteenOnlineCategorySimpleVO.java | 13 ++++++++++++ .../CanteenOnlineCategoryController.java | 18 ++++++++++++++++- .../CanteenOnlineSpuController.java | 2 ++ .../controller/CanteenSpuController.java | 2 +- .../service/CanteenOnlineCategoryService.java | 20 +++++++++++++++++++ .../canteen/service/CanteenSpuService.java | 10 ++++++++++ .../impl/CanteenDailyMenuServiceImpl.java | 2 +- .../CanteenOnlineCategoryServiceImpl.java | 15 ++++++++++++++ .../service/impl/CanteenSpuServiceImpl.java | 6 ++++++ 9 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/CanteenOnlineCategorySimpleVO.java diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/CanteenOnlineCategorySimpleVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/CanteenOnlineCategorySimpleVO.java new file mode 100644 index 000000000..382d34098 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/CanteenOnlineCategorySimpleVO.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.canteen.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "在线订餐分类下拉") +public class CanteenOnlineCategorySimpleVO { + + private Long id; + + private String name; +} diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java index 96b16a655..6616dc682 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java @@ -6,6 +6,8 @@ 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.canteen.vo.CanteenOnlineCategorySimpleVO; +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.canteen.entity.CanteenOnlineCategoryEntity; @@ -49,7 +51,7 @@ public class CanteenOnlineCategoryController { public R getCanteenOnlineCategoryPage(@ParameterObject Page page, @ParameterObject CanteenOnlineCategoryEntity canteenOnlineCategory) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(canteenOnlineCategory.getName()),CanteenOnlineCategoryEntity::getName,canteenOnlineCategory.getName()); - return R.ok(canteenOnlineCategoryService.page(page, wrapper)); + return R.ok(canteenOnlineCategoryService.pageScope(page, wrapper)); } @@ -118,6 +120,20 @@ public class CanteenOnlineCategoryController { return canteenOnlineCategoryService.list(Wrappers.lambdaQuery(canteenOnlineCategory).in(ArrayUtil.isNotEmpty(ids), CanteenOnlineCategoryEntity::getId, ids)); } + /** + * 后台分类下拉查询 + * @return R + */ + @Operation(summary = "后台分类下拉查询" ) + @GetMapping("/selectAllSimple" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenOnlineCategory_view')" ) + public R getById() { + LambdaQueryWrapper canteenOnlineCategoryEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + canteenOnlineCategoryEntityLambdaQueryWrapper.eq(CanteenOnlineCategoryEntity::getStatus,"0"); + List list = canteenOnlineCategoryService.listScope(canteenOnlineCategoryEntityLambdaQueryWrapper); + List bean = BeanUtils.toBean(list, CanteenOnlineCategorySimpleVO.class); + return R.ok(bean); + } // ---------------APP--------------------- diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java index 26c2a9c13..87d5903aa 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java @@ -14,6 +14,7 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity; import com.bsd.pjcloud.canteen.service.CanteenOnlineSpuService; +import com.bsd.pjcloud.common.security.util.SecurityUtils; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -81,6 +82,7 @@ public class CanteenOnlineSpuController { @PostMapping @PreAuthorize("@pms.hasPermission('canteen_canteenOnlineSpu_add')" ) public R save(@RequestBody CanteenOnlineSpuEntity canteenOnlineSpu) { + canteenOnlineSpu.setDeptId(SecurityUtils.getUser().getDeptId()); return R.ok(canteenOnlineSpuService.save(canteenOnlineSpu)); } diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java index 30e20c1f7..439a876e0 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java @@ -54,7 +54,7 @@ public class CanteenSpuController { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(canteenSpu.getName()), CanteenSpuEntity::getName, canteenSpu.getName()); wrapper.eq(Objects.nonNull(canteenSpu.getCategoryId()), CanteenSpuEntity::getCategoryId, canteenSpu.getCategoryId()); - return R.ok(canteenSpuService.page(page, wrapper)); + return R.ok(canteenSpuService.pageScope(page, wrapper)); } diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenOnlineCategoryService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenOnlineCategoryService.java index c3d73657c..cc21755f6 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenOnlineCategoryService.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenOnlineCategoryService.java @@ -1,8 +1,28 @@ package com.bsd.pjcloud.canteen.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.canteen.entity.CanteenOnlineCategoryEntity; +import java.util.List; + public interface CanteenOnlineCategoryService extends IService { + + /** + * 分页查询 + * @param page + * @param wrapper + * @return + */ + Object pageScope(Page page, LambdaQueryWrapper wrapper); + + + /** + * 查询所有的分类，通过数据权限 + * @param canteenOnlineCategoryEntityLambdaQueryWrapper + * @return + */ + List listScope(LambdaQueryWrapper canteenOnlineCategoryEntityLambdaQueryWrapper); } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java index fae38bf69..c839cc360 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.canteen.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.canteen.dto.CanteenSpuUpdateStockReqDTO; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; @@ -31,4 +32,13 @@ public interface CanteenSpuService extends IService { * @return */ R getCanteenSpuList(String categoryId); + + + /** + * 分页查询 + * @param page + * @param wrapper + * @return + */ + Object pageScope(Page page, LambdaQueryWrapper wrapper); } \ No newline at end of file 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 898f74f84..661ee0b8d 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 @@ -40,7 +40,7 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl selectTimeFood(String time, Long merchantId, Long categoryId) { List dailyMenuAllES = new ArrayList<>(); - List dailyMenuVOS = baseMapper.selectTimeFood(time, merchantId, categoryId, new DataScope()); + List dailyMenuVOS = baseMapper.selectTimeFood(time, merchantId, categoryId, DataScope.of()); Map> collect = dailyMenuVOS.stream().collect(Collectors.groupingBy(DailyMenuVO::getHourType)); collect.keySet().forEach(x -> { DailyMenuAll dailyMenuAll = new DailyMenuAll(); diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineCategoryServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineCategoryServiceImpl.java index 1bd1449c8..40a247414 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineCategoryServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineCategoryServiceImpl.java @@ -1,10 +1,16 @@ package com.bsd.pjcloud.canteen.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.canteen.entity.CanteenOnlineCategoryEntity; import com.bsd.pjcloud.canteen.mapper.CanteenOnlineCategoryMapper; import com.bsd.pjcloud.canteen.service.CanteenOnlineCategoryService; +import com.bsd.pjcloud.common.data.datascope.DataScope; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 在线点餐分类 * @@ -13,4 +19,13 @@ import org.springframework.stereotype.Service; */ @Service public class CanteenOnlineCategoryServiceImpl extends ServiceImpl implements CanteenOnlineCategoryService { + @Override + public Object pageScope(Page page, LambdaQueryWrapper wrapper) { + return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + } + + @Override + public List listScope(LambdaQueryWrapper canteenOnlineCategoryEntityLambdaQueryWrapper) { + return baseMapper.selectListByScope(canteenOnlineCategoryEntityLambdaQueryWrapper, DataScope.of()); + } } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java index 58fccccda..014f9433e 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.canteen.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.canteen.dto.CanteenSpuUpdateStockReqDTO; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; @@ -58,5 +59,10 @@ public class CanteenSpuServiceImpl extends ServiceImpl wrapper) { + return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + } + } \ No newline at end of file