设备列表导出优化

common-lib/src/main/java/com/mortals/xhx/common/pdu/RespData.java

+package com.mortals.xhx.common.pdu;
+
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.model.PageInfo;
+
+/**
+ * @author: zxfei
+ * @date: 2022/7/13 14:17
+ * @description:
+ **/
+public class RespData<T> {
+
+    private T data;
+    private PageInfo pageInfo;
+
+
+    public static void main(String[] args) {
+
+        String resp="";
+
+        //JSON.parseObject()
+
+
+
+    }
+}

common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java

 package com.mortals.xhx.feign.user;
 
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
@@ -10,6 +11,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 用户信息业务 Feign接口
  * @author zxfei
@@ -26,7 +29,7 @@ public interface IUserFeign extends IFeign {
      * @return
      */
     @PostMapping(value = "/user/list")
-    String list(@RequestBody UserPdu userPdu);
+    Rest<RespData<List<UserPdu>>> list(@RequestBody UserPdu userPdu);
 
 
     /**
@@ -80,8 +83,8 @@ class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
     public IUserFeign create(Throwable t) {
         return new IUserFeign() {
             @Override
-            public String list(UserPdu userPdu) {
-               return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务列表，请稍后再试!"));
+            public Rest<RespData<List<UserPdu>>>  list(UserPdu userPdu) {
+               return Rest.fail("暂时无法获取用户信息业务列表，请稍后再试!");
             }
 
             @Override

common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqProducerTemplate.java

@@ -10,6 +10,7 @@ import com.rabbitmq.client.BuiltinExchangeType;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -18,6 +19,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 /**
  * rabbmit 消息生产模板
@@ -83,7 +85,7 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
             if (!topicIfNotExist) {
                 //topic不存在创建通道队列
                 Map<String, Object> args = new HashMap<>();
-                log.info("x-message-ttl:{}",rabbitMqSettings.getMessageTtl());
+                log.info("x-message-ttl:{}", rabbitMqSettings.getMessageTtl());
                 args.put("x-message-ttl", Integer.parseInt(rabbitMqSettings.getMessageTtl()));
                 channel.queueDeclare(tpi.getTopic(), true, false, false, args);
             }
@@ -134,7 +136,7 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
             if (!topicIfNotExist) {
                 //topic不存在创建通道队列
                 Map<String, Object> args = new HashMap<>();
-                log.info("x-message-ttl:{}",rabbitMqSettings.getMessageTtl());
+                log.info("x-message-ttl:{}", rabbitMqSettings.getMessageTtl());
                 args.put("x-message-ttl", Integer.parseInt(rabbitMqSettings.getMessageTtl()));
                 channel.queueDeclare(tpi.getTopic(), true, false, false, args);
             }
@@ -156,6 +158,11 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
     public void queueDel(String queue, TbQueueCallback callback) {
         try {
             channel.queueDelete(queue);
+            //删除topic
+            TopicPartitionInfo topicPartitionInfo = this.topics.stream().filter(f -> f.getTopic().equals(queue)).findFirst().orElseGet(() -> null);
+            if (!ObjectUtils.isEmpty(topicPartitionInfo)) {
+                this.topics.remove(topicPartitionInfo);
+            }
         } catch (IOException e) {
             log.error("Failed publish message: {}.", e);
         }
@@ -163,7 +170,7 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
 
     private Boolean createTopicIfNotExist(TopicPartitionInfo tpi) {
         if (topics.contains(tpi)) {
-            log.info("contains topc:{}",tpi.getTopic());
+            log.info("contains topc:{}", tpi.getTopic());
             return true;
         }
         topics.add(tpi);

device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -3,10 +3,12 @@ package com.mortals.xhx.daemon.task;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.common.code.SendStatusEnum;
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.SendSmsTask;
@@ -36,7 +38,14 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
     @Override
     public void excuteTask(ITask task) throws AppException {
 
-        return;
+                UserPdu userPdu = new UserPdu();
+        userPdu.setPage(1);
+        userPdu.setSize(-1);
+        Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
+
+        log.info("syncUserResp:{}",JSON.toJSONString(list));
+
+       // return;
 //        UserPdu userPdu = new UserPdu();
 //        userPdu.setPage(1);
 //        userPdu.setSize(-1);