支部信息及未读消息数

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@@ -1,6 +1,7 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.SysSmsDTO;
 import com.epmet.dto.form.*;
@@ -135,4 +136,7 @@ public interface EpmetMessageOpenFeignClient {
     @PostMapping(value = "message/icMessage/saveicmessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result saveIcMessageList(List<UserMessageFormDTO> msgList);
 
+    @PostMapping(value = "message/icMessage/unreadcount/{userId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<Integer> unReadCount(@PathVariable("userId") String userId);
+
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java

@@ -84,4 +84,9 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig
         return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveIcMessageList", msgList);
     }
 
+    @Override
+    public Result<Integer> unReadCount(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "unReadCount", userId);
+    }
+
 }

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

@@ -96,5 +96,10 @@ public class IcMessageController {
         return new Result();
     }
 
+    @PostMapping("unreadcount/{userId}")
+    public Result<Integer> unReadCount(@PathVariable ("userId") String userId) {
+        return new Result<Integer>().ok(icMessageService.unReadCount(userId));
+    }
+
 
 }

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

@@ -6,6 +6,7 @@ import com.epmet.dto.form.IcMessageListFormDTO;
 import com.epmet.dto.form.ReadIcMessageFormDTO;
 import com.epmet.entity.IcMessageEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,4 +22,6 @@ public interface IcMessageDao extends BaseDao<IcMessageEntity> {
     List<IcMessageDTO> selectMessageList(IcMessageListFormDTO formDTO);
 
     void upByUserId(ReadIcMessageFormDTO formDTO);
+
+    Integer selectUnReadCount(@Param("userId") String userId);
 }

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

@@ -73,4 +73,6 @@ public interface IcMessageService extends BaseService<IcMessageEntity> {
     void saveIcMessageList(List<IcMessageFormDTO> msgList);
 
     void read(ReadIcMessageFormDTO formDTO);
+
+    Integer unReadCount(String userId);
 }

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

@@ -107,4 +107,9 @@ public class IcMessageServiceImpl extends BaseServiceImpl<IcMessageDao, IcMessag
         baseDao.upByUserId(formDTO);
     }
 
+    @Override
+    public Integer unReadCount(String userId) {
+        return baseDao.selectUnReadCount(userId);
+    }
+
 }

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

@@ -34,4 +34,14 @@
         AND user_id = #{userId}
     </update>
 
+    <select id="selectUnReadCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM
+            ic_message
+        WHERE
+            del_flag = '0'
+        AND user_id = #{userId}
+    </select>
+
 </mapper>

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IcPartyInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 所属支部Id
+     */
+    private String id = "";
+
+    /**
+     * 所属支部名称
+     */
+    private String partOrgName = "";
+
+    /**
+     * 未读消息数
+     */
+    private Integer count;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java

@@ -6,6 +6,7 @@ import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.dto.result.PartyMemberEducationResultDTO;
 import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -74,4 +75,6 @@ public interface IcPartyMemberDao extends BaseDao<IcPartyMemberEntity> {
     * @return java.util.List<com.epmet.commons.tools.dto.result.OptionDataResultDTO>
     */
     List<OptionDataResultDTO> getPartyMemberAgeStatistics(@Param("agencyId") String agencyId,@Param("orgId") String orgId);
+
+    IcPartyInfoResultDTO selectByUserId(@Param("userId") String userId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java

@@ -11,6 +11,7 @@ import com.epmet.dto.result.PartyMemberEducationResultDTO;
 import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
 
 import java.nio.file.Path;
@@ -147,4 +148,6 @@ public interface IcPartyMemberService extends BaseService<IcPartyMemberEntity> {
      * @param filePath
      */
     void execAsyncExcelImport(Path filePath, String importTaskId);
+
+    IcPartyInfoResultDTO partyInfo(TokenDto tokenDto);
 }

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

@@ -13,12 +13,14 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.enums.PartyPostEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -31,10 +33,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO;
 import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.dto.result.PartyMemberEducationResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.*;
-import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.OperCustomizeOpenFeignClient;
-import com.epmet.feign.OssFeignClient;
 import com.epmet.modules.partyOrg.dao.IcPartyOrgDao;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
 import com.epmet.modules.partyOrg.service.IcPartyOrgService;
@@ -49,6 +48,7 @@ import com.epmet.modules.partymember.excel.handler.IcPartyMemberImportListener;
 import com.epmet.modules.partymember.service.IcPartyMemberService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
 import com.epmet.utils.ImportTaskUtils;
 import com.github.pagehelper.PageHelper;
@@ -60,6 +60,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.util.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -101,6 +102,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
     private IcPartyMemberPointDao icPartyMemberPointDao;
     @Resource
     private OssFeignClient ossFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     @Override
     public PageData<IcPartyMemberResultDTO> page(TokenDto tokenDto, IcPartyMemberFromDTO formDTO) {
@@ -706,4 +709,23 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
 
     }
 
+    @Override
+    public IcPartyInfoResultDTO partyInfo(TokenDto tokenDto) {
+        //epmetMessageOpenFeignClient
+        IcPartyInfoResultDTO resultDTO = new IcPartyInfoResultDTO();
+        //1.判断是居民端用户查询其党支部信息
+        //根据token判断查询党支部信息和未读消息数，居民端用户根据userId查询partymember_info表关联ic_party_member、ic_party_org查询支部信息，工作段端不用查支部信息
+        if ("resi".equals(tokenDto.getApp())) {
+            resultDTO = baseDao.selectByUserId(tokenDto.getUserId());
+        }
+        //2.查询用户未读消息数
+        Result<Integer> result = epmetMessageOpenFeignClient.unReadCount(tokenDto.getUserId());
+        if (!result.success()) {
+            throw new RenException("获取用户未读消息数据失败");
+        }
+        resultDTO.setCount(result.getData());
+        return resultDTO;
+    }
+
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml

@@ -267,5 +267,16 @@
         GROUP BY ageGroup
     </select>
 
+    <select id="getPartyMemberAgeStatistics" resultType="com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO">
+        SELECT
+            ipo.id id,
+            ipo.PARTY_ORG_NAME partOrgName
+        FROM
+            partymember_info pi
+        INNER JOIN ic_party_member ipm ON ipm.del_flag = '0' AND pi.ID_CARD = ipm.id_card
+        INNER JOIN ic_party_org ipo ON ipo.del_flag = '0' AND ipm.sszb = ipo.id
+        WHERE pi.del_flag = '0'
+        AND pi.user_id = #{userId}
+    </select>
 
 </mapper>