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

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class IcMessageListFormDTO implements Serializable {
+	private static final long serialVersionUID = 2697079163476964749L;
+
+	private Integer pageNo = 1;
+	private Integer pageSize = 20;
+	private Boolean isPage = false;
+	//token中信息
+	private String customerId;
+	private String userId;
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java

@@ -1,7 +1,9 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -10,6 +12,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcMessageDTO;
 import com.epmet.dto.form.IcMessageFormDTO;
+import com.epmet.dto.form.IcMessageListFormDTO;
 import com.epmet.service.IcMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,10 +34,11 @@ public class IcMessageController {
     @Autowired
     private IcMessageService icMessageService;
 
-    @RequestMapping("page")
-    public Result<PageData<IcMessageDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcMessageDTO> page = icMessageService.page(params);
-        return new Result<PageData<IcMessageDTO>>().ok(page);
+    @RequestMapping("list")
+    public Result<PageData<IcMessageDTO>> list(@LoginUser TokenDto tokenDto, @RequestBody IcMessageListFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<PageData<IcMessageDTO>>().ok(icMessageService.list(formDTO));
     }
 
     @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java

@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcMessageDTO;
+import com.epmet.dto.form.IcMessageListFormDTO;
 import com.epmet.entity.IcMessageEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户消息表(党建小助手)
  *
@@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcMessageDao extends BaseDao<IcMessageEntity> {
-	
+
+    List<IcMessageDTO> selectMessageList(IcMessageListFormDTO formDTO);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcMessageDTO;
 import com.epmet.dto.form.IcMessageFormDTO;
+import com.epmet.dto.form.IcMessageListFormDTO;
 import com.epmet.entity.IcMessageEntity;
 
 import java.util.List;
@@ -18,25 +19,15 @@ import java.util.Map;
  */
 public interface IcMessageService extends BaseService<IcMessageEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IcMessageDTO>
-     * @author generator
-     * @date 2022-08-19
-     */
-    PageData<IcMessageDTO> page(Map<String, Object> params);
-
     /**
      * 默认查询
      *
-     * @param params
+     * @param formDTO
      * @return java.util.List<IcMessageDTO>
      * @author generator
      * @date 2022-08-19
      */
-    List<IcMessageDTO> list(Map<String, Object> params);
+    PageData<IcMessageDTO> list(IcMessageListFormDTO formDTO);
 
     /**
      * 单条查询

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java

@@ -4,20 +4,34 @@ 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.FieldConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.DictTypeEnum;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcMessageDao;
 import com.epmet.dto.IcMessageDTO;
 import com.epmet.dto.form.IcMessageFormDTO;
+import com.epmet.dto.form.IcMessageListFormDTO;
+import com.epmet.dto.form.IcMoveInListFormDTO;
+import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.IcMoveInListResultDTO;
 import com.epmet.entity.IcMessageEntity;
 import com.epmet.service.IcMessageService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 用户消息表(党建小助手)
@@ -30,19 +44,11 @@ public class IcMessageServiceImpl extends BaseServiceImpl<IcMessageDao, IcMessag
 
 
     @Override
-    public PageData<IcMessageDTO> page(Map<String, Object> params) {
-        IPage<IcMessageEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IcMessageDTO.class);
-    }
-
-    @Override
-    public List<IcMessageDTO> list(Map<String, Object> params) {
-        List<IcMessageEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IcMessageDTO.class);
+    public PageData<IcMessageDTO> list(IcMessageListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        List<IcMessageDTO> list = baseDao.selectMessageList(formDTO);
+        PageInfo<IcMessageDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
     }
 
     private QueryWrapper<IcMessageEntity> getWrapper(Map<String, Object> params){

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml

@@ -3,6 +3,24 @@
 
 <mapper namespace="com.epmet.dao.IcMessageDao">
 
-
+    <select id="selectMessageList" resultType="com.epmet.dto.IcMessageDTO">
+        SELECT
+            id,
+            customer_id,
+            grid_id,
+            user_id,
+            app,
+            message_type,
+            target_id,
+            title,
+            message_content,
+            read_flag
+        FROM
+            ic_message
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND user_id = #{userId}
+    </select>
 
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

@@ -247,26 +247,10 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
      */
     @Override
     public ActAndScheduleListResultDTO getActAndScheduleList(ActAndScheduleListFormDTO formDTO) {
-        CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
-        formDTO.setAgencyId(staffInfo.getAgencyId());
-        IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
-        if (null == icPartyOrgDTO){
-            throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
-        }
-        formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
+        disposeActAndScheduleListFormDTO(formDTO);
         List<ActAndScheduleListResultDTO.ActivityListDTO> activityList = baseDao.getActivityList(formDTO);
         if (CollectionUtils.isNotEmpty(activityList)){
-            List<String> partyOrgIdsNoDistinct = new ArrayList<>();
-            activityList.forEach(a -> {
-                partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList()));
-            });
-            List<String> partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList());
-            List<ActAndScheduleListResultDTO.JoinOrgDTO> partyOrg = partyOrgDao.getPartyOrg(partyOrgIds);
-            activityList.forEach(a -> {
-                a.setIsMe(formDTO.getStaffId().equals(a.getStaffId()));
-                a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName())));
-                a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList()));
-            });
+            disposeActivityList(formDTO,activityList);
         }
         List<ActAndScheduleListResultDTO.ScheduleListDTO> scheduleList = scheduleDao.getScheduleList(formDTO);
         if (CollectionUtils.isNotEmpty(scheduleList)){
@@ -288,22 +272,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
      */
     @Override
     public List<ActAndScheduleListResultDTO> homeSearch(ActAndScheduleListFormDTO formDTO) {
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        if (null == staffInfo){
-            throw new EpmetException("查询工作人员失败："+formDTO.getStaffId());
-        }
-        formDTO.setAgencyId(staffInfo.getAgencyId());
-        IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
-        if (null == icPartyOrgDTO){
-            throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
-        }
-        formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
+        disposeActAndScheduleListFormDTO(formDTO);
         List<ActAndScheduleListResultDTO> result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate());
         List<ActAndScheduleListResultDTO.ActivityListDTO> activityList = baseDao.getActivityList(formDTO);
         if (CollectionUtils.isNotEmpty(activityList)){
-            activityList.forEach(a -> {
-                a.setIsMe(formDTO.getStaffId().equals(a.getStaffId()));
-            });
+            disposeActivityList(formDTO,activityList);
             Map<String, List<ActAndScheduleListResultDTO.ActivityListDTO>> groupByDateId = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getDateId));
             result.forEach(r -> {
                 groupByDateId.forEach((dateId,list) -> {
@@ -331,6 +304,50 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         }
         return result;
     }
+
+    /**
+     * Desc:
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/19 17:26
+     */
+    public void disposeActAndScheduleListFormDTO(ActAndScheduleListFormDTO formDTO){
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo){
+            throw new EpmetException("查询工作人员失败："+formDTO.getStaffId());
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+        IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
+        if (null == icPartyOrgDTO){
+            throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
+        }
+        formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
+
+    }
+
+    /**
+     * Desc: 组装activityList
+     * @param formDTO
+     * @param activityList
+     * @author zxc
+     * @date 2022/8/19 17:19
+     */
+    public void disposeActivityList(ActAndScheduleListFormDTO formDTO,List<ActAndScheduleListResultDTO.ActivityListDTO> activityList){
+        List<String> partyOrgIdsNoDistinct = new ArrayList<>();
+        activityList.forEach(a -> {
+            partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList()));
+        });
+        List<String> partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList());
+        List<ActAndScheduleListResultDTO.JoinOrgDTO> partyOrg = partyOrgDao.getPartyOrg(partyOrgIds);
+        if (CollectionUtils.isNotEmpty(activityList)) {
+            activityList.forEach(a -> {
+                a.setIsMe(formDTO.getStaffId().equals(a.getStaffId()));
+                a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName())));
+                a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList()));
+            });
+        }
+    }
+
     public static List<ActAndScheduleListResultDTO> constructHomeSearchData(String startDate,String endDate){
         List<ActAndScheduleListResultDTO> result = new ArrayList<>();
         if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){