Browse Source

同步

master
wangpengfei 9 months ago
parent
commit
ba037fc0e1
  1. 14
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
  2. 13
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java
  3. 13
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java
  4. 13
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java
  5. 2
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java
  6. 1
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java
  7. 13
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java
  8. 78
      oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SystemLogRest.java
  9. 14
      oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java
  10. 2
      oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java
  11. 17
      oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java
  12. 19
      oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
  13. 2
      oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
  14. 2
      oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java
  15. 13
      oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java
  16. 3
      oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java
  17. 13
      oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java
  18. 19
      oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java
  19. 13
      oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java
  20. 16
      oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java
  21. 13
      oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java
  22. 5
      oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java
  23. 20
      oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java
  24. 1
      oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java
  25. 1
      oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java
  26. 1
      oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java
  27. 44
      oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLog.java
  28. 46
      oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogDto.java
  29. 38
      oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.java
  30. 13
      oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.xml
  31. 44
      oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogQuery.java
  32. 59
      oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogService.java
  33. 44
      oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogVo.java
  34. 13
      oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java
  35. 13
      oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java
  36. 2
      oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java
  37. 13
      oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java
  38. 2
      oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java
  39. 1
      oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
  40. 13
      oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java
  41. 13
      oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java
  42. 13
      oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java
  43. 13
      oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java
  44. 13
      oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java
  45. 14
      oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java
  46. 13
      oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java
  47. 20
      oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java
  48. 68
      oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeign.java
  49. 67
      oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeignFallback.java
  50. 25
      oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
  51. 1
      oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java
  52. 9
      oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
  53. 10
      oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
  54. 3
      oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
  55. 13
      oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java
  56. 13
      oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java

14
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java

@ -15,6 +15,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: anrui_oms(门户建设) <br/>
* File: SysMenuFeignFallback.java <br/>
* Class: com.yxt.user.biz.sysmenu.SysMenuRest <br/>
* Description: 菜单表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "菜单表")
@RestController
@RequestMapping("apiadmin/sysmenu")
@ -26,6 +39,7 @@ public class SysMenuRest {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysMenuVo>> listPage(@RequestBody PagerQuery<SysMenuQuery> pq) {
return sysMenuService.listPageVo(pq);
}

13
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java

@ -12,6 +12,19 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuRoleFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleRest <br/>
* Description: 菜单与角色关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "菜单与角色关联表")
@RestController
@RequestMapping("apiadmin/sysmenurole")

13
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java

@ -11,6 +11,19 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysPostFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.biz.syspost.SysPostRest <br/>
* Description: 岗位. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "岗位")
@RestController
@RequestMapping("apiadmin/syspost")

13
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java

@ -15,6 +15,19 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysRoleFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.biz.sysrole.SysRoleRest <br/>
* Description: 角色. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "角色")
@RestController
@RequestMapping("apiadmin/sysrole")

2
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java

@ -26,7 +26,7 @@ public class SysStaffOrgRest {
@GetMapping("/selAllByOrgSidPath")
@ResponseBody
@ApiOperation("根据组织全路径查询当前部门下的所有员工")
public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath) {
public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath) {
return sysStaffOrgService.selAllByOrgSidPath(orgSidPath);
}
}

1
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java

