Merge remote-tracking branch 'origin/dev_govgrid' into dev

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -90,12 +90,6 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>gov-org-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -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<CustomerGridDTO> get(String id) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", id);
-    }
-}

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<UserMessageEntity> {
 	 * @Description 批量插入未读消息
 	 **/
 	Result saveUserMessageList(List<UserMessageFormDTO> msgList);
-
-	/**
-	* @Description 居民端动作触发发消息给政府端
-	* @param msgResi2GovFormDTO
-	* @author wangc
-	* @date 2020.04.29 14:42
-	*/
-	Result sendMsgResi2Gov(SendMsgResi2GovFormDTO msgResi2GovFormDTO);
 }

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

@@ -24,22 +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.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;
@@ -62,8 +56,6 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 
 	@Autowired
 	private UserMessageRedis userMessageRedis;
-	@Autowired
-	private GovOrgFeignClient govOrgFeignClient;
 
 	@Override
 	public PageData<UserMessageDTO> page(Map<String, Object> params) {
@@ -182,26 +174,4 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 		insertBatch(entityList);
 		return new Result();
 	}
-
-	@Override
-	public Result sendMsgResi2Gov(SendMsgResi2GovFormDTO msgResi2GovFormDTO) {
-
-		if(ModuleConstant.INSTITUTION_GRID.equals(msgResi2GovFormDTO.getInstitutionFlag())){
-			//1.根据网格Id找到其PID，即当前的AgencyId，调用gov-org服务
-			Result<CustomerGridDTO> 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;
-	}
 }

epmet-module/resi-group/resi-group-server/pom.xml

@@ -70,6 +70,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-org-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java → 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;
 

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<CustomerGridDTO> getGrid(String id) {
+        return null;
+    }
+
+    @Override
+    public Result<CustomerDepartmentDTO> getDept(String id) {
+        return null;
+    }
+}