From 0261d270c9f9b5282d923e585c307aee44b0612c Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 23 三月 2023 14:23:39 +0800
Subject: [PATCH] 删除警员，对应案件
---
src/main/java/com/example/jz/controller/UserController.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index 958d7e5..e88dbff 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -17,7 +17,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.Serializable;
-import java.util.Date;
+import java.util.*;
import java.util.function.Consumer;
/**
@@ -117,16 +117,16 @@
@GetMapping("/status")
@ApiOperation("绂佺敤/鍚敤鐢ㄦ埛")
- public R updateStatus(Integer id,Integer status){
+ public R updateStatus(Integer id, Integer status) {
int newStatus = 0;
- if(status!=null){
- if(status==1){
- newStatus=0;
- }else{
- newStatus=1;
+ if (status != null) {
+ if (status == 1) {
+ newStatus = 0;
+ } else {
+ newStatus = 1;
}
}
- userService.update(new UpdateWrapper<User>().set("status", newStatus).eq("id",id));
+ userService.update(new UpdateWrapper<User>().set("status", newStatus).eq("id", id));
return R.ok();
}
@@ -145,9 +145,21 @@
@DeleteMapping("/manager")
@ApiOperation("鍒犻櫎绠＄悊")
public R removeManager(@RequestParam Integer id) {
- causeService.list(new LambdaQueryWrapper<Cause>().eq(Cause::getUserId, id)).forEach(item -> {
- causeService.deleteCause(item.getId());
- });
+ List<Cause> list = causeService.list(new LambdaQueryWrapper<Cause>().eq(Cause::getUserId, id));
+ if (!Objects.isNull(list) && list.size() != 0){
+ ArrayList<Map> maps = new ArrayList<>();
+ for (Cause cause : list) {
+ HashMap<String, String> map = new HashMap<>();
+ map.put("caseName", cause.getName());
+ map.put("caseNumber", cause.getNumber());
+ maps.add(map);
+ }
+ return R.failed(maps, "璇ヨ鍛樿繕鏈夋浠跺叧鑱�,鑻ヨ鍒犻櫎璇峰厛淇敼瀵瑰簲妗堜欢鍏宠仈鐨勮鍛�");
+ }
+// causeService.list(new LambdaQueryWrapper<Cause>().eq(Cause::getUserId, id)).forEach(item -> {
+// causeService.deleteCause(item.getId());
+// });
+// userService.remove(new LambdaQueryWrapper<User>().eq(User::getId, id));
messageService.remove(new LambdaQueryWrapper<Message>().eq(Message::getCopId, id));
return R.ok(userService.removeById(id));
}
@@ -198,4 +210,18 @@
user.setLoginPassword(Md5Utils.md5(user.getUserIdcard().substring(user.getUserIdcard().length() - 6)));
return R.ok(userService.updateById(user));
}
+
+ /**
+ * 杞负绠＄悊鍛�
+ *
+ * @param id 鐢ㄦ埛id
+ * @return
+ */
+ @GetMapping("/toManager/{id}")
+ @ApiOperation("杞负绠＄悊鍛�")
+ public R toManager(@PathVariable Serializable id) {
+ User user = userService.getById(id);
+ user.setRole(1);
+ return R.ok(userService.updateById(user));
+ }
}
--
Gitblit v1.8.0