From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/InquiryController.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java
index 9845d1f..afc3605 100644
--- a/src/main/java/com/lf/server/controller/show/InquiryController.java
+++ b/src/main/java/com/lf/server/controller/show/InquiryController.java
@@ -1,14 +1,15 @@
 package com.lf.server.controller.show;
 
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
 import com.lf.server.controller.all.BaseQueryController;
 import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
 import com.lf.server.entity.ctrl.ShpRecordEntity;
 import com.lf.server.entity.data.MetaFileEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.AesHelper;
 import com.lf.server.helper.StringHelper;
-import com.lf.server.service.data.UploaderService;
+import com.lf.server.service.all.BaseUploadService;
 import com.lf.server.service.show.InquiryService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -28,13 +29,11 @@
 @RestController
 @RequestMapping("/inquiry")
 public class InquiryController extends BaseQueryController {
-    private final static int FOUR = 4;
-
     @Autowired
     TokenService tokenService;
 
     @Autowired
-    UploaderService uploaderService;
+    BaseUploadService baseUploadService;
 
     @Autowired
     InquiryService inquiryService;
@@ -50,8 +49,8 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            List<MetaFileEntity> list = uploaderService.uploadData(null, ue, req, res);
-            if (list.size() < FOUR) {
+            List<MetaFileEntity> list = baseUploadService.uploadData(null, null, false, req, res);
+            if (list == null || list.size() < StaticData.FOUR) {
                 return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
             }
 
@@ -62,7 +61,7 @@
 
             return success(sr);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3