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

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java

@@ -1,9 +1,11 @@
 package com.epmet.dto.result;
 
+import com.epmet.dto.OrganizationMessagePublishRangeDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description 烟台消息管理，列表查询
@@ -70,5 +72,7 @@ public class OrganizationMessageResultDTO {
      * 共发送出多少条消息
      */
     private Integer totalReceiver;
+
+    private List<OrganizationMessagePublishRangeDTO> rangeList;
 }
 

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

@@ -67,7 +67,10 @@ public class OrganizationMessageController {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setPublishStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, OrganizationMessageFormDTO.AddShowGroup.class);
-        return new Result().ok(organizationMessageService.publish(formDTO));
+        String messageId=organizationMessageService.publish(formDTO);
+        // 发送消息 发布范围下有哪些网格，网格下所有的注册居民，每人发送一条消息
+        organizationMessageService.sendUserMsg(messageId,formDTO.getContent(),formDTO.getPublishStaffId(),formDTO.getRangeList(),formDTO.getCustomerId());
+        return new Result().ok(messageId);
     }
 
 }

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

@@ -3,9 +3,12 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.OrganizationMessageFormDTO;
+import com.epmet.dto.OrganizationMessagePublishRangeDTO;
 import com.epmet.dto.result.OrganizationMessageResultDTO;
 import com.epmet.entity.OrganizationMessageEntity;
 
+import java.util.List;
+
 /**
  * 组织发布消息（烟台）
  *
@@ -39,4 +42,6 @@ public interface OrganizationMessageService extends BaseService<OrganizationMess
      * @return 返回消息id
      */
     String publish(OrganizationMessageFormDTO formDTO);
+
+    void sendUserMsg(String messageId, String content, String publishStaffId, List<OrganizationMessagePublishRangeDTO> rangeList, String customerId);
 }

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

@@ -15,10 +15,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
-import com.epmet.commons.tools.utils.PidUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
 import com.epmet.dao.OrganizationMessageDao;
 import com.epmet.dao.OrganizationMessagePublishRangeDao;
 import com.epmet.dao.UserMessageDao;
@@ -79,7 +76,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl<Organization
         PageHelper.startPage(pageNo, pageSize);
         List<OrganizationMessageResultDTO> list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null);
         PageInfo<OrganizationMessageResultDTO> pageInfo = new PageInfo<>(list);
-        return new PageData<>(list, pageInfo.getTotal());
+        return new PageData<>(list, pageInfo.getTotal(),pageSize);
     }
 
     /**
@@ -92,7 +89,13 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl<Organization
     public OrganizationMessageResultDTO getDetail(String messageId) {
         List<OrganizationMessageResultDTO> list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),null, null, null, null, null,messageId);
         if(CollectionUtils.isNotEmpty(list)){
-            return list.get(NumConstant.ZERO);
+            OrganizationMessageResultDTO resultDTO=list.get(NumConstant.ZERO);
+            LambdaQueryWrapper<OrganizationMessagePublishRangeEntity> queryWrapper=new LambdaQueryWrapper<>();
+            queryWrapper.eq(OrganizationMessagePublishRangeEntity::getMessageId,messageId)
+                    .orderByAsc(OrganizationMessagePublishRangeEntity::getCreatedTime);
+            List<OrganizationMessagePublishRangeEntity> rangeList=organizationMessagePublishRangeDao.selectList(queryWrapper);
+            resultDTO.setRangeList(ConvertUtils.sourceToTarget(rangeList,OrganizationMessagePublishRangeDTO.class));
+            return resultDTO;
         }
         return null;
     }
@@ -138,13 +141,12 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl<Organization
             organizationMessagePublishRangeDao.insert(rangeEntity);
         }
         String messageId = messageEntity.getId();
-        // 发送消息 发布范围下有哪些网格，网格下所有的注册居民，每人发送一条消息
-        sendUserMsg(messageId,formDTO.getContent(),formDTO.getPublishStaffId(),formDTO.getRangeList(),messageEntity.getCustomerId());
         return messageId;
     }
 
 
     @Async
+    @Override
     public void sendUserMsg(String messageId, String content, String publishStaffId,List<OrganizationMessagePublishRangeDTO> rangeList, String customerId) {
         String result = "success";
         int totalMsg = NumConstant.ZERO;

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml

@@ -30,6 +30,7 @@
             om.PUBLISH_TIME as publishTime,
             om.PUBLISH_STAFF_ID as publishStaffId,
             om.PUBLISH_ORG_ID as publishStaffName,
+            om.PUBLISH_ORG_ID as publishOrgId,
             om.PUBLISH_ORG_ID_PATH as publishOrgIdPath,
             OM.PUBLISH_ORG_NAME as publishOrgName,
             om.SEND_MSG_RES as sendMsgRes,
@@ -58,6 +59,7 @@
         <if test='messageId != null and messageId != "" '>
             and om.id =#{messageId}
         </if>
+        group by om.id
         order by om.PUBLISH_TIME desc
     </select>
 </mapper>