Jelajahi Sumber

feat:修改人情增删改查接口

刘传伟 1 bulan lalu
induk
melakukan
ef282829f4

+ 26 - 5
src/main/java/com/anyway/favor/controller/FavorController.java

@@ -1,6 +1,7 @@
 package com.anyway.favor.controller;
 
 import com.anyway.favor.model.Favor;
+import com.anyway.favor.model.Person;
 import com.anyway.favor.model.User;
 import com.anyway.favor.model.dto.FavorDto;
 import com.anyway.favor.model.enums.Update;
@@ -58,13 +59,33 @@ public class FavorController {
         return favorService.update(favorAddDto) ? R.ok() : R.fail("保存失败");
     }
 
+
+    /**
+     * 保存事件
+     *
+     * @param favor
+     * @return
+     */
+    @PostMapping("/save")
+    public R<Void> save(@Validated @RequestBody FavorDto favor) {
+        User currentUser = SessionUtils.currentUser();
+        if(favor.getId() != null) {
+            favor.setModifyBy(currentUser.getId());
+            return favorService.update(favor) ? R.ok() : R.fail("更新失败");
+        } else {
+            favor.setCreateBy(currentUser.getId());
+            return favorService.add(favor) ? R.ok() : R.fail("新增失败");
+        }
+
+    }
+
     /**
      * 人情事件列表
      *
      * @param pageQuery
      * @return
      */
-    @GetMapping("/listPage")
+    @PostMapping("/listPage")
     public R<List<Favor>> listPage(@RequestBody PageQuery<Map<String, Object>> pageQuery) {
         User currentUser = SessionUtils.currentUser();
         Map<String, Object> mapCondition = pageQuery.getTerms(new HashMap<>());
@@ -79,8 +100,8 @@ public class FavorController {
      *
      * @return
      */
-    @GetMapping("/detail/{id}")
-    public R<FavorDto> detail(@PathVariable Long id) {
+    @GetMapping("/detail")
+    public R<FavorDto> detail(@RequestParam Long id) {
         return R.data(favorService.findDetail(id));
     }
 
@@ -90,8 +111,8 @@ public class FavorController {
      * @param id
      * @return
      */
-    @PostMapping("/delete/{id}")
-    public R<Boolean> delete(@PathVariable Long id) {
+    @GetMapping("/delete")
+    public R<Boolean> delete(@RequestParam Long id) {
         boolean b = favorService.deleteById(id);
         return b ? R.ok() : R.fail("删除失败");
     }

+ 1 - 1
src/main/java/com/anyway/favor/controller/PersonController.java

@@ -145,7 +145,7 @@ public class PersonController {
      * @param ids
      * @return
      */
-    @PostMapping("/delete")
+    @GetMapping("/delete")
     public R<Void> delete(@RequestParam(defaultValue = "") @NotBlank(message = "ids不能为空") String ids) {
         if(!StringUtils.hasText(ids)) {
             return R.fail("无效的ID");

+ 1 - 4
src/main/java/com/anyway/favor/service/impl/PersonServiceImpl.java

@@ -16,10 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Nullable;
 import javax.annotation.PostConstruct;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**