diff --git a/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java b/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java index 6fc33ec..c3487ef 100644 --- a/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java +++ b/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java @@ -55,8 +55,8 @@ public class RzRestaurantImagesController extends BaseController */ @RequestMapping("/uploadDispatchings") @ResponseBody - public AjaxResult uploadPDF(@RequestParam("name") String name,@RequestParam("file") MultipartFile filePath){ - return rzRestaurantImagesService.insertRzRestaurantImages(name,filePath); + public AjaxResult uploadPDF(RzRestaurantImages rzRestaurantImages){ + return rzRestaurantImagesService.insertRzRestaurantImages(rzRestaurantImages); } } diff --git a/evo-admin/src/main/java/com/evo/restaurant/domain/RzRestaurantImages.java b/evo-admin/src/main/java/com/evo/restaurant/domain/RzRestaurantImages.java index 9f3d59a..7d0f7a8 100644 --- a/evo-admin/src/main/java/com/evo/restaurant/domain/RzRestaurantImages.java +++ b/evo-admin/src/main/java/com/evo/restaurant/domain/RzRestaurantImages.java @@ -1,7 +1,9 @@ package com.evo.restaurant.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.evo.common.annotation.Excel; import com.evo.common.core.domain.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author chenyj * @date 2024-10-25 */ + +@Data public class RzRestaurantImages extends BaseEntity { private static final long serialVersionUID = 1L; @@ -29,42 +33,8 @@ public class RzRestaurantImages extends BaseEntity /** 删除标识 */ private String delFlag; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setImageUrl(String imageUrl) - { - this.imageUrl = imageUrl; - } - - public String getImageUrl() - { - return imageUrl; - } - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getDelFlag() - { - return delFlag; - } + @TableField(exist = false) + private Long fileId; @Override public String toString() { diff --git a/evo-admin/src/main/java/com/evo/restaurant/service/IRzRestaurantImagesService.java b/evo-admin/src/main/java/com/evo/restaurant/service/IRzRestaurantImagesService.java index 2e5c4b0..8f366c4 100644 --- a/evo-admin/src/main/java/com/evo/restaurant/service/IRzRestaurantImagesService.java +++ b/evo-admin/src/main/java/com/evo/restaurant/service/IRzRestaurantImagesService.java @@ -37,5 +37,5 @@ public interface IRzRestaurantImagesService extends IService * @param name 照片管理 * @return 结果 */ - public AjaxResult insertRzRestaurantImages(String name, MultipartFile filePath); + public AjaxResult insertRzRestaurantImages(RzRestaurantImages rzRestaurantImages); } diff --git a/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java b/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java index 2704cc9..a5e2267 100644 --- a/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.evo.common.constant.Constants; import com.evo.common.core.domain.AjaxResult; +import com.evo.common.core.domain.entity.RzUpload; import com.evo.common.utils.Collections; import com.evo.common.utils.DateUtils; import com.evo.common.utils.SecurityUtils; @@ -18,10 +19,13 @@ import com.evo.restaurant.domain.RzRestaurantStatistics; import com.evo.restaurant.mapper.RzRestaurantImagesMapper; import com.evo.restaurant.mapper.RzRestaurantStatisticsMapper; import com.evo.restaurant.service.IRzRestaurantImagesService; +import com.evo.system.service.RzUploadService; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.*; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -38,7 +42,8 @@ public class RzRestaurantImagesServiceImpl extends ServiceImpl