diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 57008f3d6b..66ae9b3533 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -99,7 +99,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -129,7 +129,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index bee517a83e..2842c7a96c 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -123,7 +123,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -157,7 +157,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 9bdc3d080e..f8f1d96b77 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -95,7 +95,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -164,7 +164,7 @@ 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 77c63cce67..df5bebdd66 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -175,7 +175,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -203,7 +203,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index f22330be65..cdee37a62c 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -121,7 +121,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -151,7 +151,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 69e393849b..a2784eae25 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -112,7 +112,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -142,7 +142,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java index 693524057e..37f0bd632c 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java @@ -27,6 +27,11 @@ public class MymessageResultDTO implements Serializable { /** * 消息内容 */ + private String messageContent; + + /** + * 已读标记 + */ private String readFlag; /** diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index d0491e382b..d822419549 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -133,7 +133,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -163,7 +163,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 2d154e0fe3..a970236643 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -137,7 +137,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -167,7 +167,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 54875bf0ce..bd5863a670 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -112,7 +112,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -142,7 +142,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 8df713a550..8f8e681280 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -108,7 +108,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -138,7 +138,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 8473caf7e8..4bbfea43c6 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -107,7 +107,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -137,7 +137,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index c2781bb01a..715075b15d 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -101,7 +101,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -131,7 +131,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index a9a39329a3..3873802452 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -113,7 +113,7 @@ elink@833066 1 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -143,7 +143,7 @@ elink@833066 1 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 3e62a7e591..637f50ed6d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -565,7 +565,9 @@ public class ResiGroupServiceImpl extends BaseServiceImplelink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -149,7 +149,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java new file mode 100644 index 0000000000..932f38fa18 --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java @@ -0,0 +1,16 @@ +package com.epmet.resi.mine.dto.from; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/14 11:01 + */ +@Data +public class ReadMessageFromDTO implements Serializable { + private static final long serialVersionUID = 1116253566756531198L; + private String messageId; +} diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index b212d3a44b..8bab7eec80 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -125,7 +125,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -155,7 +155,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java index d0c75c990c..2af9dfb554 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java @@ -7,8 +7,12 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; import com.epmet.modules.message.service.UserMessageService; +import com.epmet.resi.mine.dto.from.ReadMessageFromDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -40,18 +44,16 @@ public class UserMessageController { } /** - * @param tokenDto - * @param messageId + * @param fromDTO * @return com.epmet.commons.tools.utils.Result * @Author yinzuomei * @Description 单条消息标记为已读 * @Date 2020/3/29 21:05 **/ @PostMapping("readmsg") - public Result readMessage(@LoginUser TokenDto tokenDto, - @RequestParam("messageId") String messageId) { + public Result readMessage(@RequestBody ReadMessageFromDTO fromDTO) { //逻辑待实现 - return userMessageService.readMessage(messageId); + return userMessageService.readMessage(fromDTO.getMessageId()); } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 460f436997..fd3b44f67b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -124,7 +124,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -154,7 +154,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index 158517a9cc..c0f4565c8a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -105,4 +105,19 @@ public interface PartyMemberConstant { * 审核状态 未通过 */ String REJECTED = "rejected"; + + /** + * 网格ID + */ + String ALL = " all"; + + /** + * 认证成功 + */ + String CONFIRM_SUCCESS = "0"; + + /** + * 认证失败 + */ + String CONFIRM_FAILED = "1"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 2b0ea84e5d..ef61ee84e3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -164,14 +164,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); //自动认证失败 - partyMemberInfoEntity.setConfirmResult("1"); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_FAILED); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { partymemberInfoService.updateById(partyMemberInfoEntity); } - result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode()); result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg()); } else { @@ -179,17 +178,26 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); //自动认证成功 - partyMemberInfoEntity.setConfirmResult("0"); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_SUCCESS); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { partymemberInfoService.updateById(partyMemberInfoEntity); } + //人工审核数据状态设为通过 + PartymemberConfirmManualDTO partymemberConfirmManualDTO = + partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfoDTO.getId()); + if (null != partymemberConfirmManualDTO) { + partymemberConfirmManualDTO.setAuditStatus(PartyMemberConstant.APPROVED); + partymemberConfirmManualService.updateById(ConvertUtils.sourceToTarget(partymemberConfirmManualDTO, + PartymemberConfirmManualEntity.class)); + } + //添加用户党员角色关系 UserRoleDTO userRole = new UserRoleDTO(); userRole.setCustomerId(partyMemberInfoDTO.getCustomerId()); - userRole.setGridId("all"); + userRole.setGridId(PartyMemberConstant.ALL); userRole.setUserId(partyMemberInfoDTO.getUserId()); userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER); userRole.setApp(partyMemberInfoDTO.getApp()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index df09d8e777..ddc60b46db 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -40,6 +40,7 @@ pi.CUSTOMER_ID = #{customerId} AND pi.GRID_ID = #{gridId} AND pi.USER_ID = #{userId} + AND pi.CONFIRM_RESULT = '1' AND pi.DEL_FLAG = 0 AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL ) diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 80aa220e15..4461b0da41 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -115,7 +115,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456 @@ -145,7 +145,7 @@ elink@833066 0 - 10.10.10.77 + 10.10.10.248 6379 123456