Merge remote-tracking branch 'origin/test' into test

esua-epdc/docker-compose/prod/nginx/docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3.7'
+services:
+  web:
+    image: nginx
+    ports:
+      - 443:443
+    volumes:
+      - /mnt/nginx/html:/usr/share/nginx/html
+      - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro
+      - /mnt/nginx/logs:/var/log/nginx
+    restart: always
+    container_name: nginx_master
+

esua-epdc/docker-compose/test/nginx/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3.7'
+services:
+  web:
+    image: nginx
+    ports:
+      - 443:443
+    volumes:
+      - /opt/docker/nginx/html:/usr/share/nginx/html
+      - /opt/docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /opt/docker/nginx/conf.d:/etc/nginx/conf.d:ro
+      - /opt/docker/nginx/logs:/var/log/nginx
+      - /opt/docker/nginx/cert:/etc/nginx/cert:ro
+    restart: always
+    container_name: nginx_master
+

esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java

@@ -12,7 +12,7 @@ import lombok.Data;
 public class DeptEntityUtils {
 
     @Data
-    public class DeptDto {
+    public static class DeptDto {
         /**
          * 父所有部门ID
          */

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 取消报名参数
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-12-17
+ */
+@Data
+public class EpdcAppActUserCancelsignupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 活动ID
+     */
+	private String actId;
+    /**
+     * 取消报名原因
+     */
+    private String failureReason;
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -178,7 +178,7 @@
                 <server.port>9040</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_API</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -219,7 +219,7 @@
                 <server.port>9040</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_API</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -12,6 +13,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppActUserCancelsignupDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppActUserClockLogDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO;
 import com.elink.esua.epdc.service.ActUserRelationService;
@@ -84,15 +86,16 @@ public class ApiActUserRelationController {
      * 取消活动报名
      *
      * @param tokenDto
-     * @param actId
+     * @param epdcAppActUserCancelsignupDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author wanggongfeng
      * @date 2019/12/13 14:41
      */
     @PostMapping("cancelsignup")
-    public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,String actId) {
-        return actUserRelationService.activityCancelSignUp(tokenDto.getUserId(),actId);
-        //return actUserRelationService.activityCancelSignUp("0598a2e20eb2466ef0ebb42e930f3801",actId);
+    public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@RequestBody EpdcAppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
+        epdcAppActUserCancelsignupDTO.setUserId(tokenDto.getUserId());
+        AppActUserCancelsignupDTO actUserCancelsignupDTO = ConvertUtils.sourceToTarget(epdcAppActUserCancelsignupDTO, AppActUserCancelsignupDTO.class);
+        return actUserRelationService.activityCancelSignUp(actUserCancelsignupDTO);
 
     }
 
@@ -111,21 +114,6 @@ public class ApiActUserRelationController {
         appActUserClockLogDTO.setUserId(tokenDto.getUserId());
         return actUserRelationService.activityClock(appActUserClockLogDTO);
 
-       /* ArrayList<String> imgList = new ArrayList<String>();
-        imgList.add("http://123232323223");
-        imgList.add("http://12323232342423423");
-        EpdcAppActUserClockLogDTO epdcAppActUserClockLogDTO = new EpdcAppActUserClockLogDTO();
-        epdcAppActUserClockLogDTO.setActId("122");
-        epdcAppActUserClockLogDTO.setClockAddress("打卡描述");
-        epdcAppActUserClockLogDTO.setClockLatitude(new BigDecimal(123.122));
-        epdcAppActUserClockLogDTO.setClockLongitude(new BigDecimal(123.122));
-        epdcAppActUserClockLogDTO.setClockType("0");
-        epdcAppActUserClockLogDTO.setImages(imgList);
-        epdcAppActUserClockLogDTO.setClockAddress("山东省青岛市市北区台东路");
-        AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class);
-        appActUserClockLogDTO.setUserId("3f6448adbfbe736dde333f057a956012");
-        return actUserRelationService.activityClock(appActUserClockLogDTO);*/
-
     }
 
     /**
@@ -138,7 +126,7 @@ public class ApiActUserRelationController {
      * @date 2019/12/13 14:41
      */
     @GetMapping("clockList")
-    public Result<EpdcAppClockListDTO> getClockList(@LoginUser TokenDto tokenDto, @PathVariable("actId") String actId) {
+    public Result<EpdcAppClockListDTO> getClockList(@LoginUser TokenDto tokenDto, String actId) {
         Result<AppClockListDTO> result = actUserRelationService.getClockList(actId);
         EpdcAppClockListDTO epdcAppClockListDTO = ConvertUtils.sourceToTarget(result.getData(), EpdcAppClockListDTO.class);
         Result<EpdcAppClockListDTO> result1 = new Result<EpdcAppClockListDTO>();
@@ -156,7 +144,7 @@ public class ApiActUserRelationController {
      * @date 2019/12/13 14:41
      */
     @GetMapping("clockAddressDetail")
-    public Result<AppActInfoDTO> clockAddressDetail(@PathVariable("actId") String actId) {
+    public Result<AppActInfoDTO> clockAddressDetail(String actId) {
         return actUserRelationService.clockAddressDetail(actId);
 
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -32,11 +33,11 @@ public interface AppActUserRelationFeignClient {
 
     /**
      * 取消活动报名
-     * @param actId
+     * @param epdcAppActUserCancelsignupDTO
      * @return
      */
-    @GetMapping("heart/appactuserrelation/activityCancelSignUp/{userId}/{actId}")
-    Result activityCancelSignUp(@PathVariable("userId") String userId,@PathVariable("actId") String actId);
+    @GetMapping("heart/appactuserrelation/activityCancelSignUp")
+    Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO);
 
     /**
      * 活动打卡

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
@@ -21,8 +22,8 @@ public class AppActUserRelationFeignClientFallback implements AppActUserRelation
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activitySignUp", actUserRelationDTO);
     }
     @Override
-    public Result activityCancelSignUp(String userId,String actId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", userId,actId);
+    public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", epdcAppActUserCancelsignupDTO);
     }
 
     @Override

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -22,12 +23,11 @@ public interface ActUserRelationService {
 
     /**
      * 取消活动报名
-     * @param actId
-     * @param userId
+     * @param epdcAppActUserCancelsignupDTO
      * @Author wanggongfeng
      * @return
      */
-    Result activityCancelSignUp(String userId,String actId);
+    Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO);
 
     /**
      * 活动打卡

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
@@ -30,8 +31,8 @@ public class ActUserRelationServiceImpl implements ActUserRelationService {
     }
 
     @Override
-    public Result activityCancelSignUp(String userId,String actId) {
-        Result<Integer> dataResult = actInfoFeignClient.activityCancelSignUp(userId,actId);
+    public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
+        Result<Integer> dataResult = actInfoFeignClient.activityCancelSignUp(epdcAppActUserCancelsignupDTO);
         return dataResult;
     }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1107,21 +1107,21 @@ public class AppUserServiceImpl implements AppUserService {
         formDto.setSex(sex);                     // 性别
         formDto.setBirthday(birthday);           // 生日
         formDto.setUserId(tokenDto.getUserId()); // 用户ID
-        //验证是否为志愿者
+        // 验证是否为志愿者
         Result<Integer> volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId());
         if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) {
             return new Result().error("志愿者认证失败");
         } else if (volunteerCountResult.getData() == 0) {
-            //添加志愿者
+            // 添加志愿者
             Result<Integer> insertCountResult = userFeignClient.insertVolunteerInfo(formDto);
         }
 
-        //调用用户完善个人信息-保存
+        // 调用用户完善个人信息-保存
         EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class);
         if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
             epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());// 党员标志
         } else {
-            epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value());// 党员标志
+            epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); // 党员标志
         }
         Result<EpdcAppAuthorizationDTO> result = completeUserInfoNoVerifyCode(tokenDto, epdcCompleteUserInfoFormDTO);
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml

@@ -18,3 +18,4 @@ nacos:
 spring:
   application:
     name: epdc-api-server
+

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -178,7 +178,7 @@
                 <server.port>9066</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_EVENTS</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
                 <docker.tag>dev</docker.tag>
             </properties>
@@ -218,7 +218,7 @@
                 <server.port>9066</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_EVENTS</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
                 <docker.tag>test</docker.tag>
             </properties>

esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml

@@ -147,7 +147,7 @@
 
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_GROUP</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -178,7 +178,7 @@
 
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_GROUP</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.activity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 取消报名参数
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-12-17
+ */
+@Data
+public class AppActUserCancelsignupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 活动ID
+     */
+	private String actId;
+    /**
+     * 取消报名原因
+     */
+    private String failureReason;
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml

@@ -152,7 +152,7 @@
                 <server.port>9072</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_HEART</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -184,7 +184,7 @@
                 <server.port>9072</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_HEART</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.activity.controller;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.activity.service.ActUserRelationService;
@@ -49,12 +50,13 @@ public class AppActUserRelationController {
 
     /**
      * 取消活动报名
-     * @param actId
+     * @param appActUserCancelsignupDTO
      * @return
      */
-    @GetMapping("activityCancelSignUp/{userId}/{actId}")
-    public Result activityCancelSignUp(@PathVariable("userId")String userId, @PathVariable("actId")String actId){
-        return actUserRelationService.activityCancelSignUp(userId,actId);
+    @GetMapping("activityCancelSignUp")
+    public Result activityCancelSignUp(@RequestBody AppActUserCancelsignupDTO appActUserCancelsignupDTO){
+
+        return actUserRelationService.activityCancelSignUp(appActUserCancelsignupDTO);
     }
 
     /**

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.activity.service;
 
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
+import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
 import com.elink.esua.epdc.activity.AppClockListDTO;
 import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO;
@@ -119,12 +120,11 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
     /**
      * 取消活动报名
      *
-     * @param userId
-     * @param actId
+     * @param appActUserCancelsignupDTO
      * @author wanggongfeng
      * @date 2019-12-16
      */
-    Result activityCancelSignUp(String userId,String actId);
+    Result activityCancelSignUp(AppActUserCancelsignupDTO appActUserCancelsignupDTO);
 
     /**
      * 查询人员活动关系Id

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -238,6 +238,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         //查询人员活动关系Id
         ActUserRelationDTO actUserRelationDTO = actUserRelationService.getActUserRelationId(appActUserClockLogDTO.getUserId(),appActUserClockLogDTO.getActId());
         ActUserClockLogDTO actUserClockLogDTO = ConvertUtils.sourceToTarget(appActUserClockLogDTO, ActUserClockLogDTO.class);
+        if(actUserRelationDTO.getId() == null){
+            return new Result().error("打卡失败");
+        }
         actUserClockLogDTO.setActUserId(actUserRelationDTO.getId());
         actUserClockLogDTO.setClockTime(new Date());
         //存储打卡日志

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java

@@ -180,13 +180,14 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
     }
 
     @Override
-    public Result activityCancelSignUp(String userId,String actId) {
+    public Result activityCancelSignUp(AppActUserCancelsignupDTO appActUserCancelsignupDTO) {
 
         //查询是否已报名
-        List<ActUserRelationDTO> data = baseDao.selectOneActUserRelationInfo(userId,actId);
+        List<ActUserRelationDTO> data = baseDao.selectOneActUserRelationInfo(appActUserCancelsignupDTO.getUserId(),appActUserCancelsignupDTO.getActId());
         if(data != null && data.size() > 0){
             ActUserRelationDTO actUserRelationDTO = data.get(0);
             actUserRelationDTO.setStatus("3");//取消报名
+            actUserRelationDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason());//取消报名原因
             //已报名该活动，进行取消报名
             //更新活动人员关系表
             ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class);

esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml

@@ -168,7 +168,7 @@
                 <server.port>9061</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_JOB</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -198,7 +198,7 @@
                 <server.port>9061</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_JOB</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java

@@ -15,12 +15,12 @@ public enum KpiResultGridDataEnum {
     /***
      * 群众反映问题网格响应率得分
      */
-    GIRD_PROBLEM_RESPONSE_RATE_SCORE("gird_problem_response_rate_score","群众反映问题网格响应率得分"),
+    GRID_PROBLEM_RESPONSE_RATE_SCORE("grid_problem_response_rate_score","群众反映问题网格响应率得分"),
 
     /***
      * 群众反映问题网格办理满意率得分
      */
-    GIRD_PROBLEM_SATISFACTION_RATE_SCORE("gird_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分");
+    GRID_PROBLEM_SATISFACTION_RATE_SCORE("grid_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分");
 
 
     private String value;

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml

@@ -138,7 +138,7 @@
                 <server.port>9987</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_KPI</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -168,7 +168,7 @@
                 <server.port>9987</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_KPI</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java

@@ -135,7 +135,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
         responseDetail.append(mapBigDecimal.get("peopleReportAmount") + ",");
         responseDetail.append("群众反应问题响应数:" + mapBigDecimal.get("peopleReportRespAmount"));
         dto.setRownum(2);
-        dto.setRule(KpiResultGridDataEnum.GIRD_PROBLEM_RESPONSE_RATE_SCORE.getName());
+        dto.setRule(KpiResultGridDataEnum.GRID_PROBLEM_RESPONSE_RATE_SCORE.getName());
         dto.setDetail(responseDetail.toString());
         listMap.add(dto);
 
@@ -145,7 +145,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
         satisfiedDetail.append("调查总数：" + mapBigDecimal.get("total") + ";满意数：" + mapBigDecimal.get("peopleHighEvaluationAmount") + ";基本满意数："
                 + mapBigDecimal.get("peopleMediumEvaluationAmount") + ";不满意数：" + mapBigDecimal.get("peopleLowEvaluationAmount"));
         dto1.setRownum(3);
-        dto1.setRule(KpiResultGridDataEnum.GIRD_PROBLEM_SATISFACTION_RATE_SCORE.getName());
+        dto1.setRule(KpiResultGridDataEnum.GRID_PROBLEM_SATISFACTION_RATE_SCORE.getName());
         dto1.setDetail(satisfiedDetail.toString());
         listMap.add(dto1);
         return listMap;

esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@@ -133,7 +133,7 @@
                 <server.port>9064</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_NEWS</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -163,7 +163,7 @@
                 <server.port>9064</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_NEWS</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@@ -181,7 +181,7 @@
                 <server.port>9065</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_OSS</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -211,7 +211,7 @@
                 <server.port>9065</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_OSS</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -46,7 +47,7 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 姓名
      */
-    private String fullName;
+    private String realName;
 
     /**
      * 性别(0-女，1-男)
@@ -81,7 +82,7 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 网格ID
      */
-    private Long girdId;
+    private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java

@@ -34,8 +34,8 @@ public class EpdcCompleteVolunteerInfoFormDTO implements Serializable {
     @NotBlank(message = "手机号不能为空")
     private String mobile;
 
-    @NotBlank(message = "党员标识不能为空")
-    private String partyFlag;
+    //@NotBlank(message = "党员标识不能为空")
+    //private String partyFlag;
 
     /**
      * 身份证号码

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java

@@ -31,7 +31,7 @@ public class EpdcAdjustVolunteerPointsDTO implements Serializable {
 	/**
 	 * 姓名
 	 */
-	private String fullName;
+	private String realName;
 
 	/**
 	 * 性别(0-女，1-男)

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java

@@ -22,7 +22,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable {
     /**
      * 姓名
      */
-    private String fullName;
+    private String realName;
 
     /**
      * 性别(0-女，1-男)
@@ -58,7 +58,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable {
     /**
      * 网格ID
      */
-    private Long girdId;
+    private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@@ -144,7 +144,7 @@
                 <server.port>9068</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
-                <nacos.config.group>EPDC_USER</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
@@ -174,7 +174,7 @@
                 <server.port>9068</server.port>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
-                <nacos.config.group>EPDC_USER</nacos.config.group>
+                <nacos.config.group>EPDC_CONFIG_GROUP</nacos.config.group>
                 <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -5,16 +5,8 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.service.UserInvitationRecordService;
 import com.elink.esua.epdc.service.UserService;
@@ -411,7 +403,6 @@ public class EpdcAppUserController {
      */
     @GetMapping("needCachingUserInfoByUserId/{userId}")
     public Result<CachingUserInfoDTO> needCachingUserInfoByUserId(@PathVariable("userId") String userId) {
-        //TODO:尹作梅
-        return null;
+        return userService.cachingUserInfoByUserId(userId);
     }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java

@@ -9,10 +9,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.service.VolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -46,7 +43,7 @@ public class EpdcAppVolunteerInfoController {
      * @return
      */
     @GetMapping("insertVolunteerInfo")
-    public Result<Integer> insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) {
+    public Result<Integer> insertVolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) {
         //效验数据
         ValidatorUtils.validateEntity(epdcCompleteVolunteerInfoFormDTO, UpdateGroup.class, DefaultGroup.class);
         Result<Integer> result = volunteerInfoService.insertVolunteerInfo(epdcCompleteVolunteerInfoFormDTO);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -176,4 +176,13 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @Date 2019/12/18 14:12
      **/
     CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
+
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.dto.CachingUserInfoDTO
+     * @Author yinzuomei
+     * @Description 根据用户id查询CachingUserInfoDTO
+     * @Date 2020/1/15 17:43
+     **/
+    CachingUserInfoDTO selectCachingUserInfoDTOByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java

@@ -46,7 +46,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity {
     /**
      * 姓名
      */
-	private String fullName;
+	private String realName;
 
     /**
      * 性别(0-女，1-男)
@@ -82,7 +82,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity {
     /**
      * 网格ID
      */
-	private Long girdId;
+	private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java

@@ -38,7 +38,7 @@ public class VolunteerInfoExcel {
     private String userId;
 
     @Excel(name = "姓名")
-    private String fullName;
+    private String realName;
 
     @Excel(name = "性别(0-女，1-男)")
     private String sex;
@@ -62,7 +62,7 @@ public class VolunteerInfoExcel {
     private Integer points;
 
     @Excel(name = "网格ID")
-    private Long girdId;
+    private Long gridId;
 
     @Excel(name = "父所有部门ID")
     private String parentDeptIds;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -22,16 +22,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 
 import java.util.List;
@@ -289,5 +281,12 @@ public interface UserService extends BaseService<UserEntity> {
      **/
     Result handleUserPoints(EpdcUserPointsFormDTO formDTO);
 
-
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2020/1/15 17:40
+     **/
+    Result<CachingUserInfoDTO> cachingUserInfoByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -34,11 +33,8 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
-import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.MessageUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
 import com.elink.esua.epdc.constant.UserFieldConsant;
@@ -46,22 +42,14 @@ import com.elink.esua.epdc.dao.*;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.entity.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
-import com.elink.esua.epdc.exception.UserModuleErrorCode;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.PartyMembersService;
 import com.elink.esua.epdc.service.UserGridRelationService;
@@ -72,7 +60,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户信息表
@@ -111,14 +102,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private AdminFeignClient adminFeignClient;
 
-    private UserDetailRedis userDetailRedis;
-
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         this.verifyParams(params);
         Long userId = SecurityUser.getUserId();
-        // 查询当前用户所具有的的数据权限
-        UserDetail userDetail = userDetailRedis.get(userId);
         IPage<UserDTO> iPage = this.getPage(params);
         List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params);
         return new PageData<>(userDtoList, iPage.getTotal());
@@ -366,7 +353,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userEntity.setFaceImg(null);
             userEntity.setId(userId);
             //用户已绑定手机号时不更新手机号
-            if(StringUtils.isNotBlank(existUser.getMobile())){
+            if (StringUtils.isNotBlank(existUser.getMobile())) {
                 userEntity.setMobile(existUser.getMobile());
             }
             this.updateById(userEntity);
@@ -1067,6 +1054,22 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result();
     }
 
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2020/1/15 17:40
+     **/
+    @Override
+    public Result<CachingUserInfoDTO> cachingUserInfoByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            throw new RenException("userId不能为空");
+        }
+        CachingUserInfoDTO cachingUserInfoDTO = baseDao.selectCachingUserInfoDTOByUserId(userId);
+        return new Result<CachingUserInfoDTO>().ok(cachingUserInfoDTO);
+    }
+
     /**
      * 根据微信信息查询用户
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -247,7 +247,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         volunteerEntity.setAddress(address);      // 居住地址
 
         // 获取部门信息
-        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGirdId()+"");
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGridId()+"");
         ParentAndAllDeptDTO parentAndAllDeptDTO = dtoResult.getData();
 
         volunteerEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());    // 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -422,9 +422,9 @@
             limit 1
         )as grid
         FROM
-            epdc_user eu
+        epdc_user eu
         WHERE
-            eu.DEL_FLAG = '0'
+        eu.DEL_FLAG = '0'
         <if test="openId!=null and openId!=''">
             and eu.WX_OPEN_ID=#{openId}
         </if>
@@ -432,4 +432,35 @@
             and eu.WX_UNION_ID=#{unionId}
         </if>
     </select>
+
+    <!-- 根据用户id查询CachingUserInfoDTO   -->
+    <select id="selectCachingUserInfoDTOByUserId" parameterType="java.lang.String" resultMap="CachingUserInfoDTOMap">
+        SELECT
+            eu.ID,
+            eu.NICKNAME,
+            eu.MOBILE,
+            eu.FACE_IMG,
+            eu.SEX,
+            eu.REAL_NAME,
+            eu.STATE,
+            eu.REMARK,
+        (select r.GRID_ID
+            from epdc_user_grid_relation r
+            where r.USER_ID=eu.ID
+            order by r.CREATED_TIME desc
+            limit 1
+        )as gridId,
+        (
+            select r.GRID
+            from epdc_user_grid_relation r
+            where r.USER_ID=eu.ID
+            order by r.CREATED_TIME desc
+            limit 1
+        )as grid
+        FROM
+            epdc_user eu
+        WHERE
+            eu.DEL_FLAG = '0'
+            and eu.id=#{userId}
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -6,7 +6,7 @@
     <resultMap type="com.elink.esua.epdc.entity.VolunteerInfoEntity" id="volunteerInfoMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
-        <result property="fullName" column="FULL_NAME"/>
+        <result property="realName" column="REAL_NAME"/>
         <result property="sex" column="SEX"/>
         <result property="birthday" column="BIRTHDAY"/>
         <result property="mobile" column="MOBILE"/>
@@ -14,7 +14,7 @@
         <result property="kindnessTime" column="KINDNESS_TIME"/>
         <result property="participationNum" column="PARTICIPATION_NUM"/>
         <result property="points" column="POINTS"/>
-        <result property="girdId" column="GIRD_ID"/>
+        <result property="gridId" column="GRID_ID"/>
         <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
         <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
         <result property="allDeptIds" column="ALL_DEPT_IDS"/>
@@ -41,7 +41,7 @@
         SELECT
                 v.ID id,
 				v.USER_ID userId,
-				v.FULL_NAME fullName,
+				v.REAL_NAME realName,
 				v.SEX sex,
 				v.BIRTHDAY birthday,
                 date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString,
@@ -55,8 +55,8 @@
         FROM
         epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID
         where 1=1
-        <if test="fullName !='' and fullName != null">
-            and v.FULL_NAME = #{fullName}
+        <if test="realName !='' and realName != null">
+            and v.REAL_NAME = #{realName}
         </if>
         <if test="mobile !='' and mobile != null">
             and v.MOBILE = #{mobile}
@@ -74,8 +74,8 @@
         FROM
         epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID
 		where 1=1
-        <if test="fullName !='' and fullName != null">
-            and v.FULL_NAME = #{fullName}
+        <if test="realName !='' and realName != null">
+            and v.REAL_NAME = #{realName}
         </if>
         <if test="mobile !='' and mobile != null">
             and v.MOBILE = #{mobile}
@@ -90,7 +90,7 @@
         SELECT
         v.ID id,
         v.USER_ID userId,
-        v.FULL_NAME fullName,
+        v.REAL_NAME realName,
         v.SEX sex,
         v.BIRTHDAY birthday,
         date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString,
@@ -109,10 +109,10 @@
     <select id="getVolunteerUserDefaultValue" resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
         SELECT
             eu.ID userId,
-            eu.REAL_NAME fullName,
+            eu.REAL_NAME realName,
             eu.MOBILE mobile,
             eu.IDENTITY_NO identityNo,
-			eugr.GRID_ID girdId,
+			eugr.GRID_ID gridId,
             eu.PARENT_DEPT_IDS parentDeptIds,
             eu.PARENT_DEPT_NAMES parentDeptNames,
             eu.ALL_DEPT_IDS allDeptIds,
@@ -155,7 +155,7 @@
         SELECT
             m.id,
             m.USER_ID as userId,
-            m.FULL_NAME as fullName,
+            m.REAL_NAME as realName,
             m.SEX,
             DATE_FORMAT(m.BIRTHDAY,'%Y-%m-%d') as birthday,
             m.MOBILE,