diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendMsgResi2GovFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendMsgResi2GovFormDTO.java new file mode 100644 index 0000000000..3ea73a34b5 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendMsgResi2GovFormDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 居民端的行为触发发送消息给政府端的入参 + * @Author yinzuomei + * @Date 2020/4/19 20:54 + */ +@Data +public class SendMsgResi2GovFormDTO implements Serializable { + private static final long serialVersionUID = -1844010483732604630L; + + /** + * 发送人Id resiUser的Id + * */ + private String from; + + /** + * 角色key + * */ + private String roleKey; + + /** + * 消息内容 + * */ + private String msg; + + /** + * 组织Id 可能是agencyId、deptId、gridId + * */ + private String institutionId; + + /** + * 组织标识 1：agency 2：department 3:grid + * */ + private String institutionFlag; + + /** + *客户Id + */ + private String customerId; + + /** + * 等级 1：当前组织下 2：所属机构(agency)下 + * 当institutionFlag为1时，permissionLevel默认为1 + * */ + private String permissionLevel; +} diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 46bb33b442..03180554fb 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -90,6 +90,12 @@ feign-httpclient 10.3.0 + + com.epmet + gov-org-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..06ad630418 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,37 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerDepartmentDTO; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * @Description gov-org服务feginClient 服务间调用 + * @Author wangc + * @Date 2020/3/16 14:48 + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface GovOrgFeignClient { + + /** + * @param id - gridId + * @return Result + * @Author wangc + * @Description 查询网格信息 + * @Date 2020/3/30 10:45 + **/ + @GetMapping("/gov/org/customergrid/{id}") + Result getGrid(String id); + + /** + * @Description 查询部门信息 + * @param id + * @author wangc + * @date 2020.04.29 15:02 + */ + @GetMapping("/gov/org/customerdepartment/{id}") + Result getDept(String id); +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..485e0b5883 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,18 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + + +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + @Override + public Result get(String id) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", id); + } +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index ca08d47299..6b867b26b1 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -22,9 +22,9 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.dto.form.SendMsgResi2GovFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; - import java.util.List; import java.util.Map; @@ -135,4 +135,12 @@ public interface UserMessageService extends BaseService { * @Description 批量插入未读消息 **/ Result saveUserMessageList(List msgList); + + /** + * @Description 居民端动作触发发消息给政府端 + * @param msgResi2GovFormDTO + * @author wangc + * @date 2020.04.29 14:42 + */ + Result sendMsgResi2Gov(SendMsgResi2GovFormDTO msgResi2GovFormDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index e5f3a2ba9e..6c425c8d59 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -24,16 +24,24 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserMessageConstans; import com.epmet.dao.UserMessageDao; +import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.dto.form.SendMsgResi2GovFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.UserMessageRedis; import com.epmet.service.UserMessageService; +import com.epmet.utils.ModuleConstant; import org.apache.commons.lang3.StringUtils; +import org.bouncycastle.math.raw.Mod; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -50,9 +58,12 @@ import java.util.Map; */ @Service public class UserMessageServiceImpl extends BaseServiceImpl implements UserMessageService { + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private UserMessageRedis userMessageRedis; + @Autowired + private GovOrgFeignClient govOrgFeignClient; @Override public PageData page(Map params) { @@ -171,4 +182,26 @@ public class UserMessageServiceImpl extends BaseServiceImpl gridInfo = govOrgFeignClient.get(msgResi2GovFormDTO.getInstitutionId()); + if(!gridInfo.success() || null == gridInfo.getData() || StringUtils.isBlank(gridInfo.getData().getPid())){ + logger.warn(""); + } + } + + + //2.1根据AgencyId查找staff_role下所有的staffId且是未被禁用的，调用epmet-user服务 + + //2.2是本机构下的所有拥有roleKey的工作人员还是本网格下所有拥有roleKey的工作人员 + //如果是本网格下则需要再次调用gov-org服务校验查询出相应角色的员工是否在本网格下，如果是本机构下则跳过此操作 + + //3.创建消息，调用epmet-message服务 + + return null; + } } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java index 863fa85e40..0843644411 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java @@ -26,5 +26,29 @@ public interface ModuleConstant extends Constant { */ String MAIL_CONFIG_KEY = "MAIL_CONFIG_KEY"; + /** + * 组织：机构 + * */ + String INSTITUTION_AGENCY = "1"; + + /** + * 组织：部门 + * */ + String INSTITUTION_DEPT = "2"; + + /** + * 祖师：网格 + * */ + String INSTITUTION_GRID = "3"; + + /** + * 当前组织下 + * */ + String PERMISSION_LEVEL_CURRENT = "1"; + + /** + * 所属机构(agency)下 + * */ + String PERMISSION_LEVEL_PARENT = "2"; } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java index b07c045e22..d4612fcb7e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java @@ -46,8 +46,6 @@ public class ResiTopicServiceImpl implements ResiTopicService { **/ @Override public Result> allTopics(ResiTopicPageFormDTO topicPageFormDTO) { - topicPageFormDTO.setPageNo(NumConstant.ONE); - topicPageFormDTO.setPageSize(NumConstant.MAX); return resiGroupFeignClient.getPastTopicListGov(topicPageFormDTO); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java index f1401ff8df..2e838f61b6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java @@ -26,11 +26,9 @@ public class GroupAuditedFromDTO implements Serializable { /** * 页码 */ - @NotBlank(message = "页码不能为空") private Integer pageNo; /** * 每页显示数量 */ - @NotBlank(message = "每页显示数量不能为空") private Integer pageSize; } 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 ac0f67d50a..e229b1c51b 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 @@ -111,6 +111,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -335,7 +336,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl