From a5a0ff50ea4be9a7e7d0c6f805ed26809e3b183e Mon Sep 17 00:00:00 2001
From: shiyue <1211061228@qq.com>
Date: 星期四, 16 二月 2023 12:48:42 +0800
Subject: [PATCH] 2023-02-16更新
---
src/main/java/com/example/jz/auth/UserDetailService.java | 5 ++++-
src/main/java/com/example/jz/controller/ReportController.java | 4 ++++
src/main/java/com/example/jz/controller/UserController.java | 16 ++++++++++++++++
src/main/java/com/example/jz/controller/CauseController.java | 8 ++++++++
4 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/example/jz/auth/UserDetailService.java b/src/main/java/com/example/jz/auth/UserDetailService.java
index 1ee9d8f..8c7ad8a 100644
--- a/src/main/java/com/example/jz/auth/UserDetailService.java
+++ b/src/main/java/com/example/jz/auth/UserDetailService.java
@@ -29,6 +29,9 @@
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
// 閫氳繃username鏌ヨ鏁版嵁搴撹幏鍙栫敤鎴蜂俊鎭�
User user = userDao.selectOne(new LambdaQueryWrapper<>(User.class).eq(User::getLoginUsername, username));
+ if(user.getStatus()==0){
+ throw new UsernameNotFoundException("褰撳墠璐︽埛琚鐢�,璇疯仈绯荤鐞嗗憳!");
+ }
// 鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪
if (user == null) {
throw new UsernameNotFoundException("璐︽埛淇℃伅涓嶅瓨鍦紒");
@@ -47,4 +50,4 @@
return securityUser;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/example/jz/controller/CauseController.java b/src/main/java/com/example/jz/controller/CauseController.java
index 8ba9def..90bfc38 100644
--- a/src/main/java/com/example/jz/controller/CauseController.java
+++ b/src/main/java/com/example/jz/controller/CauseController.java
@@ -1,6 +1,8 @@
package com.example.jz.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +10,7 @@
import com.example.jz.modle.dto.AddReportDto;
import com.example.jz.modle.dto.CauseDto;
import com.example.jz.modle.dto.ReportParamDto;
+import com.example.jz.modle.entity.Cause;
import com.example.jz.modle.vo.ReportListVo;
import com.example.jz.service.CauseService;
import com.example.jz.service.ReportService;
@@ -21,6 +24,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.List;
/**
* 妗堜欢琛�(Cause)琛ㄦ帶鍒跺眰
@@ -54,6 +58,10 @@
@PostMapping("/addCause")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R addCause(@RequestBody @Validated CauseDto causeDto) {
+ int count = causeService.count(new LambdaQueryWrapper<Cause>().eq(Cause::getName, causeDto.getName()));
+ if(count>0){
+ return R.failed("璇ユ浠跺悕宸插瓨鍦�,璇烽噸鏂拌緭鍏�");
+ }
causeService.addCause(causeDto);
return R.ok();
}
diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java
index f3ec50d..a99b59c 100644
--- a/src/main/java/com/example/jz/controller/ReportController.java
+++ b/src/main/java/com/example/jz/controller/ReportController.java
@@ -107,6 +107,10 @@
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
@Transactional(rollbackFor = Exception.class)
public R updateReport(@RequestBody AddReportDto report) {
+ Integer causeId = report.getCauseId();
+ if(causeId==null){
+ return R.failed("鍏宠仈妗堜欢涓嶈兘涓虹┖");
+ }
int imgIndexFirst = report.getPic().indexOf("/img");
int imgIndexEnd = report.getPic().indexOf("?");
String pic = report.getPic().substring(imgIndexFirst + 5, imgIndexEnd);
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index 73e162d..9d1af72 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -11,6 +11,7 @@
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;
@@ -115,6 +116,21 @@
}
+ @GetMapping("/status")
+ @ApiOperation("绂佺敤/鍚敤鐢ㄦ埛")
+ public R updateStatus(Integer id,Integer status){
+ int newStatus = 0;
+ if(status!=null){
+ if(status==1){
+ newStatus=0;
+ }else{
+ newStatus=1;
+ }
+ }
+ userService.update(new UpdateWrapper<User>().set("status", newStatus).eq("id",id));
+ return R.ok();
+ }
+
@PostMapping("/manager")
@ApiOperation("娣诲姞绠＄悊")
public R addManager(@RequestBody ManagerDto managerDto) {
--
Gitblit v1.8.0