From 4a5879a5454a5b396a13ab0b3c7386cdc0779ea7 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期一, 17 四月 2023 13:54:39 +0800
Subject: [PATCH] 一系列修改,主要包括添加,警方通告
---
src/main/java/com/example/jz/controller/UserController.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index 9d1af72..e955c8e 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.example.jz.modle.R;
@@ -11,14 +12,13 @@
import com.example.jz.modle.entity.*;
import com.example.jz.service.*;
import com.example.jz.utils.Md5Utils;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.Serializable;
-import java.util.Date;
+import java.util.*;
import java.util.function.Consumer;
/**
@@ -118,16 +118,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();
}
@@ -144,13 +144,38 @@
}
@DeleteMapping("/manager")
- @ApiOperation("鍒犻櫎绠$悊")
+ @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));
+ }
+
+ @DeleteMapping("/crowd")
+ @ApiOperation("鍒犻櫎鏅�氱敤鎴�")
+ public R removeCrowd(@RequestParam Integer id){
+ List<Report> list = reportService.list(Wrappers.<Report>lambdaQuery().eq(Report::getUserId, id));
+ for (Report report : list) {
+ groupUserService.remove(new LambdaQueryWrapper<GroupUser>().eq(GroupUser::getUserId, report.getId()));
+ messageService.remove(new LambdaQueryWrapper<Message>().eq(Message::getUserId, report.getId()));
+ reportService.removeById(report.getId());
+ }
+ userService.remove(Wrappers.<User>lambdaQuery().eq(User::getId, id));
+ return R.ok();
}
@GetMapping("/manager")
@@ -199,4 +224,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