open_platform/ss-common-user
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

portal

Browse Source
This commit is contained in:
wangpengfei
2024-05-11 17:03:37 +08:00
parent d7f28e3509
commit fdbd1e482f
198 changed files with 2840 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -11,8 +11,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ss-common-user</artifactId>
<groupId>ss-common-user</groupId>
<artifactId>ss-common-portal</artifactId>
<groupId>ss-common-portal</groupId>
<version>2.0.1</version>
<dependencies>

10
src/main/java/com/yxt/user/UserApplication.java → src/main/java/com/yxt/portal/PortalApplication.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user;
package com.yxt.portal;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,15 +10,15 @@ import org.springframework.scheduling.annotation.EnableScheduling;
* @date 2024/4/28 14:43
*/
@SpringBootApplication(scanBasePackages = {
"com.yxt.user.config",
"com.yxt.portal.config",
"com.yxt.common.base.config",
"com.yxt.user"
"com.yxt.portal"
})
// 启用自带定时任务
@EnableScheduling
@EnableFeignClients(basePackages = {})
public class UserApplication {
public class PortalApplication {
public static void main(String[] args) {
SpringApplication.run(UserApplication.class, args);
SpringApplication.run(PortalApplication.class, args);
}
}

2
src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java → src/main/java/com/yxt/portal/apiadmin/AdminHomeRest.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

164
src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java Normal file
View File

@@ -0,0 +1,164 @@
package com.yxt.portal.apiadmin;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.portal.biz.dictcommon.*;
import com.yxt.portal.biz.dicttype.DictTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/7/5 21:29
* @description
*/
@Slf4j
@Controller
@RequestMapping("apiadmin/dictcommons")
@Api(tags = "数据字典数据项管理")
public class DictCommonRest {
@Autowired
private DictTypeService dictTypeService;
@Autowired
private DictCommonService dictCommonService;
@PostMapping(value = "/save")
@ResponseBody
@ApiOperation(value = "数据字典数据项保存")
ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto) {
ResultBean resultBean = ResultBean.fireFail();
//数据类型
String dictType = dictCommonDto.getDictType();
//数据项值
String dictKey = dictCommonDto.getDictKey();
//父级sid
String parentSid = dictCommonDto.getParentSid();
int size = dictTypeService.selectSize(dictType);
if (size > 0) {
//根据数据类型和数据项值查询是否已存在
DictCommon dc = dictCommonService.selectSize(dictKey, dictType, parentSid);
if (dc != null) {
return resultBean.setMsg(dictType + "此类型的数据项已存在");
}
DictCommon dictCommon = new DictCommon();
dictCommonDto.fillEntity(dictCommon);
boolean isSave = dictCommonService.save(dictCommon);
if (!isSave) {
return resultBean.setMsg("保存数据项失败");
}
} else {
return resultBean.setMsg("数据字典类型不存在");
}
return resultBean.success().setMsg("保存成功");
}
@PostMapping("/pageList")
@ResponseBody
@ApiOperation(value = "数据字典数据项分页列表")
ResultBean<PagerVo<DictCommonVo>> pageList(@RequestBody PagerQuery<DictCommonQuery> pagerQuery) {
ResultBean<PagerVo<DictCommonVo>> rb = ResultBean.fireFail();
PagerVo<DictCommonVo> pv = new PagerVo<>();
IPage<DictCommonVo> p2 = dictCommonService.pageList(pagerQuery);
PagerVo<DictCommonVo> pv1 = PagerUtil.pageToVo(p2, pv);
return rb.success().setData(pv1);
}
@PostMapping("/update/{sid}")
@ResponseBody
@ApiOperation(value = "数据字典修改后保存")
ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){
ResultBean resultBean = ResultBean.fireFail();
//数据类型
String dictType = dictCommonDto.getDictType();
int size = dictTypeService.selectSize(dictType);
if (size > 0) {
//根据数据类型和数据项值查询是否已存在
DictCommon dc = dictCommonService.fetchBySid(sid);
if (dc == null) {
return resultBean.setMsg(dictType + "此类型的数据项不存在");
} else {
if (!sid.equals(dc.getSid())) {
return resultBean.setMsg(dictType + "此类型的数据项已存在");
}
}
if (0 == dictCommonService.updateBySid(dictCommonDto.toMap(), sid)) {
return resultBean.setMsg("更新失败");
}
} else {
return resultBean.setMsg("数据字典类型不存在");
}
return resultBean.success().setMsg("保存成功");
}
@ResponseBody
@DeleteMapping("/delete/{sid}")
@ApiOperation(value = "删除")
ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){
DictCommon dictCommon = dictCommonService.fetchBySid(sid);
if (null == dictCommon) {
return ResultBean.fireFail().setMsg("该数据项不存在");
}
if (0 == dictCommonService.deleteBySid(sid)) {
return ResultBean.fireFail().setMsg("删除失败");
}
return ResultBean.fireSuccess().setMsg("删除成功");
}
@GetMapping("/typeValues")
@ResponseBody
@ApiOperation("下拉框的获取")
ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid){
DictCommonTypeQuery query = new DictCommonTypeQuery();
query.setType(type);
query.setPsid(psid);
List<DictCommonVo> dictCommonVoList = dictCommonService.getValue(query);
if (dictCommonVoList.size() == 0) {
return new ResultBean<List<DictCommonVo>>().fail().setMsg("该类型无数据项");
}
return new ResultBean<List<DictCommonVo>>().success().setData(dictCommonVoList);
}
@ResponseBody
@GetMapping("/selectBykey/{key}/{type}")
@ApiOperation(value = "数据字典信息修改时的初始化信息")
public ResultBean<DictCommonVo> selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type) {
DictCommonVo v = dictCommonService.selectBykey(key, type);
if (v == null) {
return new ResultBean<DictCommonVo>().success().setData(new DictCommonVo());
}
return new ResultBean<DictCommonVo>().success().setData(v);
}
@GetMapping("/getFirstDictKeyByType")
@ResponseBody
@ApiOperation("根据数据字典的key获取第一个值（默认值）")
ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid){
ResultBean<List<DictCommonVo>> resultBean = getTypeValues(dictType, psid);
if (resultBean.getSuccess() && resultBean.getData() != null) {
String dictKey = resultBean.getData().get(0).getDictKey();
return new ResultBean().success().setData(dictKey);
} else {
return new ResultBean().fail().setData(new DictCommon());
}
}
@GetMapping("/getTypeValueList")
@ResponseBody
@ApiOperation("根据分类编码和数据分组查询数据字典")
ResultBean<List<DictCommonVo>> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum){
return dictCommonService.getList(type,groupNum);
}
}

105
src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java Normal file
View File

@@ -0,0 +1,105 @@
package com.yxt.portal.apiadmin;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.portal.biz.dictcommon.DictCommon;
import com.yxt.portal.biz.dictcommon.DictCommonService;
import com.yxt.portal.biz.dicttype.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/7/5 22:37
* @description
*/
@Slf4j
@Controller
@RequestMapping("apiadmin/dicttypes")
@Api(tags = "数据字典类型管理")
public class DictTypeRest{
@Autowired
private DictTypeService dictTypeService;
@Autowired
private DictCommonService dictCommonService;
@PostMapping(value = "/save")
@ResponseBody
@ApiOperation(value = "数据字典类型保存")
ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto){
ResultBean resultBean = ResultBean.fireFail();
DictType dictType = new DictType();
//判断数据字典类型是否已存在
String dictTypeCode = dictTypeDto.getDictTypeCode();
int size = dictTypeService.selectSize(dictTypeCode);
if (size > 0) {
return resultBean.setMsg("数据类型代码已存在");
}
dictTypeDto.fillEntity(dictType);
boolean isSave = dictTypeService.save(dictType);
if (!isSave) {
return resultBean.setMsg("保存失败");
}
return resultBean.success().setMsg("保存成功");
}
@PostMapping("/pageList")
@ResponseBody
@ApiOperation(value = "数据字典类型分页列表")
ResultBean<PagerVo<DictTypeVo>> pageList(@RequestBody PagerQuery<DictTypeQuery> pagerQuery){
ResultBean<PagerVo<DictTypeVo>> rb = ResultBean.fireFail();
PagerVo<DictTypeVo> pv = new PagerVo<>();
IPage<DictTypeVo> p2 = dictTypeService.pageList(pagerQuery);
PagerVo<DictTypeVo> pv1 = PagerUtil.pageToVo(p2, pv);
return rb.success().setData(pv1);
}
@PostMapping("/update/{sid}")
@ResponseBody
@ApiOperation(value = "数据字典类型更新")
ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid){
DictType dictType = dictTypeService.fetchBySid(sid);
if (null == dictType) {
return ResultBean.fireFail().setMsg("该数据字典类型不存在");
}
if (!dictTypeDto.getDictTypeCode().equals(dictType.getDictTypeCode())) {
return ResultBean.fireFail().setMsg("数据字典类型的code值不允许修改");
}
if (0 == dictTypeService.updateBySid(dictTypeDto.toMap(), sid)) {
return ResultBean.fireFail().setMsg("更新失败");
}
return ResultBean.fireSuccess().setMsg("更新成功");
}
@DeleteMapping("/delete/{sid}")
@ResponseBody
@ApiOperation(value = "数据字典类型删除")
ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid){
DictType dictType = dictTypeService.fetchBySid(sid);
if (null == dictType) {
return ResultBean.fireFail().setMsg("该数据字典类型不存在");
}
//查询该类型下是否存在数据项
List<DictCommon> dictCommon = dictCommonService.selectByType(dictType.getDictTypeCode());
if (dictCommon.size() > 0) {
return ResultBean.fireFail().setMsg("该数据字典类型下存在数据项，请先删除该类下的数据项");
}
if (0 == dictTypeService.deleteBySid(sid)) {
return ResultBean.fireFail().setMsg("删除失败");
}
return ResultBean.fireSuccess().setMsg("删除成功");
}
}

9
src/main/java/com/yxt/user/apiadmin/SmsRest.java → src/main/java/com/yxt/portal/apiadmin/SmsRest.java
View File

@@ -1,12 +1,9 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.user.biz.sms.SmsDto;
import com.yxt.user.biz.sms.SmsFeign;
import com.yxt.user.utils.MsgWs;
import com.yxt.portal.biz.sms.SmsDto;
import com.yxt.portal.utils.MsgWs;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import com.yxt.user.biz.sms.SmsDto;
import com.yxt.user.utils.MsgWs;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

10
src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java → src/main/java/com/yxt/portal/apiadmin/SysFunctionRest.java
View File

@@ -1,11 +1,11 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.user.biz.sysfunction.*;
import com.yxt.user.biz.syssource.SysSource;
import com.yxt.user.biz.syssource.SysSourceVo;
import com.yxt.portal.biz.sysfunction.*;
import com.yxt.portal.biz.syssource.SysSource;
import com.yxt.portal.biz.syssource.SysSourceVo;
//import com.yxt.user.biz.syssourcefunction.SysSourceFunction;
import com.yxt.user.biz.syssource.SysSourceService;
import com.yxt.portal.biz.syssource.SysSourceService;
//import com.yxt.user.biz.syssourcefunction.SysSourceFunctionService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;

126
src/main/java/com/yxt/user/apiadmin/SysMenuRest.java → src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
View File

