From 826f20416cf386f9372b374b51f03264d34ec91c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 8 Sep 2022 21:38:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?api=E6=8E=A8=E9=80=81tupian=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/UploadToOssDTO.java | 5 ++ .../epdc/controller/ApiTopicController.java | 14 +++++ .../elink/esua/epdc/service/TopicService.java | 12 ++++ .../epdc/service/impl/TopicServiceImpl.java | 19 ++++++ .../esua/epdc/controller/OssController.java | 62 ++++++++++++++++--- 5 files changed, 102 insertions(+), 10 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/UploadToOssDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/UploadToOssDTO.java index 0fc514c07..27f47d76a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/UploadToOssDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/UploadToOssDTO.java @@ -15,5 +15,10 @@ public class UploadToOssDTO implements Serializable { private String fileName; + /** + * 三大诉求标识 + */ + private String code; + private byte[] fileByte; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java index 5ded8ce1a..52e056174 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java @@ -148,4 +148,18 @@ public class ApiTopicController { public Result uploadImage(@RequestParam("file") MultipartFile file) { return topicService.uploadImage(file); } + + /** + * + * 文件上传 + * + * @params [file] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/25 10:45 + */ + @PostMapping("upload/{code}") + public Result uploadImageByCode(@RequestParam("file") MultipartFile file, @PathVariable("code") String code) { + return topicService.uploadImageByCode(file, code); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java index 1ac17170b..5df6fb720 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java @@ -109,4 +109,16 @@ public interface TopicService { * @since 2019/11/25 10:45 */ Result uploadImage(MultipartFile file); + + /** + * + * 文件上传 + * + * @param file + * @param code + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/25 10:45 + */ + Result uploadImageByCode(MultipartFile file, String code); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java index 232cf137c..77ec26405 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java @@ -156,4 +156,23 @@ public class TopicServiceImpl implements TopicService { return new Result().error("上传文件失败"); } + + @Override + public Result uploadImageByCode(MultipartFile file, String code) { + if (null == file) { + return new Result().error("上传文件不能为空"); + } + + try { + UploadToOssDTO uploadToOssDto = new UploadToOssDTO(); + uploadToOssDto.setFileByte(file.getBytes()); + uploadToOssDto.setFileName(file.getOriginalFilename()); + uploadToOssDto.setCode(code); + return ossFeignClient.uploadFile(uploadToOssDto); + } catch (Exception e) { + e.printStackTrace(); + } + + return new Result().error("上传文件失败"); + } } diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java index d4daf58d9..45d1d385e 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java @@ -166,17 +166,31 @@ public class OssController { @PostMapping("uploadFile") public Result uploadFile(@RequestBody UploadToOssDTO dto) throws Exception { - byte[] fileByte = dto.getFileByte(); - if (null == fileByte || fileByte.length == NumConstant.ZERO) { - return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); - } - // 图片压缩 - byte[] imgBytes = CompressImgUtils.commpressPicCycle(fileByte, 110, 0.9); - //上传文件 - String extension = FilenameUtils.getExtension(dto.getFileName()); - String url = OssFactory.build().uploadSuffix(imgBytes, extension); + if (StringUtils.isNotBlank(dto.getCode())) { + String name = ItemStateCodeEnum.getValueByCode(dto.getCode()); + + // 图片压缩 + byte[] afterJyBytes = CompressImgUtils.commpressPicCycle(dto.getFileByte(), 1024, 0.5); - return new Result().ok(url); + //上传文件 + String extension = FilenameUtils.getExtension(dto.getFileName()); + String url = OssFactory.build().upload(afterJyBytes, name, extension); + + return new Result().ok(url); + } else { + + byte[] fileByte = dto.getFileByte(); + if (null == fileByte || fileByte.length == NumConstant.ZERO) { + return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); + } + // 图片压缩 + byte[] imgBytes = CompressImgUtils.commpressPicCycle(fileByte, 110, 0.9); + //上传文件 + String extension = FilenameUtils.getExtension(dto.getFileName()); + String url = OssFactory.build().uploadSuffix(imgBytes, extension); + + return new Result().ok(url); + } } /** @@ -281,4 +295,32 @@ public class OssController { String url = OssFactory.build().upload(afterJyBytes, name, extension); return ossService.afterUpload(url, file.getSize()); } + + /** + * 图片上传并压缩缩略图 + * + * @return void + * @author lpf + * @date 2020/03/27 + */ + @PostMapping("uploadImg/{code}") + @ApiOperation(value = "上传图片") + public Result uploadImgByCode(@RequestParam("file") MultipartFile file, @PathVariable("code") String code) throws Exception { + if (file.isEmpty()) { + return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); + } + String name = ItemStateCodeEnum.getValueByCode(code); + + // 图片压缩 + byte[] afterJyBytes = CompressImgUtils.commpressPicCycle(file.getBytes(), 1024, 0.5); + + //上传文件 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + String url = OssFactory.build().upload(afterJyBytes, name, extension); + UploadImgAllDTO uploadAll = new UploadImgAllDTO(); + uploadAll.setImgUrl(url); + uploadAll.setThumbnail(url); + uploadAll.setFileName(name); + return new Result().ok(uploadAll); + } } From 807f4e1822d69a8dacaaacea3e0076790b4ef749 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 8 Sep 2022 21:50:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=A2=9E=E5=8A=A030=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c92ba3e39..25789d0b2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -2028,6 +2028,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem progressList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Date insertTime = sdf.parse(dto.getCREATEDATE()); + // 拉取的记录增加30秒，防止出现排序问题 + insertTime.setTime(insertTime.getTime() + 30000); String itemHandleProcessId = UUID.randomUUID().toString().replaceAll("-", ""); // 插入项目处理进度表 ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO(); From 6896bd6ed8215193388fd693be416a52801c6b4a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 8 Sep 2022 21:58:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E7=BB=93=E6=A1=88=E8=AF=9D=E6=9C=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 25789d0b2..bc75cdf9d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -2616,9 +2616,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem if("0".equals(formDto.getState())){ ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); - //内容组成：第一个发起结案申请/吹哨的意见+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！ - ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId()); - itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile()); + if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())){ + //执法和发展填写网格化平台的意见 + itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); + }else{ + //内容组成：第一个发起结案申请/吹哨的意见+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！ + ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId()); + itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile()); + } item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); updateById(item); }else if("1".equals(formDto.getState())){