@ -75,6 +75,7 @@ public class SysStaffinfoRest {
public ResultBean update(@RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid) {
return sysStaffinfoService.updateStaffInfo(dto, sid);
}
/**
* 进行删除操作即设置员工类型为离职类型02的操作
*

13
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java

@ -14,6 +14,19 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserRoleFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleRest <br/>
* Description: 用户与角色关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "用户与角色关联表")
@RestController
@RequestMapping("apiadmin/sysuserrole")

78
oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SystemLogRest.java

@ -0,0 +1,78 @@
package com.yxt.oms.apiadmin.aggregation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.oms.biz.func.systemlog.*;
import com.yxt.oms.feign.portal.systemlog.SystemLogFeign;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.biz.systemlog.SystemLogRest <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "系统日志表")
@RestController
@RequestMapping("apiadmin/systemlog")
public class SystemLogRest implements SystemLogFeign {
@Resource
private SystemLogService systemLogService;
@Override
public ResultBean<PagerVo<SystemLogVo>> listPage(@RequestBody PagerQuery<SystemLogQuery> pq){
return systemLogService.listPageVo(pq);
}
@Override
public ResultBean<List<SystemLogVo>> listAll(@RequestBody SystemLogQuery query){
return systemLogService.listAllVo(query);
}
@Override
public ResultBean<List<SystemLogVo>> list(){
return systemLogService.listVo();
}
@Override
public ResultBean save(SystemLogDto dto){
ResultBean rb = ResultBean.fireFail();
systemLogService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
public ResultBean update(SystemLogDto dto,String sid){
ResultBean rb = ResultBean.fireFail();
systemLogService.updateBySid(dto.toMap(),sid);
return rb.success();
}
@Override
public ResultBean del(String ids){
ResultBean rb = ResultBean.fireFail();
systemLogService.delByIds(ids);
return rb.success();
}
@Override
public ResultBean<SystemLogVo> fetch(String id){
return systemLogService.fetchByIdVo(id);
}
}

14
oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java

@ -6,6 +6,19 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenu.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenu.SysMenu <br/>
* Description: 菜单表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "菜单表", description = "菜单表")
@TableName("sys_menu")
@Data
@ -49,5 +62,4 @@ public class SysMenu extends BaseEntity {
@ApiModelProperty("菜单类型(0左侧当行菜单,1页面中功能)")
private String menuType;
private String cid;
private String btnKey;
}

2
oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java

@ -70,5 +70,5 @@ public class SysMenuDto implements Dto {
@ApiModelProperty(value = "备注")
private String remarks;
private String cid;
private String btnKey;
}

17
oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java

@ -5,16 +5,25 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.sysmenu.SysMenuMapper <br/>
* Description: 菜单表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SysMenuMapper extends BaseMapper<SysMenu> {

19
oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java

@ -15,19 +15,32 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuService.java <br/>
* Class: com.yxt.user.biz.sysmenu.SysMenuService <br/>
* Description: 菜单表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
@Resource
@Autowired
SysMenuFeign sysMenuFeign;
public PagerVo<SysMenu> listPage(PagerQuery<SysMenuQuery> pq) {
SysMenuQuery query = pq.getParams();
QueryWrapper<SysMenu> qw = createQueryWrapper(query);

2
oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java

@ -60,5 +60,5 @@ public class SysMenuTreeVo implements Vo {
private String isShow;
private String menuTypeValue;
private String cid;
private String btnKey;
}

2
oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java

@ -72,5 +72,5 @@ public class SysMenuVo implements Vo {
@ApiModelProperty("资源名称")
private String sourceName;
private String cid;
private String btnKey;
}

13
oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java

@ -9,6 +9,19 @@ import org.apache.ibatis.annotations.*;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuRoleMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper <br/>
* Description: 菜单与角色关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SysMenuRoleMapper extends BaseMapper<SysMenuRole> {

3
oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java

@ -13,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -34,7 +33,7 @@ import java.util.Map;
@Service
public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, SysMenuRole> {
@Resource
@Autowired
SysMenuRoleFeign sysMenuRoleFeign;
@Autowired
SysMenuService sysMenuService;

13
oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java

@ -11,6 +11,19 @@ import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysOrganizationMapper.java <br/>
* Class: SysOrganizationMapper <br/>
* Description: 组织机构表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {

19
oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java

@ -14,17 +14,28 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysOrganizationService.java <br/>
* Class: SysOrganizationService <br/>
* Description: 组织机构表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SysOrganizationService extends MybatisBaseService<SysOrganizationMapper, SysOrganization> {
@Autowired
private FileUploadComponent fileUploadComponent;
@Resource
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
SysOrganizationFeign sysOrganizationFeign;
@Autowired
private RedisUtil redisUtil;

13
oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java

@ -10,6 +10,19 @@ import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysPostMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.syspost.SysPostMapper <br/>
* Description: 岗位. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SysPostMapper extends BaseMapper<SysPost> {

16
oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java

@ -12,14 +12,26 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysPostService.java <br/>
* Class: com.yxt.user.biz.syspost.SysPostService <br/>
* Description: 岗位 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SysPostService extends MybatisBaseService<SysPostMapper, SysPost> {
@Resource
@Autowired
SysPostFeign sysPostFeign;
public PagerVo<SysPost> listPage(PagerQuery<SysPostQuery> pq) {

13
oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java

@ -10,6 +10,19 @@ import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysRoleMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.sysrole.SysRoleMapper <br/>
* Description: 角色. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SysRoleMapper extends BaseMapper<SysRole> {

5
oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java

@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -29,12 +28,12 @@ import java.util.List;
*/
@Service
public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
@Autowired
private SysUserRoleService sysUserRoleService;
@Resource
@Autowired
SysRoleFeign sysRoleFeign;
public ResultBean<PagerVo<SysRoleVo>> listPage(PagerQuery<SysRoleQuery> pq) {
return sysRoleFeign.listPage(pq);
}

20
oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java

@ -6,14 +6,26 @@ import com.yxt.oms.feign.portal.sysroleauthorize.SysRoleAuthorizeFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysSourceService.java <br/>
* Class: com.yxt.anrui.portal.biz.syssource.SysSourceService <br/>
* Description: 资源表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SysRoleAuthorizeService extends MybatisBaseService<SysRoleAuthorizeMapper, SysRoleAuthorize> {
@Resource
@Autowired
SysRoleAuthorizeFeign sysRoleAuthorizeFeign;
public ResultBean updateRoleAndMenu(SysRoleAuthorizeDto dto) {
return sysRoleAuthorizeFeign.updateRoleAndMenu(dto);

1
oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java

@ -84,5 +84,6 @@ public class SysStaffinfoDetailsVo implements Vo {
private String userType;//用户类型:1员工、2客户、3供应商
private String userName;
private String remarks;
private String orgSid;
}

1
oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java

@ -15,6 +15,7 @@ public class SysStaffOrgDetailsVo implements Vo {
@ApiModelProperty("部门sid")
private String orgSid;
private String orgSid1;
@ApiModelProperty("部门名称")
private String orgName;
@ApiModelProperty("部门路径")

1
oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java

@ -28,6 +28,7 @@ public class SysStaffOrgDto implements Dto {
private static final long serialVersionUID = 1403491378761015027L;
@ApiModelProperty("部门sid")
private String orgSid;
private String orgSid1;
@ApiModelProperty("部门名称")
@NotBlank(message = "部门名称不能为空")
private String orgName;

44
oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLog.java

@ -0,0 +1,44 @@
package com.yxt.oms.biz.func.systemlog;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLog.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLog <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "系统日志表", description = "系统日志表")
@TableName("system_log")
@Data
public class SystemLog extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("事件名称或类别")
private String eventName;
@ApiModelProperty("事件内容")
private String eventContent;
@ApiModelProperty("事件url")
private String eventUrl;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("用户名")
private String userName;
@ApiModelProperty("用户iP")
private String userIp;
}

46
oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogDto.java

@ -0,0 +1,46 @@
package com.yxt.oms.biz.func.systemlog;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogDto.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogDto <br/>
* Description: 系统日志表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Builder
@ApiModel(value = "系统日志表 数据传输对象", description = "系统日志表 数据传输对象")
@Data
public class SystemLogDto implements Dto {
@ApiModelProperty("事件名称或类别")
private String eventName;
@ApiModelProperty("事件内容")
private String eventContent;
@ApiModelProperty("事件url")
private String eventUrl;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("用户名")
private String userName;
@ApiModelProperty("用户iP")
private String userIp;
}

38
oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.java

@ -0,0 +1,38 @@
package com.yxt.oms.biz.func.systemlog;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.systemlog.SystemLogMapper <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SystemLogMapper extends BaseMapper<SystemLog> {
//@Update("update system_log set name=#{msg} where id=#{id}")
//IPage<SystemLogVo> voPage(IPage<SystemLog> page, @Param(Constants.WRAPPER) QueryWrapper<SystemLog> qw);
IPage<SystemLogVo> selectPageVo(IPage<SystemLog> page, @Param(Constants.WRAPPER) Wrapper<SystemLog> qw);
List<SystemLogVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SystemLog> qw);
@Select("select * from system_log")
List<SystemLogVo> selectListVo();
}

13
oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.oms.biz.func.systemlog.SystemLogMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.oms.biz.func.systemlog.SystemLogVo">
SELECT * FROM system_log <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.oms.biz.func.systemlog.SystemLogVo">
SELECT * FROM system_log <where> ${ew.sqlSegment} </where>
</select>
</mapper>

44
oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogQuery.java

@ -0,0 +1,44 @@
package com.yxt.oms.biz.func.systemlog;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogQuery.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogQuery <br/>
* Description: 系统日志表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "系统日志表 查询条件", description = "系统日志表 查询条件")
@Data
public class SystemLogQuery implements Query {
@ApiModelProperty("事件名称或类别")
private String eventName;
@ApiModelProperty("事件内容")
private String eventContent;
@ApiModelProperty("事件url")
private String eventUrl;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("用户名")
private String userName;
@ApiModelProperty("用户iP")
private String userIp;
}

59
oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogService.java

@ -0,0 +1,59 @@
package com.yxt.oms.biz.func.systemlog;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.oms.feign.portal.systemlog.SystemLogFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogService.java <br/>
* Class: com.yxt.anrui.portal.biz.systemlog.SystemLogService <br/>
* Description: 系统日志表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SystemLogService extends MybatisBaseService<SystemLogMapper, SystemLog> {
@Autowired
SystemLogFeign systemLogFeign;
public ResultBean<PagerVo<SystemLogVo>> listPage(PagerQuery<SystemLogQuery> pq) {
return systemLogFeign.listPage(pq);
}
public ResultBean<List<SystemLogVo>> listAll(SystemLogQuery query) {
return systemLogFeign.list();
}
public ResultBean<PagerVo<SystemLogVo>> listPageVo(PagerQuery<SystemLogQuery> pq) {
return systemLogFeign.listPage(pq);
}
public ResultBean<List<SystemLogVo>> listAllVo(SystemLogQuery query) {
return systemLogFeign.listAll(query);
}
public ResultBean<List<SystemLogVo>> listVo() {
return systemLogFeign.list();
}
public void saveOrUpdateDto(SystemLogDto dto){
systemLogFeign.save(dto);
}
public ResultBean<SystemLogVo> fetchByIdVo(String id){
return systemLogFeign.fetch(id);
}
}

44
oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogVo.java

@ -0,0 +1,44 @@
package com.yxt.oms.biz.func.systemlog;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogVo.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogVo <br/>
* Description: 系统日志表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "系统日志表 视图数据对象", description = "系统日志表 视图数据对象")
@Data
public class SystemLogVo implements Vo {
@ApiModelProperty("事件名称或类别")
private String eventName;
@ApiModelProperty("事件内容")
private String eventContent;
@ApiModelProperty("事件url")
private String eventUrl;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("用户名")
private String userName;
@ApiModelProperty("用户iP")
private String userIp;
}

