diff --git a/pom.xml b/pom.xml
index 2305cda..8bed395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,8 @@
4.0.0
- ss-common-user
- ss-common-user
+ ss-common-portal
+ ss-common-portal
2.0.1
diff --git a/src/main/java/com/yxt/user/UserApplication.java b/src/main/java/com/yxt/portal/PortalApplication.java
similarity index 75%
rename from src/main/java/com/yxt/user/UserApplication.java
rename to src/main/java/com/yxt/portal/PortalApplication.java
index 52f7e15..686c12c 100644
--- a/src/main/java/com/yxt/user/UserApplication.java
+++ b/src/main/java/com/yxt/portal/PortalApplication.java
@@ -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);
}
}
diff --git a/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java b/src/main/java/com/yxt/portal/apiadmin/AdminHomeRest.java
similarity index 88%
rename from src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java
rename to src/main/java/com/yxt/portal/apiadmin/AdminHomeRest.java
index 779af32..9a077c4 100644
--- a/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/AdminHomeRest.java
@@ -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;
diff --git a/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java
new file mode 100644
index 0000000..ac0c27a
--- /dev/null
+++ b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java
@@ -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> pageList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = new PagerVo<>();
+ IPage p2 = dictCommonService.pageList(pagerQuery);
+ PagerVo 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> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid){
+ DictCommonTypeQuery query = new DictCommonTypeQuery();
+ query.setType(type);
+ query.setPsid(psid);
+ List dictCommonVoList = dictCommonService.getValue(query);
+ if (dictCommonVoList.size() == 0) {
+ return new ResultBean>().fail().setMsg("该类型无数据项");
+ }
+ return new ResultBean>().success().setData(dictCommonVoList);
+ }
+
+ @ResponseBody
+ @GetMapping("/selectBykey/{key}/{type}")
+ @ApiOperation(value = "数据字典信息修改时的初始化信息")
+ public ResultBean 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().success().setData(new DictCommonVo());
+ }
+ return new ResultBean().success().setData(v);
+ }
+
+ @GetMapping("/getFirstDictKeyByType")
+ @ResponseBody
+ @ApiOperation("根据数据字典的key获取第一个值（默认值）")
+ ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid){
+ ResultBean> 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> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum){
+ return dictCommonService.getList(type,groupNum);
+ }
+}
diff --git a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
new file mode 100644
index 0000000..4e3b6e2
--- /dev/null
+++ b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
@@ -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> pageList(@RequestBody PagerQuery pagerQuery){
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = new PagerVo<>();
+ IPage p2 = dictTypeService.pageList(pagerQuery);
+ PagerVo 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 = 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("删除成功");
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SmsRest.java b/src/main/java/com/yxt/portal/apiadmin/SmsRest.java
similarity index 84%
rename from src/main/java/com/yxt/user/apiadmin/SmsRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SmsRest.java
index 1bc8269..1192489 100644
--- a/src/main/java/com/yxt/user/apiadmin/SmsRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SmsRest.java
@@ -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;
diff --git a/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java b/src/main/java/com/yxt/portal/apiadmin/SysFunctionRest.java
similarity index 97%
rename from src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysFunctionRest.java
index 12c0e8d..243aa8f 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysFunctionRest.java
@@ -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;
diff --git a/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
similarity index 69%
rename from src/main/java/com/yxt/user/apiadmin/SysMenuRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
index 340bdfd..81f9d6d 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
@@ -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> listPage(@RequestBody PagerQuery pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo pv = sysMenuService.listPageVo(pq);
@@ -78,15 +80,27 @@ public class SysMenuRest {
return rb.success().setData(list);
}*/
-
- public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query) {
+ /**
+ * 菜单列表：根据资源归类
+ *
+ * @param query
+ * @return
+ */
+ @ApiOperation("菜单列表：根据资源归类")
+ @PostMapping("/listAllVoForSource")
+ public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query){
ResultBean rb = ResultBean.fireFail();
List list = sysMenuService.listAllVoForSource(query);
return rb.success().setData(list);
}
-
- public ResultBean>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) {
+ /**
+ * 菜单列表：根据资源归类 设置功能的url用
+ * @return
+ */
+ @ApiOperation("菜单列表：根据资源归类 设置功能的url用")
+ @PostMapping("/getMenusForFunction")
+ public ResultBean>> 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>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query) {
+ ResultBean>> rb = ResultBean.fireFail();
+ SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
+ List> list = new ArrayList<>();
+ if (null == query)
+ return rb.setData(list);
- public ResultBean>> sourcemenutree(SysMenuQuery query) {
+ //if业务角色存在，则查询业务角色的菜单列表，否则查询平台角色的菜单列表
+ List userRole = sysUserRoleService.selectByUserSid(query.getUserSid());
+ List 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>> sourcemenutree(@RequestBody SysMenuQuery query) {
ResultBean>> rb = ResultBean.fireFail();
// SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
List> list = new ArrayList<>();
@@ -144,8 +188,9 @@ public class SysMenuRest {
return rb.success().setData(list);
}
-
- public ResultBean> listAllByRoleSid(SysMenuQuery query) {
+ @ApiOperation("根据角色sid条件查询所有数据列表")
+ @PostMapping("/listAllByRoleSid")
+ public ResultBean> 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) {
diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java
new file mode 100644
index 0000000..e29369b
--- /dev/null
+++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java
@@ -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(门户建设)
+ * File: SysMenuRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleRest
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单与角色关联表")
+@RestController
+@RequestMapping("v1/sysmenurole")
+public class SysMenuRoleRest {
+
+ @Autowired
+ private SysMenuRoleService sysMenuRoleService;
+ @Autowired
+ private SysRoleService sysRoleService;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysMenuRoleService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
+ public ResultBean> listAll(@RequestBody SysMenuRoleQuery query){
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysMenuRoleService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+ @ApiOperation("根据角色查询授权的菜单列表(PC)")
+ @PostMapping("/selMenuByRole")
+ public ResultBean> selMenuByRole(@RequestBody SysMenuRoleDataQuery query) {
+ return sysMenuRoleService.selMenuByRole(query);
+ }
+
+ @ApiOperation("根据角色查询授权的菜单列表(APP)")
+ @PostMapping("/selMenuByRoleApp")
+ public ResultBean> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query) {
+ return sysMenuRoleService.selMenuByRoleApp(query);
+ }
+
+ @ApiOperation("修改角色菜单的数据权限（PC）")
+ @PostMapping("/updateDataByRoleMenu")
+ public ResultBean updateDataByRoleMenu(@RequestBody List dtos) {
+ return sysMenuRoleService.updateDataByRoleMenu(dtos);
+ }
+
+ @ApiOperation("修改角色菜单的数据权限（移动端）")
+ @PostMapping("/updateDataByRoleMenuApp")
+ public ResultBean updateDataByRoleMenuApp(@RequestBody List dtos) {
+ return sysMenuRoleService.updateDataByRoleMenuApp(dtos);
+ }
+
+
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
+ public ResultBean> list(){
+ ResultBean rb = ResultBean.fireFail();
+ List 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 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 fetch(@PathVariable("id") String id){
+ ResultBean rb = ResultBean.fireFail();
+ SysMenuRoleVo vo = sysMenuRoleService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java b/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java
similarity index 71%
rename from src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java
index 73ba8ef..d8687d2 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java
@@ -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> listPage(@RequestBody PagerQuery 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> listAll(@RequestBody SysOrganizationQuery query) {
ResultBean rb = ResultBean.fireFail();
List list = sysOrganizationService.listAllVo(query);
return rb.success().setData(list);
}
-
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
public ResultBean> list() {
ResultBean rb = ResultBean.fireFail();
List 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> selectFirstOrgList() {
+ @ApiOperation("一级组织机构列表")
+ @GetMapping("/selectFirstOrgList")
+ public ResultBean> selectFirstOrgList(){
return new ResultBean>().success().setData(sysOrganizationService.selectFirstOrgList());
}
-
- public ResultBean> selectChildrenListBySid(String sid) {
+ @ApiOperation("根据父级sid查询子集列表")
+ @GetMapping("/selectChildrenListBySid/{sid}")
+ public ResultBean> selectChildrenListBySid(@PathVariable("sid") String sid) {
return new ResultBean>().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 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 fetch(String id) {
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetch/{id}")
+ public ResultBean fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysOrganizationVo vo = sysOrganizationService.fetchByIdVo(id);
return rb.success().setData(vo);
}
-
- public ResultBean fetchBySid(String sid) {
+ @ApiOperation("获取一条记录 根据sid")
+ @ResponseBody
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysOrganization entity = sysOrganizationService.fetchBySid(sid);
List list = sysStaffOrgService.fetchByOrgSid(sid);
@@ -247,8 +258,10 @@ public class SysOrganizationRest{
return rb.success().setData(vo);
}
-
- public ResultBean> selectAppOrganization(String sid) {
+ @ApiOperation("手机获取组织架构")
+ @ResponseBody
+ @GetMapping("/selectAppOrganization")
+ public ResultBean> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid) {
Map map = new HashMap<>();
List> nameList = sysOrganizationService.selectOrgNameList(sid);
List staffList = new ArrayList<>();
@@ -267,48 +280,68 @@ public class SysOrganizationRest{
}
- public ResultBean> selectListOrg() {
+ @ApiOperation("组织架构")
+ @ResponseBody
+ @GetMapping("/selectListOrg")
+ ResultBean> selectListOrg(){
ResultBean> rb = ResultBean.fireFail();
List menuTree2VoList = sysOrganizationService.treeList();
return rb.success().setData(menuTree2VoList);
}
- public ResultBean> getListOrg() {
+ @ApiOperation("获取到分公司")
+ @ResponseBody
+ @GetMapping("/getListOrg")
+ ResultBean> getListOrg(){
ResultBean> rb = ResultBean.fireFail();
List menuTree2VoList = sysOrganizationService.getListOrg();
return rb.success().setData(menuTree2VoList);
}
-
- public ResultBean> getListOrgByBrand(String orgSid) {
+ @ApiOperation("获取同品牌下分公司")
+ @ResponseBody
+ @GetMapping("/getListOrgByBrand/{orgSid}")
+ ResultBean> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid){
return null;//sysOrganizationService.getListOrgByBrand(orgSid);
}
-
- public ResultBean> getListOrgByBrandSid(String orgSid, String brandSid) {
+ @ApiOperation("获取指定品牌下分公司(已筛选本分公司)")
+ @ResponseBody
+ @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}")
+ ResultBean> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid);
}
-
- public ResultBean> getListOrgByBrandSidNo(String orgSid, String brandSid) {
+ @ApiOperation("获取指定品牌下分公司(未筛选本分公司)")
+ @ResponseBody
+ @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}")
+ ResultBean> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid);
}
-
- public ResultBean> getListDeptByOrgSid(String orgSid) {
+ @ApiOperation("获取指定分公司下部门信息")
+ @ResponseBody
+ @GetMapping("/getListDeptByOrgSid/{orgSid}")
+ ResultBean> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid){
return sysOrganizationService.getListDeptByOrgSid(orgSid);
}
- public ResultBean getUseOrgByUserSid(String userSid) {
+ @ApiOperation("根据业务员sid获取到分公司")
+ @ResponseBody
+ @GetMapping("/getUseOrgByUserSid")
+ ResultBean getUseOrgByUserSid(@RequestParam("userSid") String userSid){
ResultBean rb = ResultBean.fireFail();
SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid);
return rb.success().setData(vo);
}
- public ResultBean selectBySid(String sid) {
+ @ApiOperation("根据部门sid查询组织信息")
+ @ResponseBody
+ @GetMapping("/selectBySid")
+ ResultBean selectBySid(@RequestParam("sid") String sid){
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
if (sysOrganization == null) {
return new ResultBean().fail().setData(new SysOrganization());
@@ -317,7 +350,10 @@ public class SysOrganizationRest{
}
- public ResultBean>> selectUseOrgSidBySid(String sid) {
+ @ApiOperation("根据组织架构sid查询组织下所有分公司")
+ @ResponseBody
+ @GetMapping("/selectUseOrgSidBySid")
+ ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid){
ResultBean rb = ResultBean.fireFail();
List> maps = sysOrganizationService.selectUseOrgSidBySid(sid);
return rb.success().setData(maps);
@@ -328,8 +364,10 @@ public class SysOrganizationRest{
*
* @return
*/
-
- public ResultBean> selectListOne() {
+ @ApiOperation("所在部门下拉")
+ @ResponseBody
+ @GetMapping("/selectListOne")
+ ResultBean> selectListOne(){
ResultBean> rb = ResultBean.fireFail();
List sysOrgListVo = sysOrganizationService.selectTreeList();
if (sysOrgListVo.size() == 0) {
@@ -340,8 +378,10 @@ public class SysOrganizationRest{
return rb.success().setData(sysOrgListVo);
}
-
- public ResultBean getQrCode(String sid) {
+ @PostMapping("/getQrCode/{sid}")
+ @ResponseBody
+ @ApiOperation("查看二维码")
+ public ResultBean getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid) {
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
if (sysOrganization == null) {
return new ResultBean().fail().setMsg("部门不存在");
@@ -371,7 +411,10 @@ public class SysOrganizationRest{
}
- public ResultBean getOrgSid(String sid) {
+ @GetMapping("/getOrgSid/{sid}")
+ @ResponseBody
+ @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司")
+ ResultBean getOrgSid(@PathVariable(value = "sid") String sid){
ResultBean 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> selectOrgList(SysOrganizationListQuery query) {
+ @GetMapping("/selectOrgList")
+ @ResponseBody
+ @ApiOperation("当前分公司销售部门及部门人员")
+ ResultBean> selectOrgList(@SpringQueryMap SysOrganizationListQuery query){
return sysOrganizationService.selectOrgList(query);
}
- public ResultBean> selectOrgLists(SysOrganizationListQuery query) {
+ @GetMapping("/selectOrgLists")
+ @ResponseBody
+ @ApiOperation("当前分公司下所有部门")
+ ResultBean> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query){
return sysOrganizationService.selectOrgLists(query);
}
- public ResultBean selectByPSid(String sid, String name) {
+ @GetMapping("/selectByPSid")
+ @ResponseBody
+ @ApiOperation("查询分公司下的销售支持部")
+ ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name){
return sysOrganizationService.selectByPSid(sid,name);
}
-
- public ResultBean> selectOrgSidList() {
+ @GetMapping("/selectOrgSidList")
+ @ResponseBody
+ @ApiOperation("所有分公司sid")
+ ResultBean> selectOrgSidList() {
ResultBean> rb = ResultBean.fireFail();
List stringList = sysOrganizationService.selectOrgSidList();
return rb.success().setData(stringList);
}
- public ResultBean> selectOrgByPSid(String psid) {
+ @GetMapping("/selectOrgByPSid")
+ @ResponseBody
+ @ApiOperation("查询事业部下所有分公司")
+ ResultBean> selectOrgByPSid(@RequestParam("psid") String psid){
return sysOrganizationService.selectOrgByPSid(psid);
}
- public ResultBean selectByOrgSidPath(String orgSidPath) {
+ @GetMapping("/selectByOrgSidPath")
+ @ResponseBody
+ @ApiOperation("组织层级分页查询")
+ ResultBean selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath){
return sysOrganizationService.selectByOrgSidPath(orgSidPath);
}
}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysPostRest.java b/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java
similarity index 64%
rename from src/main/java/com/yxt/user/apiadmin/SysPostRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysPostRest.java
index 3a8277c..01da8ca 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysPostRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java
@@ -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> listPage(@RequestBody PagerQuery pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo pv = sysPostService.listPageVo(pq);
return rb.success().setData(pv);
}
-
- public ResultBean> listAll(@RequestBody SysPostQuery query) {
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
+ public ResultBean> listAll(@RequestBody SysPostQuery query){
ResultBean rb = ResultBean.fireFail();
List list = sysPostService.listAllVo(query);
return rb.success().setData(list);
}
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
public ResultBean> list() {
ResultBean rb = ResultBean.fireFail();
List 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 fetch(String id) {
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetch/{id}")
+ public ResultBean fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysPostVo vo = sysPostService.fetchByIdVo(id);
return rb.success().setData(vo);
}
- public ResultBean fetchBySid(String sid) {
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysPostVo vo = sysPostService.fetchBySidVo(sid);
return rb.success().setData(vo);
}
- public ResultBean> fetchByOrgSid(String orgSid) {
+ @ApiOperation("根据部门sid获取岗位列表")
+ @GetMapping("/fetchByOrgSid/{orgSid}")
+ public ResultBean> fetchByOrgSid(@PathVariable("orgSid") String orgSid){
ResultBean rb = ResultBean.fireFail();
List list = sysPostService.fetchByOrgSid(orgSid);
return rb.success().setData(list);
}
-
- public ResultBean fetchByOrgSidPostCode() {
+ @ApiOperation("根据部门sid获取岗位编号")
+ @GetMapping("/fetchByOrgSidPostCode/{orgSid}")
+ public ResultBean fetchByOrgSidPostCode(){
ResultBean rb = ResultBean.fireFail();
String s = sysPostService.fetchByOrgSidPostCode();
return rb.success().setData(s);
}
/**
- * 查询所有岗位
+ * 查询岗位列表
*
* @return
*/
-
+ @ApiOperation("查询岗位列表")
+ @GetMapping("/selectList")
public ResultBean> selectList() {
ResultBean> rb = ResultBean.fireFail();
List sysPostVoList = sysPostService.selectList();
diff --git a/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java
similarity index 66%
rename from src/main/java/com/yxt/user/apiadmin/SysRoleRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java
index 61ab9f8..bd010e9 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java
@@ -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> listPage(@RequestBody PagerQuery pq){
ResultBean rb = ResultBean.fireFail();
PagerVo pv = sysRoleService.listPageVo(pq);
@@ -42,6 +43,8 @@ public class SysRoleRest {
}
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
public ResultBean> listAll(@RequestBody SysRoleQuery query){
ResultBean rb = ResultBean.fireFail();
List list = sysRoleService.listAllVo(query);
@@ -49,14 +52,18 @@ public class SysRoleRest {
}
- public ResultBean> listAllByUserSid(String userSid) {
+ @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
+ @PostMapping("/listAllByUserSid/{userSid}")
+ public ResultBean> listAllByUserSid(@PathVariable("userSid") String userSid){
ResultBean rb = ResultBean.fireFail();
List list = sysRoleService.listAllByUserSid(userSid);
return rb.success().setData(list);
}
- public ResultBean> fetchByUserSid(String userSid) {
+ @ApiOperation("根据用户sid查询用户的角色列表")
+ @PostMapping("/fetchByUserSid/{userSid}")
+ public ResultBean> fetchByUserSid(@PathVariable("userSid") String userSid){
if(StringUtils.isBlank(userSid)){
return new ResultBean>().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>().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>().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 fetch(String id){
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetch/{id}")
+ public ResultBean fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysRoleVo vo = sysRoleService.fetchByIdVo(id);
return rb.success().setData(vo);
}
-
- public ResultBean fetchBySid(String sid) {
+ @ApiOperation("获取一条记录根据sid")
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean 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("此角色已不存在");
diff --git a/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java b/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java
similarity index 95%
rename from src/main/java/com/yxt/user/apiadmin/SysSourceRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java
index 83d3e81..729ca19 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java
@@ -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;
/**
diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java
similarity index 98%
rename from src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java
index 732b548..db22782 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java
@@ -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;
diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffPostRest.java
similarity index 91%
rename from src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysStaffPostRest.java
index 0e47c48..e2ea3c3 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffPostRest.java
@@ -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;
/**
diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
similarity index 96%
rename from src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
index e9e4bdd..6feea80 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
@@ -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;
diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserDefaultOrgRest.java
similarity index 78%
rename from src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysUserDefaultOrgRest.java
index 6940d11..378c827 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysUserDefaultOrgRest.java
@@ -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;
diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java
similarity index 71%
rename from src/main/java/com/yxt/user/apiadmin/SysUserRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysUserRest.java
index 6b4b4ab..c79d5b9 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java
@@ -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> listPage(@RequestBody PagerQuery pq) {
ResultBean rb = ResultBean.fireFail();//roleSid
PagerVo pv = sysUserService.listPageVo(pq);
return rb.success().setData(pv);
}
-
- public ResultBean> listAll(@RequestBody SysUserQuery query) {
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
+ public ResultBean> listAll(@RequestBody SysUserQuery query){
ResultBean rb = ResultBean.fireFail();
List list = sysUserService.listAllVo(query);
return rb.success().setData(list);
}
-
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
public ResultBean> list() {
ResultBean rb = ResultBean.fireFail();
List 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 getSysUserByMobile(String staffSid) {
+ @ApiOperation("根据staffSid查询用户信息")
+ @PostMapping("/getSysUserByMobile")
+ public ResultBean 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 selectByUserName(String mobile) {
+ @ApiOperation("根据用户名（手机号）查询用户")
+ @GetMapping("/fetchByMobile/{mobile}")
+ public ResultBean 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 fetch(String id) {
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetch/{id}")
+ public ResultBean fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysUserVo vo = sysUserService.fetchByIdVo(id);
return rb.success().setData(vo);
}
-
- public ResultBean fetchBySid(String sid) {
+ @ApiOperation("根据sid获取一条记录")
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SysUserVo vo = sysUserService.fetchBySidVo(sid);
return rb.success().setData(vo);
}
-
- public ResultBean> fetchBySids(String sids) {
+ @ApiOperation("根据多个或者一个sid获取对应的用户集合")
+ @GetMapping("/fetchBySids/{sids}")
+ public ResultBean> fetchBySids(@PathVariable("sids") String sids){
ResultBean rb = ResultBean.fireFail();
List 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().success().setData(userInfoOneVo);
}
- public ResultBean loginByNoVeriCode(SysUserQuery userQuery) {
+ @PostMapping("/loginByNoVeriCode")
+ @ResponseBody
+ @ApiOperation(value = "3、登录无验证码")
+ @ApiOperationSupport(order = 30)
+ public ResultBean 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 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 selectByStaffsid(@PathVariable("staffsid") String staffsid){
SysUserVo user = sysUserService.selectByStaffsid(staffsid);
if (user != null) {
return new ResultBean().success().setData(user);
@@ -579,7 +657,9 @@ public class SysUserRest {
}
- public ResultBean selectBySid(String sid) {
+ @ApiOperation("根据sid查询用户信息")
+ @PostMapping("/selectBySid")
+ public ResultBean 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 selectUserInfoByUserSid(String userSid) {
+ @ApiOperation(value = "根据用户的sid查询用户的组织信息")
+ @ResponseBody
+ @GetMapping("/selectUserInfoByUserSid/{userSid}")
+ public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid){
ResultBean rb = ResultBean.fireFail();
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid);
if (sysUserInfoVo == null) {
@@ -637,7 +720,10 @@ public class SysUserRest {
}
- public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) {
+ @ApiOperation(value = "根据用户的sid查询用户的组织信息")
+ @ResponseBody
+ @GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}")
+ public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid, @PathVariable("orgSid") String orgSid){
ResultBean 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> getUserByRole(UserQuery query) {
+ @ApiOperation(value = "获取本机构链角色的用户")
+ @GetMapping(value = "getUserByRole")
+ ResultBean> getUserByRole(@SpringQueryMap UserQuery query) {
return sysUserService.getUserByRole(query);
}
- public ResultBean> getUserSidByRole(UserQuery query) {
+ @ApiOperation(value = "获取本机构链角色的用户sid")
+ @GetMapping(value = "getUserSidByRole")
+ ResultBean> getUserSidByRole(@SpringQueryMap UserQuery query) {
return sysUserService.getUserSidByRole(query);
}
- public ResultBean> getUsersByRoles(UserssQuery usersQuery) {
+ @ApiOperation(value = "获取本机构链角色的用户")
+ @PostMapping(value = "getUsersByRoles")
+ ResultBean> getUsersByRoles(@RequestBody UserssQuery usersQuery) {
return sysUserService.getUsersByRoles(usersQuery);
}
-
- public ResultBean> getUserByOrgRole(UserRoleQuery query) {
+ /**
+ * 参数：当前用户角色sid，部门sid
+ *
+ * @param query
+ * @return
+ */
+ @ApiOperation(value = "获取本部门直属上级角色的用户")
+ @GetMapping(value = "getUserByOrgRole")
+ ResultBean> getUserByOrgRole(@SpringQueryMap UserRoleQuery query) {
return sysUserService.getUserByOrgRole(query);
}
- public ResultBean> getOtherOrgRoleUser(UserRoleQuery query) {
+ /**
+ * 参数为下一环节角色sid，机构sid
+ *
+ * @param query
+ * @return
+ */
+ @ApiOperation(value = "获取其他机构链角色的用户")
+ @GetMapping(value = "getOtherOrgRoleUser")
+ ResultBean> getOtherOrgRoleUser(@SpringQueryMap UserRoleQuery query) {
return sysUserService.getOtherOrgRoleUser(query);
}
- public ResultBean>> getUserByOrgSid(String orgSid, String userSid) {
+ @ApiOperation(value = "获取当前分公司下所有员工的userSid和员工姓名")
+ @GetMapping(value = "getUserByOrgSid")
+ ResultBean>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid){
return sysUserService.getUserByOrgSid(orgSid, userSid);
}
-
- public ResultBean selectIdBySid(List stringList) {
+ @ApiOperation(value = "根据用户sid获取用户id")
+ @PostMapping(value = "selectIdBySid")
+ ResultBean selectIdBySid(@RequestBody List stringList) {
return sysUserService.selectIdBySid(stringList);
}
- public ResultBean> selectSysUserList(String userSid, String orgPath) {
+ @ApiOperation(value = "根据用户sid查询该分公司下所有销售经理的用户")
+ @GetMapping(value = "selectSysUserList")
+ ResultBean> selectSysUserList(@RequestParam("userSid") String userSid, @RequestParam(value = "orgPath", required = false) String orgPath){
return sysUserService.selectSysUserList(userSid, orgPath);
}
- public ResultBean selectPasswordByUserSid(String userSid) {
+ @ApiOperation(value = "查询是否需要更换密码")
+ @GetMapping(value = "/selectPasswordByUserSid/{userSid}")
+ ResultBean 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> getOrgListByUserSid(String userSid) {
-// return sysUserService.getOrgListByUserSid(userSid);
-// }
+ @ApiOperation(value = "根据用户sid获取当前用户所有的组织机构list")
+ @GetMapping(value = "/getOrgListByUserSid")
+ ResultBean> getOrgListByUserSid(@RequestParam("userSid") String userSid) {
+ return sysUserService.getOrgListByUserSid(userSid);
+ }
- public ResultBean> getUserByRoles(UserByRolesAndOrgQuery userQuery) {
+ @ApiOperation(value = "根据多个角色sid以及机构sid获取本机构链角色的用户")
+ @PostMapping(value = "/getUserByRoles")
+ ResultBean> getUserByRoles(@RequestBody UserByRolesAndOrgQuery userQuery) {
return sysUserService.getUserByRoles(userQuery);
}
- public ResultBean> shareSelectUser(ShareUserQuery shareUserQuery) {
+ @ApiOperation(value = "分享时查询的人员")
+ @PostMapping(value = "/shareSelectUser")
+ ResultBean> shareSelectUser(@RequestBody ShareUserQuery shareUserQuery){
return sysUserService.shareSelectUser(shareUserQuery);
}
- public ResultBean selectPrivilegeLevel(PrivilegeQuery query) {
+ @ApiOperation(value = "查询角色权限的层级获取权限id")
+ @PostMapping(value = "/selectPrivilegeLevel")
+ ResultBean selectPrivilegeLevel(@RequestBody PrivilegeQuery query) {
return sysUserService.selectPrivilegeLevel(query);
}
- public ResultBean removeRedis() {
+ @ApiOperation(value = "清除所有离职人员的移动端登录缓存")
+ @PostMapping(value = "/removeRedis")
+ ResultBean removeRedis() {
return sysUserService.removeRedis();
}
}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java
similarity index 61%
rename from src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java
rename to src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java
index c1d5413..b0131c0 100644
--- a/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java
@@ -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> listPage(@RequestBody PagerQuery pq){
ResultBean rb = ResultBean.fireFail();
PagerVo pv = sysUserRoleService.listPageVo(pq);
return rb.success().setData(pv);
}
-
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
public ResultBean> listAll(@RequestBody SysUserRoleQuery query){
ResultBean rb = ResultBean.fireFail();
List list = sysUserRoleService.listAllVo(query);
return rb.success().setData(list);
}
-
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
public ResultBean> list(){
ResultBean rb = ResultBean.fireFail();
List 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 fetch(String id){
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetch/{id}")
+ public ResultBean fetch(@PathVariable("id") String id){
ResultBean rb = ResultBean.fireFail();
SysUserRoleVo vo = sysUserRoleService.fetchByIdVo(id);
return rb.success().setData(vo);
}
-
- public ResultBean> getUserRoleSidByUserSid(String userSid) {
+ @ApiOperation("根据用户sid查询用户角色sid列表")
+ @GetMapping("/getUserRoleSidByUserSid/{userSid}")
+ public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid) {
return sysUserRoleService.getUserRoleSidByUserSid(userSid);
}
-
- public ResultBean> getUserIdListByRoleSid(List roleList) {
+ @ApiOperation("根据角色sid查询用户id列表")
+ @GetMapping("/getUserIdListByRoleSid")
+ public ResultBean> getUserIdListByRoleSid(@RequestParam("roleList") List roleList) {
return sysUserRoleService.getUserIdListByRoleSid(roleList);
}
-
- public ResultBean> selectByUserSid(String userSid) {
+ @ApiOperation("查询用户的角色")
+ @GetMapping("/selectByUserSid")
+ ResultBean> selectByUserSid(@RequestParam("userSid") String userSid) {
return sysUserRoleService.selectByUserSids(userSid);
}
}
diff --git a/src/main/java/com/yxt/user/apiwx/WxHomeRest.java b/src/main/java/com/yxt/portal/apiwx/WxHomeRest.java
similarity index 88%
rename from src/main/java/com/yxt/user/apiwx/WxHomeRest.java
rename to src/main/java/com/yxt/portal/apiwx/WxHomeRest.java
index 9dbbfde..9c73c03 100644
--- a/src/main/java/com/yxt/user/apiwx/WxHomeRest.java
+++ b/src/main/java/com/yxt/portal/apiwx/WxHomeRest.java
@@ -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;
diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java
new file mode 100644
index 0000000..8c66e73
--- /dev/null
+++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java
@@ -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;
+}
diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java
new file mode 100644
index 0000000..401258e
--- /dev/null
+++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java
@@ -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;
+}
diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java
new file mode 100644
index 0000000..fc738da
--- /dev/null
+++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java
@@ -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> pageList(@RequestBody PagerQuery 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 selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type);
+
+ @GetMapping("/typeValues")
+ @ResponseBody
+ @ApiOperation("下拉框的获取")
+ ResultBean> 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> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum);
+}
diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java
new file mode 100644
index 0000000..e5a7aa7
--- /dev/null
+++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java
@@ -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> pageList(PagerQuery pagerQuery) {
+ return new ResultBean>().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 selectBykey(String key, String type) {
+ return null;
+ }
+
+ @Override
+ public ResultBean> getTypeValues(String type, String psid) {
+ return null;
+ }
+
+ @Override
+ public ResultBean getFirstDictKeyByType(String dictType, String psid) {
+ return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+ }
+
+ @Override
+ public ResultBean> getTypeValueList(String type, String groupNum) {
+ return null;
+ }
+}
diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java
new file mode 100644
index 0000000..c6e84ae
--- /dev/null
+++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java
@@ -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