diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 03180554fb..46bb33b442 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -90,12 +90,6 @@ 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/fallback/GovOrgFeignClientFallBack.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java deleted file mode 100644 index 485e0b5883..0000000000 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ /dev/null @@ -1,18 +0,0 @@ -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 6b867b26b1..ebb6141067 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,7 +22,6 @@ 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; @@ -135,12 +134,4 @@ 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 505f329900..1e5cc4e52e 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,23 +24,16 @@ 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.CustomerDepartmentDTO; -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; @@ -63,8 +56,6 @@ public class UserMessageServiceImpl extends BaseServiceImpl page(Map params) { @@ -183,36 +174,4 @@ public class UserMessageServiceImpl extends BaseServiceImpl gridInfo = govOrgFeignClient.getGrid(msgResi2GovFormDTO.getInstitutionId()); - if(gridInfo.success() && null != gridInfo.getData() && StringUtils.isNotBlank(gridInfo.getData().getPid())){ - - }else{ - logger.warn(""); - } - }else if(ModuleConstant.INSTITUTION_DEPT.equals(msgResi2GovFormDTO.getInstitutionFlag())){ - //1.根据部门Id找到其AGENCY_ID，调用gov-org服务 - Result deptInfo = govOrgFeignClient.getDept(msgResi2GovFormDTO.getInstitutionId()); - if(deptInfo.success() && null != deptInfo.getData() && StringUtils.isNoneBlank(deptInfo.getData().getAgencyId())){ - - }else{ - 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/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index b246579931..16195cb349 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -70,6 +70,12 @@ 2.0.0 compile + + 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/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java similarity index 91% rename from epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java index 06ad630418..23a4c288f1 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java @@ -1,10 +1,10 @@ -package com.epmet.feign; +package com.epmet.modules.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 com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..d71016b127 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,24 @@ +package com.epmet.modules.feign.fallback; + + +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerDepartmentDTO; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.modules.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + + +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + + @Override + public Result getGrid(String id) { + return null; + } + + @Override + public Result getDept(String id) { + return null; + } +}