Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
This commit is contained in:
commit
af21a4d024
|
|
@ -27,13 +27,13 @@ public class UserController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "新增用户信息", notes = "")
|
@ApiOperation(value = "新增用户信息", notes = "")
|
||||||
@PostMapping
|
@PostMapping("/createUser")
|
||||||
public ElectromagneticResult<?> createUser(@RequestBody UserRequest userRequest) {
|
public ElectromagneticResult<?> createUser(@RequestBody UserRequest userRequest) {
|
||||||
return userFacade.createUser(userRequest);
|
return userFacade.createUser(userRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value="编辑用户信息",notes = "")
|
@ApiOperation(value="编辑用户信息",notes = "")
|
||||||
@PutMapping
|
@PutMapping("/updateUser")
|
||||||
public ElectromagneticResult<?> editUser(@RequestBody UserModiRequest userModiRequest){ return userFacade.modifyUser(userModiRequest);}
|
public ElectromagneticResult<?> editUser(@RequestBody UserModiRequest userModiRequest){ return userFacade.modifyUser(userModiRequest);}
|
||||||
|
|
||||||
@ApiOperation(value = "发布用户信息", notes = "")
|
@ApiOperation(value = "发布用户信息", notes = "")
|
||||||
|
|
@ -43,10 +43,9 @@ public class UserController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "获取单条用户信息", notes = "")
|
@ApiOperation(value = "获取单条用户信息", notes = "")
|
||||||
@RequestMapping(value = "/{userId}", method = RequestMethod.GET)
|
@RequestMapping(value = "/getInfo", method = RequestMethod.GET)
|
||||||
public ElectromagneticResult<?> getSingleUser(@PathVariable String userId) {
|
public ElectromagneticResult<?> getSingleUser(GetSingleUserRequest getSingleUserRequest) {
|
||||||
GetSingleUserRequest getSingleUserRequest = new GetSingleUserRequest();
|
System.out.println(getSingleUserRequest.getUserId());
|
||||||
getSingleUserRequest.setUserId(userId);
|
|
||||||
return userFacade.getSingleUser(getSingleUserRequest);
|
return userFacade.getSingleUser(getSingleUserRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue