爱心互助-居民端

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 居民端-活动相关api
@@ -196,14 +197,14 @@ public class ResiActListController {
     /**
      * 活动详情-已结束-现场实况列表
      *
-     * @param actId
+     * @param map{actId:""}
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActLiveRecResultDTO>
      * @Author zhangyong
      * @Date 13:39 2020-07-21
      **/
     @PostMapping("livereclist")
-    public Result<ResiActLiveRecResultDTO> liveRecList(@RequestBody String actId) {
+    public Result<ResiActLiveRecResultDTO> liveRecList(@RequestBody Map<String, String> map) {
-        return actLiveRecService.liveRecList(actId);
+        return actLiveRecService.liveRecList(map);
     }
 
     //

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/HeartUserInfoDao.java

@@ -49,11 +49,11 @@ public interface HeartUserInfoDao extends BaseDao<HeartUserInfoEntity> {
      * 查询用户是否是志愿者：1是志愿者，0不是志愿者
      *
      * @param userId
-     * @return java.lang.Integer
+     * @return java.lang.Boolean
      * @Author zhangyong
      * @Date 13:53 2020-07-22
      **/
-    Integer selectUserVolunteerFlag(@Param("userId") String userId);
+    Boolean selectUserVolunteerFlag(@Param("userId") String userId);
 
     /**
      * 爱心榜

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

@@ -24,6 +24,8 @@ import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
 import com.epmet.dto.result.resi.ResiActLiveRecResultDTO;
 import com.epmet.entity.ActLiveRecEntity;
 
+import java.util.Map;
+
 /**
  * 活动实况记录
  *
@@ -35,12 +37,12 @@ public interface ActLiveRecService extends BaseService<ActLiveRecEntity> {
     /**
      * 活动详情-已结束-现场实况列表
      *
-     * @param actId
+     * @param map
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActLiveRecResultDTO>
      * @Author zhangyong
      * @Date 13:39 2020-07-21
      **/
-    Result<ResiActLiveRecResultDTO> liveRecList(String actId);
+    Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map);
 
     /**
      * 活动-添加实况

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

@@ -199,6 +199,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
 
     @Override
     public Result<List<ResiLookBackActResultDTO>> actLookBack(ResiActBaseFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
         List<ResiLookBackActResultDTO> lookBackAct = baseDao.selectListLookBackAct(formDTO);
         return new Result<List<ResiLookBackActResultDTO>>().ok(lookBackAct);
     }
@@ -211,8 +213,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         // 获取活动内容
         detailResultDTO.setActContent(baseDao.selectListActContent(formDto.getActId()));
         // 查询用户是否是志愿者
-        Integer volunteerFlag = heartUserInfoDao.selectUserVolunteerFlag(formDto.getUserId());
+        Boolean volunteerFlag = heartUserInfoDao.selectUserVolunteerFlag(formDto.getUserId());
-        detailResultDTO.setUserVolunteerFlag(volunteerFlag == 1);
+        detailResultDTO.setUserVolunteerFlag(volunteerFlag);
 
         // 获取用户报名状态
         String currentUserStatus = getCurrentUserStatus(formDto.getActId(), formDto.getUserId());

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

@@ -24,6 +24,8 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
+import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
@@ -48,6 +50,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 活动实况记录
@@ -69,37 +72,47 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     private ActLivePicDao actLivePicDao;
 
     @Override
-    public Result<ResiActLiveRecResultDTO> liveRecList(String actId) {
+    public Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map) {
+        // 数据汇总
+        ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO();
         // 查询实况记录
-        List<ActLiveRecDTO> actLives = baseDao.selectListActLives(actId);
+        List<ActLiveRecDTO> actLives = baseDao.selectListActLives(map.get("actId"));
         List<String> userIds = new ArrayList<>();
         List<String> liveIds = new ArrayList<>();
         for (ActLiveRecDTO actLive : actLives){
             userIds.add(actLive.getUserId());
             liveIds.add(actLive.getId());
         }
-        // 查询用户微信基础信息
+        if (actLives.size() > NumConstant.ZERO){
-        Result<List<UserBaseInfoResultDTO>> userWxInfos = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+            // 查询用户微信基础信息
-        // 根据活动实况id，查询对应实况的图片集合
+            Result<List<UserBaseInfoResultDTO>> userWxInfos = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
-        List<ActLivePicDTO> actLiveImg = baseDao.selectListActLiveImg(liveIds);
+            if (userWxInfos.getData().size() > NumConstant.ZERO){
-        // 数据汇总
+                // 根据活动实况id，查询对应实况的图片集合
-        ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO();
+                List<ActLivePicDTO> actLiveImg = baseDao.selectListActLiveImg(liveIds);
-        List<Object> dataContainer = new ArrayList<>();
+
-        for (int k = 0; k < actLives.size(); k++) {
+                List<Object> dataContainer = new ArrayList<>();
-            Map<String, Object> map = new HashMap<>();
+                for (int k = 0; k < actLives.size(); k++) {
-            map.put("nickname", userWxInfos.getData().get(k).getNickname());
+                    Map<String, Object> base = new HashMap<>();
-            map.put("headImg", userWxInfos.getData().get(k).getHeadImgUrl());
+                    base.put("nickname", userWxInfos.getData().get(k).getNickname());
-            map.put("desc", actLives.get(k).getDesc());
+                    base.put("headImg", userWxInfos.getData().get(k).getHeadImgUrl());
-            map.put("createdTime", actLives.get(k).getCreatedTime());
+                    base.put("desc", actLives.get(k).getDesc());
-            // 查询打卡对应图片
+                    base.put("createdTime", actLives.get(k).getCreatedTime());
-            List<String> imgUrlList = new ArrayList<>();
+                    // 查询打卡对应图片
-            for (ActLivePicDTO urlDto : actLiveImg) {
+                    List<String> imgUrlList = new ArrayList<>();
-                if (actLives.get(k).getId().equals(urlDto.getLiveId())) {
+                    for (ActLivePicDTO urlDto : actLiveImg) {
-                    imgUrlList.add(urlDto.getPicUrl());
+                        if (actLives.get(k).getId().equals(urlDto.getLiveId())) {
+                            imgUrlList.add(urlDto.getPicUrl());
+                        }
+                    }
+                    base.put("images", imgUrlList);
+                    dataContainer.add(base);
                 }
+                resultDto.setActLives(dataContainer);
+                resultDto.setActLiveNum(dataContainer.size());
+            } else {
+                logger.error("未查到用户基础信息");
+                throw new RenException("未查到用户基础信息");
             }
-            map.put("images", imgUrlList);
-            dataContainer.add(map);
         }
         return new Result<ResiActLiveRecResultDTO>().ok(resultDto);
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml

@@ -32,7 +32,7 @@
 
     <!-- 查询用户志愿者标识 -->
     <select id="selectUserVolunteerFlag" parameterType="java.lang.String"
-            resultType="java.lang.Integer">
+            resultType="java.lang.Boolean">
         SELECT
              VOLUNTEER_FLAG
         FROM heart_user_info u