feat:菜品喜好排行

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<Long> classifyIds;
+
     private LocalDateTime[] payTimeList;
 
 }

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<String> mchTypeCodes;
 
+    private List<Long> classifyIds;
+
     private String hourTypeIsNull;
 
     private String hourType;

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<HardPanelSettingEntity> {
 
-
     /**
      * 主键ID
      */
@@ -28,10 +28,11 @@ public class HardPanelSettingEntity extends Model<HardPanelSettingEntity> {
     private Long id;
 
     /**
-     * 营养分析-菜品排行-排除菜品分类
+     * 营养分析json配置
      */
-    @Schema(description = "营养分析-菜品排行-排除菜品分类")
-    private String nutritionTopExcludeClassify;
+    @Schema(description = "营养分析json配置")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private HardPanelSettingShare.NutritionSetting nutritionSetting;
 
     /**
      * 创建者

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<Long> topExcludeCategoryIds;
+
+    }
+
+}