From 3058f3d94dc3dbfdbf1d69c4b5143f95d674827d Mon Sep 17 00:00:00 2001
From: 安瑾然 <107107765@qq.com>
Date: 星期二, 19 七月 2022 13:36:26 +0800
Subject: [PATCH] commit
---
/dev/null | 85 ----------------------------
src/main/java/com/example/jz/dao/ReportDao.java | 2
src/main/java/com/example/jz/controller/UserController.java | 70 +++++++++++++++++-----
src/main/java/com/example/jz/modle/dto/ReportParamDto.java | 2
4 files changed, 55 insertions(+), 104 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/GroupUserController.java b/src/main/java/com/example/jz/controller/GroupUserController.java
deleted file mode 100644
index 12deb72..0000000
--- a/src/main/java/com/example/jz/controller/GroupUserController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.example.jz.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.ApiController;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.jz.modle.entity.GroupUser;
-import com.example.jz.service.GroupUserService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 鐢ㄦ埛鍜岀兢涓棿琛�(GroupUser)琛ㄦ帶鍒跺眰
- *
- * @author makejava
- * @since 2022-07-11 16:35:57
- */
-@RestController
-@RequestMapping("groupUser")
-public class GroupUserController extends ApiController {
- /**
- * 鏈嶅姟瀵硅薄
- */
- @Resource
- private GroupUserService groupUserService;
-
- /**
- * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
- *
- * @param page 鍒嗛〉瀵硅薄
- * @param groupUser 鏌ヨ瀹炰綋
- * @return 鎵�鏈夋暟鎹�
- */
- @GetMapping
- public R selectAll(Page<GroupUser> page, GroupUser groupUser) {
- return success(this.groupUserService.page(page, new QueryWrapper<>(groupUser)));
- }
-
- /**
- * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁
- *
- * @param id 涓婚敭
- * @return 鍗曟潯鏁版嵁
- */
- @GetMapping("{id}")
- public R selectOne(@PathVariable Serializable id) {
- return success(this.groupUserService.getById(id));
- }
-
- /**
- * 鏂板鏁版嵁
- *
- * @param groupUser 瀹炰綋瀵硅薄
- * @return 鏂板缁撴灉
- */
- @PostMapping
- public R insert(@RequestBody GroupUser groupUser) {
- return success(this.groupUserService.save(groupUser));
- }
-
- /**
- * 淇敼鏁版嵁
- *
- * @param groupUser 瀹炰綋瀵硅薄
- * @return 淇敼缁撴灉
- */
- @PutMapping
- public R update(@RequestBody GroupUser groupUser) {
- return success(this.groupUserService.updateById(groupUser));
- }
-
- /**
- * 鍒犻櫎鏁版嵁
- *
- * @param idList 涓婚敭缁撳悎
- * @return 鍒犻櫎缁撴灉
- */
- @DeleteMapping
- public R delete(@RequestParam("idList") List<Long> idList) {
- return success(this.groupUserService.removeByIds(idList));
- }
-}
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index 6b2c106..20d0031 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -3,9 +3,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.example.jz.modle.entity.User;
import com.example.jz.service.UserService;
+import com.example.jz.utils.Md5Utils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -15,17 +22,19 @@
/**
* 鐢ㄦ埛琛�(User)琛ㄦ帶鍒跺眰
*
- * @author makejava
+ * @author 瀹夌懢鐒�
* @since 2022-07-11 16:35:57
*/
@RestController
@RequestMapping("user")
+@Api(tags = "鐢ㄦ埛绠＄悊")
public class UserController extends ApiController {
- /**
- * 鏈嶅姟瀵硅薄
- */
- @Resource
private UserService userService;
+
+ @Autowired
+ public void setUserService(UserService userService) {
+ this.userService = userService;
+ }
/**
* 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
@@ -35,6 +44,7 @@
* @return 鎵�鏈夋暟鎹�
*/
@GetMapping
+ @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�")
public R selectAll(Page<User> page, User user) {
return success(this.userService.page(page, new QueryWrapper<>(user)));
}
@@ -46,19 +56,9 @@
* @return 鍗曟潯鏁版嵁
*/
@GetMapping("{id}")
+ @ApiOperation("閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁")
public R selectOne(@PathVariable Serializable id) {
return success(this.userService.getById(id));
- }
-
- /**
- * 鏂板鏁版嵁
- *
- * @param user 瀹炰綋瀵硅薄
- * @return 鏂板缁撴灉
- */
- @PostMapping
- public R insert(@RequestBody User user) {
- return success(this.userService.save(user));
}
/**
@@ -68,8 +68,9 @@
* @return 淇敼缁撴灉
*/
@PutMapping
+ @ApiOperation("淇敼鐢ㄦ埛鏁版嵁")
public R update(@RequestBody User user) {
- return success(this.userService.updateById(user));
+ return success(userService.updateById(user));
}
/**
@@ -79,7 +80,42 @@
* @return 鍒犻櫎缁撴灉
*/
@DeleteMapping
+ @ApiOperation("鍒犻櫎鐢ㄦ埛鏁版嵁")
public R delete(@RequestParam("idList") List<Long> idList) {
return success(this.userService.removeByIds(idList));
}
+
+ /**
+ * 娣诲姞绠＄悊鍛�
+ *
+ * @param id 鐢ㄦ埛id
+ * @param username 绠＄悊鍛樼敤鎴峰悕
+ * @param password 绠＄悊鍛樺瘑鐮�
+ * @return
+ */
+ @PostMapping("/addAdmin/{id}")
+ @ApiOperation("娣诲姞绠＄悊鍛�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "password", value = "瀵嗙爜", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚�", required = true, dataType = "String")
+ })
+ public R addAdmin(@PathVariable Serializable id, String username, String password) {
+ User user = userService.getById(id).setLoginUsername(username).setLoginPassword(Md5Utils.md5(password)).setRole(1);
+ return success(userService.updateById(user));
+ }
+
+ /**
+ * 閲嶇疆绠＄悊鍛樺瘑鐮�
+ *
+ * @param id 鐢ㄦ埛id
+ * @return
+ */
+ @GetMapping("/resetPassword/{id}")
+ @ApiOperation("閲嶇疆绠＄悊鍛樺瘑鐮�")
+ public R resetPassword(@PathVariable Serializable id) {
+ User user = userService.getById(id);
+ // 閲嶇疆鍒濆瀵嗙爜涓鸿韩浠借瘉鍚庡叚浣�
+ user.setLoginPassword(Md5Utils.md5(user.getUserIdcard().substring(user.getUserIdcard().length() - 6)));
+ return success(userService.updateById(user));
+ }
}
diff --git a/src/main/java/com/example/jz/dao/ReportDao.java b/src/main/java/com/example/jz/dao/ReportDao.java
index 53fd686..eee3b7d 100644
--- a/src/main/java/com/example/jz/dao/ReportDao.java
+++ b/src/main/java/com/example/jz/dao/ReportDao.java
@@ -19,7 +19,7 @@
@Mapper
public interface ReportDao extends BaseMapper<Report> {
- Page<ReportListVo> getPage(Page<ReportListVo> page,@Param("reportDto") ReportParamDto reportParamDto);
+ Page<ReportListVo> getPage(Page<ReportListVo> page,@Param("reportParamDto") ReportParamDto reportParamDto);
ReportListVo getReportListVoById(Serializable id);
diff --git a/src/main/java/com/example/jz/modle/dto/ReportParamDto.java b/src/main/java/com/example/jz/modle/dto/ReportParamDto.java
index 7708269..f991a22 100644
--- a/src/main/java/com/example/jz/modle/dto/ReportParamDto.java
+++ b/src/main/java/com/example/jz/modle/dto/ReportParamDto.java
@@ -18,7 +18,7 @@
@AllArgsConstructor
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel("淇濆畨鏌ヨ鏉′欢")
+@ApiModel("鎶ユ鏌ヨ鏉′欢")
public class ReportParamDto {
/**
* 鏌ヨ鏉′欢 鍙互鏄鍚嶄篃鍙互鏄韩浠借瘉鍙�
--
Gitblit v1.8.0