设备列表导出优化

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;
+import lombok.Data;
 
 /**
  * @author: zxfei
  * @date: 2022/7/13 14:17
  * @description:
  **/
+@Data
 public class RespData<T> {
 
     private T data;
+    private T entity;
     private PageInfo pageInfo;
 
 
@@ -20,7 +22,5 @@ public class RespData<T> {
 
         //JSON.parseObject()
 
-
-
     }
 }

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

@@ -39,7 +39,7 @@ public interface IUserFeign extends IFeign {
      * @return
      */
     @GetMapping(value = "/user/info")
-    String info(@RequestParam(value = "id") Long id);
+    Rest<UserPdu> info(@RequestParam(value = "id") Long id);
 
     /**
      * 删除用户信息业务
@@ -48,7 +48,7 @@ public interface IUserFeign extends IFeign {
      * @return
      */
     @GetMapping(value = "/user/delete")
-    String delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+    Rest<Void> delete(Long[] ids,@RequestHeader("Authorization") String authorization);
 
 
     /**
@@ -58,7 +58,7 @@ public interface IUserFeign extends IFeign {
      * @return
      */
     @PostMapping(value = "/user/save")
-    String save(@RequestBody UserPdu userPdu,@RequestHeader("Authorization") String authorization);
+    Rest<RespData<UserPdu>> save(@RequestBody UserPdu userPdu,@RequestHeader("Authorization") String authorization);
 
 
     @PostMapping(value = "/login/login")
@@ -88,18 +88,18 @@ class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
             }
 
             @Override
-            public String info(Long id) {
-               return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务详细，请稍后再试!"));
+            public Rest<UserPdu>  info(Long id) {
+               return Rest.fail("暂时无法获取用户信息业务详细，请稍后再试!");
             }
 
             @Override
-            public String delete(Long[] ids, String authorization) {
-                return JSON.toJSONString(Rest.fail("暂时无法删除用户信息业务，请稍后再试!"));
+            public Rest<Void> delete(Long[] ids, String authorization) {
+                return Rest.fail("暂时无法删除用户信息业务，请稍后再试!");
             }
 
             @Override
-            public String save(UserPdu userPdu, String authorization) {
-                return JSON.toJSONString(Rest.fail("暂时无法保存用户信息业务，请稍后再试!"));
+            public Rest<RespData<UserPdu>> save(UserPdu userPdu, String authorization) {
+                return Rest.fail("暂时无法保存用户信息业务，请稍后再试!");
             }
 
             @Override

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

@@ -38,14 +38,14 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
     @Override
     public void excuteTask(ITask task) throws AppException {
 
-                UserPdu userPdu = new UserPdu();
+        UserPdu userPdu = new UserPdu();
         userPdu.setPage(1);
         userPdu.setSize(-1);
         Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
 
-        log.info("syncUserResp:{}",JSON.toJSONString(list));
+        log.info("syncUserResp:{}", JSON.toJSONString(list));
 
-       // return;
+        // return;
 //        UserPdu userPdu = new UserPdu();
 //        userPdu.setPage(1);
 //        userPdu.setSize(-1);