爱心互助-代码清理

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -1,49 +0,0 @@
-package com.epmet.feign;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UserRoleFormDTO;
-import com.epmet.dto.form.WxUserInfoFormDTO;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
-import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-
-/**
- * 用户模块
- *
- * @author zhangyong
- * @date 2020/7/22 14:51
- */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
-public interface EpmetUserFeignClient {
-
-	/**
-	 * @param userIds
-	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.UserBaseInfoResultDTO>>
-	 * @author zhangyong
-	 * @description 传入用户id集合，返回用户的基本信息（包含微信基本信息）
-	 * @Date 2020/7/22 9:30
-	 **/
-	@PostMapping("epmetuser/userbaseinfo/queryuserbaseinfo")
-	Result<List<UserBaseInfoResultDTO>> heartQueryUserBaseInfo(@RequestBody List<String> userIds);
-
-	/**
-	 * 同步-居民基础信息、用户微信信息
-     *
-     * @param formDTO
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author zhangyong
-	 * @Date 14:37 2020-07-23
-	 **/
-    @PostMapping("epmetuser/user/updateUserBaseAndWxUserInfo")
-    Result updateUserBaseAndWxUserInfo(@RequestBody WxUserInfoFormDTO formDTO);
-}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -1,33 +0,0 @@
-package com.epmet.feign.fallback;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.WxUserInfoFormDTO;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
-import com.epmet.feign.EpmetUserFeignClient;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @author zhangyong
- * @date 2020/7/22 14:51
- */
-@Component
-public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
-
-    @Override
-    public Result<List<UserBaseInfoResultDTO>> heartQueryUserBaseInfo(List<String> userIds) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "heartQueryUserBaseInfo", userIds);
-    }
-
-
-    @Override
-    public Result updateUserBaseAndWxUserInfo(WxUserInfoFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateUserBaseAndWxUserInfo", formDTO);
-    }
-}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java

@@ -20,7 +20,6 @@ package com.epmet.service.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ActLivePicDao;
 import com.epmet.dao.ActLiveRecDao;
@@ -31,8 +30,7 @@ import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.resi.ResiActLiveRecResultDTO;
 import com.epmet.entity.ActLivePicEntity;
 import com.epmet.entity.ActLiveRecEntity;
-import com.epmet.entity.ActSignInRecEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.ActLiveRecRedis;
 import com.epmet.service.ActLiveRecService;
 import com.epmet.utils.ValidityVerification;
@@ -55,7 +53,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     private ActLiveRecRedis actLiveRecRedis;
 
     @Autowired
-    private EpmetUserFeignClient epmetUserFeignClient;
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Autowired
     private ActLivePicDao actLivePicDao;
@@ -71,7 +69,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
             liveIds.add(actLive.getId());
         }
         // 查询用户微信基础信息
-        Result<List<UserBaseInfoResultDTO>> userWxInfos = epmetUserFeignClient.heartQueryUserBaseInfo(userIds);
+        Result<List<UserBaseInfoResultDTO>> userWxInfos = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
         // 根据活动实况id，查询对应实况的图片集合
         List<ActLivePicDTO> actLiveImg = baseDao.selectListActLiveImg(liveIds);
         // 数据汇总

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -17,34 +17,24 @@
 
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.VolunteerInfoDao;
 import com.epmet.dto.HeartUserInfoDTO;
-import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.WxUserInfoFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.entity.VolunteerInfoEntity;
-import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.VolunteerInfoRedis;
 import com.epmet.service.HeartUserInfoService;
 import com.epmet.service.VolunteerInfoService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 志愿者信息
  *
@@ -58,7 +48,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     private VolunteerInfoRedis volunteerInfoRedis;
 
     @Autowired
-    private EpmetUserFeignClient epmetUserFeignClient;
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Autowired
     private HeartUserInfoService heartUserInfoService;
@@ -76,6 +66,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         } else {
             // 不是志愿者：插入志愿者信息表
             baseDao.insert(volunteerInfoEntity);
+            // 发送消息 由积分系统消费消息（需要使用规则）
+            //?
+
             // 更新用户信息表的 是否是志愿者标识
             HeartUserInfoDTO userInfoDTO = new HeartUserInfoDTO();
             userInfoDTO.setUserId(tokenDto.getUserId());
@@ -84,6 +77,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         }
         // 更新用户基础信息表 并 更新用户微信表
         WxUserInfoFormDTO wxUserInfoFormDTO = ConvertUtils.sourceToTarget(formDTO, WxUserInfoFormDTO.class);
-        return epmetUserFeignClient.updateUserBaseAndWxUserInfo(wxUserInfoFormDTO);
+        return epmetUserOpenFeignClient.updateUserBaseAndWxUserInfo(wxUserInfoFormDTO);
     }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -159,4 +159,15 @@ public interface EpmetUserOpenFeignClient {
      **/
     @GetMapping(value = "epmetuser/userrole/getuserroleinfobyuserid/{userId}")
     Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(@PathVariable("userId") String userId);
+
+    /**
+     * 同步-居民基础信息、用户微信信息
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 14:37 2020-07-23
+     **/
+    @PostMapping("epmetuser/user/updateUserBaseAndWxUserInfo")
+    Result updateUserBaseAndWxUserInfo(@RequestBody WxUserInfoFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -103,4 +103,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleInfoByUserId", userId);
     }
+
+    @Override
+    public Result updateUserBaseAndWxUserInfo(WxUserInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateUserBaseAndWxUserInfo", formDTO);
+    }
 }