From 60e4184587a2e3e69376a28aaf6b6f87c55f2e4e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 20 Jul 2020 17:30:00 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/test/controller/TestUserController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/test/controller/TestUserController.java b/src/main/java/com/xcong/excoin/modules/test/controller/TestUserController.java
index 430f8e6..0be8a3b 100644
--- a/src/main/java/com/xcong/excoin/modules/test/controller/TestUserController.java
+++ b/src/main/java/com/xcong/excoin/modules/test/controller/TestUserController.java
@@ -2,19 +2,19 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xcong.excoin.common.annotations.UserAuth;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.test.dto.TestUserDto;
import com.xcong.excoin.modules.test.entity.TestUserEntity;
import com.xcong.excoin.modules.test.mapper.TestUserEntityMapper;
import com.xcong.excoin.modules.test.service.TestUserService;
import com.xcong.excoin.modules.test.vo.TestUserVo;
import com.xcong.excoin.utils.MessageSourceUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -38,12 +38,14 @@
@PostMapping(value = "/findUserInPage")
public Result findUserInPage(@RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
- @RequestBody @Valid TestUserDto testUserDto) {
+ @RequestBody @Validated TestUserDto testUserDto, @UserAuth MemberEntity memberEntity) {
log.info("--->{}",SecurityContextHolder.getContext().getAuthentication());
+ log.info("----->{}", memberEntity);
Page<TestUserEntity> page = new Page<>(pageNum, pageSize);
- log.info(testUserDto.getName());
IPage<TestUserEntity> list = testUserService.page(page);
- return Result.ok(MessageSourceUtils.getString("111"), list);
+
+ IPage<TestUserVo> aa = TestUserEntityMapper.INSTANCE.pageEntityToPageVO(list);
+ return Result.ok(MessageSourceUtils.getString("111"), aa);
}
@@ -58,6 +60,19 @@
return Result.fail("fail");
}
+ @ApiOperation(value = "修改测试用户", notes = "该接口用户修改测试用户")
+ @PostMapping(value = "/modify")
+ public Result modify(@RequestBody @Validated TestUserDto testUserDto) {
+ TestUserEntity testUserEntity = TestUserEntityMapper.INSTANCE.dtoToEntity(testUserDto);
+ log.info("#-------->{}#", testUserEntity);
+ boolean flag = testUserService.updateById(testUserEntity);
+ if (flag) {
+ return Result.ok("success");
+ }
+ return Result.fail("fail");
+ }
+
+
@ApiOperation(value = "根据ID删除用户", notes = "根据ID删除用户")
@GetMapping(value = "/del/{id}")
public Result del(@PathVariable(value = "id") Long id) {
@@ -70,9 +85,18 @@
@ApiOperation(value = "根据Id查询用户信息", notes = "根据Id查询用户信息")
@GetMapping(value = "/findById/{id}")
- public Result findById(@PathVariable(value = "id") Long id) {
+ public Result findById(@ApiParam(name = "id", value = "用户ID", required = true, example = "1") @PathVariable(value = "id") Long id) {
TestUserEntity testUserEntity = testUserService.getById(id);
TestUserVo testUserVo = TestUserEntityMapper.INSTANCE.entityToVo(testUserEntity);
return Result.ok("success", testUserVo);
}
+
+ @ApiOperation(value = "根据Id查询用户信息", notes = "根据Id查询用户信息")
+ @GetMapping(value = "/findByIdAndName/{id}/{name}")
+ public Result findByIdAndName(@ApiParam(name = "id", value="用户ID", required = true, example = "1") @PathVariable(value = "id") Long id,
+ @ApiParam(name = "name", value="用户姓名", required = true, example = "wzy") @PathVariable(value = "name") String name) {
+ log.info("---->{}", id);
+ log.info("----<{}", name);
+ return Result.ok("success");
+ }
}
--
Gitblit v1.9.1