diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/SysUtil.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/SysUtil.java index ee10da86..b2fc2b22 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/SysUtil.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/SysUtil.java @@ -42,7 +42,13 @@ public class SysUtil { public static String getCutFileUrl(String fileUrl) { log.info("出参_补图_原路径:{},前缀:{},存储桶:{}", new Object[]{fileUrl, getPrefix(), getBucket()}); - String cutFileUrl = getCutFileUrl(fileUrl, getPrefix(), getBucket()); + String cutFileUrl = null; + try { + cutFileUrl = getCutFileUrl(fileUrl, getPrefix(), getBucket()); + } catch (Exception e) { + log.error("获取存储桶图片地址失败, " + e.getMessage()); + cutFileUrl = fileUrl; + } log.info("出参_补图_补图后路径:{}", cutFileUrl); return cutFileUrl; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletCurrentStallVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletCurrentStallVO.java index c8fa3843..d2733cae 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletCurrentStallVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletCurrentStallVO.java @@ -1,15 +1,14 @@ package com.bonus.core.menu.vo; +import com.bonus.core.common.utils.SysUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.time.LocalTime; import java.util.List; import java.util.Optional; @ApiModel("档口菜谱") -@Data public class AppletCurrentStallVO { @ApiModelProperty("档口id") private Long stallId; @@ -31,4 +30,84 @@ public class AppletCurrentStallVO { private LocalTime endBusinessTime; @ApiModelProperty("食堂营业状态") private Integer businessState; + + public String getStallImgUrl() { + return SysUtil.getCutFileUrl(this.stallImgUrl); + } + + public Integer getMonthlySales() { + return (Integer)Optional.ofNullable(this.monthlySales).orElse(0); + } + + public Long getStallId() { + return this.stallId; + } + + public String getStallName() { + return this.stallName; + } + + public Integer getStallState() { + return this.stallState; + } + + public Long getRecipeId() { + return this.recipeId; + } + + public List getRecommendList() { + return this.recommendList; + } + + public LocalTime getStartBusinessTime() { + return this.startBusinessTime; + } + + public LocalTime getEndBusinessTime() { + return this.endBusinessTime; + } + + public Integer getBusinessState() { + return this.businessState; + } + + public void setStallId(final Long stallId) { + this.stallId = stallId; + } + + public void setStallName(final String stallName) { + this.stallName = stallName; + } + + public void setStallState(final Integer stallState) { + this.stallState = stallState; + } + + public void setStallImgUrl(final String stallImgUrl) { + this.stallImgUrl = stallImgUrl; + } + + public void setRecipeId(final Long recipeId) { + this.recipeId = recipeId; + } + + public void setRecommendList(final List recommendList) { + this.recommendList = recommendList; + } + + public void setMonthlySales(final Integer monthlySales) { + this.monthlySales = monthlySales; + } + + public void setStartBusinessTime(final LocalTime startBusinessTime) { + this.startBusinessTime = startBusinessTime; + } + + public void setEndBusinessTime(final LocalTime endBusinessTime) { + this.endBusinessTime = endBusinessTime; + } + + public void setBusinessState(final Integer businessState) { + this.businessState = businessState; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletRecommendDishesVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletRecommendDishesVO.java index 3394751e..96ed07f3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletRecommendDishesVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletRecommendDishesVO.java @@ -1,11 +1,11 @@ package com.bonus.core.menu.vo; +import com.bonus.core.common.utils.SysUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @ApiModel("推荐菜品") -@Data public class AppletRecommendDishesVO { @ApiModelProperty("菜品id") private Long dishesId; @@ -15,4 +15,36 @@ public class AppletRecommendDishesVO { private Integer dishesPrice; @ApiModelProperty("菜品图片") private String dishesImgUrl; + + public String getDishesImgUrl() { + return SysUtil.getCutFileUrl(this.dishesImgUrl); + } + + public Long getDishesId() { + return this.dishesId; + } + + public String getDishesName() { + return this.dishesName; + } + + public Integer getDishesPrice() { + return this.dishesPrice; + } + + public void setDishesId(final Long dishesId) { + this.dishesId = dishesId; + } + + public void setDishesName(final String dishesName) { + this.dishesName = dishesName; + } + + public void setDishesPrice(final Integer dishesPrice) { + this.dishesPrice = dishesPrice; + } + + public void setDishesImgUrl(final String dishesImgUrl) { + this.dishesImgUrl = dishesImgUrl; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveCanteenVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveCanteenVO.java index 731795b0..48753c1f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveCanteenVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveCanteenVO.java @@ -1,6 +1,7 @@ package com.bonus.core.menu.vo; import cn.hutool.core.collection.CollUtil; +import com.bonus.core.common.utils.SysUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalTime; @@ -27,11 +28,75 @@ public class AppletReserveCanteenVO { @ApiModelProperty("档口菜谱") private List stallList; -// public String getCanteenImgUrl() { -// return SysUtil.getCutFileUrl(this.canteenImgUrl); -// } -// -// public Integer getMonthlySales() { -// return CollUtil.isNotEmpty(this.stallList) ? this.stallList.stream().mapToInt(AppletReserveStallVO::getMonthlySales).sum() : 0; -// } + public String getCanteenImgUrl() { + return SysUtil.getCutFileUrl(this.canteenImgUrl); + } + + public Integer getMonthlySales() { + return CollUtil.isNotEmpty(this.stallList) ? this.stallList.stream().mapToInt(AppletReserveStallVO::getMonthlySales).sum() : 0; + } + + public Long getCanteenId() { + return this.canteenId; + } + + public String getCanteenName() { + return this.canteenName; + } + + public Integer getCanteenState() { + return this.canteenState; + } + + public LocalTime getStartBusinessTime() { + return this.startBusinessTime; + } + + public LocalTime getEndBusinessTime() { + return this.endBusinessTime; + } + + public Integer getBusinessState() { + return this.businessState; + } + + public List getStallList() { + return this.stallList; + } + + public void setCanteenId(final Long canteenId) { + this.canteenId = canteenId; + } + + public void setCanteenName(final String canteenName) { + this.canteenName = canteenName; + } + + public void setCanteenState(final Integer canteenState) { + this.canteenState = canteenState; + } + + public void setCanteenImgUrl(final String canteenImgUrl) { + this.canteenImgUrl = canteenImgUrl; + } + + public void setMonthlySales(final Integer monthlySales) { + this.monthlySales = monthlySales; + } + + public void setStartBusinessTime(final LocalTime startBusinessTime) { + this.startBusinessTime = startBusinessTime; + } + + public void setEndBusinessTime(final LocalTime endBusinessTime) { + this.endBusinessTime = endBusinessTime; + } + + public void setBusinessState(final Integer businessState) { + this.businessState = businessState; + } + + public void setStallList(final List stallList) { + this.stallList = stallList; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveStallVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveStallVO.java index 7ebcceaa..31162498 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveStallVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletReserveStallVO.java @@ -1,5 +1,6 @@ package com.bonus.core.menu.vo; +import com.bonus.core.common.utils.SysUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalTime; @@ -33,4 +34,99 @@ public class AppletReserveStallVO { @ApiModelProperty("推荐菜品") private List recommendList; + public String getStallImgUrl() { + return SysUtil.getCutFileUrl(this.stallImgUrl); + } + + public Integer getMonthlySales() { + return (Integer)Optional.ofNullable(this.monthlySales).orElse(0); + } + + public Long getStallId() { + return this.stallId; + } + + public String getStallName() { + return this.stallName; + } + + public Integer getStallState() { + return this.stallState; + } + + public LocalTime getStallStartTime() { + return this.stallStartTime; + } + + public LocalTime getStallEndTime() { + return this.stallEndTime; + } + + public Long getRecipeId() { + return this.recipeId; + } + + public LocalTime getStartBusinessTime() { + return this.startBusinessTime; + } + + public LocalTime getEndBusinessTime() { + return this.endBusinessTime; + } + + public Integer getBusinessState() { + return this.businessState; + } + + public List getRecommendList() { + return this.recommendList; + } + + public void setStallId(final Long stallId) { + this.stallId = stallId; + } + + public void setStallName(final String stallName) { + this.stallName = stallName; + } + + public void setStallState(final Integer stallState) { + this.stallState = stallState; + } + + public void setStallImgUrl(final String stallImgUrl) { + this.stallImgUrl = stallImgUrl; + } + + public void setStallStartTime(final LocalTime stallStartTime) { + this.stallStartTime = stallStartTime; + } + + public void setStallEndTime(final LocalTime stallEndTime) { + this.stallEndTime = stallEndTime; + } + + public void setRecipeId(final Long recipeId) { + this.recipeId = recipeId; + } + + public void setMonthlySales(final Integer monthlySales) { + this.monthlySales = monthlySales; + } + + public void setStartBusinessTime(final LocalTime startBusinessTime) { + this.startBusinessTime = startBusinessTime; + } + + public void setEndBusinessTime(final LocalTime endBusinessTime) { + this.endBusinessTime = endBusinessTime; + } + + public void setBusinessState(final Integer businessState) { + this.businessState = businessState; + } + + public void setRecommendList(final List recommendList) { + this.recommendList = recommendList; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletWeekCanteenVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletWeekCanteenVO.java index 21673857..75a6b5a1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletWeekCanteenVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/vo/AppletWeekCanteenVO.java @@ -1,12 +1,12 @@ package com.bonus.core.menu.vo; +import com.bonus.core.common.utils.SysUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @ApiModel("获取一周菜谱食堂列表") -@Data public class AppletWeekCanteenVO { @ApiModelProperty("菜谱id") private Long recipeId; @@ -20,4 +20,52 @@ public class AppletWeekCanteenVO { private String stallImgUrl; @ApiModelProperty("档口标签") private List labelList; + + public String getCanteenImgUrl() { + return SysUtil.getCutFileUrl(this.canteenImgUrl); + } + + public String getStallImgUrl() { + return SysUtil.getCutFileUrl(this.stallImgUrl); + } + + public Long getRecipeId() { + return this.recipeId; + } + + public String getStallName() { + return this.stallName; + } + + public String getCanteenName() { + return this.canteenName; + } + + public List getLabelList() { + return this.labelList; + } + + public void setRecipeId(final Long recipeId) { + this.recipeId = recipeId; + } + + public void setStallName(final String stallName) { + this.stallName = stallName; + } + + public void setCanteenName(final String canteenName) { + this.canteenName = canteenName; + } + + public void setCanteenImgUrl(final String canteenImgUrl) { + this.canteenImgUrl = canteenImgUrl; + } + + public void setStallImgUrl(final String stallImgUrl) { + this.stallImgUrl = stallImgUrl; + } + + public void setLabelList(final List labelList) { + this.labelList = labelList; + } }