From 18b0beec7bf9b755e5d2cc0116bccb0ee2403996 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 九月 2023 10:17:57 +0800
Subject: [PATCH] 修改标绘接口

---
 src/main/java/com/moon/server/controller/show/MarkController.java |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 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..94b3167 100644
--- a/src/main/java/com/moon/server/controller/show/MarkController.java
+++ b/src/main/java/com/moon/server/controller/show/MarkController.java
@@ -14,9 +14,9 @@
 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;
 
@@ -28,29 +28,30 @@
 @RestController
 @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 +61,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 +80,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) {
@@ -139,9 +144,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 +164,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) {

--
Gitblit v1.9.3