居民端-代码优化-不引用server服务

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

@@ -28,7 +28,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.entity.UserMessageEntity;
 import com.epmet.excel.UserMessageExcel;
 import com.epmet.service.UserMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,7 +140,7 @@ public class UserMessageController {
      * @Description 批量插入未读消息
      **/
     @PostMapping("saveusermessagelist")
-    public Result saveUserMessageList(@RequestBody List<UserMessageEntity> msgList) {
+    public Result saveUserMessageList(@RequestBody List<UserMessageFormDTO> msgList) {
         return userMessageService.saveUserMessageList(msgList);
     }
 }

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

@@ -134,5 +134,5 @@ public interface UserMessageService extends BaseService<UserMessageEntity> {
 	 * @Author sun
 	 * @Description 批量插入未读消息
 	 **/
-	Result saveUserMessageList(List<UserMessageEntity> msgList);
+	Result saveUserMessageList(List<UserMessageFormDTO> msgList);
 }

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

@@ -166,8 +166,9 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 	}
 
 	@Override
-	public Result saveUserMessageList(List<UserMessageEntity> msgList) {
-		insertBatch(msgList);
+	public Result saveUserMessageList(List<UserMessageFormDTO> msgList) {
+		List<UserMessageEntity> entityList = ConvertUtils.sourceToTarget(msgList, UserMessageEntity.class);
+		insertBatch(entityList);
 		return new Result();
 	}
 }

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

@@ -93,12 +93,6 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-message-server</artifactId>
-            <version>0.3.1</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java

@@ -3,7 +3,6 @@ package com.epmet.modules.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.entity.UserMessageEntity;
 import com.epmet.modules.feign.fallback.EpmetMessageFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -43,6 +42,6 @@ public interface EpmetMessageFeignClient {
      * @Description 热心居民申请给网格长们发送消息
      **/
     @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result saveUserMessageList(List<UserMessageEntity> msgList);
+    Result saveUserMessageList(List<UserMessageFormDTO> msgList);
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java

@@ -4,7 +4,6 @@ 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.form.UserMessageFormDTO;
-import com.epmet.entity.UserMessageEntity;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -28,7 +27,7 @@ public class EpmetMessageFeignClientFallback implements EpmetMessageFeignClient
     }
 
     @Override
-    public Result saveUserMessageList(List<UserMessageEntity> msgList) {
+    public Result saveUserMessageList(List<UserMessageFormDTO> msgList) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList);
     }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java → epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedConstant.java

@@ -1,4 +1,4 @@
-package com.epmet.constant;
+package com.epmet.modules.warmhearted.constant;
 
 /**
  * @author sun

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

@@ -38,7 +38,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.AgencyAndStaffsResultDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.entity.UserMessageEntity;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
@@ -257,19 +256,19 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		Result<List<GovStaffRoleResultDTO>> resultList = epmetUserFeignClient.getStaffsInRole(staffRoleFormDTO);
 		List<GovStaffRoleResultDTO> roleList = resultList.getData();
 		//3:遍历找出当前网格的所有网格长并给网格长发消息
-		List<UserMessageEntity> msgList = new ArrayList<>();
+		List<UserMessageFormDTO> msgList = new ArrayList<>();
 		staffList.forEach(staff->{
 			roleList.forEach(role->{
 				if(staff.getUserId().equals(role.getStaffId())){
-					UserMessageEntity msgEntity = new UserMessageEntity();
-					msgEntity.setCustomerId(formDTO.getCustomerId());
-					msgEntity.setGridId(formDTO.getGridId());
-					msgEntity.setUserId(staff.getUserId());
-					msgEntity.setApp(formDTO.getApp());
-					msgEntity.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE);
-					msgEntity.setMessageContent(formDTO.getMessageText());
-					msgEntity.setReadFlag(ReadFlagConstant.UN_READ);
-					msgList.add(msgEntity);
+					UserMessageFormDTO msgDTO = new UserMessageFormDTO();
+					msgDTO.setCustomerId(formDTO.getCustomerId());
+					msgDTO.setGridId(formDTO.getGridId());
+					msgDTO.setUserId(staff.getUserId());
+					msgDTO.setApp(formDTO.getApp());
+					msgDTO.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE);
+					msgDTO.setMessageContent(formDTO.getMessageText());
+					msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
+					msgList.add(msgDTO);
 				}
 			});
 		});