From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/show/MarkController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/MarkController.java b/src/main/java/com/lf/server/controller/show/MarkController.java
index f9ec04b..8d63273 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -1,11 +1,14 @@
package com.lf.server.controller.show;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.service.all.BaseUploadService;
+import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.MarkService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -30,6 +33,15 @@
@Autowired
TokenService tokenService;
+
+ @Autowired
+ BaseUploadService baseUploadService;
+
+ @Autowired
+ DownlogService downlogService;
+
+ @Autowired
+ DownloadService downloadService;
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@@ -57,7 +69,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -73,7 +85,7 @@
return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -94,7 +106,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -117,7 +129,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -133,7 +145,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -153,7 +165,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -175,7 +187,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -199,7 +211,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
}
--
Gitblit v1.9.3