13
oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java

@ -11,6 +11,19 @@ import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserRoleMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleMapper <br/>
* Description: 用户与角色关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {

13
oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java

@ -14,6 +14,19 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserRoleService.java <br/>
* Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService <br/>
* Description: 用户与角色关联表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, SysUserRole> {

2
oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java

@ -54,7 +54,7 @@ public interface DictCommonFeign {
@GetMapping("/typeValues")
@ResponseBody
@ApiOperation("下拉框的获取")
ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid);
ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid);
@GetMapping("/getFirstDictKeyByType")
@ResponseBody

13
oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java

@ -14,6 +14,19 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuRoleFeign.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeign <br/>
* Description: 菜单与角色关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "菜单与角色关联表")
@FeignClient(
contextId = "ss-common-portal-SysMenuRole",

2
oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java

@ -50,7 +50,7 @@ public interface SysOrganizationFeign {
@ApiOperation("一级组织机构列表")
@GetMapping("/selectFirstOrgList")
public ResultBean<List<SysOrganizationVo>>selectFirstOrgList();
public ResultBean<List<SysOrganizationVo>> selectFirstOrgList();
@ApiOperation("根据父级sid查询子集列表")
@GetMapping("/selectChildrenListBySid/{sid}")

1
oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java

@ -46,6 +46,7 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
return null;
}
@Override
public ResultBean<List<SysOrganizationVo>> selectFirstOrgList() {
return null;

13
oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java

@ -17,6 +17,19 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysPostFeign.java <br/>
* Class: com.yxt.anrui.portal.api.syspost.SysPostFeign <br/>
* Description: 岗位. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "岗位")
@FeignClient(
contextId = "ss-common-portal-SysPost",

13
oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java

@ -11,6 +11,19 @@ import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysPostFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.syspost.SysPostFeignFallback <br/>
* Description: 岗位. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class SysPostFeignFallback implements SysPostFeign {

13
oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java

@ -14,6 +14,19 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysRoleFeign.java <br/>
* Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
* Description: 角色. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "角色")
@FeignClient(
contextId = "ss-common-portal-SysRole",

13
oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java

@ -10,6 +10,19 @@ import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysRoleFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
* Description: 角色. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class SysRoleFeignFallback implements SysRoleFeign {

13
oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java

@ -8,6 +8,19 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysSourceFeign.java <br/>
* Class: com.yxt.anrui.portal.api.syssource.SysSourceFeign <br/>
* Description: 资源表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "资源表")
@FeignClient(
contextId = "ss-common-portal-SysOrgAuthorize",

14
oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java

@ -3,6 +3,20 @@ package com.yxt.oms.feign.portal.sysroleauthorize;
import com.yxt.common.core.result.ResultBean;
import com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorizeDto;
import org.springframework.stereotype.Component;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysSourceFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.syssource.SysSourceFeignFallback <br/>
* Description: 资源表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class SysRoleAuthorizeFeignFallback implements SysRoleAuthorizeFeign {

13
oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java

@ -16,8 +16,17 @@ import java.util.List;
import java.util.Map;
/**
* @author wangpengfei
* @date 2024/7/11 13:55
* Project: anrui_portal(门户建设) <br/>
* File: SysStaffinfoFeignFallback.java <br/>
* Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoRest <br/>
* Description: 人员基础信息表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@FeignClient(
contextId = "ss-common-portal-sysstaffinfo",

20
oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java

@ -1,13 +1,10 @@
package com.yxt.oms.feign.portal.sysstafforg;
import com.yxt.common.core.result.ResultBean;
import com.yxt.oms.biz.func.sysstafforg.SysStaffOrg;
import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgByUserVo;
import com.yxt.oms.feign.portal.sysuser.SysStaffOrgVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@ -32,20 +29,5 @@ public interface SysStaffOrgFeign {
@GetMapping("/selAllByOrgSidPath")
@ResponseBody
@ApiOperation("根据组织全路径查询当前部门下的所有员工")
public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath);
@GetMapping("/getOrgByStaffSid")
@ResponseBody
@ApiOperation("根据用户组织全路径获取用户的分公司sid")
public ResultBean<SysStaffOrg> getOrgByStaffSid(@RequestParam("staffSid") String staffSid);
@GetMapping("/getPathSidByUserSid")
@ResponseBody
@ApiOperation("根据组织全路径查询当前部门下的所有员工")
public ResultBean<String> getPathSidByUserSid(@RequestParam(value = "userSid") String applySid);
@ApiOperation("根据员工sid获取部门信息")
@ResponseBody
@GetMapping("/getSysStaffOrgListByStaffSid/{staffSid}")
public ResultBean<List<SysStaffOrgVo>> getSysStaffOrgListByStaffSid(@PathVariable("staffSid") String staffSid);
public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath);
}

68
oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeign.java

@ -0,0 +1,68 @@
package com.yxt.oms.feign.portal.systemlog;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.oms.biz.func.systemlog.SystemLogDto;
import com.yxt.oms.biz.func.systemlog.SystemLogQuery;
import com.yxt.oms.biz.func.systemlog.SystemLogVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogFeign.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeign <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "系统日志表")
@FeignClient(
contextId = "ss-common-portal-SystemLog",
name = "ss-common-portal",
path = "/apiadmin/systemlog",
fallback = SystemLogFeignFallback.class)
public interface SystemLogFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SystemLogVo>> listPage(@RequestBody PagerQuery<SystemLogQuery> pq);
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SystemLogVo>> listAll(@RequestBody SystemLogQuery query);
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SystemLogVo>> list();
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody SystemLogDto dto);
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SystemLogDto dto,@PathVariable("sid") String sid);
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids);
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SystemLogVo> fetch(@PathVariable("id") String id);
}

67
oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeignFallback.java

@ -0,0 +1,67 @@
package com.yxt.oms.feign.portal.systemlog;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.oms.biz.func.systemlog.SystemLogDto;
import com.yxt.oms.biz.func.systemlog.SystemLogQuery;
import com.yxt.oms.biz.func.systemlog.SystemLogVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SystemLogFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeignFallback <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class SystemLogFeignFallback implements SystemLogFeign {
@Override
public ResultBean<PagerVo<SystemLogVo>> listPage(PagerQuery<SystemLogQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/systemlog/listPage无法访问");
}
@Override
public ResultBean<List<SystemLogVo>> listAll(SystemLogQuery query){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/systemlog/listAll无法访问");
}
@Override
public ResultBean<List<SystemLogVo>> list(){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/systemlog/list无法访问");
}
@Override
public ResultBean save(SystemLogDto dto){
return ResultBean.fireFail().setMsg("接口anrui_portal/systemlog/save无法访问");
}
@Override
public ResultBean update(SystemLogDto dto, String sid){
return ResultBean.fireFail().setMsg("接口anrui_portal/systemlog/update无法访问");
}
@Override
public ResultBean del(String ids){
return ResultBean.fireFail().setMsg("接口anrui_portal/systemlog/del无法访问");
}
@Override
public ResultBean<SystemLogVo> fetch(String id){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/systemlog/fetch无法访问");
}
}

25
oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java

@ -29,38 +29,38 @@ import java.util.Date;
public class SysUser extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("登录名,登录名不能相同")
private String userName;
@ApiModelProperty("密码(加密或签名后)")
private String password;
@ApiModelProperty("密码修改时限")
private String pwdDayslimit;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("最后一次密码修改时间")
private Date pwdModifyTime;
@ApiModelProperty("在线状态(0为离线、1为在线)")
private Integer onlineState;
@ApiModelProperty("用户登录时随机生成身份验证字符串")
private String token;
@ApiModelProperty("是否是管理员:1管理员,2一般用户,0是超级管理员,3尚无单位人员")
private String isAdmin;
@ApiModelProperty("手机登录唯一标识,手机与用户绑定字段")
private String appId;
@ApiModelProperty("关联的人员sid")
private String staffSid;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("用户类型:1员工、2客户、3供应商")
private Integer userType;
@ -68,5 +68,6 @@ public class SysUser extends BaseEntity {
private String headImage;
@TableField(exist = false)
private String orgSid;
private String accountType;////账号类型 1单位管理员,2操作员,0是平台管理员 3非登录账户
private String accountType;////账号类型 1单位管理员,2操作员,0是平台管理员 3非登录账户‘
}

1
oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java

@ -45,5 +45,4 @@ public class SysUserDto implements Dto {
private String password;
private String orgSid;
private String sourceSid;
}

9
oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java

@ -91,13 +91,4 @@ public interface SysUserFeign {
@ApiOperation("删除记录根据sid")
@GetMapping("/delBySid/{sid}")
public ResultBean delBySid(@PathVariable("sid") String sid);
@ApiOperation("根据sid查询用户信息")
@PostMapping("/selectBySid")
public ResultBean<SysUser> selectBySid(@RequestParam("sid") String sid);
@ApiOperation("根据staffsid查询用户")
@ResponseBody
@GetMapping("/selectByStaffsid/{staffsid}")
public ResultBean<SysUserVo> selectByStaffsid(@PathVariable("staffsid") String staffsid);
}

10
oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java

@ -86,14 +86,4 @@ public class SysUserFeignFallback implements SysUserFeign {
public ResultBean delBySid(String sid) {
return null;
}
@Override
public ResultBean<SysUser> selectBySid(String sid) {
return null;
}
@Override
public ResultBean<SysUserVo> selectByStaffsid(String staffsid) {
return null;
}
}

3
oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java

@ -4,8 +4,7 @@ package com.yxt.oms.feign.portal.sysuser;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import com.yxt.oms.biz.func.sysrole.SysRoleVo;
import com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo;
import com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

13
oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java

@ -13,6 +13,19 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserRoleFeign.java <br/>
* Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign <br/>
* Description: 用户与角色关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "用户与角色关联表")
@FeignClient(
contextId = "ss-common-portal-SysUserRole",

13
oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java

@ -10,6 +10,19 @@ import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserRoleFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeignFallback <br/>
* Description: 用户与角色关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class SysUserRoleFeignFallback implements SysUserRoleFeign {

Loading…
Cancel
Save