From a1ae9d712f1d18799c3e4e34995fd037f6c5a22a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 19 Jul 2023 16:56:32 +0800 Subject: [PATCH] 商城商品修改 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 129 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 121 insertions(+), 8 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java index 567ff86..ced6d3d 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java @@ -7,11 +7,9 @@ import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.utils.OssUtils; -import cc.mrbird.febs.mall.dto.AddMallGoodsDto; -import cc.mrbird.febs.mall.dto.MallGoodsUpdateDto; -import cc.mrbird.febs.mall.dto.RankAwardUpdateDto; -import cc.mrbird.febs.mall.dto.UpMallGoodsDto; +import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.DataDictionaryCustom; +import cc.mrbird.febs.mall.entity.MallCarriageRule; import cc.mrbird.febs.mall.entity.MallGoods; import cc.mrbird.febs.mall.entity.MallGoodsCategory; import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; @@ -24,14 +22,18 @@ import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import net.coobird.thumbnailator.Thumbnails; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import sun.misc.BASE64Encoder; +import javax.imageio.ImageIO; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import java.io.IOException; +import java.awt.image.BufferedImage; +import java.io.*; +import java.net.URLEncoder; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -50,8 +52,78 @@ * 图片上传 * @return */ - @PostMapping(value = "/uploadFileBase64") + @PostMapping(value = "/uploadFileBase64Test") @ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败") + public Map<String,Object> uploadFileBase64Test(@RequestBody @Validated MultipartFile file) { + if (file.isEmpty()) { + new FebsResponse().message("上传文件为空"); + } + + String base64EncoderImg = ""; + try { + //输出到BufferedImage + BufferedImage bufferedImage = Thumbnails.of(file.getInputStream()) + // 图片大小(长宽)压缩比例 从0-1,1表示原图 + .scale(1f) + // 图片质量压缩比例 从0-1,越接近1质量越好 + .outputQuality(1f) + .asBufferedImage(); + //对内存中的图片文件进行Base64处理 + ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流 + ImageIO.write(bufferedImage, "jpg", newBaos);//写入流中 + byte[] bytes = newBaos.toByteArray();//转换成字节 + base64EncoderImg = new BASE64Encoder().encode(bytes); +// base64EncoderImg = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8"); + } catch (Exception e) { + e.printStackTrace(); + } + + + //文件加密 +// BASE64Encoder base64Encoder =new BASE64Encoder(); +// try { +// base64EncoderImg = base64Encoder.encode(file.getBytes()); +// } catch (IOException e) { +// e.printStackTrace(); +// } + + String imageFuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); +// String imageFuffix = ".png"; + String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix; + String imageName = "uploadeFile/" + imageNames; + OssUtils.uploadFileWithBase64(base64EncoderImg, imageName); + String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com"; + String url = bucket_name + "/" + imageName; + + Map<String,Object> map = new HashMap<String,Object>(); + Map<String,Object> map2 = new HashMap<String,Object>(); + map.put("code",0);//0表示成功,1失败 + map.put("msg","上传成功");//提示消息 + map.put("data",map2); + map2.put("src",url);//图片url + map2.put("title",imageNames);//图片名称,这个会显示在输入框里 + return map; + } + + public String Base64ImageByMemory(BufferedImage pic) { + String imgString = ""; + ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流 + try { + ImageIO.write(pic, "jpg", newBaos);//写入流中 + byte[] bytes = newBaos.toByteArray();//转换成字节 + imgString = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8"); + } catch (Exception e) { + e.printStackTrace(); + } + return imgString; + } + + /** + * 图片上传 + * @return + */ + @PostMapping(value = "/uploadFileBase64") + @ControllerEndpoint(operation = "帮助中心---图片上传", exceptionMessage = "上传失败") public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) { if (file.isEmpty()) { new FebsResponse().message("上传文件为空"); @@ -66,8 +138,7 @@ e.printStackTrace(); } - String imageFuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// String imageFuffix = ".png"; + String imageFuffix = ".png"; String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix; String imageName = "uploadeFile/" + imageNames; OssUtils.uploadFileWithBase64(base64EncoderImg, imageName); @@ -210,5 +281,47 @@ return adminMallGoodsService.deliveryHomeUpdate(adminHomeDeliverySettingVo); } + /** + * 运费模板列表 + */ + @GetMapping("carriageRuleList") + public FebsResponse carriageRuleList(MallCarriageRule mallCarriageRule, QueryRequest request) { + Map<String, Object> data = getDataTable(adminMallGoodsService.getMallCarriageRuleListInPage(mallCarriageRule, request)); + return new FebsResponse().success().data(data); + } + + /** + * 运费模板列表-删除 + */ + @GetMapping("carriageRuleDel/{id}") + @ControllerEndpoint(operation = "运费模板列表-删除", exceptionMessage = "操作失败") + public FebsResponse carriageRuleDel(@NotNull(message = "{required}") @PathVariable Long id) { + return adminMallGoodsService.carriageRuleDelById(id); + } + + /** + * 运费模板列表-新增 + */ + @PostMapping("carriageRuleAdd") + @ControllerEndpoint(operation = " 商品-新增", exceptionMessage = "操作失败") + public FebsResponse carriageRuleAdd(@RequestBody @Valid AdminCarriageRuleAddDto adminCarriageRuleAddDto) { + return adminMallGoodsService.carriageRuleAdd(adminCarriageRuleAddDto); + } + + + /** + * 运费模板列表-更新 + */ + @PostMapping("carriageRuleUpdate") + @ControllerEndpoint(operation = "运费模板列表-更新", exceptionMessage = "操作失败") + public FebsResponse carriageRuleUpdate(@RequestBody @Valid AdminCarriageRuleUpdateDto adminCarriageRuleUpdateDto) { + return adminMallGoodsService.carriageRuleUpdate(adminCarriageRuleUpdateDto); + } + + @GetMapping(value = "/carriageRuleTree") + public FebsResponse carriageRuleTree() { + return new FebsResponse().success().data(adminMallGoodsService.findAllCarriageRuleTree()); + } + } -- Gitblit v1.9.1