Compare commits

..

No commits in common. "e879a58ecc93c9dd7625252f98a625c5a839fe7a" and "67e39ccc648d291e9e509101771c49ac71961951" have entirely different histories.

2 changed files with 19 additions and 8 deletions

View File

@ -20,9 +20,6 @@ import com.four.system.domain.SysDoctor;
import com.four.system.domain.SysRegistrationInformation; import com.four.system.domain.SysRegistrationInformation;
import com.four.system.service.*; import com.four.system.service.*;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.poi.hpsf.Decimal;
import org.apache.xmlbeans.impl.jam.mutable.MElement;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -122,8 +119,6 @@ public class SysUserController extends BaseController
sysUserVo.setSysUser(sysUser); sysUserVo.setSysUser(sysUser);
sysUserVo.setRoles(roles); sysUserVo.setRoles(roles);
sysUserVo.setPermissions(permission); sysUserVo.setPermissions(permission);
SysUser sysUser1 = sysUserVo.getSysUser();
System.out.println(sysUserVo.getSysUser().toString());
return R.ok(sysUserVo); return R.ok(sysUserVo);
} }
@ -151,6 +146,11 @@ public class SysUserController extends BaseController
} }
/***
*
* @param email
* @return
*/
@InnerAuth @InnerAuth
@GetMapping("/infoByUserEmail/{email}") @GetMapping("/infoByUserEmail/{email}")
public R<LoginUser> infoByUserEmail(@PathVariable("email") String email){ public R<LoginUser> infoByUserEmail(@PathVariable("email") String email){
@ -391,7 +391,7 @@ public class SysUserController extends BaseController
* @param userId * @param userId
* @return * @return
*/ */
@PostMapping("/findByUserId/{userId}") @PostMapping("findByUserId/{userId}")
public R<SysUser> findByUserId(@PathVariable("userId") Long userId){ public R<SysUser> findByUserId(@PathVariable("userId") Long userId){
SysUser sysUser = userService.selectUserById(userId); SysUser sysUser = userService.selectUserById(userId);
return R.ok(sysUser,"查询成功"); return R.ok(sysUser,"查询成功");
@ -442,6 +442,9 @@ public class SysUserController extends BaseController
} }
/*** /***
* *
* @param medicalDepartmentId * @param medicalDepartmentId
@ -470,9 +473,17 @@ public class SysUserController extends BaseController
/** /**
* *
* @param registrationInformationId * @param
* @return * @return
*/ */
@GetMapping("/searchUser")
public R searchUser(){
SysUser sysUser = userService.selectUserById(1L);
System.out.println(sysUser.toString());
return R.ok(sysUser);
}
@GetMapping("findRegistrationInformation/{registrationInformationId}") @GetMapping("findRegistrationInformation/{registrationInformationId}")
public AjaxResult findRegistrationInformation(@PathVariable("registrationInformationId") Long registrationInformationId){ public AjaxResult findRegistrationInformation(@PathVariable("registrationInformationId") Long registrationInformationId){
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();

View File

@ -1,6 +1,6 @@
# Tomcat # Tomcat
server: server:
port: 9201 port: 9209
# Spring # Spring
spring: spring: