|
@@ -1,6 +1,7 @@
|
|
package com.anyway.favor.controller;
|
|
package com.anyway.favor.controller;
|
|
|
|
|
|
import com.anyway.favor.model.Favor;
|
|
import com.anyway.favor.model.Favor;
|
|
|
|
+import com.anyway.favor.model.Person;
|
|
import com.anyway.favor.model.User;
|
|
import com.anyway.favor.model.User;
|
|
import com.anyway.favor.model.dto.FavorDto;
|
|
import com.anyway.favor.model.dto.FavorDto;
|
|
import com.anyway.favor.model.enums.Update;
|
|
import com.anyway.favor.model.enums.Update;
|
|
@@ -58,13 +59,33 @@ public class FavorController {
|
|
return favorService.update(favorAddDto) ? R.ok() : R.fail("保存失败");
|
|
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
|
|
* @param pageQuery
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @GetMapping("/listPage")
|
|
|
|
|
|
+ @PostMapping("/listPage")
|
|
public R<List<Favor>> listPage(@RequestBody PageQuery<Map<String, Object>> pageQuery) {
|
|
public R<List<Favor>> listPage(@RequestBody PageQuery<Map<String, Object>> pageQuery) {
|
|
User currentUser = SessionUtils.currentUser();
|
|
User currentUser = SessionUtils.currentUser();
|
|
Map<String, Object> mapCondition = pageQuery.getTerms(new HashMap<>());
|
|
Map<String, Object> mapCondition = pageQuery.getTerms(new HashMap<>());
|
|
@@ -79,8 +100,8 @@ public class FavorController {
|
|
*
|
|
*
|
|
* @return
|
|
* @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));
|
|
return R.data(favorService.findDetail(id));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -90,8 +111,8 @@ public class FavorController {
|
|
* @param id
|
|
* @param id
|
|
* @return
|
|
* @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);
|
|
boolean b = favorService.deleteById(id);
|
|
return b ? R.ok() : R.fail("删除失败");
|
|
return b ? R.ok() : R.fail("删除失败");
|
|
}
|
|
}
|