先把消息发送拿到controller

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -22,6 +22,8 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.messages.CheckMQMsg;
 import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
@@ -85,6 +87,8 @@ import org.jetbrains.annotations.NotNull;
 import org.redisson.api.RLock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
@@ -558,6 +562,20 @@ public class IcResiUserController implements ResultDataResolver {
             } else {
                 icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, response,false);
             }
+            CheckMQMsg msg = new CheckMQMsg();
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            msg.setOperateTime(new Date());
+            msg.setContent("导出居民数据");
+            msg.setType("exportIcResiUser");
+            msg.setTypeDisplay("导出居民数据");
+            msg.setUserId(tokenDto.getUserId());
+            msg.setFromApp(tokenDto.getApp());
+            msg.setIp(IpUtils.getIpAddr(request));
+            msg.setFromClient(tokenDto.getClient());
+            SystemMsgFormDTO form = new SystemMsgFormDTO();
+            form.setMessageType(TopicConstants.CHECK_OR_EXPORT);
+            form.setContent(msg);
+            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
         } catch (EpmetException e) {
             response.reset();
             response.setCharacterEncoding("UTF-8");

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@@ -204,20 +204,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                     excelWriter.write(resultData, writeSheet);
                 }
             } while (!searchForm.getIsPage() && mapListPage.getResult().size() == searchForm.getPageSize());
-            CheckMQMsg msg = new CheckMQMsg();
-            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-            msg.setOperateTime(new Date());
-            msg.setContent("导出居民数据");
-            msg.setType("exportIcResiUser");
-            msg.setTypeDisplay("导出居民数据");
-            msg.setUserId(tokenDto.getUserId());
-            msg.setFromApp(tokenDto.getApp());
-            msg.setIp(IpUtils.getIpAddr(request));
-            msg.setFromClient(tokenDto.getClient());
-            SystemMsgFormDTO form = new SystemMsgFormDTO();
-            form.setMessageType(TopicConstants.CHECK_OR_EXPORT);
-            form.setContent(msg);
-            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
         } catch (IOException e) {
             log.error("exportIcResiUser exception", e);
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMessage(), "导出失败");