From ba037fc0e11390798c5260371b0db9fc532bf2e2 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 7 Aug 2024 16:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../oms/apiadmin/aggregation/SysMenuRest.java | 14 ++++
.../apiadmin/aggregation/SysMenuRoleRest.java | 13 ++++
.../oms/apiadmin/aggregation/SysPostRest.java | 13 ++++
.../oms/apiadmin/aggregation/SysRoleRest.java | 13 ++++
.../apiadmin/aggregation/SysStaffOrgRest.java | 2 +-
.../aggregation/SysStaffinfoRest.java | 1 +
.../apiadmin/aggregation/SysUserRoleRest.java | 13 ++++
.../apiadmin/aggregation/SystemLogRest.java | 78 +++++++++++++++++++
.../com/yxt/oms/biz/func/sysmenu/SysMenu.java | 14 +++-
.../yxt/oms/biz/func/sysmenu/SysMenuDto.java | 2 +-
.../oms/biz/func/sysmenu/SysMenuMapper.java | 17 +++-
.../oms/biz/func/sysmenu/SysMenuService.java | 19 ++++-
.../oms/biz/func/sysmenu/SysMenuTreeVo.java | 2 +-
.../yxt/oms/biz/func/sysmenu/SysMenuVo.java | 2 +-
.../func/sysmenurole/SysMenuRoleMapper.java | 13 ++++
.../func/sysmenurole/SysMenuRoleService.java | 3 +-
.../SysOrganizationMapper.java | 13 ++++
.../SysOrganizationService.java | 19 ++++-
.../oms/biz/func/syspost/SysPostMapper.java | 13 ++++
.../oms/biz/func/syspost/SysPostService.java | 16 +++-
.../oms/biz/func/sysrole/SysRoleMapper.java | 13 ++++
.../oms/biz/func/sysrole/SysRoleService.java | 5 +-
.../SysRoleAuthorizeService.java | 20 ++++-
.../sysstaffinfo/SysStaffinfoDetailsVo.java | 1 +
.../sysstafforg/SysStaffOrgDetailsVo.java | 1 +
.../biz/func/sysstafforg/SysStaffOrgDto.java | 1 +
.../yxt/oms/biz/func/systemlog/SystemLog.java | 44 +++++++++++
.../oms/biz/func/systemlog/SystemLogDto.java | 46 +++++++++++
.../biz/func/systemlog/SystemLogMapper.java | 38 +++++++++
.../biz/func/systemlog/SystemLogMapper.xml | 13 ++++
.../biz/func/systemlog/SystemLogQuery.java | 44 +++++++++++
.../biz/func/systemlog/SystemLogService.java | 59 ++++++++++++++
.../oms/biz/func/systemlog/SystemLogVo.java | 44 +++++++++++
.../func/sysuserrole/SysUserRoleMapper.java | 13 ++++
.../func/sysuserrole/SysUserRoleService.java | 13 ++++
.../portal/dictcommon/DictCommonFeign.java | 2 +-
.../portal/sysmenurole/SysMenuRoleFeign.java | 13 ++++
.../sysorganization/SysOrganizationFeign.java | 2 +-
.../SysOrganizationFeignFallback.java | 1 +
.../feign/portal/syspost/SysPostFeign.java | 13 ++++
.../portal/syspost/SysPostFeignFallback.java | 13 ++++
.../feign/portal/sysrole/SysRoleFeign.java | 13 ++++
.../portal/sysrole/SysRoleFeignFallback.java | 13 ++++
.../SysRoleAuthorizeFeign.java | 13 ++++
.../SysRoleAuthorizeFeignFallback.java | 14 ++++
.../sysstaffinfo/SysStaffinfoFeign.java | 13 +++-
.../portal/sysstafforg/SysStaffOrgFeign.java | 20 +----
.../portal/systemlog/SystemLogFeign.java | 68 ++++++++++++++++
.../systemlog/SystemLogFeignFallback.java | 67 ++++++++++++++++
.../yxt/oms/feign/portal/sysuser/SysUser.java | 25 +++---
.../oms/feign/portal/sysuser/SysUserDto.java | 1 -
.../feign/portal/sysuser/SysUserFeign.java | 9 ---
.../portal/sysuser/SysUserFeignFallback.java | 10 ---
.../oms/feign/portal/sysuser/SysUserVo.java | 3 +-
.../portal/sysuserrole/SysUserRoleFeign.java | 13 ++++
.../sysuserrole/SysUserRoleFeignFallback.java | 13 ++++
56 files changed, 890 insertions(+), 84 deletions(-)
create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SystemLogRest.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLog.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogDto.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.xml
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogQuery.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogService.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogVo.java
create mode 100644 oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeign.java
create mode 100644 oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeignFallback.java
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
index 35f8e75..b4ddd01 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
+++ b/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(门户建设)
+ * File: SysMenuFeignFallback.java
+ * Class: com.yxt.user.biz.sysmenu.SysMenuRest
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @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> listPage(@RequestBody PagerQuery pq) {
+
return sysMenuService.listPageVo(pq);
}
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java
index ed26469..2f09d82 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java
+++ b/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(门户建设)
+ * File: SysMenuRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleRest
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "菜单与角色关联表")
@RestController
@RequestMapping("apiadmin/sysmenurole")
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java
index dd04e63..0cc987a 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java
+++ b/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(门户建设)
+ * File: SysPostFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostRest
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "岗位")
@RestController
@RequestMapping("apiadmin/syspost")
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java
index fd48698..65309e9 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java
+++ b/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(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleRest
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "角色")
@RestController
@RequestMapping("apiadmin/sysrole")
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java
index f15ac0d..2c9fc9c 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java
@@ -26,7 +26,7 @@ public class SysStaffOrgRest {
@GetMapping("/selAllByOrgSidPath")
@ResponseBody
@ApiOperation("根据组织全路径查询当前部门下的所有员工")
- public ResultBean> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath) {
+ public ResultBean> selAllByOrgSidPath(String orgSidPath) {
return sysStaffOrgService.selAllByOrgSidPath(orgSidPath);
}
}
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java
index 0f4eb87..1023b97 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java
+++ b/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的操作。
*
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java
index bc8cf1d..a8d143c 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java
+++ b/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(门户建设)
+ * File: SysUserRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleRest
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "用户与角色关联表")
@RestController
@RequestMapping("apiadmin/sysuserrole")
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SystemLogRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SystemLogRest.java
new file mode 100644
index 0000000..6aba584
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogRest
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @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> listPage(@RequestBody PagerQuery pq){
+ return systemLogService.listPageVo(pq);
+ }
+
+ @Override
+ public ResultBean> listAll(@RequestBody SystemLogQuery query){
+ return systemLogService.listAllVo(query);
+ }
+
+ @Override
+ public ResultBean> 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 fetch(String id){
+ return systemLogService.fetchByIdVo(id);
+ }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java
index 164a293..8ddb891 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java
+++ b/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(门户建设)
+ * File: SysMenu.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenu
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @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;
}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java
index a3c0cc3..be68da7 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java
+++ b/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;
+
}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java
index 5cdbf7b..c29076e 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java
+++ b/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(门户建设)
+ * File: SysMenuMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysmenu.SysMenuMapper
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Mapper
public interface SysMenuMapper extends BaseMapper {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
index e01220c..d151287 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
+++ b/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(门户建设)
+ * File: SysMenuService.java
+ * Class: com.yxt.user.biz.sysmenu.SysMenuService
+ * Description: 菜单表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Service
public class SysMenuService extends MybatisBaseService {
-
- @Resource
+ @Autowired
SysMenuFeign sysMenuFeign;
+
+
public PagerVo listPage(PagerQuery pq) {
SysMenuQuery query = pq.getParams();
QueryWrapper qw = createQueryWrapper(query);
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
index 2d1a4d0..528fff9 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
+++ b/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;
+
}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java
index 4fb6734..fe73d38 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java
+++ b/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;
+
}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java
index 6ea0970..3754ea1 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java
+++ b/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(门户建设)
+ * File: SysMenuRoleMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Mapper
public interface SysMenuRoleMapper extends BaseMapper {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java
index 4cbb038..d28e353 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java
+++ b/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 {
- @Resource
+ @Autowired
SysMenuRoleFeign sysMenuRoleFeign;
@Autowired
SysMenuService sysMenuService;
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java
index c3d3a53..541e7b3 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java
+++ b/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(门户建设)
+ * File: SysOrganizationMapper.java
+ * Class: SysOrganizationMapper
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Mapper
public interface SysOrganizationMapper extends BaseMapper {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java
index 90b565b..91086d4 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java
+++ b/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(门户建设)
+ * File: SysOrganizationService.java
+ * Class: SysOrganizationService
+ * Description: 组织机构表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Service
public class SysOrganizationService extends MybatisBaseService {
-
@Autowired
private FileUploadComponent fileUploadComponent;
- @Resource
- private SysOrganizationFeign sysOrganizationFeign;
+ @Autowired
+ SysOrganizationFeign sysOrganizationFeign;
@Autowired
private RedisUtil redisUtil;
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java
index db76122..044421f 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java
+++ b/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(门户建设)
+ * File: SysPostMapper.java
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostMapper
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Mapper
public interface SysPostMapper extends BaseMapper {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java
index 78e92be..8785ad6 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java
+++ b/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(门户建设)
+ * File: SysPostService.java
+ * Class: com.yxt.user.biz.syspost.SysPostService
+ * Description: 岗位 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Service
public class SysPostService extends MybatisBaseService {
- @Resource
+ @Autowired
SysPostFeign sysPostFeign;
public PagerVo listPage(PagerQuery pq) {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java
index f2fe6b5..8b045f7 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java
+++ b/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(门户建设)
+ * File: SysRoleMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleMapper
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Mapper
public interface SysRoleMapper extends BaseMapper {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java
index c34c80b..d170a57 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java
+++ b/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 {
-
@Autowired
private SysUserRoleService sysUserRoleService;
- @Resource
+ @Autowired
SysRoleFeign sysRoleFeign;
+
public ResultBean> listPage(PagerQuery pq) {
return sysRoleFeign.listPage(pq);
}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java
index 3063d1b..d30c8a3 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java
+++ b/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(门户建设)
+ * File: SysSourceService.java
+ * Class: com.yxt.anrui.portal.biz.syssource.SysSourceService
+ * Description: 资源表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Service
public class SysRoleAuthorizeService extends MybatisBaseService {
-
- @Resource
+ @Autowired
SysRoleAuthorizeFeign sysRoleAuthorizeFeign;
+
+
public ResultBean updateRoleAndMenu(SysRoleAuthorizeDto dto) {
return sysRoleAuthorizeFeign.updateRoleAndMenu(dto);
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java
index 8ea3143..f495e9c 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java
+++ b/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;
}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java
index 9792324..d513554 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java
+++ b/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("部门路径")
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java
index 04b883c..1f9b784 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java
+++ b/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;
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLog.java b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLog.java
new file mode 100644
index 0000000..f6b1675
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLog.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLog
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @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;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogDto.java b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogDto.java
new file mode 100644
index 0000000..755a4f8
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogDto.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogDto
+ * Description: 系统日志表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @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;
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.java
new file mode 100644
index 0000000..54e400b
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogMapper.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogMapper
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SystemLogMapper extends BaseMapper {
+
+ //@Update("update system_log set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from system_log")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.xml
new file mode 100644
index 0000000..ea8a383
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogQuery.java
new file mode 100644
index 0000000..31b9db3
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogQuery.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogQuery
+ * Description: 系统日志表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @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;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogService.java b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogService.java
new file mode 100644
index 0000000..f903906
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogService.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogService
+ * Description: 系统日志表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SystemLogService extends MybatisBaseService {
+ @Autowired
+ SystemLogFeign systemLogFeign;
+ public ResultBean> listPage(PagerQuery pq) {
+ return systemLogFeign.listPage(pq);
+ }
+ public ResultBean> listAll(SystemLogQuery query) {
+ return systemLogFeign.list();
+ }
+
+
+ public ResultBean> listPageVo(PagerQuery pq) {
+
+ return systemLogFeign.listPage(pq);
+ }
+
+ public ResultBean> listAllVo(SystemLogQuery query) {
+ return systemLogFeign.listAll(query);
+ }
+
+ public ResultBean> listVo() {
+ return systemLogFeign.list();
+ }
+
+ public void saveOrUpdateDto(SystemLogDto dto){
+ systemLogFeign.save(dto);
+ }
+
+ public ResultBean fetchByIdVo(String id){
+ return systemLogFeign.fetch(id);
+ }
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogVo.java b/oms/src/main/java/com/yxt/oms/biz/func/systemlog/SystemLogVo.java
new file mode 100644
index 0000000..d23100f
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogVo.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogVo
+ * Description: 系统日志表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @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;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java
index 82e6ea7..afc968e 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java
+++ b/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(门户建设)
+ * File: SysUserRoleMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleMapper
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Mapper
public interface SysUserRoleMapper extends BaseMapper {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java
index e67a259..c1b8eda 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java
+++ b/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(门户建设)
+ * File: SysUserRoleService.java
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService
+ * Description: 用户与角色关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Service
public class SysUserRoleService extends MybatisBaseService {
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java
index 5a80685..aafd4d3 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java
@@ -54,7 +54,7 @@ public interface DictCommonFeign {
@GetMapping("/typeValues")
@ResponseBody
@ApiOperation("下拉框的获取")
- ResultBean> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid);
+ ResultBean> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid);
@GetMapping("/getFirstDictKeyByType")
@ResponseBody
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java
index 046a439..323a4d0 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java
+++ b/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(门户建设)
+ * File: SysMenuRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeign
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "菜单与角色关联表")
@FeignClient(
contextId = "ss-common-portal-SysMenuRole",
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java
index b6b7247..6481a9a 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java
@@ -50,7 +50,7 @@ public interface SysOrganizationFeign {
@ApiOperation("一级组织机构列表")
@GetMapping("/selectFirstOrgList")
- public ResultBean>selectFirstOrgList();
+ public ResultBean> selectFirstOrgList();
@ApiOperation("根据父级sid查询子集列表")
@GetMapping("/selectChildrenListBySid/{sid}")
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
index 58d8f92..6b13494 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
+++ b/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> selectFirstOrgList() {
return null;
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java
index 0e66b06..f2b3c81 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java
+++ b/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(门户建设)
+ * File: SysPostFeign.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeign
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "岗位")
@FeignClient(
contextId = "ss-common-portal-SysPost",
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java
index 7c27d42..f8782f8 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java
+++ b/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(门户建设)
+ * File: SysPostFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeignFallback
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Component
public class SysPostFeignFallback implements SysPostFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java
index 41697ff..a041e34 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java
+++ b/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(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "角色")
@FeignClient(
contextId = "ss-common-portal-SysRole",
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java
index fedc9e2..e0d1020 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java
+++ b/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(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Component
public class SysRoleFeignFallback implements SysRoleFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java
index b93d696..d5feec6 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java
+++ b/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(门户建设)
+ * File: SysSourceFeign.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeign
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "资源表")
@FeignClient(
contextId = "ss-common-portal-SysOrgAuthorize",
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java
index 529f97b..e65a897 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java
+++ b/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(门户建设)
+ * File: SysSourceFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeignFallback
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Component
public class SysRoleAuthorizeFeignFallback implements SysRoleAuthorizeFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java
index cae62b8..c6476bf 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java
+++ b/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(门户建设)
+ * File: SysStaffinfoFeignFallback.java
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoRest
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
*/
@FeignClient(
contextId = "ss-common-portal-sysstaffinfo",
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java
index 835f357..a274a80 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java
+++ b/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> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath);
-
- @GetMapping("/getOrgByStaffSid")
- @ResponseBody
- @ApiOperation("根据用户组织全路径获取用户的分公司sid")
- public ResultBean getOrgByStaffSid(@RequestParam("staffSid") String staffSid);
-
- @GetMapping("/getPathSidByUserSid")
- @ResponseBody
- @ApiOperation("根据组织全路径查询当前部门下的所有员工")
- public ResultBean getPathSidByUserSid(@RequestParam(value = "userSid") String applySid);
-
- @ApiOperation("根据员工sid获取部门信息")
- @ResponseBody
- @GetMapping("/getSysStaffOrgListByStaffSid/{staffSid}")
- public ResultBean> getSysStaffOrgListByStaffSid(@PathVariable("staffSid") String staffSid);
+ public ResultBean> selAllByOrgSidPath(String orgSidPath);
}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeign.java
new file mode 100644
index 0000000..aa2c0ab
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogFeign.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeign
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @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> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
+ public ResultBean> listAll(@RequestBody SystemLogQuery query);
+
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
+ public ResultBean> 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 fetch(@PathVariable("id") String id);
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/systemlog/SystemLogFeignFallback.java
new file mode 100644
index 0000000..a119d7c
--- /dev/null
+++ b/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(门户建设)
+ * File: SystemLogFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeignFallback
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SystemLogFeignFallback implements SystemLogFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui_portal/systemlog/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean> listAll(SystemLogQuery query){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui_portal/systemlog/listAll无法访问");
+ }
+
+ @Override
+ public ResultBean> 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 fetch(String id){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui_portal/systemlog/fetch无法访问");
+ }
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
index 40c74e0..13978ad 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
+++ b/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非登录账户‘
+
}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java
index 8f9c5ed..8c1f0a4 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java
+++ b/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;
-
}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
index 66274b3..9adbaa2 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
+++ b/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 selectBySid(@RequestParam("sid") String sid);
-
- @ApiOperation("根据staffsid查询用户")
- @ResponseBody
- @GetMapping("/selectByStaffsid/{staffsid}")
- public ResultBean selectByStaffsid(@PathVariable("staffsid") String staffsid);
}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
index f9bc385..ba0e04a 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
+++ b/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 selectBySid(String sid) {
- return null;
- }
-
- @Override
- public ResultBean selectByStaffsid(String staffsid) {
- return null;
- }
}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
index 8685a84..c4b9d0d 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
+++ b/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;
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java
index c210f95..b7c963c 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java
+++ b/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(门户建设)
+ * File: SysUserRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Api(tags = "用户与角色关联表")
@FeignClient(
contextId = "ss-common-portal-SysUserRole",
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java
index e8113fc..e4eaf2d 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java
+++ b/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(门户建设)
+ * File: SysUserRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeignFallback
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
@Component
public class SysUserRoleFeignFallback implements SysUserRoleFeign {