From 75ea0e39af7b2bb7a44c49ec37279e0d9dd5edd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Sat, 28 Mar 2020 09:59:54 +0800
Subject: [PATCH 01/14] =?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.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+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<List<String>> compressImg(@RequestBody List<String> imgUrlList) {
         return ossService.compressImg(imgUrlList);
     }
+
+    /**
+     * 图片上传并压缩缩略图
+     *
+     * @return void
+     * @author yinzuomei
+     * @date 2020/02/27
+     */
+    @PostMapping("uploadImg")
+    @ApiOperation(value = "上传文件")
+    public Result<UploadImgAllDTO> uploadImg(@RequestParam("file") MultipartFile file) throws Exception {
+        if (file.isEmpty()) {
+            return new Result<UploadImgAllDTO>().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<UploadImgAllDTO>().ok(uploadAll);
+    }
 }

From c1021d1662c4d4676fbb5036d3118599d41075c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 30 Mar 2020 10:03:00 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E7=BB=93?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/MetaUserGridOpiningServiceImpl.java  | 4 ++++
 .../user/service/impl/MetaUserPartyRankServiceImpl.java    | 3 +++
 .../user/service/impl/MetaUserRegisterRankServiceImpl.java | 7 ++++++-
 .../main/resources/mapper/user/MetaUserPartyRankDao.xml    | 2 ++
 .../main/resources/mapper/user/MetaUserRegisterRankDao.xml | 2 ++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index a126d5d1e..7e6548fa3 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -130,6 +130,10 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     @Override
     @DataSource(name = DataSourceNames.TWELVE)
     public Result createUserAnalysisData() {
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        Map<String,Object> params = new HashMap<>();
+        params.put("startTime","2018-01-01");
+        params.put("endTime",nowTime);
         List<GridOpeningResultDTO> list = userAnalysisService.getToLeadGridOpenings(new HashMap<>());
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntities = ConvertUtils.sourceToTarget(list, MetaUserGridOpiningEntity.class);
         boolean b = insertBatch(metaUserGridOpiningEntities);
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
index 5da1eb35a..252f62adb 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
@@ -132,6 +132,9 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
         // 获取导出数据
         Map<String,Object> params = new HashMap<>();
         params.put("partyFlag", YesOrNoEnum.YES.value());
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        params.put("startTime","2018-01-01");
+        params.put("endTime",nowTime);
         List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(params);
         List<MetaUserPartyRankEntity> metaUserPartyRankEntities = ConvertUtils.sourceToTarget(toLeadUserRegisterRandData, MetaUserPartyRankEntity.class);
         return insertBatch(metaUserPartyRankEntities)? new Result(): new Result().error("导入党员排行失败") ;
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
index 6d89b576e..608ee9060 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -124,8 +125,12 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
     @Override
     @DataSource(name = DataSourceNames.TWELVE)
     public Result toLeadUserRegisterRandData() {
+        Map<String,Object> params = new HashMap<>();
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        params.put("startTime","2018-01-01");
+        params.put("endTime",nowTime);
         // 获取导出数据
-        List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(new HashMap<>());
+        List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(params);
         // 导入数据
         List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = ConvertUtils.sourceToTarget(toLeadUserRegisterRandData, MetaUserRegisterRankEntity.class);
         return insertBatch(metaUserRegisterRankEntities) ? new Result():new Result().error("导入注册用户排行失败");
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
index fb795db24..3b0d64678 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
@@ -43,6 +43,8 @@
                 #{streetId}
             </foreach>
         </if>
+        ORDER BY
+        pr.PARTY_MEMBER_COUNT DESC
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
index 592c90d7c..9c986fb5f 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
@@ -44,6 +44,8 @@
                 #{streetId}
             </foreach>
         </if>
+        ORDER BY
+        rr.USER_COUNT DESC
     </select>
 
     <select id="selectListStreetId" resultType="String">

From ad9527ffab32667ccd79dc85a89de0472278caaf Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 30 Mar 2020 15:34:43 +0800
Subject: [PATCH 03/14] =?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<SysUserEntity> {
      * @Date: 2020-01-09
      */
     Result<List<String>> 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<SysUserDao, SysUserEntit
         return new Result<List<String>>().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<DeptOption> 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<DeptOption> 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 <wt373747285@163.com>
Date: Mon, 30 Mar 2020 16:54:21 +0800
Subject: [PATCH 04/14] =?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<SysUserEntity> {
     * @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<SysUserDao, SysUserEntit
         }
     }
 
+    @Override
+    public Result updateAvatar(String avatar) {
+        if(StringUtils.isBlank(avatar)){
+            throw new RenException("头像地址不可为空");
+        }
+        String userId = SecurityUser.getUser().getId().toString();
+        SysUserEntity userInfo = baseDao.selectById(userId);
+        userInfo.setHeadUrl(avatar);
+        baseDao.updateById(userInfo);
+        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 7cf0da9f2..dc4cac939 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
@@ -209,4 +209,16 @@ public class ApiWorkUserController {
         return workUserService.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 workUserService.updateAvatar(avatar);
+    }
+
 }
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 b78436145..8c4f6d000 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
@@ -10,8 +10,10 @@ import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -100,4 +102,14 @@ public interface AdminFeignClient {
     */
     @GetMapping("sys/user/checkUpdateAvatar")
     Result checkUpdateAvatar();
+
+    /**
+    * @describe: 更新头像
+    * @author wangtong
+    * @date 2020/3/30 16:17
+    * @param [avatar]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping(value="sys/user/updateAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result updateAvatar(@RequestParam("avatar") String avatar);
 }
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 7ebc6edae..b8ccb3bd9 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
@@ -56,4 +56,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result checkUpdateAvatar() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "checkUpdateAvatar");
     }
+
+    @Override
+    public Result updateAvatar(String avatar) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "updateAvatar",avatar);
+    }
 }
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 eb4bcdad1..e30ff25e0 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
@@ -148,4 +148,13 @@ public interface WorkUserService {
     * @return
     */
     Result checkUpdateAvatar();
+
+    /**
+    * @describe: 更新头像
+    * @author wangtong
+    * @date 2020/3/30 16:13
+    * @param [avatar]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result updateAvatar(String avatar);
 }
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 4b0c042c2..6ea6a68b6 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
@@ -347,4 +347,9 @@ public class WorkUserServiceImpl implements WorkUserService {
     public Result checkUpdateAvatar() {
         return adminFeignClient.checkUpdateAvatar();
     }
+
+    @Override
+    public Result updateAvatar(String avatar) {
+        return adminFeignClient.updateAvatar(avatar);
+    }
 }

From b476fd5cfaad3547381b90bb771fe9cfb9390ff9 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 30 Mar 2020 17:44:19 +0800
Subject: [PATCH 05/14] =?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<SysUserDao, SysUserEntit
         }
     }
 
+    @Transactional
     @Override
     public Result updateAvatar(String avatar) {
         if(StringUtils.isBlank(avatar)){

From c5b40199094eab8cd4e4e19b3d85048ad0e78c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Tue, 31 Mar 2020 10:20:23 +0800
Subject: [PATCH 06/14] =?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 @@
                 <!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
                 <gateway.routes.epdc-cloud-analysis-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-cloud-analysis-server.uri>
 <!--                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>-->
+                <gateway.routes.epdc-work-record-server.uri>http://127.0.0.1:9085</gateway.routes.epdc-work-record-server.uri>
+                <!--                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server</gateway.routes.epdc-work-record-server.uri>-->
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
                 <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
@@ -173,6 +175,7 @@
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
                 <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
                 <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>
+                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server</gateway.routes.epdc-work-record-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
                 <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
@@ -212,6 +215,7 @@
                 <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
                 <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>
+                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server</gateway.routes.epdc-work-record-server.uri>
                 <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
                 <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
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?= <lipengfei@outlook.com>
Date: Tue, 31 Mar 2020 17:27:18 +0800
Subject: [PATCH 07/14] =?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?= <lipengfei@outlook.com>
Date: Thu, 2 Apr 2020 17:47:25 +0800
Subject: [PATCH 08/14] =?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<UploadImgAllDTO>().ok(uploadAll);
     }
 }

From 82659b1430273190bf45ab60cb6e11d44777715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 2 Apr 2020 18:00:42 +0800
Subject: [PATCH 09/14] =?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<UploadImgAllDTO> uploadImg(@RequestParam("file") MultipartFile file) throws Exception {
         if (file.isEmpty()) {
             return new Result<UploadImgAllDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
@@ -232,4 +232,26 @@ public class OssController {
         uploadAll.setFileName(file.getOriginalFilename());
         return new Result<UploadImgAllDTO>().ok(uploadAll);
     }
+    /**
+     * 文件上传
+     *
+     * @return void
+     * @author lpf
+     * @date 2020/04/02
+     */
+    @PostMapping("uploadFile")
+    @ApiOperation(value = "上传文件")
+    public Result<UploadImgAllDTO> uploadFile(@RequestParam("file") MultipartFile file) throws Exception {
+        if (file.isEmpty()) {
+            return new Result<UploadImgAllDTO>().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<UploadImgAllDTO>().ok(uploadAll);
+    }
 }

From 18ec6d38f87cff43d92461ba1a66f425083172f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 2 Apr 2020 18:06:43 +0800
Subject: [PATCH 10/14] =?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<UploadImgAllDTO> uploadFile(@RequestParam("file") MultipartFile file) throws Exception {
+    public Result<UploadImgAllDTO> uploadAllFile(@RequestParam("file") MultipartFile file) throws Exception {
         if (file.isEmpty()) {
             return new Result<UploadImgAllDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
         }

From 8738becc8c203f64dc134a18b38fd1ca7c2f5641 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 2 Apr 2020 20:56:20 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/item/ItemDao.xml    | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index a6528b3a2..6dcad3cfc 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -152,25 +152,40 @@
         LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID
         AND hp.DEL_FLAG = '0'
         AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID )
-        LEFT JOIN epdc_item_dept dept ON item.Id = dept.ITEM_ID AND dept.DEL_FLAG = '0'
         WHERE
-        item.DEL_FLAG = '0'
-        <if test="formDto.timestamp != null">
-            <![CDATA[ AND DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
-        </if>
-        AND dept.DEPT_ID IN
+        item.ID IN (
+        SELECT
+        tmp.ITEM_ID
+        FROM
+        (
+        SELECT DISTINCT
+        d.ITEM_ID
+        FROM
+        epdc_item_dept d
+        LEFT JOIN epdc_item it ON d.ITEM_ID = it.ID
+        WHERE
+        d.DEL_FLAG = '0'
+        AND it.DEL_FLAG = '0'
+        AND d.DEPT_ID IN
         <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
             #{deptIdItem}
         </foreach>
-        <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND dept.DEPT_ID = #{formDto.deptId}
+        <if test="formDto.timestamp != null">
+            <![CDATA[ AND DATE_FORMAT(it.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
         </if>
         <if test='formDto.itemState != null '>
-            AND item.ITEM_STATE = #{formDto.itemState}
+            AND it.ITEM_STATE = #{formDto.itemState}
+        </if>
+        <if test='formDto.deptId != null and formDto.deptId != ""'>
+            AND d.DEPT_ID = #{formDto.deptId}
         </if>
         ORDER BY
-        item.CREATED_TIME DESC
+        it.CREATED_TIME DESC
         LIMIT #{formDto.pageIndex},#{formDto.pageSize}
+        ) tmp
+        )
+        ORDER BY
+        item.CREATED_TIME DESC
     </select>
 
     <select id="selectListItemsOfMine" resultMap="itemsMap">

From 9aed106446b1918946fadaee5067b9fa69d36657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Tue, 7 Apr 2020 09:29:04 +0800
Subject: [PATCH 12/14] =?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();
+    }
+}

From c7d15fc84aa80a215b0bb23480f25057f5858c30 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 8 Apr 2020 09:31:05 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E7=BD=91=E6=A0=BC=E5=86=85=E5=8F=AF=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consult/service/impl/GridOperatorInfoServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
index 30bb4c1ff..720795bcf 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
@@ -144,7 +144,7 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
             throw new RenException("获取网格人员所属网格失败");
         }
 
-        QueryWrapper<GridOperatorInfoEntity> wrapper = new QueryWrapper<>();
+        /*QueryWrapper<GridOperatorInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("real_name", operatorInfo.getRealName())
                 .eq("mobile", operatorInfo.getMobile());
         List<GridOperatorInfoEntity> entityList = baseDao.selectList(wrapper);
@@ -155,7 +155,7 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
                     operatorGridIdList.remove(deptId);
                 }
             }
-        }
+        }*/
         return operatorGridIdList;
     }
 

From d215e68c88a8bf8a43428fc9aa6d3386cc812491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 8 Apr 2020 10:37:52 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MetaUserGridOpiningServiceImpl.java   | 10 ++++++++++
 .../epdc/service/impl/ScheduleJobUserServiceImpl.java  | 10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index 7e6548fa3..97b7e2ae0 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -34,6 +34,8 @@ import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
 import com.elink.esua.epdc.modules.user.dao.MetaUserGridOpiningDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
 import com.elink.esua.epdc.modules.user.service.MetaUserGridOpiningService;
+import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;
+import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +57,12 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     @Autowired
     private UserAnalysisService userAnalysisService;
 
+    @Autowired
+    private MetaUserPartyRankService metaUserPartyRankService;
+
+    @Autowired
+    private MetaUserRegisterRankService metaUserRegisterRankService;
+
     @Override
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserGridOpiningDTO> page(Map<String, Object> params) {
@@ -137,6 +145,8 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
         List<GridOpeningResultDTO> list = userAnalysisService.getToLeadGridOpenings(new HashMap<>());
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntities = ConvertUtils.sourceToTarget(list, MetaUserGridOpiningEntity.class);
         boolean b = insertBatch(metaUserGridOpiningEntities);
+        metaUserPartyRankService.toLeadPartyRankData();
+        metaUserRegisterRankService.toLeadUserRegisterRandData();
         return b?new Result<>():new Result().error("录入失败");
     }
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
index 246f39540..7a0726756 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
@@ -20,10 +20,10 @@ public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
     public void createUserAnalysisData() {
         // 网格开通
         userFeignClint.createUserAnalysisData();
-        // 用户注册
-        userFeignClint.toLeadUserRegisterRandData();
-
-        // 党员排行绑
-        userFeignClint.toLeadPartyRankData();
+//        // 用户注册
+//        userFeignClint.toLeadUserRegisterRandData();
+//
+//        // 党员排行绑
+//        userFeignClint.toLeadPartyRankData();
     }
 }