Merge branch 'feature/xgh/202503' into 'developer'

导出异常返回

See merge request !2833

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ChatDataController.java

@@ -346,7 +346,13 @@ public class ChatDataController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(singleChatStoreDataHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
 
@@ -427,7 +433,13 @@ public class ChatDataController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(singleChatClerkDataHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
 
@@ -531,7 +543,13 @@ public class ChatDataController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(singleChatDetailsHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
 
 
     }
@@ -781,7 +799,13 @@ public class ChatDataController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(groupStoreDataHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
 
@@ -856,7 +880,13 @@ public class ChatDataController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(groupClerkDataHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
 
@@ -961,7 +991,13 @@ public class ChatDataController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(groupDetailsHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
 
@@ -1074,7 +1110,13 @@ public class ChatDataController extends NewBaseController {
         task.setHandler(groupJoinHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
 
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
 
     }
 
@@ -1181,7 +1223,13 @@ public class ChatDataController extends NewBaseController {
         task.setHandler(groupExitHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
 
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
 
 
     }
@@ -1314,7 +1362,13 @@ public class ChatDataController extends NewBaseController {
         task.setHandler(groupChatDetailsHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
 
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
 
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/EventTrackingController.java

@@ -219,7 +219,13 @@ public class EventTrackingController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(wechatEventTrackingStoreGroupHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     /**
@@ -318,7 +324,13 @@ public class EventTrackingController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(wechatEventTrackingClerkDetailHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     private JSONObject getOverviewParam(WechatOverviewQO qo) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WechatWorkController.java

@@ -212,7 +212,13 @@ public class WechatWorkController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(wechatWorkLostStoreGroupHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     /**
@@ -303,7 +309,13 @@ public class WechatWorkController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(wechatWorkLostClerkHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     /**
@@ -390,7 +402,13 @@ public class WechatWorkController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(wechatWorkLostDetailHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     private AuthorizedUser getUserInfo() {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatActivityDataController.java

@@ -285,8 +285,13 @@ public class GroupChatActivityDataController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(groupChatActivityJoinHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     /**
@@ -398,8 +403,13 @@ public class GroupChatActivityDataController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(groupChatActivityInviterHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
 
     }
 
@@ -511,8 +521,13 @@ public class GroupChatActivityDataController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(groupChatActivityRewardHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
 
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/wechatwork/WechatWorkOverviewController.java

@@ -213,7 +213,13 @@ public class WechatWorkOverviewController extends NewBaseController {
         task.setSearchDataParams(jsonObject.toJSONString());
         task.setHandler(wechatWorkOverviewStoreGroupHandle);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     private AuthorizedUser getUserInfo() {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java

@@ -255,7 +255,13 @@ public class MaterialDataStaticsController {
         task.setSearchDataParams(JSONObject.toJSONString(materialStatisticsBaseQO));
         task.setHandler(materialClerkUsedDataHandler);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }
 
     /**
@@ -320,7 +326,13 @@ public class MaterialDataStaticsController {
         task.setSearchDataParams(JSONObject.toJSONString(materialStatisticsBaseQO));
         task.setHandler(materialStoreUsedDataHandler);
         JSONResponse downloadTask = DownloadTaskUtil.createDownloadTask(task);
-        return RestResponse.successResult(downloadTask.getResult());
+        final String reportId;
+        if (downloadTask.isSuccess()) {
+            reportId = (String) downloadTask.getResult();
+        } else {
+            return RestResponse.failure("9999", downloadTask.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
     }