@@ -1,31 +1,31 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.user.biz.sysmenu.*;
import com.yxt.portal.biz.sysmenu.*;
//import com.yxt.user.biz.sysmenurole.SysMenuRoleQuery;
import com.yxt.user.biz.sysrole.SysRole;
import com.yxt.user.biz.syssource.SysSource;
import com.yxt.user.biz.syssource.SysSourceVo;
import com.yxt.portal.biz.sysmenurole.SysMenuRoleQuery;
import com.yxt.portal.biz.sysmenurole.SysMenuRoleService;
import com.yxt.portal.biz.sysrole.SysRole;
import com.yxt.portal.biz.syssource.SysSource;
import com.yxt.portal.biz.syssource.SysSourceVo;
//import com.yxt.user.biz.syssourcemenu.SysSourceMenu;
//import com.yxt.user.biz.syssourcemenu.SysSourceMenuVo;
import com.yxt.user.biz.sysuserrole.SysUserRoleVo;
import com.yxt.portal.biz.sysuserrole.SysUserRoleVo;
//import com.yxt.user.biz.sysmenurole.SysMenuRoleService;
import com.yxt.user.biz.sysrole.SysRoleService;
import com.yxt.user.biz.syssource.SysSourceService;
import com.yxt.portal.biz.sysrole.SysRoleService;
import com.yxt.portal.biz.syssource.SysSourceService;
//import com.yxt.user.biz.syssourcemenu.SysSourceMenuService;
import com.yxt.user.biz.sysuser.SysUserService;
import com.yxt.user.biz.sysuserrole.SysUserRoleService;
import com.yxt.portal.biz.sysuser.SysUserService;
import com.yxt.portal.biz.sysuserrole.SysUserRoleService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysmenu.*;
import com.yxt.user.biz.syssource.SysSourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -57,14 +57,16 @@ public class SysMenuRest {
private SysSourceService sysSourceService;
@Autowired
private SysUserRoleService sysUserRoleService;
// @Autowired
// private SysMenuRoleService sysMenuRoleService;
@Autowired
private SysMenuRoleService sysMenuRoleService;
@Autowired
private SysUserService sysUserService;
@Autowired
private SysRoleService sysRoleService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysMenuVo>> listPage(@RequestBody PagerQuery<SysMenuQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<SysMenuVo> pv = sysMenuService.listPageVo(pq);
@@ -78,15 +80,27 @@ public class SysMenuRest {
return rb.success().setData(list);
}*/
public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody SysMenuQuery query) {
/**
* 菜单列表：根据资源归类
*
* @param query
* @return
*/
@ApiOperation("菜单列表：根据资源归类")
@PostMapping("/listAllVoForSource")
public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody SysMenuQuery query){
ResultBean rb = ResultBean.fireFail();
List<SysMenuTreeVo> list = sysMenuService.listAllVoForSource(query);
return rb.success().setData(list);
}
public ResultBean<List<Map<String, String>>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) {
/**
* 菜单列表：根据资源归类 设置功能的url用
* @return
*/
@ApiOperation("菜单列表：根据资源归类 设置功能的url用")
@PostMapping("/getMenusForFunction")
public ResultBean<List<Map<String,String>>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) {
ResultBean rb = ResultBean.fireFail();
SysMenuQuery smq= new SysMenuQuery();
smq.setSourceSid(sysMenuFunctionQuery.getSourceSid());
@@ -115,8 +129,38 @@ public class SysMenuRest {
}
}
@ApiOperation("根据用户sid查询所有数据列表 ")
@PostMapping("/sourceMenuTreeByUserSid")
public ResultBean<List<Map<String, Object>>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query) {
ResultBean<List<Map<String, Object>>> rb = ResultBean.fireFail();
SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
List<Map<String, Object>> list = new ArrayList<>();
if (null == query)
return rb.setData(list);
public ResultBean<List<Map<String, Object>>> sourcemenutree(SysMenuQuery query) {
//if业务角色存在，则查询业务角色的菜单列表，否则查询平台角色的菜单列表
List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(query.getUserSid());
List<String> roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList());
for (String roleSid : roleSids) {
SysRole sysRole = sysRoleService.fetchBySid(roleSid);
if(sysRole == null){
continue;
}
Integer type = sysRoleService.fetchBySid(roleSid).getType();
if (type == 1){
orgRoleMenuQuery.setIsAdmin("1");
}else {
orgRoleMenuQuery.setIsAdmin("0");
}
}
orgRoleMenuQuery.setRoleSids(roleSids);
orgRoleMenuQuery.setSourceSid(query.getSourceSid());
list = sysMenuRoleService.getSourceMenuTreeOfRoles(orgRoleMenuQuery, null);
return rb.success().setData(list);
}
@ApiOperation("根据资源sid查询所有数据列表 ")
@PostMapping("/sourcemenutree")
public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query) {
ResultBean<List<Map<String, Object>>> rb = ResultBean.fireFail();
// SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
List<Map<String, Object>> list = new ArrayList<>();
@@ -144,8 +188,9 @@ public class SysMenuRest {
return rb.success().setData(list);
}
public ResultBean<List<SysMenuVo>> listAllByRoleSid(SysMenuQuery query) {
@ApiOperation("根据角色sid条件查询所有数据列表")
@PostMapping("/listAllByRoleSid")
public ResultBean<List<SysMenuVo>> listAllByRoleSid(@RequestBody SysMenuQuery query) {
ResultBean rb = ResultBean.fireFail();
String roleSid = query.getRoleSid();
if (StringUtils.isBlank(roleSid)) {
@@ -174,7 +219,9 @@ public class SysMenuRest {
}
public ResultBean save(SysMenuDto dto) {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@Valid @RequestBody SysMenuDto dto) {
ResultBean rb = ResultBean.fireFail();
String sourceSid = dto.getSourceSid();
SysSource sysSource = sysSourceService.fetchBySid(sourceSid);
@@ -185,8 +232,9 @@ public class SysMenuRest {
return rb.success();
}
public ResultBean update(SysMenuDto dto, String sid) {
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
//查询菜单是否存在
SysMenu sysMenu = sysMenuService.fetchBySid(sid);
@@ -207,8 +255,16 @@ public class SysMenuRest {
return rb.success();
}
public ResultBean updateIsEnable(String sid, Integer isEnable) {
/**
* 修改是否可用的状态
*
* @param sid 菜单sid或资源sid
* @param isEnable 是否可用的状态：1可用，0不可用
* @return
*/
@ApiOperation("修改是否可用的状态 ")
@PostMapping("/updateIsEnable/{sid}/{isEnable}")
public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) {
ResultBean rb = ResultBean.fireFail();
SysMenu sysMenu = sysMenuService.fetchBySid(sid);
if (sysMenu == null) {
@@ -234,9 +290,15 @@ public class SysMenuRest {
sysMenuService.delByIds(ids);
return rb.success();
}*/
public ResultBean delBySids(String sid) {
/**
* 根据当前行sid删除菜单
*
* @param sid 菜单sid
* @return
*/
@ApiOperation("删除记录 根据sid")
@GetMapping("/delBySids/{sid}")
public ResultBean delBySids(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
SysMenu sysMenu = sysMenuService.fetchBySid(sid);
if (sysMenu == null) {

159
src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java Normal file
View File

@@ -0,0 +1,159 @@
package com.yxt.portal.apiadmin;
import com.yxt.portal.biz.sysmenurole.*;
import com.yxt.portal.biz.sysrole.SysRole;
import com.yxt.portal.biz.sysrole.SysRoleService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.portal.biz.sysmenurole.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
/**
* 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("v1/sysmenurole")
public class SysMenuRoleRest {
@Autowired
private SysMenuRoleService sysMenuRoleService;
@Autowired
private SysRoleService sysRoleService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysMenuRoleVo>> listPage(@RequestBody PagerQuery<SysMenuRoleQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<SysMenuRoleVo> pv = sysMenuRoleService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SysMenuRoleVo>> listAll(@RequestBody SysMenuRoleQuery query){
ResultBean rb = ResultBean.fireFail();
List<SysMenuRoleVo> list = sysMenuRoleService.listAllVo(query);
return rb.success().setData(list);
}
@ApiOperation("根据角色查询授权的菜单列表(PC)")
@PostMapping("/selMenuByRole")
public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(@RequestBody SysMenuRoleDataQuery query) {
return sysMenuRoleService.selMenuByRole(query);
}
@ApiOperation("根据角色查询授权的菜单列表(APP)")
@PostMapping("/selMenuByRoleApp")
public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query) {
return sysMenuRoleService.selMenuByRoleApp(query);
}
@ApiOperation("修改角色菜单的数据权限（PC）")
@PostMapping("/updateDataByRoleMenu")
public ResultBean updateDataByRoleMenu(@RequestBody List<SysMenuRoleDataDto> dtos) {
return sysMenuRoleService.updateDataByRoleMenu(dtos);
}
@ApiOperation("修改角色菜单的数据权限（移动端）")
@PostMapping("/updateDataByRoleMenuApp")
public ResultBean updateDataByRoleMenuApp(@RequestBody List<SysMenuRoleDataDto> dtos) {
return sysMenuRoleService.updateDataByRoleMenuApp(dtos);
}
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SysMenuRoleVo>> list(){
ResultBean rb = ResultBean.fireFail();
List<SysMenuRoleVo> list = sysMenuRoleService.listVo();
return rb.success().setData(list);
}
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody SysMenuRoleDto dto){
ResultBean rb = ResultBean.fireFail();
sysMenuRoleService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
sysMenuRoleService.updateBySid(dto.toMap(),sid);
return rb.success();
}
@ApiOperation("修改角色的菜单配置")
@PostMapping("/updateRoleAndMenu")
public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto) {
String roleSid=dto.getRoleSid();
String menuSid=dto.getMenuSid();
if(StringUtils.isBlank(roleSid)){
return ResultBean.fireFail().setMessage("角色sid不能为空");
}else{
SysRole sysRole = sysRoleService.fetchBySid(roleSid);
if(sysRole==null||StringUtils.isBlank(sysRole.getSid())){
return ResultBean.fireFail().setMessage("角色sid不存在");
}
}
List<MenuRoleVo> menuRoleList = sysMenuRoleService.selectByRoleSid(roleSid);
sysMenuRoleService.delByRoleSid(roleSid);
ResultBean rb = ResultBean.fireFail();
if(!StringUtils.isBlank(menuSid)){
String[] sids = menuSid.split(",");
for(String sid:sids){
MenuRoleVo menuRoleVo = menuRoleList.stream().filter(s -> Objects.equals(s.getMenuSid(), sid)).findFirst().orElse(null);
SysMenuRole sysMenuRole = new SysMenuRole();
sysMenuRole.setRoleSid(roleSid);
sysMenuRole.setMenuSid(sid);
if(menuRoleVo != null){
sysMenuRole.setDataRuleId(menuRoleVo.getDataRuleId());
}
sysMenuRoleService.save(sysMenuRole);
}
}
return rb.success();
}
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids){
ResultBean rb = ResultBean.fireFail();
sysMenuRoleService.delByIds(ids);
return rb.success();
}
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SysMenuRoleVo> fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysMenuRoleVo vo = sysMenuRoleService.fetchByIdVo(id);
return rb.success().setData(vo);
}
}

171
src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java → src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.common.base.config.RedisUtil;
@@ -8,18 +8,18 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.user.biz.sysstafforg.SysStaffOrgService;
import com.yxt.user.biz.sysstafforg.SysStaffOrgVo;
import com.yxt.user.biz.sysuser.SysUserService;
import com.yxt.user.biz.sysorganization.*;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo;
import com.yxt.portal.biz.sysuser.SysUserService;
import com.yxt.portal.biz.sysorganization.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.io.File;
import java.util.*;
@@ -62,7 +62,8 @@ public class SysOrganizationRest{
return sysOrganizationService.saveOrg(dto);
}
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) {
ResultBean rb = ResultBean.fireFail();
String psid = pq.getParams().getPsid();
@@ -74,40 +75,45 @@ public class SysOrganizationRest{
return rb.success().setData(pv);
}
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SysOrganizationVo>> listAll(@RequestBody SysOrganizationQuery query) {
ResultBean rb = ResultBean.fireFail();
List<SysOrganizationVo> list = sysOrganizationService.listAllVo(query);
return rb.success().setData(list);
}
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SysOrganizationVo>> list() {
ResultBean rb = ResultBean.fireFail();
List<SysOrganizationVo> list = sysOrganizationService.listVo();
return rb.success().setData(list);
}
public ResultBean save(SysOrganizationDto dto) {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody SysOrganizationDto dto) {
ResultBean rb = ResultBean.fireFail();
sysOrganizationService.saveOrUpdateDto(dto);
return rb.success();
}
public ResultBean<List<SysOrganizationVo>> selectFirstOrgList() {
@ApiOperation("一级组织机构列表")
@GetMapping("/selectFirstOrgList")
public ResultBean<List<SysOrganizationVo>> selectFirstOrgList(){
return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectFirstOrgList());
}
public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(String sid) {
@ApiOperation("根据父级sid查询子集列表")
@GetMapping("/selectChildrenListBySid/{sid}")
public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(@PathVariable("sid") String sid) {
return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectChildrenListBySid(sid));
}
@Transactional(rollbackFor = Exception.class)
public ResultBean update(SysOrganizationDto dto, String sid) {
public ResultBean update(SysOrganizationDto dto, String sid){
ResultBean rb = ResultBean.fireFail();
//查询该机构下的所有分管人员
List<String> stringList = sysStaffOrgService.selectByOrgSid(sid);
@@ -186,15 +192,17 @@ public class SysOrganizationRest{
return rb.success();
}
public ResultBean del(String ids) {
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids){
ResultBean rb = ResultBean.fireFail();
sysOrganizationService.delByIds(ids);
return rb.success();
}
public ResultBean delBySid(String sid) {
@ApiOperation("删除记录 根据sid")
@GetMapping("/delBySid/{sid}")
public ResultBean delBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(sid)) {
return ResultBean.fireFail().setMessage("sid不能为空!");
@@ -204,15 +212,18 @@ public class SysOrganizationRest{
return rb.success();
}
public ResultBean<SysOrganizationVo> fetch(String id) {
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SysOrganizationVo> fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysOrganizationVo vo = sysOrganizationService.fetchByIdVo(id);
return rb.success().setData(vo);
}
public ResultBean<SysOrganizationVo> fetchBySid(String sid) {
@ApiOperation("获取一条记录 根据sid")
@ResponseBody
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysOrganization entity = sysOrganizationService.fetchBySid(sid);
List<SysStaffOrgVo> list = sysStaffOrgService.fetchByOrgSid(sid);
@@ -247,8 +258,10 @@ public class SysOrganizationRest{
return rb.success().setData(vo);
}
public ResultBean<Map<String, Object>> selectAppOrganization(String sid) {
@ApiOperation("手机获取组织架构")
@ResponseBody
@GetMapping("/selectAppOrganization")
public ResultBean<Map<String, Object>> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid) {
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> nameList = sysOrganizationService.selectOrgNameList(sid);
List<AppContactSysOrganizationVo> staffList = new ArrayList<>();
@@ -267,48 +280,68 @@ public class SysOrganizationRest{
}
public ResultBean<List<SysOrgVo>> selectListOrg() {
@ApiOperation("组织架构")
@ResponseBody
@GetMapping("/selectListOrg")
ResultBean<List<SysOrgVo>> selectListOrg(){
ResultBean<List<SysOrgVo>> rb = ResultBean.fireFail();
List<SysOrgVo> menuTree2VoList = sysOrganizationService.treeList();
return rb.success().setData(menuTree2VoList);
}
public ResultBean<List<SysOrgVo>> getListOrg() {
@ApiOperation("获取到分公司")
@ResponseBody
@GetMapping("/getListOrg")
ResultBean<List<SysOrgVo>> getListOrg(){
ResultBean<List<SysOrgVo>> rb = ResultBean.fireFail();
List<SysOrgVo> menuTree2VoList = sysOrganizationService.getListOrg();
return rb.success().setData(menuTree2VoList);
}
public ResultBean<List<SysOrgVo>> getListOrgByBrand(String orgSid) {
@ApiOperation("获取同品牌下分公司")
@ResponseBody
@GetMapping("/getListOrgByBrand/{orgSid}")
ResultBean<List<SysOrgVo>> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid){
return null;//sysOrganizationService.getListOrgByBrand(orgSid);
}
public ResultBean<List<SysOrgVo>> getListOrgByBrandSid(String orgSid, String brandSid) {
@ApiOperation("获取指定品牌下分公司(已筛选本分公司)")
@ResponseBody
@GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}")
ResultBean<List<SysOrgVo>> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid);
}
public ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(String orgSid, String brandSid) {
@ApiOperation("获取指定品牌下分公司(未筛选本分公司)")
@ResponseBody
@GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}")
ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid);
}
public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
@ApiOperation("获取指定分公司下部门信息")
@ResponseBody
@GetMapping("/getListDeptByOrgSid/{orgSid}")
ResultBean<List<SysOrgVo>> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid){
return sysOrganizationService.getListDeptByOrgSid(orgSid);
}
public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String userSid) {
@ApiOperation("根据业务员sid获取到分公司")
@ResponseBody
@GetMapping("/getUseOrgByUserSid")
ResultBean<SysOrganizationVo> getUseOrgByUserSid(@RequestParam("userSid") String userSid){
ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid);
return rb.success().setData(vo);
}
public ResultBean<SysOrganization> selectBySid(String sid) {
@ApiOperation("根据部门sid查询组织信息")
@ResponseBody
@GetMapping("/selectBySid")
ResultBean<SysOrganization> selectBySid(@RequestParam("sid") String sid){
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
if (sysOrganization == null) {
return new ResultBean<SysOrganization>().fail().setData(new SysOrganization());
@@ -317,7 +350,10 @@ public class SysOrganizationRest{
}
public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
@ApiOperation("根据组织架构sid查询组织下所有分公司")
@ResponseBody
@GetMapping("/selectUseOrgSidBySid")
ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid){
ResultBean rb = ResultBean.fireFail();
List<Map<String, String>> maps = sysOrganizationService.selectUseOrgSidBySid(sid);
return rb.success().setData(maps);
@@ -328,8 +364,10 @@ public class SysOrganizationRest{
*
* @return
*/
public ResultBean<List<SysOrgListVo>> selectListOne() {
@ApiOperation("所在部门下拉")
@ResponseBody
@GetMapping("/selectListOne")
ResultBean<List<SysOrgListVo>> selectListOne(){
ResultBean<List<SysOrgListVo>> rb = ResultBean.fireFail();
List<SysOrgListVo> sysOrgListVo = sysOrganizationService.selectTreeList();
if (sysOrgListVo.size() == 0) {
@@ -340,8 +378,10 @@ public class SysOrganizationRest{
return rb.success().setData(sysOrgListVo);
}
public ResultBean<QrCodeVo> getQrCode(String sid) {
@PostMapping("/getQrCode/{sid}")
@ResponseBody
@ApiOperation("查看二维码")
public ResultBean<QrCodeVo> getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid) {
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
if (sysOrganization == null) {
return new ResultBean<QrCodeVo>().fail().setMsg("部门不存在");
@@ -371,7 +411,10 @@ public class SysOrganizationRest{
}
public ResultBean<String> getOrgSid(String sid) {
@GetMapping("/getOrgSid/{sid}")
@ResponseBody
@ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司")
ResultBean<String> getOrgSid(@PathVariable(value = "sid") String sid){
ResultBean<String> rb = ResultBean.fireFail();
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
if (sysOrganization == null) {
@@ -381,35 +424,51 @@ public class SysOrganizationRest{
return rb.success().setData(orgSid);
}
public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
@GetMapping("/selectOrgList")
@ResponseBody
@ApiOperation("当前分公司销售部门及部门人员")
ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query){
return sysOrganizationService.selectOrgList(query);
}
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
@GetMapping("/selectOrgLists")
@ResponseBody
@ApiOperation("当前分公司下所有部门")
ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query){
return sysOrganizationService.selectOrgLists(query);
}
public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
@GetMapping("/selectByPSid")
@ResponseBody
@ApiOperation("查询分公司下的销售支持部")
ResultBean<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name){
return sysOrganizationService.selectByPSid(sid,name);
}
public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
@GetMapping("/selectOrgSidList")
@ResponseBody
@ApiOperation("所有分公司sid")
ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
ResultBean<List<SysOrganizationVo>> rb = ResultBean.fireFail();
List<SysOrganizationVo> stringList = sysOrganizationService.selectOrgSidList();
return rb.success().setData(stringList);
}
public ResultBean<List<SysOrganizationVo>> selectOrgByPSid(String psid) {
@GetMapping("/selectOrgByPSid")
@ResponseBody
@ApiOperation("查询事业部下所有分公司")
ResultBean<List<SysOrganizationVo>> selectOrgByPSid(@RequestParam("psid") String psid){
return sysOrganizationService.selectOrgByPSid(psid);
}
public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
@GetMapping("/selectByOrgSidPath")
@ResponseBody
@ApiOperation("组织层级分页查询")
ResultBean<SysOrganizationVo> selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath){
return sysOrganizationService.selectByOrgSidPath(orgSidPath);
}
}

59
src/main/java/com/yxt/user/apiadmin/SysPostRest.java → src/main/java/com/yxt/portal/apiadmin/SysPostRest.java
View File

@@ -1,15 +1,13 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.user.biz.syspost.*;
import com.yxt.portal.biz.syspost.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.syspost.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@@ -35,21 +33,25 @@ public class SysPostRest {
@Autowired
private SysPostService sysPostService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysPostVo>> listPage(@RequestBody PagerQuery<SysPostQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<SysPostVo> pv = sysPostService.listPageVo(pq);
return rb.success().setData(pv);
}
public ResultBean<List<SysPostVo>> listAll(@RequestBody SysPostQuery query) {
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SysPostVo>> listAll(@RequestBody SysPostQuery query){
ResultBean rb = ResultBean.fireFail();
List<SysPostVo> list = sysPostService.listAllVo(query);
return rb.success().setData(list);
}
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SysPostVo>> list() {
ResultBean rb = ResultBean.fireFail();
List<SysPostVo> list = sysPostService.listVo();
@@ -57,28 +59,35 @@ public class SysPostRest {
}
public ResultBean save(SysPostDto dto) {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody SysPostDto dto){
ResultBean rb = ResultBean.fireFail();
sysPostService.saveOrUpdateDto(dto);
return rb.success();
}
public ResultBean update(SysPostDto dto, String sid) {
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
sysPostService.updateBySid(dto.toMap(), sid);
return rb.success();
}
public ResultBean del(String ids) {
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids){
ResultBean rb = ResultBean.fireFail();
sysPostService.delByIds(ids);
return rb.success();
}
public ResultBean delBySids(String sids) {
@ApiOperation("删除记录")
@GetMapping("/delBySids/{sids}")
public ResultBean delBySids(@PathVariable("sids") String sids){
ResultBean rb = ResultBean.fireFail();
String[] sidArr = sids.split(",");
sysPostService.delBySids(sidArr);
@@ -86,39 +95,47 @@ public class SysPostRest {
}
public ResultBean<SysPostVo> fetch(String id) {
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SysPostVo> fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysPostVo vo = sysPostService.fetchByIdVo(id);
return rb.success().setData(vo);
}
public ResultBean<SysPostVo> fetchBySid(String sid) {
@ApiOperation("获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysPostVo> fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysPostVo vo = sysPostService.fetchBySidVo(sid);
return rb.success().setData(vo);
}
public ResultBean<List<SysPostVo>> fetchByOrgSid(String orgSid) {
@ApiOperation("根据部门sid获取岗位列表")
@GetMapping("/fetchByOrgSid/{orgSid}")
public ResultBean<List<SysPostVo>> fetchByOrgSid(@PathVariable("orgSid") String orgSid){
ResultBean rb = ResultBean.fireFail();
List<SysPostVo> list = sysPostService.fetchByOrgSid(orgSid);
return rb.success().setData(list);
}
public ResultBean<String> fetchByOrgSidPostCode() {
@ApiOperation("根据部门sid获取岗位编号")
@GetMapping("/fetchByOrgSidPostCode/{orgSid}")
public ResultBean<String> fetchByOrgSidPostCode(){
ResultBean rb = ResultBean.fireFail();
String s = sysPostService.fetchByOrgSidPostCode();
return rb.success().setData(s);
}
/**
* 查询所有岗位
* 查询岗位列表
*
* @return
*/
@ApiOperation("查询岗位列表")
@GetMapping("/selectList")
public ResultBean<List<SysPostListVo>> selectList() {
ResultBean<List<SysPostListVo>> rb = ResultBean.fireFail();
List<SysPostListVo> sysPostVoList = sysPostService.selectList();

58
src/main/java/com/yxt/user/apiadmin/SysRoleRest.java → src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java
View File

@@ -1,15 +1,15 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysrole.*;
import com.yxt.portal.biz.sysrole.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -34,7 +34,8 @@ public class SysRoleRest {
@Autowired
private SysRoleService sysRoleService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysRoleVo>> listPage(@RequestBody PagerQuery<SysRoleQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<SysRoleVo> pv = sysRoleService.listPageVo(pq);
@@ -42,6 +43,8 @@ public class SysRoleRest {
}
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query){
ResultBean rb = ResultBean.fireFail();
List<SysRoleVo> list = sysRoleService.listAllVo(query);
@@ -49,14 +52,18 @@ public class SysRoleRest {
}
public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
@ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
@PostMapping("/listAllByUserSid/{userSid}")
public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid){
ResultBean rb = ResultBean.fireFail();
List<SysRoleVo> list = sysRoleService.listAllByUserSid(userSid);
return rb.success().setData(list);
}
public ResultBean<List<SysRoleVo>> fetchByUserSid(String userSid) {
@ApiOperation("根据用户sid查询用户的角色列表")
@PostMapping("/fetchByUserSid/{userSid}")
public ResultBean<List<SysRoleVo>> fetchByUserSid(@PathVariable("userSid") String userSid){
if(StringUtils.isBlank(userSid)){
return new ResultBean<List<SysRoleVo>>().fail().setMsg("userSid不能为空");
}
@@ -73,7 +80,9 @@ public class SysRoleRest {
}
public ResultBean save(SysRoleDto dto){
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody SysRoleDto dto){
String name = dto.getName();
if(StringUtils.isBlank(name)){
return new ResultBean<List<SysRoleVo>>().fail().setMsg("角色名称不能为空!");
@@ -87,9 +96,11 @@ public class SysRoleRest {
sysRoleService.saveOrUpdateDto(dto);
return rb.success();
}
public ResultBean update(SysRoleDto dto,String sid){
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid){
String roleName = dto.getName();
if(StringUtils.isBlank(sid)){
return new ResultBean<List<SysRoleVo>>().fail().setMsg("角色sid不能为空!");
@@ -108,28 +119,33 @@ public class SysRoleRest {
}
public ResultBean del(String ids){
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids){
ResultBean rb = ResultBean.fireFail();
sysRoleService.delByIds(ids);
return rb.success();
}
public ResultBean delBySids(String sids) {
@ApiOperation("删除记录根据sids")
@GetMapping("/delBySids/{sids}")
public ResultBean delBySids(@PathVariable("sids") String sids){
ResultBean rb = ResultBean.fireFail();
sysRoleService.delBySids(sids);
return rb.success();
}
public ResultBean<SysRoleVo> fetch(String id){
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SysRoleVo> fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysRoleVo vo = sysRoleService.fetchByIdVo(id);
return rb.success().setData(vo);
}
public ResultBean<SysRoleVo> fetchBySid(String sid) {
@ApiOperation("获取一条记录根据sid")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysRoleVo> fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysRoleVo vo = sysRoleService.fetchBySidVo(sid);
if (StringUtils.isBlank(vo.getSid())) {
@@ -138,8 +154,10 @@ public class SysRoleRest {
return rb.success().setData(vo);
}
public ResultBean setIsEnable(String sid, String isEnable) {
@PostMapping("/setIsEnable/{sid}/{isEnable}")
@ResponseBody
@ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
SysRole role = sysRoleService.fetchBySid(sid);
if (role == null) {
return ResultBean.fireFail().setMsg("此角色已不存在");

9
src/main/java/com/yxt/user/apiadmin/SysSourceRest.java → src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java
View File

@@ -1,14 +1,14 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
//import com.yxt.user.biz.systemlog.SystemLog;
import com.yxt.user.biz.sysuser.SysUser;
import com.yxt.portal.biz.sysuser.SysUser;
//import com.yxt.user.biz.systemlog.SystemLogService;
import com.yxt.user.biz.sysuser.SysUserService;
import com.yxt.portal.biz.sysuser.SysUserService;
import com.yxt.common.base.config.RedisUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.syssource.*;
import com.yxt.portal.biz.syssource.*;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
/**

4
src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java → src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java
View File

@@ -1,6 +1,6 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.user.biz.sysstafforg.*;
import com.yxt.portal.biz.sysstafforg.*;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;

15
src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java → src/main/java/com/yxt/portal/apiadmin/SysStaffPostRest.java
View File

@@ -1,18 +1,18 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.user.biz.sysstaffpost.SysStaffPostDto;
import com.yxt.user.biz.sysstaffpost.SysStaffPostQuery;
import com.yxt.user.biz.sysstaffpost.SysStaffPostVo;
import com.yxt.portal.biz.sysstaffpost.SysStaffPostDto;
import com.yxt.portal.biz.sysstaffpost.SysStaffPostQuery;
import com.yxt.portal.biz.sysstaffpost.SysStaffPostVo;
//import com.yxt.user.biz.systemlog.SystemLog;
import com.yxt.user.biz.sysuser.SysUser;
import com.yxt.portal.biz.sysuser.SysUser;
//import com.yxt.user.biz.systemlog.SystemLogService;
import com.yxt.user.biz.sysuser.SysUserService;
import com.yxt.portal.biz.sysuser.SysUserService;
import com.yxt.common.base.config.RedisUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysstaffpost.SysStaffPostService;
import com.yxt.portal.biz.sysstaffpost.SysStaffPostService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
/**

12
src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java → src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
View File

@@ -1,16 +1,16 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.user.biz.sysstaffinfo.*;
import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffQuery;
import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffVo;
import com.yxt.user.biz.sysuser.SysUserService;
import com.yxt.portal.biz.sysstaffinfo.*;
import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffQuery;
import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffVo;
import com.yxt.portal.biz.sysuser.SysUserService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

8
src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java → src/main/java/com/yxt/portal/apiadmin/SysUserDefaultOrgRest.java
View File

@@ -1,9 +1,9 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.common.core.result.ResultBean;
import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgDto;
import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgService;
import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgVo;
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgDto;
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgService;
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;

272
src/main/java/com/yxt/user/apiadmin/SysUserRest.java → src/main/java/com/yxt/portal/apiadmin/SysUserRest.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,25 +8,29 @@ import com.yxt.common.base.utils.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysorganization.SysOrganization;
import com.yxt.user.biz.sysorganization.SysOrganizationService;
import com.yxt.user.biz.syspost.SysPost;
import com.yxt.user.biz.syspost.SysPostService;
import com.yxt.user.biz.sysstaffinfo.SysStaffinfo;
import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.user.biz.sysstaffinfo.SysStaffinfoVo;
import com.yxt.user.biz.sysstafforg.SysStaffOrg;
import com.yxt.user.biz.sysstafforg.SysStaffOrgService;
import com.yxt.user.biz.sysstaffpost.SysStaffPost;
import com.yxt.user.biz.sysstaffpost.SysStaffPostService;
import com.yxt.user.biz.sysuser.*;
import com.yxt.portal.biz.sysorganization.SysOrganization;
import com.yxt.portal.biz.sysorganization.SysOrganizationService;
import com.yxt.portal.biz.syspost.SysPost;
import com.yxt.portal.biz.syspost.SysPostService;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoVo;
import com.yxt.portal.biz.sysstafforg.SysStaffOrg;
import com.yxt.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.portal.biz.sysstaffpost.SysStaffPost;
import com.yxt.portal.biz.sysstaffpost.SysStaffPostService;
import com.yxt.portal.biz.sysuser.*;
import com.yxt.portal.biz.sysuser.app.OrgList;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.*;
/**
@@ -67,21 +71,24 @@ public class SysUserRest {
// 定义点选文字图片验证码允许的误差值
private static final int ERROR_AMOUNT = 50;// 定义允许的误差值，单位是px
@ApiOperation("根据条件分页查询数据的列表 ")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysUserVo>> listPage(@RequestBody PagerQuery<SysUserQuery> pq) {
ResultBean rb = ResultBean.fireFail();//roleSid
PagerVo<SysUserVo> pv = sysUserService.listPageVo(pq);
return rb.success().setData(pv);
}
public ResultBean<List<SysUserVo>> listAll(@RequestBody SysUserQuery query) {
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SysUserVo>> listAll(@RequestBody SysUserQuery query){
ResultBean rb = ResultBean.fireFail();
List<SysUserVo> list = sysUserService.listAllVo(query);
return rb.success().setData(list);
}
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SysUserVo>> list() {
ResultBean rb = ResultBean.fireFail();
List<SysUserVo> list = sysUserService.listVo();
@@ -89,7 +96,9 @@ public class SysUserRest {
}
public ResultBean save(SysUserDto dto) {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@Valid @RequestBody SysUserDto dto){
ResultBean rb = ResultBean.fireFail();
//手机号
String mobile = dto.getMobile();
@@ -168,9 +177,10 @@ public class SysUserRest {
return rb.success();
}
public ResultBean delSysUserByMobile(String mobile) {
int i = sysUserService.delSysUserByMobile(mobile);
@ApiOperation("根据staffSid删除用户（逻辑删除）")
@PostMapping("/delSysUserByMobile")
public ResultBean delSysUserByMobile(@RequestParam("sid") String sid){
int i = sysUserService.delSysUserByMobile(sid);
if (i == 0) {
return new ResultBean().fail().setMsg("删除失败");
}
@@ -178,14 +188,17 @@ public class SysUserRest {
}
public ResultBean<SysStaffinfoVo> getSysUserByMobile(String staffSid) {
@ApiOperation("根据staffSid查询用户信息")
@PostMapping("/getSysUserByMobile")
public ResultBean<SysStaffinfoVo> getSysUserByMobile(@RequestParam("staffSid") String staffSid){
ResultBean rb = ResultBean.fireFail();
SysStaffinfoVo user = sysUserService.getSysUserByMobile(staffSid);
return rb.success().setData(user);
}
public ResultBean update(SysUserDto dto, String sid) {
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SysUserDto dto, @PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
sysUserService.updateBySid(dto.toMap(), sid);
//部门sid
@@ -229,10 +242,16 @@ public class SysUserRest {
* @param original 原始密码
* @param password 密码
* @param confirmPassword 确认密码
* @param userSid 用户sid
* @return
*/
public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) {
@PostMapping("/updatePassword")
@ApiOperation(value = "5、修改密码")
public ResultBean updatePassword(@RequestParam("original") String original,
@RequestParam("password") String password,
@RequestParam("confirmPassword") String confirmPassword,
@RequestParam("userSid") String userSid,
HttpServletRequest httpServletRequest){
String token = httpServletRequest.getHeader("token");
// 根据redisToken查询用户信息
SysUser user = sysUserService.fetchBySid(userSid);
@@ -259,21 +278,27 @@ public class SysUserRest {
}
public ResultBean del(String ids) {
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids){
ResultBean rb = ResultBean.fireFail();
sysUserService.delByIds(ids);
return rb.success();
}
public ResultBean delBySid(String sid) {
@ApiOperation("删除记录根据sid")
@GetMapping("/delBySid/{sid}")
public ResultBean delBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
sysUserService.delBySid(sid);
return rb.success();
}
public ResultBean<SysUserVo> selectByUserName(String mobile) {
@ApiOperation("根据用户名（手机号）查询用户")
@GetMapping("/fetchByMobile/{mobile}")
public ResultBean<SysUserVo> selectByUserName(@PathVariable("mobile") String mobile){
SysUser user = sysUserService.selectByUserName(mobile);
SysUserVo sysUserVo = new SysUserVo();
BeanUtil.copyProperties(user, sysUserVo);
@@ -281,33 +306,56 @@ public class SysUserRest {
}
public ResultBean<SysUserVo> fetch(String id) {
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SysUserVo> fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysUserVo vo = sysUserService.fetchByIdVo(id);
return rb.success().setData(vo);
}
public ResultBean<SysUserVo> fetchBySid(String sid) {
@ApiOperation("根据sid获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysUserVo> fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysUserVo vo = sysUserService.fetchBySidVo(sid);
return rb.success().setData(vo);
}
public ResultBean<List<SysUserVo>> fetchBySids(String sids) {
@ApiOperation("根据多个或者一个sid获取对应的用户集合")
@GetMapping("/fetchBySids/{sids}")
public ResultBean<List<SysUserVo>> fetchBySids(@PathVariable("sids") String sids){
ResultBean rb = ResultBean.fireFail();
List<SysUserVo> vo = sysUserService.fetchBySidSVo(sids);
return rb.success().setData(vo);
}
public ResultBean reGetPwd(String userName, String userPhone) {
/**
* 客户端找回密码
*
* @param userName,userPhone
* @return
*/
@ApiOperation("客户端找回密码")
@PostMapping("/reGetPwd")
public ResultBean reGetPwd(@RequestParam("userName") String userName, @RequestParam("userPhone") String userPhone){
return sysUserService.reGetPwd(userName, userPhone);
}
public ResultBean initPwd(String sid) {
/**
* 初始化密码
*
* @param sid 用户sid
* @return ResultBean
*/
@ResponseBody
@PostMapping("/initPwd/{sid}")
@ApiOperation(value = "10、用户初始化密码")
@ApiOperationSupport(order = 100)
public ResultBean
initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) {
if (!sysUserService.initPwd(sid)) {
return ResultBean.fireFail().setMsg("初始化密码失败");
}
@@ -476,7 +524,11 @@ public class SysUserRest {
return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
}
public ResultBean<SysUserVo> loginByNoVeriCode(SysUserQuery userQuery) {
@PostMapping("/loginByNoVeriCode")
@ResponseBody
@ApiOperation(value = "3、登录无验证码")
@ApiOperationSupport(order = 30)
public ResultBean<SysUserVo> loginByNoVeriCode(@RequestBody SysUserQuery userQuery) {
String userName = userQuery.getUserName();
String password = userQuery.getPassword();
@@ -522,8 +574,16 @@ public class SysUserRest {
}
public ResultBean signOut(HttpServletRequest httpServletRequest) {
/**
* 退出登录
*
* @return
*/
@PostMapping("/signOut")
@ResponseBody
@ApiOperation(value = "退出登录")
@ApiOperationSupport(order = 30)
public ResultBean signOut(HttpServletRequest httpServletRequest){
String token = httpServletRequest.getHeader("token");
String redisToken = redisUtil.get(token);
if (StringUtils.isBlank(redisToken)) {
@@ -543,7 +603,7 @@ public class SysUserRest {
@ResponseBody
@ApiOperation(value = "3、获取注册码")
@ApiOperationSupport(order = 30)
public ResultBean sendMessageCode(String mobile) {
public ResultBean sendMessageCode(@RequestParam("mobile") String mobile) {
if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) {
return new ResultBean().fail().setMsg("请输入正确的手机号");
}
@@ -552,7 +612,7 @@ public class SysUserRest {
}
/**
* 获取登录注册码（）
* 获取登录码（）
* @param mobile
* @return
*/
@@ -560,15 +620,33 @@ public class SysUserRest {
@ResponseBody
@ApiOperation(value = "3、获取登录码")
@ApiOperationSupport(order = 30)
public ResultBean sendMessageLogin(String mobile) {
public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile) {
if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) {
return new ResultBean().fail().setMsg("请输入正确的手机号");
}
String verificationCode = "";
return sysUserService.getVerificationCodeL(mobile, verificationCode);
}
public ResultBean<SysUserVo> selectByStaffsid(String staffsid) {
/**
* 获取修改码（）
* @param mobile
* @return
*/
@PostMapping("/sendMessageUpdate")
@ResponseBody
@ApiOperation(value = "3、获取修改码")
@ApiOperationSupport(order = 30)
public ResultBean sendMessageUpdate(@RequestParam("mobile") String mobile) {
if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) {
return new ResultBean().fail().setMsg("请输入正确的手机号");
}
String verificationCode = "";
return sysUserService.getVerificationCodeU(mobile, verificationCode);
}
@ApiOperation("根据staffsid查询用户")
@ResponseBody
@GetMapping("/selectByStaffsid/{staffsid}")
public ResultBean<SysUserVo> selectByStaffsid(@PathVariable("staffsid") String staffsid){
SysUserVo user = sysUserService.selectByStaffsid(staffsid);
if (user != null) {
return new ResultBean<SysUserVo>().success().setData(user);
@@ -579,7 +657,9 @@ public class SysUserRest {
}
public ResultBean<SysUser> selectBySid(String sid) {
@ApiOperation("根据sid查询用户信息")
@PostMapping("/selectBySid")
public ResultBean<SysUser> selectBySid(@RequestParam("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysUser vo = sysUserService.fetchBySid(sid);
if (vo == null) {
@@ -627,7 +707,10 @@ public class SysUserRest {
* @return
*/
public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid) {
@ApiOperation(value = "根据用户的sid查询用户的组织信息")
@ResponseBody
@GetMapping("/selectUserInfoByUserSid/{userSid}")
public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid){
ResultBean<SysUserInfoVo> rb = ResultBean.fireFail();
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid);
if (sysUserInfoVo == null) {
@@ -637,7 +720,10 @@ public class SysUserRest {
}
public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
@ApiOperation(value = "根据用户的sid查询用户的组织信息")
@ResponseBody
@GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}")
public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid, @PathVariable("orgSid") String orgSid){
ResultBean<SysUserInfoVo> rb = ResultBean.fireFail();
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid, orgSid);
if (sysUserInfoVo == null) {
@@ -647,7 +733,10 @@ public class SysUserRest {
}
public ResultBean setIsEnable(String sid, String isEnable) {
@PostMapping("/setIsEnable/{sid}/{isEnable}")
@ResponseBody
@ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
SysUser sysUser = sysUserService.fetchBySid(sid);
if (sysUser == null) {
return ResultBean.fireFail().setMsg("此角色已不存在");
@@ -660,82 +749,129 @@ public class SysUserRest {
}
public ResultBean getUsersByRoleSid(String roleSid) {
@ApiOperation("根据角色sid查询用户")
@GetMapping("/getUsersByRoleSid/{roleSid}")
ResultBean getUsersByRoleSid(@PathVariable("roleSid") String roleSid) {
return sysUserService.getUsersByRoleSid(roleSid);
}
public ResultBean<List<SysUserVo>> getUserByRole(UserQuery query) {
@ApiOperation(value = "获取本机构链角色的用户")
@GetMapping(value = "getUserByRole")
ResultBean<List<SysUserVo>> getUserByRole(@SpringQueryMap UserQuery query) {
return sysUserService.getUserByRole(query);
}
public ResultBean<List<String>> getUserSidByRole(UserQuery query) {
@ApiOperation(value = "获取本机构链角色的用户sid")
@GetMapping(value = "getUserSidByRole")
ResultBean<List<String>> getUserSidByRole(@SpringQueryMap UserQuery query) {
return sysUserService.getUserSidByRole(query);
}
public ResultBean<List<SysUserVo>> getUsersByRoles(UserssQuery usersQuery) {
@ApiOperation(value = "获取本机构链角色的用户")
@PostMapping(value = "getUsersByRoles")
ResultBean<List<SysUserVo>> getUsersByRoles(@RequestBody UserssQuery usersQuery) {
return sysUserService.getUsersByRoles(usersQuery);
}
public ResultBean<List<SysUserVo>> getUserByOrgRole(UserRoleQuery query) {
/**
* 参数：当前用户角色sid，部门sid
*
* @param query
* @return
*/
@ApiOperation(value = "获取本部门直属上级角色的用户")
@GetMapping(value = "getUserByOrgRole")
ResultBean<List<SysUserVo>> getUserByOrgRole(@SpringQueryMap UserRoleQuery query) {
return sysUserService.getUserByOrgRole(query);
}
public ResultBean<List<SysUserVo>> getOtherOrgRoleUser(UserRoleQuery query) {
/**
* 参数为下一环节角色sid，机构sid
*
* @param query
* @return
*/
@ApiOperation(value = "获取其他机构链角色的用户")
@GetMapping(value = "getOtherOrgRoleUser")
ResultBean<List<SysUserVo>> getOtherOrgRoleUser(@SpringQueryMap UserRoleQuery query) {
return sysUserService.getOtherOrgRoleUser(query);
}
public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
@ApiOperation(value = "获取当前分公司下所有员工的userSid和员工姓名")
@GetMapping(value = "getUserByOrgSid")
ResultBean<List<Map<String, String>>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid){
return sysUserService.getUserByOrgSid(orgSid, userSid);
}
public ResultBean<String> selectIdBySid(List<String> stringList) {
@ApiOperation(value = "根据用户sid获取用户id")
@PostMapping(value = "selectIdBySid")
ResultBean<String> selectIdBySid(@RequestBody List<String> stringList) {
return sysUserService.selectIdBySid(stringList);
}
public ResultBean<List<SysUserListVo>> selectSysUserList(String userSid, String orgPath) {
@ApiOperation(value = "根据用户sid查询该分公司下所有销售经理的用户")
@GetMapping(value = "selectSysUserList")
ResultBean<List<SysUserListVo>> selectSysUserList(@RequestParam("userSid") String userSid, @RequestParam(value = "orgPath", required = false) String orgPath){
return sysUserService.selectSysUserList(userSid, orgPath);
}
public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
@ApiOperation(value = "查询是否需要更换密码")
@GetMapping(value = "/selectPasswordByUserSid/{userSid}")
ResultBean<Boolean> selectPasswordByUserSid(@PathVariable("userSid") String userSid){
return sysUserService.selectPasswordByUserSid(userSid);
}
public ResultBean selectHaveMessage(SysHaveMessageQuery sysHaveMessageQuery) {
/**
* 查询该菜单是否允许创建，是否有提醒消息
*
* @return
*/
@ApiOperation(value = "查询该菜单是否允许创建，是否有提醒消息")
@PostMapping(value = "/selectHaveMessage")
ResultBean selectHaveMessage(@RequestBody SysHaveMessageQuery sysHaveMessageQuery){
return sysUserService.selectHaveMessage(sysHaveMessageQuery);
}
// public ResultBean<List<OrgList>> getOrgListByUserSid(String userSid) {
// return sysUserService.getOrgListByUserSid(userSid);
// }
@ApiOperation(value = "根据用户sid获取当前用户所有的组织机构list")
@GetMapping(value = "/getOrgListByUserSid")
ResultBean<List<OrgList>> getOrgListByUserSid(@RequestParam("userSid") String userSid) {
return sysUserService.getOrgListByUserSid(userSid);
}
public ResultBean<List<SysUserVo>> getUserByRoles(UserByRolesAndOrgQuery userQuery) {
@ApiOperation(value = "根据多个角色sid以及机构sid获取本机构链角色的用户")
@PostMapping(value = "/getUserByRoles")
ResultBean<List<SysUserVo>> getUserByRoles(@RequestBody UserByRolesAndOrgQuery userQuery) {
return sysUserService.getUserByRoles(userQuery);
}
public ResultBean<List<String>> shareSelectUser(ShareUserQuery shareUserQuery) {
@ApiOperation(value = "分享时查询的人员")
@PostMapping(value = "/shareSelectUser")
ResultBean<List<String>> shareSelectUser(@RequestBody ShareUserQuery shareUserQuery){
return sysUserService.shareSelectUser(shareUserQuery);
}
public ResultBean<String> selectPrivilegeLevel(PrivilegeQuery query) {
@ApiOperation(value = "查询角色权限的层级获取权限id")
@PostMapping(value = "/selectPrivilegeLevel")
ResultBean<String> selectPrivilegeLevel(@RequestBody PrivilegeQuery query) {
return sysUserService.selectPrivilegeLevel(query);
}
public ResultBean removeRedis() {
@ApiOperation(value = "清除所有离职人员的移动端登录缓存")
@PostMapping(value = "/removeRedis")
ResultBean removeRedis() {
return sysUserService.removeRedis();
}
}

59
src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java → src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java
View File

@@ -1,15 +1,14 @@
package com.yxt.user.apiadmin;
package com.yxt.portal.apiadmin;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysuserrole.*;
import com.yxt.portal.biz.sysuserrole.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -34,36 +33,41 @@ public class SysUserRoleRest {
@Autowired
private SysUserRoleService sysUserRoleService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysUserRoleVo>> listPage(@RequestBody PagerQuery<SysUserRoleQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<SysUserRoleVo> pv = sysUserRoleService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SysUserRoleVo>> listAll(@RequestBody SysUserRoleQuery query){
ResultBean rb = ResultBean.fireFail();
List<SysUserRoleVo> list = sysUserRoleService.listAllVo(query);
return rb.success().setData(list);
}
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SysUserRoleVo>> list(){
ResultBean rb = ResultBean.fireFail();
List<SysUserRoleVo> list = sysUserRoleService.listVo();
return rb.success().setData(list);
}
public ResultBean save(SysUserRoleDto dto){
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody SysUserRoleDto dto){
ResultBean rb = ResultBean.fireFail();
sysUserRoleService.saveOrUpdateDto(dto);
return rb.success();
}
public ResultBean update(SysUserRoleDto dto){
@ApiOperation("修改保存")
@PostMapping("/update")
public ResultBean update(@RequestBody SysUserRoleDto dto){
ResultBean rb = ResultBean.fireFail();
sysUserRoleService.deleteByUserSid(dto.getUserSid());
String roleSid = dto.getRoleSid();
@@ -80,39 +84,46 @@ public class SysUserRoleRest {
return rb.success();
}
public ResultBean del(String ids){
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids){
ResultBean rb = ResultBean.fireFail();
sysUserRoleService.delByIds(ids);
return rb.success();
}
public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) {
@ApiOperation("根据用户sid和角色sid删除记录")
@GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}")
public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid,
@PathVariable("roleSid")String roleSid) {
ResultBean rb = ResultBean.fireFail();
sysUserRoleService.delByUserSidAndRoleSid(userSid,roleSid);
return rb.success();
}
public ResultBean<SysUserRoleVo> fetch(String id){
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SysUserRoleVo> fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysUserRoleVo vo = sysUserRoleService.fetchByIdVo(id);
return rb.success().setData(vo);
}
public ResultBean<List<String>> getUserRoleSidByUserSid(String userSid) {
@ApiOperation("根据用户sid查询用户角色sid列表")
@GetMapping("/getUserRoleSidByUserSid/{userSid}")
public ResultBean<List<String>> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid) {
return sysUserRoleService.getUserRoleSidByUserSid(userSid);
}
public ResultBean<List<String>> getUserIdListByRoleSid(List<String> roleList) {
@ApiOperation("根据角色sid查询用户id列表")
@GetMapping("/getUserIdListByRoleSid")
public ResultBean<List<String>> getUserIdListByRoleSid(@RequestParam("roleList") List<String> roleList) {
return sysUserRoleService.getUserIdListByRoleSid(roleList);
}
public ResultBean<List<String>> selectByUserSid(String userSid) {
@ApiOperation("查询用户的角色")
@GetMapping("/selectByUserSid")
ResultBean<List<String>> selectByUserSid(@RequestParam("userSid") String userSid) {
return sysUserRoleService.selectByUserSids(userSid);
}
}

2
src/main/java/com/yxt/user/apiwx/WxHomeRest.java → src/main/java/com/yxt/portal/apiwx/WxHomeRest.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.apiwx;
package com.yxt.portal.apiwx;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

25
src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java Normal file
View File

@@ -0,0 +1,25 @@
package com.yxt.portal.biz.dictcommon;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/6/23 15:40
* @description 数据字典数据项
*/
@Data
public class DictCommon extends BaseEntity {
private static final long serialVersionUID = 8921237815183601526L;
@ApiModelProperty(value = "数据项值")
private String dictKey;
@ApiModelProperty(value = "数据类型")
private String dictType;
@ApiModelProperty(value = "数据项相对应的value值")
private String dictValue;
@ApiModelProperty(value = "数据项的父级sid")
private String parentSid;
@ApiModelProperty(value = "分组名称")
private String groupName;
}

36
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java Normal file
View File

@@ -0,0 +1,36 @@
package com.yxt.portal.biz.dictcommon;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @author dimengzhe
* @date 2021/6/23 15:41
* @description 数据字典数据项参数
*/
@Data
public class DictCommonDto implements Dto {
private static final long serialVersionUID = 9102264215113210976L;
@ApiModelProperty(value = "数据项值", required = true)
@NotBlank(message = "数据项值不能为空")
private String dictKey;
@ApiModelProperty(value = "数据类型", required = true)
@NotBlank(message = "数据类型不能为空")
private String dictType;
@ApiModelProperty(value = "数据项相对应的value值", required = true)
@NotBlank(message = "数据项相对应的value值不能为空")
private String dictValue;
@ApiModelProperty(value = "数据项的父级sid", required = true)
@NotBlank(message = "数据项的父级sid不能为空")
private String parentSid;
@ApiModelProperty(value = "分组名称", required = true)
private String groupName;
}

65
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java Normal file
View File

@@ -0,0 +1,65 @@
package com.yxt.portal.biz.dictcommon;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/7/5 21:59
* @description
*/
@FeignClient(
contextId = "anrui-portal-DictCommon",
name = "anrui-portal",
path = "v1/dictcommons",
fallback = DictCommonFeignFallback.class)
public interface DictCommonFeign {
@PostMapping(value = "/save")
@ResponseBody
@ApiOperation(value = "数据字典数据项保存")
ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto);
@PostMapping("/pageList")
@ResponseBody
@ApiOperation(value = "数据字典数据项分页列表")
ResultBean<PagerVo<DictCommonVo>> pageList(@RequestBody PagerQuery<DictCommonQuery> pagerQuery);
@PostMapping("/update/{sid}")
@ResponseBody
@ApiOperation(value = "数据字典修改后保存")
ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid);
@ResponseBody
@DeleteMapping("/delete/{sid}")
@ApiOperation(value = "删除")
ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid);
@ResponseBody
@GetMapping("/selectBykey/{key}/{type}")
@ApiOperation(value = "数据字典信息修改时的初始化信息")
public ResultBean<DictCommonVo> selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type);
@GetMapping("/typeValues")
@ResponseBody
@ApiOperation("下拉框的获取")
ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid);
@GetMapping("/getFirstDictKeyByType")
@ResponseBody
@ApiOperation("根据数据字典的key获取第一个值（默认值）")
ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid);
@GetMapping("/getTypeValueList")
@ResponseBody
@ApiOperation("根据分类编码和数据分组查询数据字典")
ResultBean<List<DictCommonVo>> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum);
}

57
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java Normal file
View File

@@ -0,0 +1,57 @@
package com.yxt.portal.biz.dictcommon;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/7/5 22:00
* @description
*/
@Component
public class DictCommonFeignFallback implements DictCommonFeign {
@Override
public ResultBean save(DictCommonDto dictCommonDto) {
return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean<PagerVo<DictCommonVo>> pageList(PagerQuery<DictCommonQuery> pagerQuery) {
return new ResultBean<PagerVo<DictCommonVo>>().fail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean update(DictCommonDto dictCommonDto, String sid) {
return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean delete(String sid) {
return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean<DictCommonVo> selectBykey(String key, String type) {
return null;
}
@Override
public ResultBean<List<DictCommonVo>> getTypeValues(String type, String psid) {
return null;
}
@Override
public ResultBean getFirstDictKeyByType(String dictType, String psid) {
return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean<List<DictCommonVo>> getTypeValueList(String type, String groupNum) {
return null;
}
}

60
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java Normal file
View File

@@ -0,0 +1,60 @@
package com.yxt.portal.biz.dictcommon;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/6/23 15:07
* @description
*/
@Mapper
public interface DictCommonMapper extends BaseMapper<DictCommon> {
/**
* 根据数据项的key值和分类类型code值查询数量
*
* @param dictKey 数据项key值
* @param dictType 类型code值
* @param parentSid 父级sid，无父级的此字段为0
* @return
*/
DictCommon selectSize(@Param("dictkey") String dictKey, @Param("dictType") String dictType, @Param("parentSid") String parentSid);
/**
* 根据类型查询数据项
*
* @param dictTypeCode 数据分类的类型
* @return
*/
List<DictCommon> selectByType(String dictTypeCode);
IPage<DictCommonVo> pageList(
IPage<DictCommonQuery> page, @Param(Constants.WRAPPER) Wrapper<DictCommonVo> qw);
DictCommonVo selectBykey(@Param("key") String key, @Param("type") String sid);
/**
* 根据类型和父级sid查询数据字典
*
* @param qw 查询条件
* @return
*/
List<DictCommonVo> getValue(@Param(Constants.WRAPPER) QueryWrapper<DictCommonVo> qw);
/**
* 根据数据字典编码类别和分组查询数据字典
* @param type 数据字典编码类别
* @param groupNum 数据字典分组
* @return
*/
List<DictCommonVo> getList(@Param("type") String type, @Param("groupNum") String groupNum);
}

43
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml Normal file
View File

@@ -0,0 +1,43 @@
<?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.portal.biz.dictcommon.DictCommonMapper">
<select id="selectSize" resultType="com.yxt.portal.biz.dictcommon.DictCommon">
SELECT *
FROM dict_common
WHERE dictKey = #{dictkey}
AND dictType = #{dictType}
AND parentSid = #{parentSid}
</select>
<select id="selectByType" resultType="com.yxt.portal.biz.dictcommon.DictCommon">
SELECT *
FROM dict_common
WHERE dictType = #{dictTypeCode}
</select>
<select id="pageList" resultType="com.yxt.portal.biz.dictcommon.DictCommonVo">
SELECT dc.dictValue, dc.dictType, dc.dictKey, dc.sid, dc.parentSid,dc.groupName
FROM dict_common dc
${ew.customSqlSegment}
</select>
<!--获取下拉框-->
<select id="getValue" resultType="com.yxt.portal.biz.dictcommon.DictCommonVo">
SELECT dc.sid, dc.dictType, dc.dictKey, dc.dictValue, dc.parentSid
FROM dict_common dc ${ew.customSqlSegment}
</select>
<select id="selectBykey" resultType="com.yxt.portal.biz.dictcommon.DictCommonVo">
SELECT sid,
dictKey,
dictType,
dictValue,
groupName
FROM dict_common
WHERE dictType = #{type}
AND dictkey = #{key}
</select>
<select id="getList" resultType="com.yxt.portal.biz.dictcommon.DictCommonVo">
select * from dict_common dc where dc.dictType = #{type} and find_in_set(#{groupNum}, replace(dc.groupName, ',', ','));
</select>
</mapper>

24
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonQuery.java Normal file
View File

@@ -0,0 +1,24 @@
package com.yxt.portal.biz.dictcommon;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/6/28 10:39
* @description
*/
@Data
public class DictCommonQuery implements Query {
private static final long serialVersionUID = -787372981183812826L;
@ApiModelProperty(value = "数据字典条目key", required = false)
private String dictKey;
@ApiModelProperty(value = "数据字典文本", required = false)
private String dictValue;
@ApiModelProperty(value ="dictType")
private String dictType;
}

77
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java Normal file
View File

@@ -0,0 +1,77 @@
package com.yxt.portal.biz.dictcommon;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/6/23 15:06
* @description
*/
@Service
public class DictCommonService extends MybatisBaseService<DictCommonMapper, DictCommon> {
public DictCommon selectSize(String dictKey, String dictType, String parentSid) {
return baseMapper.selectSize(dictKey, dictType, parentSid);
}
public List<DictCommon> selectByType(String dictTypeCode) {
return baseMapper.selectByType(dictTypeCode);
}
public IPage<DictCommonVo> pageList(PagerQuery<DictCommonQuery> pagerQuery) {
IPage<DictCommonQuery> page = PagerUtil.queryToPage(pagerQuery);
DictCommonQuery params = pagerQuery.getParams();
QueryWrapper<DictCommonVo> qw = new QueryWrapper<>();
if (params != null) {
String dictKey = params.getDictKey();
String dictValue = params.getDictValue();
if (StringUtils.isNotBlank(dictValue)) {
qw.like("dc.dictValue", dictValue);
}
if (StringUtils.isNotBlank(dictKey)) {
qw.like("dc.dictKey", dictKey);
}
if (StringUtils.isNotBlank(params.getDictType())) {
qw.eq("dc.dictType", params.getDictType());
}
}
qw.orderByDesc("dc.createTime");
return baseMapper.pageList(page, qw);
}
/**
* 根据类型和父级sid查询数据字典
*
* @param dictCommonTypeQuery 查询条件
* @return
*/
public List<DictCommonVo> getValue(DictCommonTypeQuery dictCommonTypeQuery) {
QueryWrapper<DictCommonVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(dictCommonTypeQuery.getType())) {//类型
qw.eq("dc.dictType", dictCommonTypeQuery.getType());
}
if (StringUtils.isNotBlank(dictCommonTypeQuery.getPsid())) {//父级sid
qw.eq("dc.parentSid", dictCommonTypeQuery.getPsid());
}
return baseMapper.getValue(qw);
}
public DictCommonVo selectBykey(String key, String type) {
return baseMapper.selectBykey(key, type);
}
public ResultBean<List<DictCommonVo>> getList(String type, String groupNum) {
ResultBean<List<DictCommonVo>> rb = ResultBean.fireFail();
List<DictCommonVo> list = baseMapper.getList(type,groupNum);
return rb.success().setData(list);
}
}

21
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonTypeQuery.java Normal file
View File

@@ -0,0 +1,21 @@
package com.yxt.portal.biz.dictcommon;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/9/30 15:33
* @description 下拉框条件
*/
@Data
public class DictCommonTypeQuery implements Query {
private static final long serialVersionUID = 139959085226402464L;
@ApiModelProperty(value = "数据字典类型", required = true)
private String type;
@ApiModelProperty(value = "psid", required = false,example = "0")
private String psid;
}

32
src/main/java/com/yxt/portal/biz/dictcommon/DictCommonVo.java Normal file
View File

@@ -0,0 +1,32 @@
package com.yxt.portal.biz.dictcommon;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/6/23 15:54
* @description
*/
@Data
public class DictCommonVo implements Vo {
private static final long serialVersionUID = -1094142938193916816L;
@ApiModelProperty(value = "数据字典项sid")
private String sid;
@ApiModelProperty(value = "数据字典项key")
private String dictKey;
@ApiModelProperty(value = "数据字典类型")
private String dictType;
@ApiModelProperty(value = "数据字典项名称")
private String dictValue;
@ApiModelProperty(value = "父级sid：0为第一级")
private String parentSid;
@ApiModelProperty(value = "分组名称")
private String groupName;
}

21
src/main/java/com/yxt/portal/biz/dicttype/DictType.java Normal file
View File

@@ -0,0 +1,21 @@
package com.yxt.portal.biz.dicttype;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/7/5 22:29
* @description
*/
@Data
public class DictType extends BaseEntity {
private static final long serialVersionUID = -2790449398289680139L;
@ApiModelProperty(value = "类型代码")
private String dictTypeCode;
@ApiModelProperty(value = "类型名称")
private String dictTypeName;
}

30
src/main/java/com/yxt/portal/biz/dicttype/DictTypeDto.java Normal file
View File

@@ -0,0 +1,30 @@
package com.yxt.portal.biz.dicttype;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @author dimengzhe
* @date 2021/6/23 15:20
* @description 数据字典类型参数
*/
@Data
public class DictTypeDto implements Dto {
private static final long serialVersionUID = -2302005624272862359L;
@ApiModelProperty(value = "类型代码", required = true)
@NotBlank(message = "类型代码不能为空")
private String dictTypeCode;
@ApiModelProperty(value = "类型名称", required = true)
@NotBlank(message = "类型名称不能为空")
private String dictTypeName;
@ApiModelProperty(value = "类型说明", required = false)
private String remarks;
}

46
src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeign.java Normal file
View File

@@ -0,0 +1,46 @@
package com.yxt.portal.biz.dicttype;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* @author dimengzhe
* @date 2021/6/23 15:21
* @description 数据字典类型对外接口
*/
@FeignClient(
contextId = "yxt-anrui-portal-DictType",
name = "yxt-anrui-portal",
path = "v1/dicttypes",
fallback = DictTypeFeignFallback.class)
public interface DictTypeFeign {
@PostMapping(value = "/save")
@ResponseBody
@ApiOperation(value = "数据字典类型保存")
ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto);
@PostMapping("/pageList")
@ResponseBody
@ApiOperation(value = "数据字典类型分页列表")
ResultBean<PagerVo<DictTypeVo>> pageList(@RequestBody PagerQuery<DictTypeQuery> pagerQuery);
@PostMapping("/update/{sid}")
@ResponseBody
@ApiOperation(value = "数据字典类型更新")
ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid);
@DeleteMapping("/delete/{sid}")
@ResponseBody
@ApiOperation(value = "数据字典类型删除")
ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
}

34
src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeignFallback.java Normal file
View File

@@ -0,0 +1,34 @@
package com.yxt.portal.biz.dicttype;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
/**
* @author dimengzhe
* @date 2021/7/5 22:32
* @description
*/
public class DictTypeFeignFallback implements DictTypeFeign{
@Override
public ResultBean save(DictTypeDto dictTypeDto) {
return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean<PagerVo<DictTypeVo>> pageList(PagerQuery<DictTypeQuery> pagerQuery) {
return new ResultBean<PagerVo<DictTypeVo>>().fail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean update(DictTypeDto dictTypeDto, String sid) {
return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
}
@Override
public ResultBean delete(String sid) {
return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
}
}

28
src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.java Normal file
View File

@@ -0,0 +1,28 @@
package com.yxt.portal.biz.dicttype;
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;
/**
* @author dimengzhe
* @date 2021/6/23 14:56
* @description
*/
@Mapper
public interface DictTypeMapper extends BaseMapper<DictType> {
/**
* 查询该类型代码存在的数量
*
* @param dictTypeCode 类型代码
* @return
*/
int selectSize(String dictTypeCode);
IPage<DictTypeVo> pageList(IPage<?> page, @Param(Constants.WRAPPER) Wrapper<DictTypeVo> qw);
}

17
src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.xml Normal file
View File

@@ -0,0 +1,17 @@
<?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.portal.biz.dicttype.DictTypeMapper">
<select id="selectSize" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM dict_type
WHERE dictTypeCode = #{dictTypeCode}
</select>
<select id="pageList" resultType="com.yxt.portal.biz.dicttype.DictTypeVo">
SELECT dt.dictTypeCode, dt.dictTypeName, dt.sid, dt.remarks
FROM dict_type dt
${ew.customSqlSegment}
</select>
</mapper>

24
src/main/java/com/yxt/portal/biz/dicttype/DictTypeQuery.java Normal file
View File

@@ -0,0 +1,24 @@
package com.yxt.portal.biz.dicttype;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/6/28 9:17
* @description
*/
@Data
public class DictTypeQuery implements Query {
private static final long serialVersionUID = -1033205660448956012L;
@ApiModelProperty(value = "数据字典code", required = false)
private String dictTypeCode;
@ApiModelProperty(value = "数据分类名称", required = false)
private String dictTypeName;
@ApiModelProperty(value = "说明", required = false)
private String remarks;
}

50
src/main/java/com/yxt/portal/biz/dicttype/DictTypeService.java Normal file
View File

@@ -0,0 +1,50 @@
package com.yxt.portal.biz.dicttype;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import org.springframework.stereotype.Service;
/**
* @author dimengzhe
* @date 2021/6/23 14:55
* @description 数据字典类型实现类
*/
@Service
public class DictTypeService extends MybatisBaseService<DictTypeMapper, DictType> {
/**
* 根据此类型代码存在的数量
*
* @param dictTypeCode 类型代码
* @return 存在此类型代码的数量
*/
public int selectSize(String dictTypeCode) {
return baseMapper.selectSize(dictTypeCode);
}
public IPage<DictTypeVo> pageList(PagerQuery<DictTypeQuery> pagerQuery) {
IPage<DictTypeQuery> page = PagerUtil.queryToPage(pagerQuery);
DictTypeQuery params = pagerQuery.getParams();
QueryWrapper<DictTypeVo> qw = new QueryWrapper<>();
if (params != null) {
String dictTypeCode = params.getDictTypeCode();
if (StringUtils.isNotBlank(dictTypeCode)) {
qw.like("dt.dictTypeCode", dictTypeCode);
}
String dictTypeName = params.getDictTypeName();
if (StringUtils.isNotBlank(dictTypeName)) {
qw.like("dt.dictTypeName", dictTypeName);
}
if (StringUtils.isNotBlank(params.getRemarks())) {
qw.like("dt.remarks", params.getRemarks());
}
}
qw.orderByDesc("dt.createTime");
return baseMapper.pageList(page, qw);
}
}

32
src/main/java/com/yxt/portal/biz/dicttype/DictTypeVo.java Normal file
View File

@@ -0,0 +1,32 @@
package com.yxt.portal.biz.dicttype;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/6/23 15:18
* @description 数据字典类型返回数据
*/
@Data
public class DictTypeVo implements Vo {
private static final long serialVersionUID = 9052935182700117654L;
@ApiModelProperty(value = "数据类型sid")
private String sid;
@ApiModelProperty(value = "类型代码")
private String dictTypeCode;
@ApiModelProperty(value = "类型名称")
private String dictTypeName;
@ApiModelProperty(value = "说明")
private String remarks;
@ApiModelProperty(value = "分组名称")
private String groupName;
}

2
src/main/java/com/yxt/user/biz/package-info.java → src/main/java/com/yxt/portal/biz/package-info.java
View File

@@ -1,4 +1,4 @@
/**
* 宇信通 仓库管理 项目后台逻辑和接口
*/
package com.yxt.user.biz;
package com.yxt.portal.biz;

2
src/main/java/com/yxt/user/biz/sms/SmsDto.java → src/main/java/com/yxt/portal/biz/sms/SmsDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sms;
package com.yxt.portal.biz.sms;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
src/main/java/com/yxt/user/biz/sms/SmsFeign.java → src/main/java/com/yxt/portal/biz/sms/SmsFeign.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sms;
package com.yxt.portal.biz.sms;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;

2
src/main/java/com/yxt/user/biz/sms/SmsFeignFallback.java → src/main/java/com/yxt/portal/biz/sms/SmsFeignFallback.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sms;
package com.yxt.portal.biz.sms;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Component;

2
src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionQuery.java → src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionVo.java → src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
src/main/java/com/yxt/user/biz/sysfunction/SysFunction.java → src/main/java/com/yxt/portal/biz/sysfunction/SysFunction.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/yxt/user/biz/sysfunction/SysFunctionDto.java → src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.java → src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

14
src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.xml → src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.xml
View File

@@ -1,9 +1,9 @@
<?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.user.biz.sysfunction.SysFunctionMapper">
<mapper namespace="com.yxt.portal.biz.sysfunction.SysFunctionMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.user.biz.sysfunction.SysFunctionVo">
<select id="selectPageVo" resultType="com.yxt.portal.biz.sysfunction.SysFunctionVo">
SELECT *
FROM sys_function
<where>
@@ -11,7 +11,7 @@
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.user.biz.sysfunction.SysFunctionVo">
<select id="selectListAllVo" resultType="com.yxt.portal.biz.sysfunction.SysFunctionVo">
SELECT func.*, source.sourceName as sourceName
FROM sys_function func
left join sys_source_function sourceF on sourceF.functionSid = func.sid
@@ -20,14 +20,14 @@
${ew.sqlSegment}
</where>
</select>
<select id="listAllParentByRoleSid" resultType="com.yxt.user.biz.sysfunction.SysFunctionVo">
<select id="listAllParentByRoleSid" resultType="com.yxt.portal.biz.sysfunction.SysFunctionVo">
SELECT DISTINCT func.*, ISNULL(roleFunction.sid) AS checked
FROM sys_function func
left join sys_role_function roleFunction
on func.sid = roleFunction.functionSid and roleFunction.roleSid = #{param1}
where func.parentSid = #{param2}
</select>
<select id="getChildrensForFunctionTree" resultType="com.yxt.user.biz.sysfunction.SysFunctionTreeVo">
<select id="getChildrensForFunctionTree" resultType="com.yxt.portal.biz.sysfunction.SysFunctionTreeVo">
SELECT func.*, source.sourceName, sourceFunction.functionRootSid as functionRootSid
FROM sys_function func
left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid
@@ -37,7 +37,7 @@
</where>
</select>
<select id="selectChildernList" resultType="com.yxt.user.biz.sysfunction.SysFunctionTreeVo">
<select id="selectChildernList" resultType="com.yxt.portal.biz.sysfunction.SysFunctionTreeVo">
SELECT func.*, source.sourceName, sourceFunction.functionRootSid as functionRootSid
FROM sys_function func
left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid
@@ -60,7 +60,7 @@
where sf.isEnable = #{isEnable}
and ssf.sourceSid = #{sourceSid}
</select>
<select id="getButtonPermissions" resultType="com.yxt.user.biz.sysfunction.ButtonPermissionVo">
<select id="getButtonPermissions" resultType="com.yxt.portal.biz.sysfunction.ButtonPermissionVo">
SELECT sf.cId AS buttonId
FROM sys_function sf
WHERE actionUrl = #{query.url}

2
src/main/java/com/yxt/user/biz/sysfunction/SysFunctionQuery.java → src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import com.fasterxml.jackson.annotation.JsonProperty;

4
src/main/java/com/yxt/user/biz/sysfunction/SysFunctionService.java → src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionService.java
View File

@@ -1,9 +1,9 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.user.biz.syssource.SysSourceService;
import com.yxt.portal.biz.syssource.SysSourceService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;

2
src/main/java/com/yxt/user/biz/sysfunction/SysFunctionTreeVo.java → src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionTreeVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import com.yxt.common.core.vo.Vo;

2
src/main/java/com/yxt/user/biz/sysfunction/SysFunctionVo.java → src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysfunction;
package com.yxt.portal.biz.sysfunction;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/yxt/user/biz/sysmenu/SysMenu.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;

2
src/main/java/com/yxt/user/biz/sysmenu/SysMenuDto.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import com.yxt.common.core.dto.Dto;

2
src/main/java/com/yxt/user/biz/sysmenu/SysMenuFunctionQuery.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuFunctionQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import com.yxt.common.core.query.Query;

2
src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

16
src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.xml → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
View File

@@ -1,16 +1,16 @@
<?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.user.biz.sysmenu.SysMenuMapper">
<mapper namespace="com.yxt.portal.biz.sysmenu.SysMenuMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.user.biz.sysmenu.SysMenuVo">
<select id="selectPageVo" resultType="com.yxt.portal.biz.sysmenu.SysMenuVo">
SELECT *
FROM sys_menu
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.user.biz.sysmenu.SysMenuVo">
<select id="selectListAllVo" resultType="com.yxt.portal.biz.sysmenu.SysMenuVo">
SELECT menu.*, source.sourceName, pmenu.name as pName
FROM sys_menu menu
left join sys_menu pmenu on pmenu.sid = menu.psid
@@ -20,7 +20,7 @@
${ew.sqlSegment}
</where>
</select>
<select id="listAllParentByRoleSid" resultType="com.yxt.user.biz.sysmenu.SysMenuVo">
<select id="listAllParentByRoleSid" resultType="com.yxt.portal.biz.sysmenu.SysMenuVo">
SELECT menu.*, ISNULL(menuRole.sid) as checked
FROM sys_menu menu
left join sys_menu_role menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1}
@@ -29,7 +29,7 @@
and menu.sourceSid = #{sourceSid}
</if>
</select>
<select id="getChildrensForMenuTree" resultType="com.yxt.user.biz.sysmenu.SysMenuTreeVo">
<select id="getChildrensForMenuTree" resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
SELECT menu.*, source.sourceName, sourceMenu.menuRootSid as menuRootSid
FROM sys_menu menu
left join sys_source_menu sourceMenu on sourceMenu.menuSid = menu.sid
@@ -45,7 +45,7 @@
where sourceSid = #{sid}
</update>
<select id="selectChildernList" resultType="com.yxt.user.biz.sysmenu.SysMenuTreeVo">
<select id="selectChildernList" resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
SELECT menu.*, source.sourceName, menu.pSid as menuRootSid
FROM sys_menu menu
left join sys_source source on source.sid = menu.sourceSid
@@ -60,11 +60,11 @@
and sourceSid = #{sourceSid}
</select>
<select id="selectByMenuUrl" resultType="com.yxt.user.biz.sysmenu.SysMenu">
<select id="selectByMenuUrl" resultType="com.yxt.portal.biz.sysmenu.SysMenu">
select * from sys_menu where menuUrl = #{menuUrl}
</select>
<!--将该资源下的所有一级菜单列表-->
<select id="fetchRootMenuBySourceSid" resultType="com.yxt.user.biz.sysmenu.SysMenuTreeVo">
<select id="fetchRootMenuBySourceSid" resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
SELECT menu.NAME AS NAME,
menu.sid AS sid,
menu.sid AS sid,

2
src/main/java/com/yxt/user/biz/sysmenu/SysMenuQuery.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import com.yxt.common.core.query.Query;

188
src/main/java/com/yxt/user/biz/sysmenu/SysMenuService.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java
View File

@@ -1,10 +1,10 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.user.biz.sysmenu.*;
import com.yxt.user.biz.syssource.SysSourceService;
import com.yxt.portal.biz.sysmenurole.SysMenuRoleVo;
import com.yxt.portal.biz.syssource.SysSourceService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@@ -280,25 +280,25 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
*
* @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单）
*/
// public List<Map<String, Object>> getSourceMenuTree(List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
//
// //获取当前资源的菜单列表
// List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
//
//
// //获取资源第一级菜单列表
// List<SysMenuRoleVo> list_firstLevel_menu = list_menu.stream().filter(s -> s.getPSid().equals("0")).collect(Collectors.toList());
//
// //遍历资源的第一级菜单
// for (int i = 0; i < list_firstLevel_menu.size(); i++) {
// Map<String, Object> map_firstLevel_menu = getMenuTreeFromStream(list_firstLevel_menu.get(i).getSid(), list_menu, map_selectMenus);
// //把该菜单挂在当前菜单列表中
// if (null != map_firstLevel_menu)
// list_menus_map.add(map_firstLevel_menu);
// }
// return list_menus_map;
//
// }
public List<Map<String, Object>> getSourceMenuTree(List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
//获取当前资源的菜单列表
List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
//获取资源第一级菜单列表
List<SysMenuRoleVo> list_firstLevel_menu = list_menu.stream().filter(s -> s.getPSid().equals("0")).collect(Collectors.toList());
//遍历资源的第一级菜单
for (int i = 0; i < list_firstLevel_menu.size(); i++) {
Map<String, Object> map_firstLevel_menu = getMenuTreeFromStream(list_firstLevel_menu.get(i).getSid(), list_menu, map_selectMenus);
//把该菜单挂在当前菜单列表中
if (null != map_firstLevel_menu)
list_menus_map.add(map_firstLevel_menu);
}
return list_menus_map;
}
/**
* 递归把list转换成菜单树形列表
@@ -307,84 +307,84 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
* @param list_menu
* @return
*/
// private Map<String, Object> getMenuTreeFromStream(String psid, List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
// //获取当前菜单
// List<SysMenuRoleVo> list_current_menu = list_menu.stream().filter(s -> s.getSid().equals(psid)).collect(Collectors.toList());
// if (null == list_current_menu || 0 == list_current_menu.size())
// return null;
//
// Map<String, Object> map_menu = getMenuMap(list_current_menu.get(0), map_selectMenus);
//
// //2.获取菜单的子菜单列表
// //存储最终子菜单列表结果
// List<Map<String, Object>> list_child = new ArrayList<Map<String, Object>>();
//
// //获取子菜单列表
// List<SysMenuRoleVo> list_child_menu = list_menu.stream().filter(s -> s.getPSid().equals(psid)).collect(Collectors.toList());
// for (int i = 0; i < list_child_menu.size(); i++) {
// //获取该菜单子菜单列表
// Map<String, Object> map_child_menu = getMenuTreeFromStream(list_child_menu.get(i).getSid(), list_menu, map_selectMenus);
// //把该菜单挂在当前菜单列表中
// if (null != map_child_menu)
// list_child.add(map_child_menu);
// }
// //把该菜单列表放到父菜单的childMenus中
// map_menu.put("children", list_child);
//
// return map_menu;
//
// }
private Map<String, Object> getMenuTreeFromStream(String psid, List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
//获取当前菜单
List<SysMenuRoleVo> list_current_menu = list_menu.stream().filter(s -> s.getSid().equals(psid)).collect(Collectors.toList());
if (null == list_current_menu || 0 == list_current_menu.size())
return null;
Map<String, Object> map_menu = getMenuMap(list_current_menu.get(0), map_selectMenus);
//2.获取菜单的子菜单列表
//存储最终子菜单列表结果
List<Map<String, Object>> list_child = new ArrayList<Map<String, Object>>();
//获取子菜单列表
List<SysMenuRoleVo> list_child_menu = list_menu.stream().filter(s -> s.getPSid().equals(psid)).collect(Collectors.toList());
for (int i = 0; i < list_child_menu.size(); i++) {
//获取该菜单子菜单列表
Map<String, Object> map_child_menu = getMenuTreeFromStream(list_child_menu.get(i).getSid(), list_menu, map_selectMenus);
//把该菜单挂在当前菜单列表中
if (null != map_child_menu)
list_child.add(map_child_menu);
}
//把该菜单列表放到父菜单的childMenus中
map_menu.put("children", list_child);
return map_menu;
}
/**
* 构造菜单的结果map
*
* @return
*/
// private Map<String, Object> getMenuMap(SysMenuRoleVo menuVo, Map<String, Object> map_selectMenus) {
// Map<String, Object> map_menu = new HashMap<String, Object>();
//
// if (null != map_selectMenus) {
// //角色授权时，菜单列表
// map_menu.put("sid", menuVo.getSid());
// map_menu.put("menuName", menuVo.getMenuName() + (StringUtils.isNotBlank(menuVo.getRemarks()) ? "(" + menuVo.getRemarks() + ")" : ""));
// map_menu.put("menuUrl", menuVo.getMenuUrl());
// map_menu.put("pageUrl", menuVo.getPageUrl());
// map_menu.put("iconUrl", menuVo.getIconUrl());
// map_menu.put("isShow", menuVo.getIsShow());
// if (menuVo.getAlwaysShow() == 0) {
// map_menu.put("alwaysShow", false);
// } else if (menuVo.getAlwaysShow() == 1) {
// map_menu.put("alwaysShow", true);
// }
//
// //如果角色已有的菜单，则设置选中，并移除map中的项；否则设置不选中
// if (map_selectMenus.containsKey(menuVo.getSid())) {
// map_menu.put("isCheck", 1);
// map_selectMenus.remove(menuVo.getSid());
// } else {
// map_menu.put("isCheck", 0);
// }
// } else {
// //左侧菜单列表
// Map<String, Object> map_meta = new HashMap<String, Object>();
// map_meta.put("title", menuVo.getMenuName());
// map_meta.put("icon", menuVo.getIconUrl());
// map_menu.put("meta", map_meta);
//
// map_menu.put("redirect", menuVo.getPageUrlRedirect());
// //路径
// map_menu.put("path", menuVo.getPageUrl() != null && !menuVo.getPageUrl().equals("") ? menuVo.getPageUrl() : "/" + menuVo.getPageName());
// map_menu.put("name", menuVo.getPageAliasName() != null && !menuVo.getPageAliasName().equals("") ? menuVo.getPageAliasName() : menuVo.getPageUrl());
// //组件名
// map_menu.put("component", menuVo.getPageName());
// if (menuVo.getAlwaysShow() == 0) {
// map_menu.put("alwaysShow", false);
// } else if (menuVo.getAlwaysShow() == 1) {
// map_menu.put("alwaysShow", true);
// }
// }
// return map_menu;
// }
private Map<String, Object> getMenuMap(SysMenuRoleVo menuVo, Map<String, Object> map_selectMenus) {
Map<String, Object> map_menu = new HashMap<String, Object>();
if (null != map_selectMenus) {
//角色授权时，菜单列表
map_menu.put("sid", menuVo.getSid());
map_menu.put("menuName", menuVo.getMenuName() + (StringUtils.isNotBlank(menuVo.getRemarks()) ? "(" + menuVo.getRemarks() + ")" : ""));
map_menu.put("menuUrl", menuVo.getMenuUrl());
map_menu.put("pageUrl", menuVo.getPageUrl());
map_menu.put("iconUrl", menuVo.getIconUrl());
map_menu.put("isShow", menuVo.getIsShow());
if (menuVo.getAlwaysShow() == 0) {
map_menu.put("alwaysShow", false);
} else if (menuVo.getAlwaysShow() == 1) {
map_menu.put("alwaysShow", true);
}
//如果角色已有的菜单，则设置选中，并移除map中的项；否则设置不选中
if (map_selectMenus.containsKey(menuVo.getSid())) {
map_menu.put("isCheck", 1);
map_selectMenus.remove(menuVo.getSid());
} else {
map_menu.put("isCheck", 0);
}
} else {
//左侧菜单列表
Map<String, Object> map_meta = new HashMap<String, Object>();
map_meta.put("title", menuVo.getMenuName());
map_meta.put("icon", menuVo.getIconUrl());
map_menu.put("meta", map_meta);
map_menu.put("redirect", menuVo.getPageUrlRedirect());
//路径
map_menu.put("path", menuVo.getPageUrl() != null && !menuVo.getPageUrl().equals("") ? menuVo.getPageUrl() : "/" + menuVo.getPageName());
map_menu.put("name", menuVo.getPageAliasName() != null && !menuVo.getPageAliasName().equals("") ? menuVo.getPageAliasName() : menuVo.getPageUrl());
//组件名
map_menu.put("component", menuVo.getPageName());
if (menuVo.getAlwaysShow() == 0) {
map_menu.put("alwaysShow", false);
} else if (menuVo.getAlwaysShow() == 1) {
map_menu.put("alwaysShow", true);
}
}
return map_menu;
}
/**
* 将该资源下的所有菜单设置为是否可用

2
src/main/java/com/yxt/user/biz/sysmenu/SysMenuTreeVo.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import com.yxt.common.core.vo.Vo;

2
src/main/java/com/yxt/user/biz/sysmenu/SysMenuVo.java → src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysmenu;
package com.yxt.portal.biz.sysmenu;
import com.yxt.common.core.vo.Vo;

19
src/main/java/com/yxt/portal/biz/sysmenurole/MenuRoleVo.java Normal file
View File

@@ -0,0 +1,19 @@
package com.yxt.portal.biz.sysmenurole;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 菜单和角色临时存储
* @author: dimengzhe
* @date: 2023/6/1
**/
@Data
public class MenuRoleVo {
@ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
private String dataRuleId;
@ApiModelProperty("菜单sid")
private String menuSid;
}

37
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRole.java Normal file
View File

@@ -0,0 +1,37 @@
package com.yxt.portal.biz.sysmenurole;
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: SysMenuRole.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRole <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_role")
@Data
public class SysMenuRole extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("角色sid")
private String roleSid;
@ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
private String dataRuleId;
}

30
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataDto.java Normal file
View File

@@ -0,0 +1,30 @@
package com.yxt.portal.biz.sysmenurole;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuRoleDto.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto <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 = "菜单与角色关联表 数据传输对象")
@Data
public class SysMenuRoleDataDto implements Dto {
@ApiModelProperty("菜单与角色关联表sid")
private String sid;
@ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
private String dataRuleId;
}

30
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataQuery.java Normal file
View File

@@ -0,0 +1,30 @@
package com.yxt.portal.biz.sysmenurole;
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: SysMenuRoleQuery.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery <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 = "菜单与角色关联表 查询条件")
@Data
public class SysMenuRoleDataQuery implements Query {
@ApiModelProperty("角色sid")
private String roleSid;
@ApiModelProperty("菜单名称")
private String menuName;
}

32
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataVo.java Normal file
View File

@@ -0,0 +1,32 @@
package com.yxt.portal.biz.sysmenurole;
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: SysMenuRoleVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <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 = "菜单与角色关联表 视图数据对象")
@Data
public class SysMenuRoleDataVo implements Vo {
@ApiModelProperty("菜单与角色关联表sid")
private String sid;
@ApiModelProperty("菜单名称")
private String name;
@ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
private String dataRuleId;
}

31
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDto.java Normal file
View File

@@ -0,0 +1,31 @@
package com.yxt.portal.biz.sysmenurole;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuRoleDto.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto <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 = "菜单与角色关联表 数据传输对象")
@Data
public class SysMenuRoleDto implements Dto {
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("角色sid")
private String roleSid;
}

60
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.java Normal file
View File

@@ -0,0 +1,60 @@
package com.yxt.portal.biz.sysmenurole;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.portal.biz.sysmenurole.MenuRoleVo;
import com.yxt.portal.biz.sysmenurole.SysMenuRole;
import com.yxt.portal.biz.sysmenurole.SysMenuRoleDataVo;
import com.yxt.portal.biz.sysmenurole.SysMenuRoleVo;
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> {
//@Update("update sys_menu_role set name=#{msg} where id=#{id}")
//IPage<SysMenuRoleVo> voPage(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenuRole> qw);
IPage<SysMenuRoleVo> selectPageVo(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) Wrapper<SysMenuRole> qw);
List<SysMenuRoleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMenuRole> qw);
@Select("select * from sys_menu_role")
List<SysMenuRoleVo> selectListVo();
@Delete("delete from sys_menu_role where roleSid=#{roleSid}")
void delByRoleSid(@Param("roleSid") String roleSid);
List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysMenuRoleVo> qw);
List<MenuRoleVo> selectByRoleSid(String roleSid);
List<SysMenuRoleDataVo> selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw);
List<SysMenuRoleDataVo> selMenuByRoleApp(@Param(Constants.WRAPPER) QueryWrapper qw);
@Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}")
void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId);
@Update("update sys_mobile_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}")
void updateDataByRoleMenuApp(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId);
}

74
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.xml Normal file
View File

@@ -0,0 +1,74 @@
<?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.portal.biz.sysmenurole.SysMenuRoleMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.portal.biz.sysmenurole.SysMenuRoleVo">
SELECT * FROM sys_menu_role
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.portal.biz.sysmenurole.SysMenuRoleVo">
SELECT * FROM sys_menu_role
<where>
${ew.sqlSegment}
</where>
</select>
<select id="list" parameterType="com.yxt.portal.biz.sysmenurole.SysMenuRoleQuery"
resultType="com.yxt.portal.biz.sysmenurole.SysMenuRoleVo">
SELECT distinct rm.menuSid as sid,
m.name as menuName,
m.menuUrl,
m.pageUrl,
m.pageName,
m.pageUrlRedirect,
m.pageAliasName,
m.iconUrl,
m.sourceSid,
m.isShow,
m.pSid,
m.sortNo,
m.remarks,
1 as alwaysShow
FROM sys_menu_role rm
LEFT JOIN sys_menu m ON rm.menuSid = m.sid
${ew.customSqlSegment}
</select>
<select id="selectByRoleSid" resultType="com.yxt.portal.biz.sysmenurole.MenuRoleVo">
select menuSid, dataRuleId
from sys_menu_role
where roleSid = #{roleSid}
</select>
<select id="selMenuByRole" resultType="com.yxt.portal.biz.sysmenurole.SysMenuRoleDataVo">
SELECT
smr.sid,
sm.`name`,
smr.`dataRuleId`
FROM
sys_menu sm
LEFT JOIN sys_menu_role smr
ON smr.`menuSid` = sm.`sid`
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selMenuByRoleApp" resultType="com.yxt.portal.biz.sysmenurole.SysMenuRoleDataVo">
SELECT
smmr.sid,
smm.`name`,
smmr.`dataRuleId`
FROM
sys_mobile_menu smm
LEFT JOIN sys_mobile_menu_role smmr
ON smmr.`menuSid` = smm.`sid`
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

40
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleQuery.java Normal file
View File

@@ -0,0 +1,40 @@
package com.yxt.portal.biz.sysmenurole;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuRoleQuery.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery <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 = "菜单与角色关联表 查询条件")
@Data
public class SysMenuRoleQuery implements Query {
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("角色sid")
private String roleSid;
@ApiModelProperty("多个角色sid计集合")
private List<String> roleSids;
@ApiModelProperty("资源sid")
private String sourceSid;
@ApiModelProperty("是否是系统管理员")
private String isAdmin;
}

213
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleService.java Normal file
View File

@@ -0,0 +1,213 @@
package com.yxt.portal.biz.sysmenurole;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.portal.biz.sysmenurole.*;
import com.yxt.portal.biz.sysmenu.SysMenuService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysMenuRoleService.java <br/>
* Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleService <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 SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, SysMenuRole> {
@Autowired
private SysMenuService sysMenuService;
public PagerVo<SysMenuRole> listPage(PagerQuery<SysMenuRoleQuery> pq) {
SysMenuRoleQuery query = pq.getParams();
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
IPage<SysMenuRole> pagging = baseMapper.selectPage(page, qw);
PagerVo<SysMenuRole> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysMenuRole> listAll(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<SysMenuRole> createQueryWrapper(SysMenuRoleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysMenuRole> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuSid())) {
qw.eq("menuSid", query.getMenuSid());
}
if (StringUtils.isNotBlank(query.getRoleSid())) {
qw.eq("roleSid", query.getRoleSid());
}
return qw;
}
public PagerVo<SysMenuRoleVo> listPageVo(PagerQuery<SysMenuRoleQuery> pq) {
SysMenuRoleQuery query = pq.getParams();
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
IPage<SysMenuRoleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysMenuRoleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysMenuRoleVo> listAllVo(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<SysMenuRoleVo> listVo() {
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(SysMenuRoleDto dto) {
SysMenuRole entity = new SysMenuRole();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public SysMenuRoleVo fetchByIdVo(String id) {
SysMenuRole entity = this.fetchById(id);
SysMenuRoleVo vo = new SysMenuRoleVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByRoleSid(String roleSid) {
baseMapper.delByRoleSid(roleSid);
}
// 不分页列表
public List<SysMenuRoleVo> list(SysMenuRoleQuery query) {
// mybits所用的查询条件封装类
QueryWrapper<SysMenuRoleVo> qw = buildQueryWrapper(query);
return baseMapper.list(qw);
}
/**
* 解析和组装查询条件，封装在qw中
*
* @param query
* @return
*/
private QueryWrapper<SysMenuRoleVo> buildQueryWrapper(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRoleVo> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getSourceSid())) {
qw.eq("m.sourceSid", query.getSourceSid());
}
/*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) {
qw.in("rm.roleSid", query.getRoleSid());
}*/
if (StringUtils.isNotBlank(query.getIsAdmin())) {
if (!query.getIsAdmin().equals("1")){
qw.eq("m.isEnable", 1);
}
}
if (query.getRoleSids() != null && query.getRoleSids().size() > 0) {
qw.in("rm.roleSid", query.getRoleSids());
}
qw.eq("m.isShow", 1);
qw.orderByAsc("m.sortNo");
}
return qw;
}
/**
* 资源菜单树形列表
*
* @param query:roleSids,sourceSid
* @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单）
*/
public List<Map<String, Object>> getSourceMenuTreeOfRoles(SysMenuRoleQuery query, Map<String, Object> map_rolemenus) {
//获取当前资源的菜单列表
List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
if (null == query)
return list_menus_map;
//角色s的某个资源的所有菜单列表
List<SysMenuRoleVo> list_menu = list(query);
list_menus_map = sysMenuService.getSourceMenuTree(list_menu, map_rolemenus);
return list_menus_map;
}
public List<MenuRoleVo> selectByRoleSid(String roleSid) {
return baseMapper.selectByRoleSid(roleSid);
}
public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(SysMenuRoleDataQuery query) {
ResultBean rb = ResultBean.fireFail();
QueryWrapper qw = new QueryWrapper<>();
qw.eq("smr.roleSid",query.getRoleSid());
if (StringUtils.isNotBlank(query.getMenuName())){
qw.like("sm.name",query.getMenuName());
}
List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRole(qw);
return rb.success().setData(sysMenuRoleDataVos);
}
public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(SysMenuRoleDataQuery query) {
ResultBean rb = ResultBean.fireFail();
QueryWrapper qw = new QueryWrapper<>();
qw.eq("smmr.roleSid",query.getRoleSid());
if (StringUtils.isNotBlank(query.getMenuName())){
qw.like("smm.name",query.getMenuName());
}
List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRoleApp(qw);
return rb.success().setData(sysMenuRoleDataVos);
}
public ResultBean updateDataByRoleMenu(List<SysMenuRoleDataDto> dtos) {
ResultBean rb = ResultBean.fireFail();
for (SysMenuRoleDataDto dto : dtos) {
if (StringUtils.isNotBlank(dto.getDataRuleId())){
baseMapper.updateDataByRoleMenu(dto.getSid(),dto.getDataRuleId());
}
}
return rb.success();
}
public ResultBean updateDataByRoleMenuApp(List<SysMenuRoleDataDto> dtos) {
ResultBean rb = ResultBean.fireFail();
for (SysMenuRoleDataDto dto : dtos) {
if (StringUtils.isNotBlank(dto.getDataRuleId())){
baseMapper.updateDataByRoleMenuApp(dto.getSid(),dto.getDataRuleId());
}
}
return rb.success();
}
///----获平台角色s的某个资源的菜单树形列表（内存操作） 开始----
}

56
src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleVo.java Normal file
View File

@@ -0,0 +1,56 @@
package com.yxt.portal.biz.sysmenurole;
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: SysMenuRoleVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <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 = "菜单与角色关联表 视图数据对象")
@Data
public class SysMenuRoleVo implements Vo {
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("角色sid")
private String roleSid;
@ApiModelProperty("菜单父级sid")
private String pSid;
@ApiModelProperty("menusid")
private String sid;
@ApiModelProperty("menuUrl")
private String menuUrl;
@ApiModelProperty("menuName")
private String menuName;
@ApiModelProperty("pageUrl")
private String pageUrl;
@ApiModelProperty("iconUrl")
private String iconUrl;
@ApiModelProperty("isShow")
private String isShow;
@ApiModelProperty("alwaysShow")
private Integer alwaysShow;
@ApiModelProperty("pageUrlRedirect")
private String pageUrlRedirect;
@ApiModelProperty("pageAliasName")
private String pageAliasName;
@ApiModelProperty("pageName")
private String pageName;
@ApiModelProperty("remarks")
private String remarks;
}

2
src/main/java/com/yxt/user/biz/sysorganization/AppContactSysOrganizationVo.java → src/main/java/com/yxt/portal/biz/sysorganization/AppContactSysOrganizationVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;

2
src/main/java/com/yxt/user/biz/sysorganization/QrCodeVo.java → src/main/java/com/yxt/portal/biz/sysorganization/QrCodeVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrgListVo.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrgListVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrgStaffVo.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrgStaffVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrgVo.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrgVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrganization.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganization.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationDto.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.dto.Dto;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListQuery.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.query.Query;
import lombok.Data;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListVo.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListsVo.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListsVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;

4
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java
View File

@@ -1,10 +1,10 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
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 com.yxt.user.biz.sysstafforg.SysStaffOrgVo;
import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

50
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.xml → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml
View File

@@ -1,9 +1,9 @@
<?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.user.biz.sysorganization.SysOrganizationMapper">
<mapper namespace="com.yxt.portal.biz.sysorganization.SysOrganizationMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectPageVo" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT so.*,
(SELECT GROUP_CONCAT(ss.name)
FROM `sys_staff_org` sso
@@ -33,7 +33,7 @@
ORDER BY so.sort
</select>
<select id="selectListAllVo" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectListAllVo" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT *
FROM sys_organization
<where>
@@ -41,13 +41,13 @@
</where>
</select>
<select id="selectFirstOrgList" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectFirstOrgList" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT sid, name, psid, orgCode
FROM sys_organization
WHERE psid = '0'
</select>
<select id="selectChildrenListByPsid" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectChildrenListByPsid" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT sid, name, psid, orgCode
FROM sys_organization
WHERE psid = #{psid}
@@ -68,7 +68,7 @@
</select>
<select id="selectAppOrganization"
resultType="com.yxt.user.biz.sysorganization.AppContactSysOrganizationVo">
resultType="com.yxt.portal.biz.sysorganization.AppContactSysOrganizationVo">
SELECT sid,
name,
(SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid) staffNum,
@@ -78,7 +78,7 @@
</select>
<select id="selectAppOrganizationByPsid"
resultType="com.yxt.user.biz.sysorganization.AppContactSysOrganizationVo">
resultType="com.yxt.portal.biz.sysorganization.AppContactSysOrganizationVo">
SELECT org.sid,
org.name,
(SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid) staffNum,
@@ -87,57 +87,57 @@
WHERE org.psid = #{psid}
</select>
<select id="treeList" resultType="com.yxt.user.biz.sysorganization.SysOrgVo">
<select id="treeList" resultType="com.yxt.portal.biz.sysorganization.SysOrgVo">
SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath, so.orgCode
FROM sys_organization so
WHERE psid = #{psid}
</select>
<select id="selectOrgCode" resultType="com.yxt.user.biz.sysorganization.SysOrganization">
<select id="selectOrgCode" resultType="com.yxt.portal.biz.sysorganization.SysOrganization">
SELECT *
FROM sys_organization
WHERE psid = '0'
</select>
<select id="getListOrg" resultType="com.yxt.user.biz.sysorganization.SysOrgVo">
<select id="getListOrg" resultType="com.yxt.portal.biz.sysorganization.SysOrgVo">
SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
FROM sys_organization so
WHERE isDept = 0
ORDER BY psid
</select>
<select id="selectOrgCodeByPsid" resultType="com.yxt.user.biz.sysorganization.SysOrganization">
<select id="selectOrgCodeByPsid" resultType="com.yxt.portal.biz.sysorganization.SysOrganization">
SELECT *
FROM sys_organization
LIMIT 0,1
</select>
<select id="selectTreeList" resultType="com.yxt.user.biz.sysorganization.SysOrgListVo">
<select id="selectTreeList" resultType="com.yxt.portal.biz.sysorganization.SysOrgListVo">
SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
FROM sys_organization so
WHERE psid = #{psid}
</select>
<!--根据部门编码查询部门信息-->
<select id="selectByOrgCode" resultType="com.yxt.user.biz.sysorganization.SysOrganization">
<select id="selectByOrgCode" resultType="com.yxt.portal.biz.sysorganization.SysOrganization">
select *
from sys_organization
where orgCode = #{substring}
</select>
<select id="selectChildernList" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectChildernList" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
FROM sys_organization so
WHERE psid = #{psid}
ORDER BY so.sort ASC
</select>
<select id="getUseOrgByUserSid" resultType="com.yxt.user.biz.sysstafforg.SysStaffOrgVo">
<select id="getUseOrgByUserSid" resultType="com.yxt.portal.biz.sysstafforg.SysStaffOrgVo">
select orgSidPath
from sys_staff_org
where staffSid = #{staffSid}
</select>
<select id="getUseOrgBySid" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="getUseOrgBySid" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
FROM sys_organization so
WHERE sid = #{sid}
@@ -150,7 +150,7 @@
WHERE sid = #{sid}
</update>
<select id="getQrCodeVo" resultType="com.yxt.user.biz.sysorganization.QrCodeVo">
<select id="getQrCodeVo" resultType="com.yxt.portal.biz.sysorganization.QrCodeVo">
SELECT so.name departmentName, so.qrText qrFilePath, so.addrs address, so.sid
FROM sys_organization so
WHERE so.sid = #{sid}
@@ -166,7 +166,7 @@
AND isDept = 0
</select>
<select id="getListOrgByBrand" resultType="com.yxt.user.biz.sysorganization.SysOrgVo">
<select id="getListOrgByBrand" resultType="com.yxt.portal.biz.sysorganization.SysOrgVo">
SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
FROM sys_organization so
WHERE isDept = 0
@@ -174,45 +174,45 @@
ORDER BY psid
</select>
<select id="selectOrgList" resultType="com.yxt.user.biz.sysorganization.SysOrganizationListVo">
<select id="selectOrgList" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationListVo">
select so.name orgDeptName, so.sid orgDeptSid
from sys_organization so
where so.psid = #{orgSid}
and orgAttributeKey = 'DP03_SYS'
</select>
<select id="selectOrgLists" resultType="com.yxt.user.biz.sysorganization.SysOrganizationListsVo">
<select id="selectOrgLists" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationListsVo">
select so.name orgDeptName, so.sid orgDeptSid
from sys_organization so
where so.psid = #{orgSid}
</select>
<select id="selectByOrgDeptSid" resultType="com.yxt.user.biz.sysorganization.SysOrgStaffVo">
<select id="selectByOrgDeptSid" resultType="com.yxt.portal.biz.sysorganization.SysOrgStaffVo">
select distinct si.name staffName, si.sid staffSid
from sys_staff_org so
left join sys_staffinfo si on so.staffSid = si.sid
where so.orgSid = #{orgDeptSid}
</select>
<select id="selectByPSid" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectByPSid" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
select *
from sys_organization
where psid = #{sid}
and name = #{name}
</select>
<select id="selectOrgSidList" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectOrgSidList" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
select sid,name,orgCode from sys_organization so where so.isDept = 0
</select>
<select id="getListDeptByOrgSid" resultType="com.yxt.user.biz.sysorganization.SysOrgVo">
<select id="getListDeptByOrgSid" resultType="com.yxt.portal.biz.sysorganization.SysOrgVo">
SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
FROM sys_organization so
WHERE isDept = 1
AND so.psid = #{orgSid}
</select>
<select id="selectOrgByPSid" resultType="com.yxt.user.biz.sysorganization.SysOrganizationVo">
<select id="selectOrgByPSid" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
FROM sys_organization so
WHERE isDept = 0 AND so.psid = #{psid}

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationQuery.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.query.Query;

14
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationService.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationService.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,12 +10,12 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysstaffinfo.SysStaffinfo;
import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.user.biz.sysstafforg.SysStaffOrg;
import com.yxt.user.biz.sysstafforg.SysStaffOrgService;
import com.yxt.user.biz.sysstafforg.SysStaffOrgVo;
import com.yxt.user.biz.sysuser.SysUserService;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.portal.biz.sysstafforg.SysStaffOrg;
import com.yxt.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo;
import com.yxt.portal.biz.sysuser.SysUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationVo.java → src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysorganization;
package com.yxt.portal.biz.sysorganization;
import com.yxt.common.core.vo.Vo;

2
src/main/java/com/yxt/user/biz/syspost/SysPost.java → src/main/java/com/yxt/portal/biz/syspost/SysPost.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.syspost;
package com.yxt.portal.biz.syspost;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;

2
src/main/java/com/yxt/user/biz/syspost/SysPostDto.java → src/main/java/com/yxt/portal/biz/syspost/SysPostDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.syspost;
package com.yxt.portal.biz.syspost;
import com.yxt.common.core.dto.Dto;

2
src/main/java/com/yxt/user/biz/syspost/SysPostListVo.java → src/main/java/com/yxt/portal/biz/syspost/SysPostListVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.syspost;
package com.yxt.portal.biz.syspost;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;

5
src/main/java/com/yxt/user/biz/syspost/SysPostMapper.java → src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.java
View File

@@ -1,12 +1,9 @@
package com.yxt.user.biz.syspost;
package com.yxt.portal.biz.syspost;
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 com.yxt.user.biz.syspost.SysPost;
import com.yxt.user.biz.syspost.SysPostListVo;
import com.yxt.user.biz.syspost.SysPostVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

10
src/main/java/com/yxt/user/biz/syspost/SysPostMapper.xml → src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.xml
View File

@@ -1,9 +1,9 @@
<?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.user.biz.syspost.SysPostMapper">
<mapper namespace="com.yxt.portal.biz.syspost.SysPostMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.user.biz.syspost.SysPostVo">
<select id="selectPageVo" resultType="com.yxt.portal.biz.syspost.SysPostVo">
SELECT post.sid sid,
post.name name,
post.orgSid,
@@ -23,7 +23,7 @@
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.user.biz.syspost.SysPostVo">
<select id="selectListAllVo" resultType="com.yxt.portal.biz.syspost.SysPostVo">
SELECT *
FROM sys_post
<where>
@@ -31,12 +31,12 @@
</where>
</select>
<!--根据部门sid查询该部门下的所有岗位列表-->
<select id="selectListOne" resultType="com.yxt.user.biz.syspost.SysPostListVo">
<select id="selectListOne" resultType="com.yxt.portal.biz.syspost.SysPostListVo">
select name, postCode, sid
from sys_post
</select>
<!--根据岗位编码查询岗位信息-->
<select id="selectByPostCode" resultType="com.yxt.user.biz.syspost.SysPost">
<select id="selectByPostCode" resultType="com.yxt.portal.biz.syspost.SysPost">
select *
from sys_post
where postCode = #{substring}

2
src/main/java/com/yxt/user/biz/syspost/SysPostQuery.java → src/main/java/com/yxt/portal/biz/syspost/SysPostQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.syspost;
package com.yxt.portal.biz.syspost;
import com.yxt.common.core.query.Query;

8
src/main/java/com/yxt/user/biz/syspost/SysPostService.java → src/main/java/com/yxt/portal/biz/syspost/SysPostService.java
View File

@@ -1,16 +1,14 @@
package com.yxt.user.biz.syspost;
package com.yxt.portal.biz.syspost;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.user.biz.sysorganization.SysOrganization;
import com.yxt.user.biz.syspost.*;
import com.yxt.user.biz.sysorganization.SysOrganizationService;
import com.yxt.portal.biz.sysorganization.SysOrganization;
import com.yxt.portal.biz.sysorganization.SysOrganizationService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.user.biz.sysorganization.SysOrganizationService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
src/main/java/com/yxt/user/biz/syspost/SysPostVo.java → src/main/java/com/yxt/portal/biz/syspost/SysPostVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.syspost;
package com.yxt.portal.biz.syspost;
import com.yxt.common.core.vo.Vo;

2
src/main/java/com/yxt/user/biz/sysrole/SysRole.java → src/main/java/com/yxt/portal/biz/sysrole/SysRole.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysrole;
package com.yxt.portal.biz.sysrole;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;

2
src/main/java/com/yxt/user/biz/sysrole/SysRoleDto.java → src/main/java/com/yxt/portal/biz/sysrole/SysRoleDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.user.biz.sysrole;
package com.yxt.portal.biz.sysrole;
import com.yxt.common.core.dto.Dto;

4
src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.java → src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java
View File

@@ -1,10 +1,10 @@
package com.yxt.user.biz.sysrole;
package com.yxt.portal.biz.sysrole;
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 com.yxt.user.biz.sysuser.SysMenuRoleVoList;
import com.yxt.portal.biz.sysuser.SysMenuRoleVoList;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

18
src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.xml → src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml
View File

@@ -1,9 +1,9 @@
<?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.user.biz.sysrole.SysRoleMapper">
<mapper namespace="com.yxt.portal.biz.sysrole.SysRoleMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.user.biz.sysrole.SysRoleVo">
<select id="selectPageVo" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
SELECT sr.*, sp.sid as postSid, sp.name as postName
FROM sys_role sr
LEFT JOIN sys_post sp ON sr.postSid = sp.sid
@@ -13,32 +13,32 @@
ORDER BY sr.sort
</select>
<select id="selectListAllVo" resultType="com.yxt.user.biz.sysrole.SysRoleVo">
<select id="selectListAllVo" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
SELECT *
FROM sys_role
<where>
${ew.sqlSegment}
</where>
</select>
<select id="listAllByUserSid" resultType="com.yxt.user.biz.sysrole.SysRoleVo">
<select id="listAllByUserSid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked
FROM sys_role role
LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid`
AND userRole.userSid = #{param1}
</select>
<select id="fetchByUserSid" resultType="com.yxt.user.biz.sysrole.SysRoleVo">
<select id="fetchByUserSid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
SELECT role.name, role.remarks, role.sid
FROM sys_role role
left join sys_user_role userrole on userrole.roleSid = role.sid
where userrole.userSid = #{param1}
</select>
<select id="fetchByName" resultType="com.yxt.user.biz.sysrole.SysRole">
<select id="fetchByName" resultType="com.yxt.portal.biz.sysrole.SysRole">
SELECT *
FROM sys_role role
where role.name = #{param1}
</select>
<select id="fetchBySid" resultType="com.yxt.user.biz.sysrole.SysRoleVo">
<select id="fetchBySid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
SELECT role.*, post.sid as postSid, post.name as postName
FROM sys_role role
LEFT JOIN sys_post post ON role.postSid = post.sid
@@ -91,14 +91,14 @@
where userSid = #{userSid}
</select>
<select id="selectRoleList" resultType="com.yxt.user.biz.sysuser.SysMenuRoleVoList">
<select id="selectRoleList" resultType="com.yxt.portal.biz.sysuser.SysMenuRoleVoList">
select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue,smr.dataRuleId
from sys_role sr
left join sys_menu_role smr on sr.sid = smr.roleSid
where smr.menuSid = #{menuSid}
</select>
<select id="selectMobileRoleList" resultType="com.yxt.user.biz.sysuser.SysMenuRoleVoList">
<select id="selectMobileRoleList" resultType="com.yxt.portal.biz.sysuser.SysMenuRoleVoList">
select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue
from sys_role sr
left join sys_mobile_menu_role smr on sr.sid = smr.roleSid

Some files were not shown because too many files have changed in this diff Show More