优化代码

java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java

@@ -23,6 +23,7 @@ public class NoticeDto extends PageDto implements Serializable {
     public static final String OBJ_TYPE_FLOOR = "002";//楼栋
     public static final String OBJ_TYPE_UNIT = "003";//单元
     public static final String OBJ_TYPE_ROOM = "004";//单元
+    public static final String OBJ_TYPE_ALL = "005";//单元
 
     public static final String NOTICE_TYPE_OWNER_WECHAT = "1003";//发送给业主微信
 

service-api/src/main/java/com/java110/api/listener/notice/ListNoticesListener.java

@@ -10,7 +10,11 @@ import com.java110.dto.RoomDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.notice.NoticeDto;
 import com.java110.dto.unit.FloorAndUnitDto;
-import com.java110.intf.community.*;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.IFloorInnerServiceSMO;
+import com.java110.intf.community.INoticeInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.IUnitInnerServiceSMO;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.notice.ApiNoticeDataVo;
@@ -105,6 +109,7 @@ public class ListNoticesListener extends AbstractServiceApiListener {
 
     private void refreshNotice(List<ApiNoticeDataVo> notices) {
 
+        refreshWechats(notices);
         //批量处理 小区
         refreshCommunitys(notices);
 
@@ -120,6 +125,21 @@ public class ListNoticesListener extends AbstractServiceApiListener {
 
     }
 
+    /**
+     * 获取批量小区
+     *
+     * @param notices 设备信息
+     * @return 批量userIds 信息
+     */
+    private void refreshWechats(List<ApiNoticeDataVo> notices) {
+
+        for (ApiNoticeDataVo noticeDto : notices) {
+            if (NoticeDto.OBJ_TYPE_ALL.equals(noticeDto.getObjType())) {
+                noticeDto.setObjName("关注用户");
+            }
+        }
+    }
+
     /**
      * 获取批量小区
      *

service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -184,7 +184,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
         String objType = noticeDto.getObjType();
 
         switch (objType) {
-            case NoticeDto.OBJ_TYPE_COMMUNITY:
+            case NoticeDto.OBJ_TYPE_ALL:
                 sendAllOwner(noticeDto, templateId, accessToken, weChatDto);
                 break;
             case NoticeDto.OBJ_TYPE_FLOOR:
@@ -196,6 +196,9 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
             case NoticeDto.OBJ_TYPE_ROOM:
                 sendRoomOwner(noticeDto, templateId, accessToken, weChatDto);
                 break;
+            case NoticeDto.OBJ_TYPE_COMMUNITY:
+                sendCommunityOwner(noticeDto, templateId, accessToken, weChatDto);
+                break;
         }
 
         NoticeDto tmpNoticeDto = new NoticeDto();
@@ -205,6 +208,14 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
 
     }
 
+    private void sendCommunityOwner(NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
+        ownerAppUserDto.setCommunityId(noticeDto.getCommunityId());
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+        doSend(ownerAppUserDtos, noticeDto, templateId, accessToken, weChatDto);
+    }
+
     private void sendFloorOwner(NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
 
         RoomDto roomDto = new RoomDto();