From d7f28e3509c9de206f704467bda6d7f3a42fe876 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 6 May 2024 14:55:08 +0800 Subject: [PATCH] user --- src/main/java/com/yxt/user/apiadmin/SmsRest.java | 2 +- .../com/yxt/user/apiadmin/SysFunctionRest.java | 2 +- .../java/com/yxt/user/apiadmin/SysMenuRest.java | 2 +- .../yxt/user/apiadmin/SysOrganizationRest.java | 2 +- .../java/com/yxt/user/apiadmin/SysPostRest.java | 2 +- .../java/com/yxt/user/apiadmin/SysRoleRest.java | 2 +- .../java/com/yxt/user/apiadmin/SysSourceRest.java | 4 ++-- .../com/yxt/user/apiadmin/SysStaffOrgRest.java | 2 +- .../com/yxt/user/apiadmin/SysStaffPostRest.java | 4 ++-- .../com/yxt/user/apiadmin/SysStaffinfoRest.java | 6 +++--- .../yxt/user/apiadmin/SysUserDefaultOrgRest.java | 2 +- .../java/com/yxt/user/apiadmin/SysUserRest.java | 15 +++++++++------ .../com/yxt/user/apiadmin/SysUserRoleRest.java | 2 +- src/main/java/com/yxt/user/biz/sms/SmsFeign.java | 2 +- .../yxt/user/biz/syssource/SysSourceFeign.java | 2 +- 15 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/yxt/user/apiadmin/SmsRest.java b/src/main/java/com/yxt/user/apiadmin/SmsRest.java index c68e2ca..1bc8269 100644 --- a/src/main/java/com/yxt/user/apiadmin/SmsRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SmsRest.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Api(tags = "短信") @RestController -@RequestMapping("v1/sms") +@RequestMapping("apiadmin/sms") public class SmsRest { diff --git a/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java b/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java index b8c271c..12c0e8d 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java @@ -35,7 +35,7 @@ import java.util.Map; */ @Api(tags = "功能") @RestController -@RequestMapping("v1/sysfunction") +@RequestMapping("apiadmin/sysfunction") public class SysFunctionRest { @Autowired diff --git a/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java index 947fbc8..340bdfd 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; */ @Api(tags = "菜单表") @RestController -@RequestMapping("v1/sysmenu") +@RequestMapping("apiadmin/sysmenu") public class SysMenuRest { // @Autowired // private SysSourceMenuService sysSourceMenuService; diff --git a/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java b/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java index 968ea1b..73ba8ef 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java @@ -41,7 +41,7 @@ import static java.util.stream.Collectors.toList; */ @Api(tags = "组织机构表") @RestController -@RequestMapping("v1/sysorganization") +@RequestMapping("apiadmin/sysorganization") public class SysOrganizationRest{ @Autowired diff --git a/src/main/java/com/yxt/user/apiadmin/SysPostRest.java b/src/main/java/com/yxt/user/apiadmin/SysPostRest.java index ba46c78..3a8277c 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysPostRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysPostRest.java @@ -29,7 +29,7 @@ import java.util.List; */ @Api(tags = "岗位") @RestController -@RequestMapping("v1/syspost") +@RequestMapping("apiadmin/syspost") public class SysPostRest { @Autowired diff --git a/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java b/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java index 01c6349..61ab9f8 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java @@ -28,7 +28,7 @@ import java.util.List; */ @Api(tags = "角色") @RestController -@RequestMapping("v1/sysrole") +@RequestMapping("apiadmin/sysrole") public class SysRoleRest { @Autowired diff --git a/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java b/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java index dd70dfd..83d3e81 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java @@ -34,7 +34,7 @@ import java.util.List; */ @Api(tags = "资源表") @RestController -@RequestMapping("v1/syssource") +@RequestMapping("apiadmin/syssource") public class SysSourceRest { // @Autowired // private SystemLogService systemLogService; @@ -56,7 +56,7 @@ public class SysSourceRest { // systemLog.setCreateTime(new Date()); // systemLog.setEventName("人员岗位保存"); // systemLog.setEventContent(""); -// systemLog.setEventUrl("/portal/v1/sysstaffpost/save"); +// systemLog.setEventUrl("/portal/apiadmin/sysstaffpost/save"); // systemLog.setUserIp("0.0.0.0"); // systemLog.setUserName(sysUser.getUserName()); // systemLogService.save(systemLog); diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java b/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java index 2c30e26..732b548 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java @@ -28,7 +28,7 @@ import java.util.List; */ @Api(tags = "员工部门关联表") @RestController -@RequestMapping("v1/sysstafforg") +@RequestMapping("apiadmin/sysstafforg") public class SysStaffOrgRest { @Autowired diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java b/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java index 4b78b88..0e47c48 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java @@ -38,7 +38,7 @@ import java.util.List; */ @Api(tags = "员工岗位关联表") @RestController -@RequestMapping("v1/sysstaffpost") +@RequestMapping("apiadmin/sysstaffpost") public class SysStaffPostRest { @Autowired private RedisUtil redisUtil; @@ -84,7 +84,7 @@ public class SysStaffPostRest { // systemLog.setCreateTime(new Date()); // systemLog.setEventName("人员岗位保存"); // systemLog.setEventContent(""); -// systemLog.setEventUrl("/portal/v1/sysstaffpost/save"); +// systemLog.setEventUrl("/portal/apiadmin/sysstaffpost/save"); // systemLog.setUserIp("0.0.0.0"); // systemLog.setUserName(sysUser.getUserName()); // systemLogService.save(systemLog); diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java b/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java index 23c4a99..e9e4bdd 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java @@ -38,7 +38,7 @@ import java.util.Map; */ @Api(tags = "人员基础信息表") @RestController -@RequestMapping("v1/sysstaffinfo") +@RequestMapping("apiadmin/sysstaffinfo") public class SysStaffinfoRest{ private final Long PAGECURRENT = 2L; @@ -64,8 +64,8 @@ public class SysStaffinfoRest{ ResultBean> rb = ResultBean.fireFail(); IPage page = sysStaffinfoService.pagerList(pq); PagerVo pv = new PagerVo<>(); - PagerVo pv1 = PagerUtil.pageToVo(page, pv); - return rb.success().setData(pv1); + PagerVo papiadmin = PagerUtil.pageToVo(page, pv); + return rb.success().setData(papiadmin); } /** diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java b/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java index 804ea25..6940d11 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Api(tags = "用户默认的组织机构") @RestController -@RequestMapping("v1/sysuserdefaultorg") +@RequestMapping("apiadmin/sysuserdefaultorg") public class SysUserDefaultOrgRest { @Autowired diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java b/src/main/java/com/yxt/user/apiadmin/SysUserRest.java index 40250ea..6b4b4ab 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysUserRest.java @@ -44,7 +44,7 @@ import java.util.*; */ @Api(tags = "用户表") @RestController -@RequestMapping("v1/sysuser") +@RequestMapping("apiadmin/sysuser") public class SysUserRest { @Autowired private RedisUtil redisUtil; @@ -398,9 +398,9 @@ public class SysUserRest { if (StringUtils.isBlank(mobile)) { return new ResultBean().fail().setMsg("手机号不能为空"); } - if (userType == 0) { - return new ResultBean().fail().setMsg("用户类型不能为空"); - } +// if (userType == 0) { +// return new ResultBean().fail().setMsg("用户类型不能为空"); +// } if (StringUtils.isBlank(verificationCode)) { return new ResultBean().fail().setMsg("验证码不能为空"); } else { @@ -514,7 +514,7 @@ public class SysUserRest { // systemLog.setUserName(user.getUserName()); // String ip = WebUtil.getIpAddr(httpServletRequest); // systemLog.setUserIp(ip); -// systemLog.setEventUrl("portal/v1/sysuser/login"); +// systemLog.setEventUrl("portal/apiadmin/sysuser/login"); // systemLog.setEventContent("用户登录"); // systemLog.setEventName("用户登录"); // systemLogService.save(systemLog); @@ -589,7 +589,10 @@ public class SysUserRest { return rb.success().setData(vo); } - + @PostMapping("/loginDetails") + @ResponseBody + @ApiOperation(value = "获取登录人") + @ApiOperationSupport(order = 30) public ResultBean loginDetails(HttpServletRequest httpServletRequest) { String token = httpServletRequest.getHeader("token"); if (StringUtils.isBlank(token)) { diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java b/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java index 7200ae0..c1d5413 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java +++ b/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java @@ -28,7 +28,7 @@ import java.util.List; */ @Api(tags = "用户与角色关联表") @RestController -@RequestMapping("v1/sysuserrole") +@RequestMapping("apiadmin/sysuserrole") public class SysUserRoleRest { @Autowired diff --git a/src/main/java/com/yxt/user/biz/sms/SmsFeign.java b/src/main/java/com/yxt/user/biz/sms/SmsFeign.java index 3a6f57f..1e66649 100644 --- a/src/main/java/com/yxt/user/biz/sms/SmsFeign.java +++ b/src/main/java/com/yxt/user/biz/sms/SmsFeign.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; @FeignClient( contextId = "anrui-portal-SmsApi", name = "anrui-portal", - path = "v1/sms", + path = "apiadmin/sms", fallback = SmsFeignFallback.class) public interface SmsFeign { static String msgSign="【安瑞集团】"; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceFeign.java b/src/main/java/com/yxt/user/biz/syssource/SysSourceFeign.java index 713ea90..eae604f 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceFeign.java +++ b/src/main/java/com/yxt/user/biz/syssource/SysSourceFeign.java @@ -30,7 +30,7 @@ import java.util.List; @FeignClient( contextId = "anrui-portal-SysSource", name = "anrui-portal", - path = "v1/syssource", + path = "apiadmin/syssource", fallback = SysSourceFeignFallback.class) public interface SysSourceFeign {