|
|
@@ -12,6 +12,7 @@ import com.fs.common.core.page.TableDataInfo;
|
|
|
import com.fs.common.exception.CustomException;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.sign.Md5Utils;
|
|
|
+import com.fs.company.domain.CompanyUser;
|
|
|
import com.fs.course.service.IFsUserCourseVideoService;
|
|
|
import com.fs.his.domain.FsDoctor;
|
|
|
import com.fs.his.domain.FsPackage;
|
|
|
@@ -39,6 +40,7 @@ import com.google.zxing.WriterException;
|
|
|
import io.jsonwebtoken.lang.Assert;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import io.swagger.annotations.ApiParam;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -134,7 +136,24 @@ public class UserController extends AppBaseController {
|
|
|
return R.error("操作异常");
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ @Login
|
|
|
+ @ApiOperation("获取用户信息ByUserId")
|
|
|
+ @GetMapping("/getUserInfoByUserId")
|
|
|
+ public R getUserInfoByUserId(
|
|
|
+ @ApiParam(required = true, name = "userId", value = "用户ID") @RequestParam(value = "userId", required = false) Long userId,
|
|
|
+ HttpServletRequest request){
|
|
|
+ try {
|
|
|
+ FsUser user=userService.selectFsUserByUserId(userId);
|
|
|
+ if (user.getPhone()!=null&&user.getPhone().length()>11&&!user.getPhone().matches("\\d+")){
|
|
|
+ user.setPhone(decryptPhoneMk(user.getPhone()));
|
|
|
+ }
|
|
|
+ Map<String,Object> map=new HashMap<>();
|
|
|
+ map.put("user",user);
|
|
|
+ return R.ok(map);
|
|
|
+ } catch (Exception e){
|
|
|
+ return R.error("操作异常");
|
|
|
+ }
|
|
|
+ }
|
|
|
@Login
|
|
|
@ApiOperation("判断用户是否存在头像昵称")
|
|
|
@GetMapping("/checkUserInfo")
|