From 3ecb68c427a627ad8e90d8c555655e7724be2d96 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期五, 06 九月 2024 11:06:12 +0800 Subject: [PATCH] 修改 --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java | 71 +++++++++++------------------------ 1 files changed, 22 insertions(+), 49 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java index 2288545..34a8351 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java @@ -67,58 +67,15 @@ @PostMapping("save") @ApiOperation("淇濆瓨") @LogOperation("淇濆瓨") - public Result save(@RequestBody MultipartFile file, Long id, Integer isDefault, - String name, String contentType, Integer productType, String remark) { - SysPictureBase sysPictureBase; - SysPictureBase pictureBase = sysPictureBaseService.getDefaultImg(productType); - if (id != 0) { - sysPictureBase = sysPictureBaseService.get(id); - sysPictureBase.setIsDefault(isDefault); - sysPictureBase.setName(name); - sysPictureBase.setContentType(contentType); - sysPictureBase.setProductType(productType); - sysPictureBase.setRemark(remark); + public Result save(@RequestBody SysPictureBase sysPictureBase) { + if (sysPictureBase.getId() != null) { sysPictureBaseService.update(sysPictureBase); } else { - sysPictureBase = new SysPictureBase(); - sysPictureBase.setIsDefault(isDefault); - sysPictureBase.setName(name); - sysPictureBase.setContentType(contentType); - sysPictureBase.setProductType(productType); - sysPictureBase.setRemark(remark); sysPictureBaseService.insert(sysPictureBase); } - if (sysPictureBase.getIsDefault()==1){ - if (!sysPictureBase.getId().equals(pictureBase.getId())){ - sysPictureBaseService.updateByDefault(sysPictureBase.getId(),sysPictureBase.getProductType()); - sysPictureBaseService.updateProdeuctImg(sysPictureBase.getId(),sysPictureBase.getProductType(),pictureBase.getId()); - } - } - if (file != null) { - BufferedImage bufferedImage = null; - try { - String fileName = file.getOriginalFilename(); - String[] arr = fileName.split("\\."); - String suffixName = arr[arr.length - 1].toLowerCase(); - - bufferedImage = ImageIO.read(file.getInputStream()); - // 瀹藉害 - int width = bufferedImage.getWidth(); - sysPictureBase.setWidth(width); - // 楂樺害 - int height = bufferedImage.getHeight(); - sysPictureBase.setHeight(height); - sysPictureBaseService.update(sysPictureBase); - String tempUploadDir = localPath + "/product_img/"; - File dir = new File(tempUploadDir); - if (!dir.exists()) { - dir.mkdirs(); - } - ImageIO.write(bufferedImage, suffixName, new File(tempUploadDir + sysPictureBase.getId().toString())); - } catch (IOException e) { - e.printStackTrace(); - } - + if (sysPictureBase.getIsDefault() == 1 && sysPictureBase.getProductType()!=20) { + sysPictureBaseService.updateByDefault(sysPictureBase.getId(), sysPictureBase.getProductType()); + sysPictureBaseService.updateProdeuctImg(sysPictureBase.getId(), sysPictureBase.getProductType(), null); } return Result.ok(); } @@ -147,7 +104,22 @@ //鍏虫祦 outputStream.close(); in.close(); - } catch (IOException e) { + } catch (IOException e) { + e.printStackTrace(); + } + } + + @RequestMapping("/getSvgImage") + public void getSvgImage(HttpServletResponse response, Long id) { + try { + SysPictureBase data = sysPictureBaseService.get(id); + String svgContent = data.getSvgContent(); + response.setContentType("image/svg+xml"); + response.getWriter().write(svgContent); + response.getWriter().flush(); + response.getWriter().close(); + + } catch (IOException e) { e.printStackTrace(); } } @@ -157,6 +129,7 @@ SysPictureBase data = sysPictureBaseService.getDefaultImg(productType); return Result.ok(data); } + @DeleteMapping @ApiOperation("鍒犻櫎") @LogOperation("鍒犻櫎") -- Gitblit v1.9.1