diff --git a/gateway/src/main/java/com/yxt/wms/GatewayApplication.java b/gateway/src/main/java/com/yxt/wms/GatewayApplication.java index 97cb509..1913578 100644 --- a/gateway/src/main/java/com/yxt/wms/GatewayApplication.java +++ b/gateway/src/main/java/com/yxt/wms/GatewayApplication.java @@ -1,17 +1,21 @@ package com.yxt.wms; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author wangpengfei * @date ${DATE} ${TIME} */ - +@SpringBootApplication(scanBasePackages = { + "com.yxt.wms" +}) @EnableDiscoveryClient -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@EnableFeignClients(basePackages = {}) public class GatewayApplication { public static void main(String[] args) { SpringApplication.run(GatewayApplication.class, args); diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysMenuRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysMenuRest.java index 8992c10..57cd38c 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysMenuRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysMenuRest.java @@ -58,7 +58,7 @@ public class SysMenuRest { */ @ApiOperation("菜单列表：根据资源归类") @PostMapping("/listAllVoForSource") - public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query){ + public ResultBean> listAllVoForSource(@RequestBody PagerQuery query){ return sysMenuService.listAllVoForSource(query); } diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysOrganizationRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysOrganizationRest.java index 2514626..060087b 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysOrganizationRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysOrganizationRest.java @@ -57,9 +57,9 @@ public class SysOrganizationRest { } @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list() { - return sysOrganizationService.listVo(); + @GetMapping("/list/{orgSid}") + public ResultBean> list(@PathVariable("orgSid") String orgSid) { + return sysOrganizationService.listVo(orgSid); } @ApiOperation("新增保存") @@ -82,7 +82,9 @@ public class SysOrganizationRest { @Transactional(rollbackFor = Exception.class) - public ResultBean update(SysOrganizationDto dto, String sid){ + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysOrganizationDto dto, @PathVariable("sid") String sid){ return sysOrganizationService.updateBySid(dto, sid); } diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysRoleAuthorizeRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysRoleAuthorizeRest.java index 8fb5eaa..0f8ff0d 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysRoleAuthorizeRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysRoleAuthorizeRest.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Api(tags = "角色授权表") @RestController -@RequestMapping("apiadmin/sysrikeauthorize") +@RequestMapping("apiadmin/sysroleauthorize") public class SysRoleAuthorizeRest { @Autowired SysRoleAuthorizeService sysRoleAuthorizeService; diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java index be0c31d..8d253f5 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysStaffinfoRest.java @@ -29,7 +29,7 @@ import java.util.Map; */ @Api(tags = "人员基础信息表") @RestController -@RequestMapping("apiadmin/sysstaffinfo") +@RequestMapping("/apiadmin/sysstaffinfo") public class SysStaffinfoRest { @@ -72,7 +72,7 @@ public class SysStaffinfoRest { */ @ApiOperation("修改保存") @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody SysStaffinfoDto dto, @RequestParam String sid) { + public ResultBean update(@RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid) { return sysStaffinfoService.updateStaffInfo(dto, sid); } diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysUserRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysUserRest.java index 9b3278d..6f8f5c2 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysUserRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SysUserRest.java @@ -107,4 +107,9 @@ public class SysUserRest { initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) { return sysUserService.initPwd(sid); } + @ApiOperation("删除记录根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid){ + return sysUserService.delBySid(sid); + }; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuService.java b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuService.java index 866b058..2b9ab5d 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuService.java @@ -120,9 +120,9 @@ public class SysMenuService extends MybatisBaseService { } return sysMenuVos; }*/ - public ResultBean> listAllVoForSource(SysMenuQuery query) { + public ResultBean> listAllVoForSource(PagerQuery query) { - return sysMenuFeign.listAllVoForSource(query); + return sysMenuFeign.listAllVoForSource(query.getParams()); } public ResultBean>> getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) { return sysMenuFeign.getMenusForFunction(sysMenuFunctionQuery); diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java index a3e2b6a..e6e1111 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java @@ -56,4 +56,6 @@ public class SysMenuTreeVo implements Vo { private String remarks; @ApiModelProperty("子菜单") private List children; + private String menuType; + private String isShow; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java index 07fbc33..39dfd29 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java @@ -71,4 +71,5 @@ public class SysMenuVo implements Vo { private String checked; @ApiModelProperty("资源名称") private String sourceName; + } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationService.java b/wms/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationService.java index 9183bfb..7f881b3 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationService.java @@ -118,8 +118,8 @@ public class SysOrganizationService extends MybatisBaseService> listVo() { - return sysOrganizationFeign.list(); + public ResultBean> listVo(String orgSid) { + return sysOrganizationFeign.list(orgSid); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java b/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java index 3df9c9b..ebfd209 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java @@ -46,4 +46,5 @@ public class SysRole extends BaseEntity { @ApiModelProperty(value = "角色组织层级value") private String roleTypeValue; private String orgSid; + private String dataRuleId; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java b/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java index fb54638..b8ca73a 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java @@ -49,4 +49,5 @@ public class SysRoleDto implements Dto { @ApiModelProperty(value = "角色组织层级value") private String roleTypeValue; private String orgSid; + private String dataRuleId; } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java index 8b091bd..3741701 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java @@ -82,5 +82,7 @@ public class SysStaffinfoDetailsVo implements Vo { private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户 private String userType;//用户类型:1员工、2客户、3供应商 + private String userName; + private String remarks; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDto.java b/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDto.java index ce52e76..7440173 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDto.java @@ -185,5 +185,9 @@ public class SysStaffinfoDto implements Dto { private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户 private String userType;//用户类型:1员工、2客户、3供应商 private String orgSid; + @Pattern(regexp = "^[0-9]{11}$", message = "账号格式不正确") + @NotBlank(message = "账号不能为空") + private String userName; + private String remarks; } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java b/wms/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java index a3c841e..44b8c3c 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java @@ -12,10 +12,7 @@ import io.swagger.annotations.ApiParam; import org.hamcrest.core.Is; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -72,11 +69,12 @@ public class SysUserService { * @param sid 用户sid * @return ResultBean */ - @ResponseBody - @PostMapping("/initPwd/{sid}") - @ApiOperation(value = "10、用户初始化密码") - @ApiOperationSupport(order = 100) + public ResultBean initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) { return sysUserFeign.initPwd(sid); } + + public ResultBean delBySid(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) { + return sysUserFeign.delBySid(sid); + } } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleVo.java index 7b77deb..b99627d 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleVo.java @@ -23,10 +23,11 @@ import lombok.Data; @Data public class SysUserRoleVo implements Vo { - - @ApiModelProperty("用户sid") + + @ApiModelProperty("用户sid") private String userSid; - - @ApiModelProperty("角色sid") + + @ApiModelProperty("角色sid") private String roleSid; + private String name; } diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java index 7b2dac4..8986eb8 100644 --- a/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java @@ -45,8 +45,8 @@ public interface SysOrganizationFeign { public ResultBean> listAll(@RequestBody SysOrganizationQuery query); @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(); + @GetMapping("/list/{orgSid}") + public ResultBean> list(@PathVariable("orgSid") String orgSid); @ApiOperation("一级组织机构列表") @GetMapping("/selectFirstOrgList") diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeignFallback.java index f2e7bcb..3a678fe 100644 --- a/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeignFallback.java @@ -42,10 +42,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { } @Override - public ResultBean> list() { + public ResultBean> list(String orgSid) { return null; } + @Override public ResultBean> selectFirstOrgList() { return null; diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java index 6f2a7e9..7b9d855 100644 --- a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java @@ -88,4 +88,7 @@ public interface SysUserFeign { @ApiOperation(value = "10、用户初始化密码") @ApiOperationSupport(order = 100) public ResultBean initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid); + @ApiOperation("删除记录根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid); } diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java index 35f54dd..a10d22a 100644 --- a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java @@ -81,4 +81,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean initPwd(String sid) { return null; } + + @Override + public ResultBean delBySid(String sid) { + return null; + } } diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java index ef07fb3..d025493 100644 --- a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java +++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import com.yxt.wms.biz.func.sysrole.SysRoleVo; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -34,45 +35,45 @@ public class SysUserVo implements Vo { private static final long serialVersionUID = 2415131854581950721L; @ApiModelProperty("部门sid") private String departmentSid; - @ApiModelProperty("部门名称") + @ApiModelProperty("部门名称") private String departmentName; @ApiModelProperty("上级部门名称-本级部门名称 岗位名称") @JsonProperty("pNameAndDepartmentNameAndPostName") private String pNameAndDepartmentNameAndPostName; - @ApiModelProperty("岗位名称") + @ApiModelProperty("岗位名称") private String postName; - @ApiModelProperty("岗位Sid") + @ApiModelProperty("岗位Sid") private String postSid; @ApiModelProperty("单位sid") private String organizationSid; - @ApiModelProperty("单位名称") + @ApiModelProperty("单位名称") private String organizationName; - @ApiModelProperty("用户姓名") + @ApiModelProperty("用户姓名") private String name; - @ApiModelProperty("登录名，登录名不能相同") + @ApiModelProperty("登录名，登录名不能相同") private String userName; @ApiModelProperty("id") private Integer id; - @ApiModelProperty("用户sid") + @ApiModelProperty("用户sid") private String sid; @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员") private String isAdmin; @ApiModelProperty("角色名称") private String roleName; - @ApiModelProperty("关联的人员sid") + @ApiModelProperty("关联的人员sid") private String staffSid; - - @ApiModelProperty("手机号") + + @ApiModelProperty("手机号") private String mobile; @ApiModelProperty(value = "禁用状态") private String isEnable; - - @ApiModelProperty("用户类型:1员工、2客户、3供应商") + + @ApiModelProperty("用户类型:1员工、2客户、3供应商") private String userType; - @ApiModelProperty("用户类型:1、2、3") - private String userTypeKey; + @ApiModelProperty("用户类型:1、2、3") + private String userTypeValue; @ApiModelProperty("用户头像") private String headImage; @ApiModelProperty("组织名称") @@ -101,7 +102,10 @@ public class SysUserVo implements Vo { List sysOrganizationVos; private String orgSid; private String orgName; - private List sysRoleVos; + private List sysRoleVos; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; + private String roles;//角色 ,分割 + private String accountType; + private String accountTypeValue; }