From d60406e8f251a7c8343825403f5fd71de1680975 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 08 八月 2022 13:31:48 +0800
Subject: [PATCH] bug解决
---
src/main/java/com/example/jz/controller/SensitiveController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/SensitiveController.java b/src/main/java/com/example/jz/controller/SensitiveController.java
index 7f44460..6b1bd38 100644
--- a/src/main/java/com/example/jz/controller/SensitiveController.java
+++ b/src/main/java/com/example/jz/controller/SensitiveController.java
@@ -3,16 +3,20 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.jz.dao.UserDao;
import com.example.jz.modle.PageParam;
import com.example.jz.modle.R;
import com.example.jz.modle.entity.Sensitive;
import com.example.jz.modle.dto.SensitiveDto;
+import com.example.jz.modle.entity.User;
import com.example.jz.modle.vo.SensitiveVO;
import com.example.jz.service.SensitiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -39,6 +43,9 @@
@Resource
private SensitiveService sensitiveService;
+ @Resource
+ UserDao userDao;
+
/**
* 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
*
@@ -49,13 +56,14 @@
@GetMapping
@ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�")
public R<Page<SensitiveVO>> selectAll(PageParam<Sensitive> page, Sensitive sensitive) {
- Page<Sensitive> sensitivePage = sensitiveService.page(page, new QueryWrapper<>(sensitive));
+ Page<Sensitive> sensitivePage = sensitiveService.page(page, new QueryWrapper<Sensitive>()
+ .like(StringUtils.isNotBlank(sensitive.getWords()),"words",sensitive.getWords()).orderByDesc("ctime"));
// 灏唖ensitive杞崲鎴恠ensitiveVO
List<SensitiveVO> sensitiveVOList = new ArrayList<>();
for (Sensitive s : sensitivePage.getRecords()) {
SensitiveVO sensitiveVO = new SensitiveVO();
BeanUtil.copyProperties(s, sensitiveVO);
- sensitiveVO.setWords(Arrays.asList(s.getWord().split(",")));
+ sensitiveVO.setCreator(userDao.selectOne(new QueryWrapper<User>().eq("id",s.getCreator())).getRealName());
sensitiveVOList.add(sensitiveVO);
}
// 灏佽鍒嗛〉鏁版嵁
@@ -77,7 +85,7 @@
Sensitive sensitive = sensitiveService.getById(id);
SensitiveVO sensitiveVO = new SensitiveVO();
BeanUtil.copyProperties(sensitive, sensitiveVO);
- sensitiveVO.setWords(Arrays.asList(sensitive.getWord().split(",")));
+ sensitiveVO.setCreator(userDao.selectOne(new QueryWrapper<User>().eq("id",sensitive.getCreator())).getRealName());
return R.ok(sensitiveVO);
}
@@ -90,7 +98,9 @@
@PostMapping
@ApiOperation("鏂板鏁版嵁")
public R<Boolean> insert(@RequestBody SensitiveDto sensitiveDto) {
- Sensitive sensitive = new Sensitive().setCreator(sensitiveDto.getCreator()).setCtime(new Date()).setWord(String.join(",", sensitiveDto.getWords()));
+ Sensitive sensitive = new Sensitive().setCreator(userDao.selectOne(new QueryWrapper<User>()
+ .eq("login_username", SecurityContextHolder.getContext().getAuthentication().getPrincipal())).getId())
+ .setCtime(new Date()).setWords(sensitiveDto.getWords());
return R.ok(sensitiveService.save(sensitive));
}
@@ -100,12 +110,12 @@
* @param sensitiveDto 瀹炰綋瀵硅薄
* @return 淇敼缁撴灉
*/
- @PutMapping
- @ApiOperation("淇敼鏁版嵁")
- public R<Boolean> update(@RequestBody SensitiveDto sensitiveDto) {
- Sensitive sensitive = new Sensitive().setId(sensitiveDto.getId()).setCreator(sensitiveDto.getCreator()).setWord(String.join(",", sensitiveDto.getWords()));
- return R.ok(sensitiveService.updateById(sensitive));
- }
+// @PutMapping
+// @ApiOperation("淇敼鏁版嵁")
+// public R<Boolean> update(@RequestBody SensitiveDto sensitiveDto) {
+// Sensitive sensitive = new Sensitive().setId(sensitiveDto.getId()).setCreator(sensitiveDto.getCreator()).setWord(String.join(",", sensitiveDto.getWords()));
+// return R.ok(sensitiveService.updateById(sensitive));
+// }
/**
* 鍒犻櫎鏁版嵁
--
Gitblit v1.8.0