From fee67ca8a0760315047a52fc4101a8f4f80b7a7f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 十一月 2024 15:02:54 +0800
Subject: [PATCH] 1
---
src/main/java/com/moon/server/controller/show/MarkController.java | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/show/MarkController.java b/src/main/java/com/moon/server/controller/show/MarkController.java
index cbec4b1..915de2a 100644
--- a/src/main/java/com/moon/server/controller/show/MarkController.java
+++ b/src/main/java/com/moon/server/controller/show/MarkController.java
@@ -14,43 +14,41 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
-/**
- * 鏍囩粯
- * @author WWW
- */
@Api(tags = "缁煎悎灞曠ず\\鏍囩粯")
@RestController
+@SuppressWarnings("ALL")
@RequestMapping("/mark")
public class MarkController extends BaseController {
- @Autowired
+ @Resource
MarkService markService;
- @Autowired
+ @Resource
TokenService tokenService;
- @Autowired
+ @Resource
BaseUploadService baseUploadService;
- @Autowired
+ @Resource
DownlogService downlogService;
- @Autowired
+ @Resource
DownloadService downloadService;
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<MarkEntity>> selectByPageAndCount(Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+ public ResponseMsg<List<MarkEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -60,12 +58,12 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = markService.selectCount(ue.getId());
+ int count = markService.selectCount(name, ue.getId());
if (count == 0) {
return success(0, null);
}
- List<MarkEntity> rs = markService.selectByPage(ue.getId(), pageSize, pageSize * (pageIndex - 1));
+ List<MarkEntity> rs = markService.selectByPage(name, ue.getId(), pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -79,9 +77,13 @@
@ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
})
@GetMapping(value = "/selectById")
- public ResponseMsg<MarkEntity> selectById(int id) {
+ public ResponseMsg<MarkEntity> selectById(int id, HttpServletRequest req) {
try {
- MarkEntity entity = markService.selectById(id);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+ MarkEntity entity = markService.selectById(id, ue.getId());
return success(entity);
} catch (Exception ex) {
@@ -94,6 +96,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MarkEntity", paramType = "body")
})
+ @ResponseBody
@PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> insert(@RequestBody MarkEntity entity, HttpServletRequest req) {
try {
@@ -104,7 +107,7 @@
int count = markService.insert(entity);
- return success(count);
+ return success(count, entity.getId());
} catch (Exception ex) {
return fail(ex, -1);
}
@@ -115,6 +118,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MarkEntity", paramType = "body")
})
+ @ResponseBody
@PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> inserts(@RequestBody List<MarkEntity> list, HttpServletRequest req) {
try {
@@ -139,9 +143,13 @@
@ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/delete")
- public ResponseMsg<Integer> delete(int id) {
+ public ResponseMsg<Integer> delete(int id, HttpServletRequest req) {
try {
- int count = markService.delete(id);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+ int count = markService.delete(id, ue.getId());
return success(count);
} catch (Exception ex) {
@@ -155,13 +163,17 @@
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
@GetMapping(value = "/deletes")
- public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
+ public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids, HttpServletRequest req) {
try {
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
- int count = markService.deletes(ids);
+ int count = markService.deletes(ids, ue.getId());
return success(count);
} catch (Exception ex) {
@@ -180,6 +192,7 @@
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
+ entity.setCreateUser(ue.getId());
entity.setUpdateUser(ue.getId());
}
@@ -203,6 +216,7 @@
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
for (MarkEntity entity : list) {
+ entity.setCreateUser(ue.getId());
entity.setUpdateUser(ue.getId());
}
}
--
Gitblit v1.9.3