From 75ea0e39af7b2bb7a44c49ec37279e0d9dd5edd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Sat, 28 Mar 2020 09:59:54 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=B9=B6=E5=8E=8B=E7=BC=A9-=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/UploadImgAllDTO.java | 31 +++++++++++++++++++ .../esua/epdc/controller/OssController.java | 30 ++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java new file mode 100644 index 000000000..f14e9d0ef --- /dev/null +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc; + +import lombok.Data; + +/** + * 上传信息 + * + * @author Mark sunlightcs@gmail.com + * @since 1.1.0 + */ +@Data +public class UploadImgAllDTO { + /** + * 图片URL + */ + private String imgUrl; + + /** + * 图片缩略图URL + */ + private String thumbnail; + +} 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 1d14e9180..c9e0c113a 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 @@ -8,6 +8,7 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.UploadImgAllDTO; import com.elink.esua.epdc.cloud.AbstractCloudStorageService; import com.elink.esua.epdc.cloud.AliyunCloudStorageService; import com.elink.esua.epdc.cloud.CloudStorageConfig; @@ -201,4 +202,33 @@ public class OssController { public Result> compressImg(@RequestBody List imgUrlList) { return ossService.compressImg(imgUrlList); } + + /** + * 图片上传并压缩缩略图 + * + * @return void + * @author yinzuomei + * @date 2020/02/27 + */ + @PostMapping("uploadImg") + @ApiOperation(value = "上传文件") + public Result uploadImg(@RequestParam("file") MultipartFile file) throws Exception { + if (file.isEmpty()) { + return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); + } + + + //上传图片 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + String url = OssFactory.build().uploadSuffix(file.getBytes(), extension); + ossService.afterUpload(url, file.getSize()); + //上传缩略图 + byte[] afterJyBytes = CompressImgUtils.commpressPicCycle(file.getBytes(), 1024, 0.5); + String thumbnailUrl = OssFactory.build().uploadSuffix(afterJyBytes, "jpg"); + ossService.afterUpload(thumbnailUrl, afterJyBytes.length); + UploadImgAllDTO uploadAll = new UploadImgAllDTO(); + uploadAll.setImgUrl(url); + uploadAll.setThumbnail(thumbnailUrl); + return new Result().ok(uploadAll); + } } From ad9527ffab32667ccd79dc85a89de0472278caaf Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Mar 2020 15:34:43 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/SysUserController.java | 12 ++++++++++++ .../elink/esua/epdc/service/SysUserService.java | 9 +++++++++ .../esua/epdc/service/impl/SysUserServiceImpl.java | 14 ++++++++++++++ .../epdc/controller/ApiWorkUserController.java | 14 ++++++++++++++ .../elink/esua/epdc/feign/AdminFeignClient.java | 10 ++++++++++ .../feign/fallback/AdminFeignClientFallback.java | 5 +++++ .../elink/esua/epdc/service/WorkUserService.java | 9 +++++++++ .../epdc/service/impl/WorkUserServiceImpl.java | 12 ++++++++++++ 8 files changed, 85 insertions(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 466d45411..9ee3224bf 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -414,4 +414,16 @@ public class SysUserController { return sysUserService.getSysGridLeaderPhone(deptId); } + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:49 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("checkUpdateAvatar") + public Result checkUpdateAvatar() { + return sysUserService.checkUpdateAvatar(); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java index 1a3635e2f..431281af9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -118,4 +118,13 @@ public interface SysUserService extends BaseService { * @Date: 2020-01-09 */ Result> getSysGridLeaderPhone(Long deptId); + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:52 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result checkUpdateAvatar(); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index f9ded4cc9..c8a0fcd2c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -262,5 +262,19 @@ public class SysUserServiceImpl extends BaseServiceImpl>().ok(baseDao.getSysGridLeaderPhone(deptId)); } + @Override + public Result checkUpdateAvatar() { + String userId = SecurityUser.getUser().getId().toString(); + SysUserEntity userInfo = baseDao.selectById(userId); + if(userInfo==null || userInfo.getDelFlag()==1 || userInfo.getStatus()==0){ + throw new RenException("未查到次用户信息或此用户被停用！"); + } + if(StringUtils.isNotBlank(userInfo.getHeadUrl())){ + return new Result().ok(false); + }else{ + return new Result().ok(true); + } + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index 5d88fe598..7cf0da9f2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -195,4 +195,18 @@ public class ApiWorkUserController { Long userId = user.getId(); return workUserService.logout(userId); } + + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:32 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("checkUpdateAvatar") + public Result checkUpdateAvatar() { + return workUserService.checkUpdateAvatar(); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 9b41b246a..b78436145 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -90,4 +90,14 @@ public interface AdminFeignClient { **/ @GetMapping("sys/dept/party/getDeptTreeForEpiDemic") Result getDeptTreeForEpiDemic(); + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:43 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("sys/user/checkUpdateAvatar") + Result checkUpdateAvatar(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index e7f13a42d..7ebc6edae 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -51,4 +51,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result getDeptTreeForEpiDemic() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTreeForEpiDemic"); } + + @Override + public Result checkUpdateAvatar() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "checkUpdateAvatar"); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index f3ff61fb5..eb4bcdad1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java @@ -139,4 +139,13 @@ public interface WorkUserService { * @Date 2019/12/25 10:17 **/ Result logout(Long userId); + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:32 + * @param + * @return + */ + Result checkUpdateAvatar(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 06cd13867..4b0c042c2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -335,4 +335,16 @@ public class WorkUserServiceImpl implements WorkUserService { public Result logout(Long userId) { return resourceFeignClient.logoutUser(userId+""); } + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:42 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result checkUpdateAvatar() { + return adminFeignClient.checkUpdateAvatar(); + } } From ad3ef5f05628c704c99011b0c829d09af126d5e6 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Mar 2020 16:54:21 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/SysUserController.java | 12 ++++++++++++ .../com/elink/esua/epdc/service/SysUserService.java | 9 +++++++++ .../esua/epdc/service/impl/SysUserServiceImpl.java | 12 ++++++++++++ .../esua/epdc/controller/ApiWorkUserController.java | 12 ++++++++++++ .../com/elink/esua/epdc/feign/AdminFeignClient.java | 12 ++++++++++++ .../feign/fallback/AdminFeignClientFallback.java | 5 +++++ .../com/elink/esua/epdc/service/WorkUserService.java | 9 +++++++++ .../esua/epdc/service/impl/WorkUserServiceImpl.java | 5 +++++ 8 files changed, 76 insertions(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 9ee3224bf..aa5e46fbe 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -426,4 +426,16 @@ public class SysUserController { return sysUserService.checkUpdateAvatar(); } + /** + * @describe: 更新头像 + * @author wangtong + * @date 2020/3/30 16:11 + * @param [avatar] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("updateAvatar") + public Result updateAvatar(String avatar) { + return sysUserService.updateAvatar(avatar); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java index 431281af9..9a5363bdb 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -127,4 +127,13 @@ public interface SysUserService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result checkUpdateAvatar(); + + /** + * @describe: 更新头像 + * @author wangtong + * @date 2020/3/30 16:12 + * @param [avatar] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result updateAvatar(String avatar); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index c8a0fcd2c..af53c2e3a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -276,5 +276,17 @@ public class SysUserServiceImpl extends BaseServiceImpl Date: Mon, 30 Mar 2020 17:44:19 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/SysUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index af53c2e3a..94fd36385 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -276,6 +276,7 @@ public class SysUserServiceImpl extends BaseServiceImpl Date: Tue, 31 Mar 2020 10:20:23 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-gateway/pom.xml | 4 ++++ esua-epdc/epdc-gateway/src/main/resources/application.yml | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index 83676cea6..922d20d50 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -122,6 +122,8 @@ http://127.0.0.1:9060 + http://127.0.0.1:9085 + lb://epdc-services-server @@ -173,6 +175,7 @@ lb://epdc-oss-server lb://epdc-events-server lb://epdc-cloud-analysis-server + lb://epdc-work-record-server lb://epdc-services-server lb://epdc-user-server @@ -212,6 +215,7 @@ lb://epdc-news-server lb://epdc-oss-server lb://epdc-cloud-analysis-server + lb://epdc-work-record-server lb://epdc-events-server lb://epdc-services-server lb://epdc-user-server diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index faebf6867..a174416d5 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -180,6 +180,14 @@ spring: - Path=${server.servlet.context-path}/cloudAnalysis/** filters: - StripPrefix=1 + #工作日志 + - id: epdc-work-record-server + uri: @gateway.routes.epdc-work-record-server.uri@ + order: 20 + predicates: + - Path=${server.servlet.context-path}/workRecord/** + filters: + - StripPrefix=1 nacos: discovery: server-addr: @nacos.server-addr@ From f55f37d7b0bb055fec8bc8af900d1ebeac28c830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Tue, 31 Mar 2020 17:27:18 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-gateway/src/main/resources/application.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index a174416d5..3cda8ce6d 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -256,6 +256,7 @@ renren: - /api/work/** #工作端接口 - /api/analysis/** #数据端接口 - /cloudAnalysis/** #数据端接口 + - /workRecord/** #工作日志接口 epdc: # 党建e家接口 @@ -276,3 +277,4 @@ epdc: - /api/work/** #工作端接口不拦截 - /api/analysis/** #数据端接口不拦截 - /cloudAnalysis/** #数据端接口 + - /workRecord/** #工作日志接口 From e52d790eb12f6941218d82391a4d24bdbb124368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 2 Apr 2020 17:47:25 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java | 4 ++++ .../java/com/elink/esua/epdc/controller/OssController.java | 1 + 2 files changed, 5 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java index f14e9d0ef..51c87a76d 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/src/main/java/com/elink/esua/epdc/UploadImgAllDTO.java @@ -27,5 +27,9 @@ public class UploadImgAllDTO { * 图片缩略图URL */ private String thumbnail; + /** + * 文件名 + */ + private String fileName; } 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 c9e0c113a..f34e6d013 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 @@ -229,6 +229,7 @@ public class OssController { UploadImgAllDTO uploadAll = new UploadImgAllDTO(); uploadAll.setImgUrl(url); uploadAll.setThumbnail(thumbnailUrl); + uploadAll.setFileName(file.getOriginalFilename()); return new Result().ok(uploadAll); } } From 82659b1430273190bf45ab60cb6e11d44777715e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 2 Apr 2020 18:00:42 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/OssController.java | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) 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 f34e6d013..078d150df 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 @@ -207,11 +207,11 @@ public class OssController { * 图片上传并压缩缩略图 * * @return void - * @author yinzuomei - * @date 2020/02/27 + * @author lpf + * @date 2020/03/27 */ @PostMapping("uploadImg") - @ApiOperation(value = "上传文件") + @ApiOperation(value = "上传图片") public Result uploadImg(@RequestParam("file") MultipartFile file) throws Exception { if (file.isEmpty()) { return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); @@ -232,4 +232,26 @@ public class OssController { uploadAll.setFileName(file.getOriginalFilename()); return new Result().ok(uploadAll); } + /** + * 文件上传 + * + * @return void + * @author lpf + * @date 2020/04/02 + */ + @PostMapping("uploadFile") + @ApiOperation(value = "上传文件") + public Result uploadFile(@RequestParam("file") MultipartFile file) throws Exception { + if (file.isEmpty()) { + return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); + } + //上传文件 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + String url = OssFactory.build().uploadSuffix(file.getBytes(), extension); + ossService.afterUpload(url, file.getSize()); + UploadImgAllDTO uploadAll = new UploadImgAllDTO(); + uploadAll.setImgUrl(url); + uploadAll.setFileName(file.getOriginalFilename()); + return new Result().ok(uploadAll); + } } From 18ec6d38f87cff43d92461ba1a66f425083172f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 2 Apr 2020 18:06:43 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/controller/OssController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 078d150df..e1e09b321 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 @@ -239,9 +239,9 @@ public class OssController { * @author lpf * @date 2020/04/02 */ - @PostMapping("uploadFile") + @PostMapping("uploadAllFile") @ApiOperation(value = "上传文件") - public Result uploadFile(@RequestParam("file") MultipartFile file) throws Exception { + public Result uploadAllFile(@RequestParam("file") MultipartFile file) throws Exception { if (file.isEmpty()) { return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); } From 9aed106446b1918946fadaee5067b9fa69d36657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Tue, 7 Apr 2020 09:29:04 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=91=A8=E6=8A=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/constant/ServiceConstant.java | 5 +++ .../epdc/feign/WorkRecordFeignClient.java | 43 +++++++++++++++++++ .../WorkRecordFeignClientFallback.java | 25 +++++++++++ .../MonthRecordHandleQueryTask.java | 19 ++++++++ .../workRecord/WeekRecordHandleQueryTask.java | 19 ++++++++ .../impl/MonthRecordHandleQueryTaskImpl.java | 28 ++++++++++++ .../impl/WeekRecordHandleQueryTaskImpl.java | 28 ++++++++++++ 7 files changed, 167 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/WorkRecordFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkRecordFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/MonthRecordHandleQueryTask.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/WeekRecordHandleQueryTask.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/MonthRecordHandleQueryTaskImpl.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/WeekRecordHandleQueryTaskImpl.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index ced432c41..0247e894b 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -89,6 +89,11 @@ public interface ServiceConstant { * 数据分析模块 */ String EPDC_ANALYSIS_SERVER = "epdc-analysis-server"; + + /** + * 工作日志模块 + */ + String EPDC_WORK_RECORD_SERVER = "epdc-work-record-server"; /** * 积分模块 */ diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/WorkRecordFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/WorkRecordFeignClient.java new file mode 100644 index 000000000..5d3628ad8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/WorkRecordFeignClient.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.WorkRecordFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * 项目模块调用 + * + * @Author：liuchuang + * @Date：2019/12/25 11:07 + */ +@FeignClient(name = ServiceConstant.EPDC_WORK_RECORD_SERVER, fallback = WorkRecordFeignClientFallback.class) +public interface WorkRecordFeignClient { + + /** + * + * 周报提交情况分析 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/25 11:11 + */ + @GetMapping(value = "workRecord/week/checkWeekRecord", consumes = MediaType.APPLICATION_JSON_VALUE) + Result checkWeekRecord(); + /** + * + * 周报提交情况分析 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/25 11:11 + */ + @GetMapping(value = "workRecord/month/checkMonthRecord", consumes = MediaType.APPLICATION_JSON_VALUE) + Result checkMonthRecord(); +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkRecordFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkRecordFeignClientFallback.java new file mode 100644 index 000000000..74cc8ca69 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkRecordFeignClientFallback.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.ItemFeignClient; +import com.elink.esua.epdc.feign.WorkRecordFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:07 + */ +@Component +public class WorkRecordFeignClientFallback implements WorkRecordFeignClient { + + @Override + public Result checkWeekRecord() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_WORK_RECORD_SERVER, "checkWeekRecord", ""); + } + @Override + public Result checkMonthRecord() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_WORK_RECORD_SERVER, "checkMonthRecord", ""); + } +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/MonthRecordHandleQueryTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/MonthRecordHandleQueryTask.java new file mode 100644 index 000000000..a227f8937 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/MonthRecordHandleQueryTask.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.task.workRecord; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:00 + */ +public interface MonthRecordHandleQueryTask { + + /** + * + * 月报情况分析 + * + * @params [params] + * @return void + * @author liuchuang + * @since 2019/12/25 11:02 + */ + void run(String params); +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/WeekRecordHandleQueryTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/WeekRecordHandleQueryTask.java new file mode 100644 index 000000000..5d3f861ea --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/WeekRecordHandleQueryTask.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.task.workRecord; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:00 + */ +public interface WeekRecordHandleQueryTask { + + /** + * + * 周报情况分析 + * + * @params [params] + * @return void + * @author liuchuang + * @since 2019/12/25 11:02 + */ + void run(String params); +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/MonthRecordHandleQueryTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/MonthRecordHandleQueryTaskImpl.java new file mode 100644 index 000000000..7d5ee135a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/MonthRecordHandleQueryTaskImpl.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.task.workRecord.impl; + +import com.elink.esua.epdc.feign.ItemFeignClient; +import com.elink.esua.epdc.task.workRecord.MonthRecordHandleQueryTask; +import com.elink.esua.epdc.task.workRecord.WeekRecordHandleQueryTask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:01 + */ +@Component("MonthRecordHandleQueryTask") +public class MonthRecordHandleQueryTaskImpl implements MonthRecordHandleQueryTask { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private ItemFeignClient itemFeignClient; + + @Override + public void run(String params){ + logger.debug("MonthRecordHandleQueryTask定时任务正在执行，参数为：{}", params); + itemFeignClient.queryItemHandle(); + } +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/WeekRecordHandleQueryTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/WeekRecordHandleQueryTaskImpl.java new file mode 100644 index 000000000..1f94b2356 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/workRecord/impl/WeekRecordHandleQueryTaskImpl.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.task.workRecord.impl; + +import com.elink.esua.epdc.feign.ItemFeignClient; +import com.elink.esua.epdc.task.events.ItemReportHandleQueryTask; +import com.elink.esua.epdc.task.workRecord.WeekRecordHandleQueryTask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:01 + */ +@Component("WeekRecordHandleQueryTask") +public class WeekRecordHandleQueryTaskImpl implements WeekRecordHandleQueryTask { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private ItemFeignClient itemFeignClient; + + @Override + public void run(String params){ + logger.debug("WeekRecordHandleQueryTask定时任务正在执行，参数为：{}", params); + itemFeignClient.queryItemHandle(); + } +}