From ab3cffc35d60f45e545697007b9f00e4bd3122e0 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 15 Oct 2025 11:12:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=8F=9C=E5=93=81=E5=96=9C=E5=A5=BD?= =?UTF-8?q?=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/app/HardAppProductLikeTopDto.java | 3 ++ .../hard/api/dto/panel/PanelProductDto.java | 2 ++ .../entity/panel/HardPanelSettingEntity.java | 11 +++---- .../entity/panel/HardPanelSettingShare.java | 29 +++++++++++++++++++ .../panel/HardPanelSettingController.java | 14 +-------- .../panel/HardPanelSettingServiceImpl.java | 1 + .../impl/panel/PanelNutritionServiceImpl.java | 15 ++++++++++ .../resources/mapper/order/HardCarMapper.xml | 6 ++++ 8 files changed, 63 insertions(+), 18 deletions(-) create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingShare.java diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppProductLikeTopDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppProductLikeTopDto.java index f0b7a983a..650a26834 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppProductLikeTopDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppProductLikeTopDto.java @@ -3,6 +3,7 @@ package com.bsd.pjcloud.hard.api.dto.order.app; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; /** * 个人菜品喜好排行 @@ -12,6 +13,8 @@ public class HardAppProductLikeTopDto { private Long userId; + private List classifyIds; + private LocalDateTime[] payTimeList; } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/panel/PanelProductDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/panel/PanelProductDto.java index 7f146d3f9..0d3345f6c 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/panel/PanelProductDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/panel/PanelProductDto.java @@ -21,6 +21,8 @@ public class PanelProductDto { private List mchTypeCodes; + private List classifyIds; + private String hourTypeIsNull; private String hourType; diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingEntity.java index 40516a696..41734abfa 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingEntity.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.api.entity.panel; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,12 +15,11 @@ import java.time.LocalDateTime; */ @Data @TenantTable -@TableName("hard_panel_setting") +@TableName(value = "hard_panel_setting", autoResultMap = true) @EqualsAndHashCode(callSuper = true) @Schema(description = "大屏配置表") public class HardPanelSettingEntity extends Model { - /** * 主键ID */ @@ -28,10 +28,11 @@ public class HardPanelSettingEntity extends Model { private Long id; /** - * 营养分析-菜品排行-排除菜品分类 + * 营养分析json配置 */ - @Schema(description = "营养分析-菜品排行-排除菜品分类") - private String nutritionTopExcludeClassify; + @Schema(description = "营养分析json配置") + @TableField(typeHandler = JacksonTypeHandler.class) + private HardPanelSettingShare.NutritionSetting nutritionSetting; /** * 创建者 diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingShare.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingShare.java new file mode 100644 index 000000000..5931b6a8c --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/panel/HardPanelSettingShare.java @@ -0,0 +1,29 @@ +package com.bsd.pjcloud.hard.api.entity.panel; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +public class HardPanelSettingShare { + + /** + * 营养分析配置 + */ + @Data + @Builder + @AllArgsConstructor + @NoArgsConstructor + static public class NutritionSetting { + + /** + * 喜爱菜品排行需要排除的菜品分类 + */ + private List topExcludeCategoryIds; + + } + +} diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/HardPanelSettingController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/HardPanelSettingController.java index fadf67f57..ca3cf83e8 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/HardPanelSettingController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/HardPanelSettingController.java @@ -1,28 +1,16 @@ package com.bsd.pjcloud.hard.controller.panel; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; -import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.hard.api.dto.panel.HardPanelSettingDto; import com.bsd.pjcloud.hard.api.entity.panel.HardPanelSettingEntity; import com.bsd.pjcloud.hard.service.HardPanelSettingService; -import org.springframework.security.access.prepost.PreAuthorize; -import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Objects; - /** * 大屏配置表 */ @@ -36,7 +24,7 @@ public class HardPanelSettingController { private final HardPanelSettingService hardPanelSettingService; @Operation(summary = "查询配置", description = "查询配置") - @GetMapping("/") + @GetMapping("/setting") public R getSetting() { return R.ok(hardPanelSettingService.getSetting()); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/HardPanelSettingServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/HardPanelSettingServiceImpl.java index 46d918926..bcc0a24b2 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/HardPanelSettingServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/HardPanelSettingServiceImpl.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.hard.service.impl.panel; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.hard.api.dto.panel.HardPanelSettingDto; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelNutritionServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelNutritionServiceImpl.java index 1ad037046..85eb1e566 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelNutritionServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelNutritionServiceImpl.java @@ -1,13 +1,17 @@ package com.bsd.pjcloud.hard.service.impl.panel; +import cn.hutool.core.util.ObjectUtil; import com.bsd.pjcloud.hard.api.dto.order.app.HardAppProductByClassifyDto; import com.bsd.pjcloud.hard.api.dto.order.app.HardAppProductLikeTopDto; import com.bsd.pjcloud.hard.api.dto.panel.PanelProductDto; +import com.bsd.pjcloud.hard.api.entity.panel.HardPanelSettingEntity; +import com.bsd.pjcloud.hard.api.entity.panel.HardPanelSettingShare; import com.bsd.pjcloud.hard.api.vo.hard.PanelPorductVo; import com.bsd.pjcloud.hard.api.vo.order.app.HardAppProductByClassifyVo; import com.bsd.pjcloud.hard.api.vo.order.app.HardAppProductLikeTopVo; import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper; import com.bsd.pjcloud.hard.service.HardCanteenTotalService; +import com.bsd.pjcloud.hard.service.HardPanelSettingService; import com.bsd.pjcloud.hard.service.PanelNutritionService; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; import lombok.RequiredArgsConstructor; @@ -26,6 +30,7 @@ public class PanelNutritionServiceImpl implements PanelNutritionService { private final HardOrderMapper hardOrderMapper; private final HardCanteenTotalService canteenTotalService; + private final HardPanelSettingService panelSettingService; private final RemoteMchService remoteMchService; @@ -54,6 +59,16 @@ public class PanelNutritionServiceImpl implements PanelNutritionService { @Override public List cuisineTop(PanelProductDto dto) { HardAppProductLikeTopDto likeQuery = new HardAppProductLikeTopDto(); + + // 查询配置 + HardPanelSettingEntity setting = panelSettingService.getSetting(); + if (ObjectUtil.isNotEmpty(setting) && ObjectUtil.isNotEmpty(setting.getNutritionSetting())) { + HardPanelSettingShare.NutritionSetting nutritionSetting = setting.getNutritionSetting(); + if (ObjectUtil.isNotEmpty(nutritionSetting.getTopExcludeCategoryIds())) { + likeQuery.setClassifyIds(nutritionSetting.getTopExcludeCategoryIds()); + } + } + likeQuery.setPayTimeList(dto.getTotalTimeList()); List list = canteenTotalService.productLikeTop(likeQuery); return list.stream().map((item) -> { diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml index 2b1de7195..5c8f9e4c7 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml @@ -378,6 +378,12 @@ and o.pay_time between #{dto.payTimeList[0]} and #{dto.payTimeList[1]} + + and s.category_id not in + + #{v} + + group by a.product_id order by SUM(a.product_count) desc