diff --git a/pom.xml b/pom.xml
index ae052fe..2305cda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,12 @@
easyexcel
3.3.2
+
+ org.jetbrains
+ annotations
+ 21.0.1
+ compile
+
diff --git a/src/main/java/com/yxt/user/UserApplication.java b/src/main/java/com/yxt/user/UserApplication.java
index 6e5d661..52f7e15 100644
--- a/src/main/java/com/yxt/user/UserApplication.java
+++ b/src/main/java/com/yxt/user/UserApplication.java
@@ -1,18 +1,18 @@
package com.yxt.user;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
- * @author dimengzhe
+ * @author wangpengfei
+ * @date 2024/4/28 14:43
*/
@SpringBootApplication(scanBasePackages = {
"com.yxt.user.config",
"com.yxt.common.base.config",
- "com.yxt.goods"
+ "com.yxt.user"
})
// 启用自带定时任务
@EnableScheduling
diff --git a/src/main/java/com/yxt/user/apiadmin/SmsRest.java b/src/main/java/com/yxt/user/apiadmin/SmsRest.java
new file mode 100644
index 0000000..c68e2ca
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SmsRest.java
@@ -0,0 +1,45 @@
+package com.yxt.user.apiadmin;
+
+import com.yxt.user.biz.sms.SmsDto;
+import com.yxt.user.biz.sms.SmsFeign;
+import com.yxt.user.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;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysFunctionFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysfunction.SysFunctionRest
+ * 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/sms")
+public class SmsRest {
+
+
+ public ResultBean SendWaitWorkMsg(SmsDto dto) {
+ String mobile = dto.getMobile();
+ String msg = dto.getMsg();
+ if (StringUtils.isBlank(mobile)){
+ return ResultBean.fireFail().setMsg("手机号不能为空!");
+ }
+ if (StringUtils.isBlank(msg)){
+ return ResultBean.fireFail().setMsg("信息不能为空!");
+ }
+ String result = MsgWs.SendWaitWorkMsg(mobile, msg);
+ return ResultBean.fireSuccess();
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java b/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java
new file mode 100644
index 0000000..b8c271c
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java
@@ -0,0 +1,218 @@
+package com.yxt.user.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.user.biz.syssourcefunction.SysSourceFunction;
+import com.yxt.user.biz.syssource.SysSourceService;
+//import com.yxt.user.biz.syssourcefunction.SysSourceFunctionService;
+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 io.swagger.annotations.Api;
+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 java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysFunctionFeignFallback.java
+ * Class: com.yxt.user.biz.sysfunction.SysFunctionRest
+ * 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/sysfunction")
+public class SysFunctionRest {
+
+ @Autowired
+ private SysFunctionService sysFunctionService;
+ @Autowired
+ private SysSourceService sysSourceService;
+// @Autowired
+// private SysSourceFunctionService sysSourceFunctionService;
+
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysFunctionService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ public ResultBean> listAll(@RequestBody SysFunctionQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysFunctionService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> listAllByRoleSid(SysFunctionQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysFunctionService.listAllByRoleSid(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> listAllVoForSource(@RequestBody SysFunctionQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysFunctionService.listAllVoForSource(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list() {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysFunctionService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysFunctionDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sourceSid = dto.getSourceSid();
+ if (StringUtils.isBlank(sourceSid)) {
+ return ResultBean.fireFail().setMessage("资源不能为空");
+ } else {
+ SysSourceVo sysSourceVo = sysSourceService.fetchBySidVo(sourceSid);
+ if (sysSourceVo.getSid() == null) {
+ return ResultBean.fireFail().setMessage("资源不存在");
+ }
+ }
+ String pSid = dto.getParentSid();
+ if (StringUtils.isBlank(pSid)) {
+ return ResultBean.fireFail().setMessage("菜单父级sid不能为空");
+ } else {
+ if (!"0".equals(pSid)) {
+ SysFunction sysFunction = sysFunctionService.fetchBySid(pSid);
+ if (StringUtils.isBlank(sysFunction.getSid())) {
+ return ResultBean.fireFail().setMessage("菜单父级不存在!");
+ }
+ }
+ }
+ sysFunctionService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ public ResultBean update(SysFunctionDto dto, String sid) {
+ SysFunction sysFunction = sysFunctionService.fetchBySid(sid);
+ if (sysFunction.getSid() == null) {
+ return ResultBean.fireFail().setMessage("功能不存在!");
+ }
+ ResultBean rb = ResultBean.fireFail();
+ sysFunctionService.updateBySid(dto.toMap(), sid);
+// SysSourceFunction sysSourceFunction1 = sysSourceFunctionService.fetchByFunctionSid(sid);
+// sysSourceFunctionService.delByFunctionSid(sid);
+// SysSourceFunction sysSourceFunction = new SysSourceFunction();
+// sysSourceFunction.setFunctionRootSid(sysSourceFunction1.getFunctionRootSid());
+// sysSourceFunction.setFunctionSid(sid);
+// sysSourceFunction.setSourceSid(dto.getSourceSid());
+// sysSourceFunctionService.insert(sysSourceFunction);
+ return rb.success();
+ }
+
+
+ public ResultBean updateIsEnable(String sid, Integer isEnable) {
+ ResultBean rb = ResultBean.fireFail();
+ SysFunction sysFunction = sysFunctionService.fetchBySid(sid);
+ if (sysFunction == null) {
+ //查询资源是否存在
+ SysSource sysSource = sysSourceService.fetchBySid(sid);
+ if (sysSource == null) {
+ return ResultBean.fireFail().setMessage("功能不存在!");
+ } else {
+ //将该资源下的所有功能关闭
+// List sids = sysSourceFunctionService.selectBySourceSid(sid);
+// if (sids.size() != 0) {
+// sysFunctionService.updateBySourceSid(isEnable, sids);
+// }
+
+ }
+ } else {
+ sysFunction.setIsEnable(isEnable);
+ sysFunctionService.updateById(sysFunction);
+ }
+
+ return rb.success();
+ }
+
+
+ public ResultBean del(String ids) {
+ ResultBean rb = ResultBean.fireFail();
+ sysFunctionService.delByIds(ids);
+ return rb.success();
+ }
+
+
+ public ResultBean delBySids(String sids) {
+ ResultBean rb = ResultBean.fireFail();
+ String[] sidsArr = sids.split(",");
+// for (String functionSid : sidsArr) {
+// sysSourceFunctionService.delByFunctionSid(functionSid);
+// }
+ sysFunctionService.delBySids(sidsArr);
+ return rb.success();
+ }
+
+
+ public ResultBean fetch(String id) {
+ ResultBean rb = ResultBean.fireFail();
+ SysFunctionVo vo = sysFunctionService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean fetchBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysFunction entity = sysFunctionService.fetchBySid(sid);
+ SysFunctionVo vo = new SysFunctionVo();
+ BeanUtil.copyProperties(entity, vo);
+// SysSourceFunction sysSourceFunction = sysSourceFunctionService.fetchByFunctionSid(sid);
+// vo.setSourceSid(sysSourceFunction.getSourceSid());
+ if ("0".equals(entity.getParentSid())) {
+ vo.setParentSid("0");
+ vo.setParentName("顶级功能");
+ } else {
+ SysFunction sysFunction = sysFunctionService.fetchBySid(entity.getParentSid());
+ vo.setParentSid(sysFunction.getSid());
+ vo.setParentName(sysFunction.getName());
+ }
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean>> getFunctionAuthorization(String roleSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List> list=sysFunctionService.getFunctionAuthorization(roleSid);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean>> getFunctionAuthorizationApp(String roleSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List> list=sysFunctionService.getFunctionAuthorizationApp(roleSid);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> getButtonPermissions(ButtonPermissionQuery query) {
+ ResultBean> rb = ResultBean.fireFail();
+ return rb.success().setData(sysFunctionService.getButtonPermissions(query));
+ }
+ //getFunctionAuthorization(){
+ // }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java
new file mode 100644
index 0000000..947fbc8
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java
@@ -0,0 +1,265 @@
+package com.yxt.user.apiadmin;
+
+import com.yxt.user.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.user.biz.syssourcemenu.SysSourceMenu;
+//import com.yxt.user.biz.syssourcemenu.SysSourceMenuVo;
+import com.yxt.user.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.user.biz.syssourcemenu.SysSourceMenuService;
+import com.yxt.user.biz.sysuser.SysUserService;
+import com.yxt.user.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 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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysMenuFeignFallback.java
+ * Class: com.yxt.user.biz.sysmenu.SysMenuRest
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单表")
+@RestController
+@RequestMapping("v1/sysmenu")
+public class SysMenuRest {
+// @Autowired
+// private SysSourceMenuService sysSourceMenuService;
+ @Autowired
+ private SysMenuService sysMenuService;
+ @Autowired
+ private SysSourceService sysSourceService;
+ @Autowired
+ private SysUserRoleService sysUserRoleService;
+// @Autowired
+// private SysMenuRoleService sysMenuRoleService;
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired
+ private SysRoleService sysRoleService;
+
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysMenuService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ /* @Override
+ public ResultBean> listAll(@RequestBody SysMenuQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysMenuService.listAllVo(query);
+ return rb.success().setData(list);
+ }*/
+
+
+ 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) {
+ ResultBean rb = ResultBean.fireFail();
+ SysMenuQuery smq= new SysMenuQuery();
+ smq.setSourceSid(sysMenuFunctionQuery.getSourceSid());
+ List list = sysMenuService.listAllVoForSource(smq);
+ List> l=new ArrayList<>();
+ list.forEach(f->{
+ if(sysMenuFunctionQuery.getSourceSid().equals(f.getSourceSid())){
+ makeMenuListForChildren(f,l);
+ }
+ });
+ return rb.success().setData(l);
+ }
+ private void makeMenuListForChildren(SysMenuTreeVo s, List> l){
+ List children = s.getChildren();
+ int size = children.size();
+ for (int i=0;i m=new HashMap<>();
+ m.put("name",s.getName());
+ m.put("url",s.getMenuUrl());
+ m.put("sid",s.getSid());
+ l.add(m);
+ }
+
+ }
+
+ public ResultBean>> sourcemenutree(SysMenuQuery query) {
+ ResultBean>> rb = ResultBean.fireFail();
+// SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
+ List> list = new ArrayList<>();
+ if (null == query)
+ return rb.setData(list);
+
+ //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);
+ }
+
+
+ public ResultBean> listAllByRoleSid(SysMenuQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ String roleSid = query.getRoleSid();
+ if (StringUtils.isBlank(roleSid)) {
+ ResultBean> resultBean = new ResultBean>();
+ return resultBean.fail().setMessage("角色sid不能为空!");
+ }
+ List sysSourceVos = sysSourceService.listVo();
+ List list = new ArrayList<>();
+ for (SysSourceVo s : sysSourceVos) {
+ SysMenuVo sysMenuVo = new SysMenuVo();
+ sysMenuVo.setName(s.getSourceName());
+ sysMenuVo.setSid(s.getSid());
+ sysMenuVo.setChecked("1");
+ query.setSourceSid(s.getSid());
+ sysMenuVo.setChildren(sysMenuService.listAllByRoleSid(query));
+ list.add(sysMenuVo);
+ }
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list() {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysMenuService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysMenuDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sourceSid = dto.getSourceSid();
+ SysSource sysSource = sysSourceService.fetchBySid(sourceSid);
+ if (sysSource == null) {
+ return rb.setMsg("资源不存在");
+ }
+ sysMenuService.saveMenu(dto);
+ return rb.success();
+ }
+
+
+ public ResultBean update(SysMenuDto dto, String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ //查询菜单是否存在
+ SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+ if (sysMenu == null) {
+ return rb.setMsg("菜单不存在");
+ }
+ String sourceSid = dto.getSourceSid();
+// SysSourceMenuVo vo = sysSourceMenuService.fetchByMenuSid(sid);
+// if (!sourceSid.equals(vo.getSourceSid())) {
+// sysSourceMenuService.delByMenuSid(sid);
+// SysSourceMenu sysSourceMenu = new SysSourceMenu();
+// sysSourceMenu.setMenuSid(sid);
+// sysSourceMenu.setSourceSid(dto.getSourceSid());
+// sysSourceMenu.setMenuRootSid(vo.getMenuRootSid());
+// sysSourceMenuService.save(sysSourceMenu);
+// }
+ sysMenuService.updateBySid(dto, sid);
+ return rb.success();
+ }
+
+
+ public ResultBean updateIsEnable(String sid, Integer isEnable) {
+ ResultBean rb = ResultBean.fireFail();
+ SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+ if (sysMenu == null) {
+ //查询资源是否存在
+ SysSource sysSource = sysSourceService.fetchBySid(sid);
+ if (sysSource == null) {
+ return ResultBean.fireFail().setMessage("菜单不存在!");
+ } else {
+ //将该资源下的所有菜单关闭
+ sysMenuService.updateBySourceSid(sid, isEnable);
+ }
+ } else {
+ sysMenu.setIsEnable(isEnable);
+ sysMenuService.updateById(sysMenu);
+ }
+
+ return rb.success();
+ }
+
+ /* @Override
+ public ResultBean del(String ids) {
+ ResultBean rb = ResultBean.fireFail();
+ sysMenuService.delByIds(ids);
+ return rb.success();
+ }*/
+
+
+ public ResultBean delBySids(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+ if (sysMenu == null) {
+ return rb.setMsg("该菜单不存在");
+ }
+// sysSourceMenuService.delByMenuSid(sid);
+ sysMenuService.deleteBySid(sid);
+ return rb.success();
+ }
+
+ /* @Override
+ public ResultBean fetch(String id) {
+ ResultBean rb = ResultBean.fireFail();
+ SysMenuVo vo = sysMenuService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean fetchBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+ SysMenuVo vo = new SysMenuVo();
+ BeanUtil.copyProperties(sysMenu, vo);
+ return rb.success().setData(vo);
+ }*/
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java b/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java
new file mode 100644
index 0000000..968ea1b
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java
@@ -0,0 +1,415 @@
+package com.yxt.user.apiadmin;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.config.RedisUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.utils.QRCodeUtil;
+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 io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.io.File;
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysOrganizationFeignFallback.java
+ * Class: SysOrganizationRest
+ * 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/sysorganization")
+public class SysOrganizationRest{
+
+ @Autowired
+ private SysOrganizationService sysOrganizationService;
+ @Autowired
+ private SysStaffOrgService sysStaffOrgService;
+ @Autowired
+ private SysStaffinfoService sysStaffinfoService;
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @PostMapping("/saveSysOrg")
+ public ResultBean saveOrg(@RequestBody SysOrganizationDto dto){
+ return sysOrganizationService.saveOrg(dto);
+ }
+
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ String psid = pq.getParams().getPsid();
+ if (StringUtils.isBlank(psid)) {
+ ResultBean> r = new ResultBean<>();
+ return r.setMessage("父级sid不能为空!");
+ }
+ PagerVo pv = sysOrganizationService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ public ResultBean> listAll(@RequestBody SysOrganizationQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysOrganizationService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list() {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysOrganizationService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysOrganizationDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ sysOrganizationService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ public ResultBean> selectFirstOrgList() {
+ return new ResultBean>().success().setData(sysOrganizationService.selectFirstOrgList());
+ }
+
+
+ public ResultBean> selectChildrenListBySid(String sid) {
+ return new ResultBean>().success().setData(sysOrganizationService.selectChildrenListBySid(sid));
+ }
+
+
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean update(SysOrganizationDto dto, String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ //查询该机构下的所有分管人员
+ List stringList = sysStaffOrgService.selectByOrgSid(sid);
+ //根据组织sid查询组织信息
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
+ if (sysOrganization == null) {
+ return rb.setMsg("该组织机构不存在");
+ }
+ BeanUtil.copyProperties(dto, sysOrganization, "sid");
+ //主管人员的sid
+ String zgStaffSid = dto.getZgStaffSid();
+ //分管人员的sid
+ String fgStaffSid = dto.getFgStaffSid();
+ //查询分管人员中是否包含主管人员
+ if (StringUtils.isNotBlank(fgStaffSid)) {
+ if (StringUtils.isNotBlank(zgStaffSid)) {
+ if (fgStaffSid.contains(zgStaffSid)) {
+ return rb.setMsg("同一个组织机构中主管分管的人员不能重复");
+ }
+ }
+ }
+ //删除关联关系中的所有主管与分管的人员关系
+ sysStaffOrgService.delZGAndFGByOrgSid(sid);
+ /*if (StringUtils.isNotBlank(zgStaffSid)) {
+ ResultBean resultBean = sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", sysOrganization);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ }*/
+ if (StringUtils.isNotBlank(fgStaffSid)) {
+ ResultBean resultBean = sysOrganizationService.addSysStaffOrg(fgStaffSid, "2", sysOrganization);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ }
+ sysOrganizationService.updateBySid(dto.toMap(), sid);
+ //修改金蝶组织信息
+ //==========================添加清空变化的用户的token
+ //查询分管人员
+ List stringList1 = new ArrayList<>();
+ List reduce1 = new ArrayList<>();
+ if(StringUtils.isNotBlank(fgStaffSid)){
+ stringList1 = Arrays.asList(fgStaffSid.split(","));
+ reduce1 = stringList1.stream().filter(item -> !stringList.contains(item)).collect(toList());
+ }else{
+ reduce1 = stringList;
+ }
+ String orgSid1 = sysStaffOrgService.getOrgByOrgSid(sid);
+ if(reduce1.size()>0){
+ for (String s : reduce1){
+ //查询该人员的组织机构list
+ List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(s);
+ List orgList = new ArrayList<>();
+ if (sysStaffOrgVos.size() > 0) {
+ for (SysStaffOrgVo vv : sysStaffOrgVos) {
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+ SysOrganization ss = sysOrganizationService.fetchBySid(orgSid);
+ if (ss != null) {
+ orgList.add(orgSid);
+ } else {
+ continue;
+ }
+ }
+ }
+ if(!orgList.contains(orgSid1)){
+ //根据staffSid查询token
+ String token = sysUserService.selectByStaffsid(s).getToken();
+ if(StringUtils.isNotBlank(token)){
+ //清空该token
+ redisUtil.remove(token);
+ }
+ }
+ }
+
+ }
+ return rb.success();
+ }
+
+
+ public ResultBean del(String ids) {
+ ResultBean rb = ResultBean.fireFail();
+ sysOrganizationService.delByIds(ids);
+ return rb.success();
+ }
+
+
+ public ResultBean delBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(sid)) {
+ return ResultBean.fireFail().setMessage("sid不能为空!");
+ }
+ String[] sidArr = sid.split(",");
+ sysOrganizationService.delBySids(sidArr);
+ return rb.success();
+ }
+
+
+ public ResultBean fetch(String id) {
+ ResultBean rb = ResultBean.fireFail();
+ SysOrganizationVo vo = sysOrganizationService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean fetchBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysOrganization entity = sysOrganizationService.fetchBySid(sid);
+ List list = sysStaffOrgService.fetchByOrgSid(sid);
+ String fgNames = "";
+ String fgSids = "";
+ String zgNames = "";
+ String zgSids = "";
+ for (SysStaffOrgVo s : list) {
+ if ("1".equals(s.getManageType())) {
+ zgNames = zgNames + "," + s.getStaffName();
+ zgSids = zgSids + "," + s.getStaffSid();
+ }
+ if ("2".equals(s.getManageType())) {
+ fgNames = fgNames + "," + s.getStaffName();
+ fgSids = fgSids + "," + s.getStaffSid();
+ }
+ }
+ if (fgNames.length() > 1) {
+ fgNames = fgNames.substring(1, fgNames.length());
+ fgSids = fgSids.substring(1, fgSids.length());
+ }
+ if (zgNames.length() > 1) {
+ zgNames = zgNames.substring(1, zgNames.length());
+ zgSids = zgSids.substring(1, zgSids.length());
+ }
+ SysOrganizationVo vo = new SysOrganizationVo();
+ BeanUtil.copyProperties(entity, vo);
+ vo.setFgNames(fgNames);
+ vo.setFgStaffSid(fgSids);
+ vo.setZgNames(zgNames);
+ vo.setZgStaffSid(zgSids);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean> selectAppOrganization(String sid) {
+ Map map = new HashMap<>();
+ List> nameList = sysOrganizationService.selectOrgNameList(sid);
+ List staffList = new ArrayList<>();
+ List list = null;
+ if (StringUtils.isBlank(sid)) { // 组织架构
+ list = sysOrganizationService.selectAppOrganization();
+ } else { // 组织架构子集
+ list = sysOrganizationService.selectAppOrganizationSub(sid);
+ staffList = sysStaffinfoService.selectContactsByOrgsid(sid);
+ list.addAll(staffList);
+ }
+ map.put("nameList", nameList);
+ map.put("list", list);
+// map.put("staffList", staffList);
+ return new ResultBean>().success().setData(map);
+ }
+
+
+ public ResultBean> selectListOrg() {
+ ResultBean> rb = ResultBean.fireFail();
+ List menuTree2VoList = sysOrganizationService.treeList();
+ return rb.success().setData(menuTree2VoList);
+ }
+
+
+ public ResultBean> getListOrg() {
+ ResultBean> rb = ResultBean.fireFail();
+ List menuTree2VoList = sysOrganizationService.getListOrg();
+ return rb.success().setData(menuTree2VoList);
+ }
+
+
+ public ResultBean> getListOrgByBrand(String orgSid) {
+ return null;//sysOrganizationService.getListOrgByBrand(orgSid);
+ }
+
+
+ public ResultBean> getListOrgByBrandSid(String orgSid, String brandSid) {
+ return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid);
+ }
+
+
+ public ResultBean> getListOrgByBrandSidNo(String orgSid, String brandSid) {
+ return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid);
+ }
+
+
+ public ResultBean> getListDeptByOrgSid(String orgSid) {
+ return sysOrganizationService.getListDeptByOrgSid(orgSid);
+ }
+
+
+ public ResultBean getUseOrgByUserSid(String userSid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean selectBySid(String sid) {
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
+ if (sysOrganization == null) {
+ return new ResultBean().fail().setData(new SysOrganization());
+ }
+ return new ResultBean().success().setData(sysOrganization);
+ }
+
+
+ public ResultBean>> selectUseOrgSidBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ List> maps = sysOrganizationService.selectUseOrgSidBySid(sid);
+ return rb.success().setData(maps);
+ }
+
+ /**
+ * 查询公司所有的部门
+ *
+ * @return
+ */
+
+ public ResultBean> selectListOne() {
+ ResultBean> rb = ResultBean.fireFail();
+ List sysOrgListVo = sysOrganizationService.selectTreeList();
+ if (sysOrgListVo.size() == 0) {
+ List list = new ArrayList();
+ list.add(new SysOrgListVo());
+ return rb.setData(list);
+ }
+ return rb.success().setData(sysOrgListVo);
+ }
+
+
+ public ResultBean getQrCode(String sid) {
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
+ if (sysOrganization == null) {
+ return new ResultBean().fail().setMsg("部门不存在");
+ }
+ if (StringUtils.isBlank(sysOrganization.getQrText())) {
+ File file = new File(fileUploadComponent.getUploadPath() + "qrCode");
+ QRCodeUtil.createCodeToFile(sysOrganization.getSid() + "#" + sysOrganization.getId() + "#" + "q", file, sysOrganization.getName() + sysOrganization.getId() + ".png");
+ //将该二维码地址放进部门表中的二维码图片地址中
+ String path = fileUploadComponent.getUrlPrefix() + "qrCode/" + sysOrganization.getName() + sysOrganization.getId() + ".png";
+ sysOrganizationService.updateQrCodePath(sid, path);
+ }
+ QrCodeVo qrCodeVo = sysOrganizationService.getQrCodeVo(sid);
+ String orgSidPath = sysOrganization.getOrgSidPath();
+ String[] split = orgSidPath.split("/");
+ for (String s : split) {
+ SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(s);
+ Integer isDept = sysOrganization1.getIsDept();
+ String psid = sysOrganization1.getPsid();
+ if (isDept != null) {
+ if (isDept == 0 && !psid.equals(0)) {
+ qrCodeVo.setOrganizationName(sysOrganization1.getName());
+ break;
+ }
+ }
+ }
+ return new ResultBean().success().setData(qrCodeVo);
+ }
+
+
+ public ResultBean getOrgSid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
+ if (sysOrganization == null) {
+ return rb.setMsg("该组织不存在");
+ }
+ String orgSid = sysOrganizationService.getOrgSid(sid);
+ return rb.success().setData(orgSid);
+ }
+
+
+ public ResultBean> selectOrgList(SysOrganizationListQuery query) {
+ return sysOrganizationService.selectOrgList(query);
+ }
+
+
+ public ResultBean> selectOrgLists(SysOrganizationListQuery query) {
+ return sysOrganizationService.selectOrgLists(query);
+ }
+
+
+ public ResultBean selectByPSid(String sid, String name) {
+ return sysOrganizationService.selectByPSid(sid,name);
+ }
+
+
+ public ResultBean> selectOrgSidList() {
+ ResultBean> rb = ResultBean.fireFail();
+ List stringList = sysOrganizationService.selectOrgSidList();
+ return rb.success().setData(stringList);
+ }
+
+
+ public ResultBean> selectOrgByPSid(String psid) {
+ return sysOrganizationService.selectOrgByPSid(psid);
+ }
+
+
+ public ResultBean selectByOrgSidPath(String orgSidPath) {
+ return sysOrganizationService.selectByOrgSidPath(orgSidPath);
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java b/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java
new file mode 100644
index 0000000..01c6349
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java
@@ -0,0 +1,153 @@
+package com.yxt.user.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 io.swagger.annotations.Api;
+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 java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleRest
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "角色")
+@RestController
+@RequestMapping("v1/sysrole")
+public class SysRoleRest {
+
+ @Autowired
+ private SysRoleService sysRoleService;
+
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysRoleService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ public ResultBean> listAll(@RequestBody SysRoleQuery query){
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysRoleService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> listAllByUserSid(String userSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysRoleService.listAllByUserSid(userSid);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> fetchByUserSid(String userSid) {
+ if(StringUtils.isBlank(userSid)){
+ return new ResultBean>().fail().setMsg("userSid不能为空");
+ }
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysRoleService.fetchByUserSid(userSid);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list(){
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysRoleService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysRoleDto dto){
+ String name = dto.getName();
+ if(StringUtils.isBlank(name)){
+ return new ResultBean>().fail().setMsg("角色名称不能为空!");
+ }else{
+ SysRoleVo sysRoleVo = sysRoleService.fetchByName(name);
+ if(sysRoleVo.getName()!=null){
+ return new ResultBean>().fail().setMsg("角色名称不能重复!");
+ }
+ }
+ ResultBean rb = ResultBean.fireFail();
+ sysRoleService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ public ResultBean update(SysRoleDto dto,String sid){
+ String roleName = dto.getName();
+ if(StringUtils.isBlank(sid)){
+ return new ResultBean>().fail().setMsg("角色sid不能为空!");
+ }
+ if(StringUtils.isBlank(roleName)){
+ return new ResultBean>().fail().setMsg("角色名称不能为空!");
+ }else{
+ SysRoleVo sysRoleVo = sysRoleService.fetchByName(roleName);
+ if(sysRoleVo.getName()!=null&&!sid.equals(sysRoleVo.getSid())){
+ return new ResultBean>().fail().setMsg("角色名称不能重复!");
+ }
+ }
+ ResultBean rb = ResultBean.fireFail();
+ sysRoleService.updateBySid(dto.toMap(),sid);
+ return rb.success();
+ }
+
+
+ public ResultBean del(String ids){
+ ResultBean rb = ResultBean.fireFail();
+ sysRoleService.delByIds(ids);
+ return rb.success();
+ }
+
+
+ public ResultBean delBySids(String sids) {
+ ResultBean rb = ResultBean.fireFail();
+ sysRoleService.delBySids(sids);
+ return rb.success();
+ }
+
+
+ public ResultBean fetch(String id){
+ ResultBean rb = ResultBean.fireFail();
+ SysRoleVo vo = sysRoleService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean fetchBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysRoleVo vo = sysRoleService.fetchBySidVo(sid);
+ if (StringUtils.isBlank(vo.getSid())) {
+ return rb.success().setData(null);
+ }
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean setIsEnable(String sid, String isEnable) {
+ SysRole role = sysRoleService.fetchBySid(sid);
+ if (role == null) {
+ return ResultBean.fireFail().setMsg("此角色已不存在");
+ }
+ int i = sysRoleService.updateIsEnable(sid, isEnable);
+ if (i == 0) {
+ return ResultBean.fireFail().setMsg("设置失败");
+ }
+ return ResultBean.fireSuccess().setMsg("设置成功");
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java b/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java
new file mode 100644
index 0000000..dd70dfd
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java
@@ -0,0 +1,131 @@
+package com.yxt.user.apiadmin;
+
+//import com.yxt.user.biz.systemlog.SystemLog;
+import com.yxt.user.biz.sysuser.SysUser;
+//import com.yxt.user.biz.systemlog.SystemLogService;
+import com.yxt.user.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 io.swagger.annotations.Api;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysSourceFeignFallback.java
+ * Class: com.yxt.user.biz.syssource.SysSourceRest
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "资源表")
+@RestController
+@RequestMapping("v1/syssource")
+public class SysSourceRest {
+// @Autowired
+// private SystemLogService systemLogService;
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired(required = false)
+ private HttpServletRequest httpServletRequest;
+ @Autowired
+ private SysSourceService sysSourceService;
+ @Autowired
+ private RedisUtil redisUtil;
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ String token = httpServletRequest.getHeader("token");
+ String s = redisUtil.get(token);
+ SysUser sysUser = sysUserService.fetchByUserName(s);
+// SystemLog systemLog = new SystemLog();
+// systemLog.setUserSid(sysUser.getSid());
+// systemLog.setCreateTime(new Date());
+// systemLog.setEventName("人员岗位保存");
+// systemLog.setEventContent("");
+// systemLog.setEventUrl("/portal/v1/sysstaffpost/save");
+// systemLog.setUserIp("0.0.0.0");
+// systemLog.setUserName(sysUser.getUserName());
+// systemLogService.save(systemLog);
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysSourceService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ public ResultBean> listAll(@RequestBody SysSourceQuery query){
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysSourceService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> listAllByRoleSid(SysSourceQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysSourceService.listAllByRoleSid(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list(){
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysSourceService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysSourceDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ sysSourceService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ public ResultBean update(SysSourceDto dto,String sid){
+ ResultBean rb = ResultBean.fireFail();
+ sysSourceService.updateBySid(dto.toMap(),sid);
+ return rb.success();
+ }
+
+
+ public ResultBean del(String ids){
+ ResultBean rb = ResultBean.fireFail();
+ sysSourceService.delByIds(ids);
+ return rb.success();
+ }
+
+
+ public ResultBean delBySids(String sids) {
+ ResultBean rb = ResultBean.fireFail();
+ String[] sidArr = sids.split(",");
+ sysSourceService.delBySids(sidArr);
+ return rb.success();
+ }
+
+
+ public ResultBean fetch(String id){
+ ResultBean rb = ResultBean.fireFail();
+ SysSourceVo vo = sysSourceService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean fetchBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysSourceVo vo = sysSourceService.fetchBySidVo(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java b/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java
new file mode 100644
index 0000000..2c30e26
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java
@@ -0,0 +1,162 @@
+package com.yxt.user.apiadmin;
+
+import com.yxt.user.biz.sysstafforg.*;
+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 io.swagger.annotations.Api;
+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 java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgFeignFallback.java
+ * Class: com.yxt.user.biz.sysstafforg.SysStaffOrgRest
+ * Description: 员工部门关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "员工部门关联表")
+@RestController
+@RequestMapping("v1/sysstafforg")
+public class SysStaffOrgRest {
+
+ @Autowired
+ private SysStaffOrgService sysStaffOrgService;
+
+
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysStaffOrgService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ public ResultBean> listAll(@RequestBody SysStaffOrgQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysStaffOrgService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list() {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysStaffOrgService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> staffinfoList(@RequestBody SysStaffOrgQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysStaffOrgService.staffinfoList(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysStaffOrgDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ sysStaffOrgService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ public ResultBean update(SysStaffOrgDto dto, String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ sysStaffOrgService.updateBySid(dto.toMap(), sid);
+ return rb.success();
+ }
+
+
+ public ResultBean del(String ids) {
+ ResultBean rb = ResultBean.fireFail();
+ sysStaffOrgService.delByIds(ids);
+ return rb.success();
+ }
+
+
+ public ResultBean fetch(String id) {
+ ResultBean rb = ResultBean.fireFail();
+ SysStaffOrgVo vo = sysStaffOrgService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean> getSysStaffOrgListByStaffSid(String staffSid) {
+ List list = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid);
+ if (list.size() > 0) {
+ return new ResultBean>().success().setData(list);
+ } else {
+ return new ResultBean().fail().setMsg("该员工无部门").setData(list);
+ }
+ }
+
+
+ public ResultBean getSysStaffOrgSidListByStaffSid(String staffSid) {
+ String orgSids = sysStaffOrgService.getSysStaffOrgSidListByStaffSid(staffSid);
+ if (StringUtils.isNotBlank(orgSids)) {
+ return new ResultBean().success().setData(orgSids);
+ } else {
+ return new ResultBean().fail().setMsg("该员工无部门").setData("");
+ }
+ }
+
+
+ public ResultBean selectSidPathByStaffSid(String applySid) {
+ return sysStaffOrgService.selectSidPathByStaffSid(applySid);
+ }
+
+
+ public ResultBean getOrgSidBySid(String orgSid) {
+ ResultBean rb = ResultBean.fireFail();
+ String orgPathSid = sysStaffOrgService.getOrgByOrgSid(orgSid);
+ return rb.success().setData(orgPathSid);
+ }
+
+
+ public ResultBean getOrgByStaffSid(String staffSid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSid(staffSid);
+ return rb.success().setData(sysStaffOrg);
+ }
+
+
+ public ResultBean getOrgSidByPath(String orgPath) {
+ return sysStaffOrgService.getOrgSidByPath(orgPath);
+ }
+
+
+ public ResultBean getOrgSidByPath2(String orgPath) {
+ return sysStaffOrgService.getOrgSidByPath2(orgPath);
+ }
+
+
+ public ResultBean> selAllByOrgPath(String orgSidPath,String roleSid) {
+ return sysStaffOrgService.selAllByOrgPath(orgSidPath,roleSid);
+ }
+
+
+ public ResultBean> selAllByOrgSidPath(String orgSidPath) {
+ return sysStaffOrgService.selAllByOrgSidPath(orgSidPath);
+ }
+
+
+ public ResultBean selectAllByStaffSid(String staffSid) {
+ return sysStaffOrgService.selectAllByStaffSid(staffSid);
+ }
+
+
+ public ResultBean getPathSidByUserSid(String applySid) {
+ return sysStaffOrgService.getPathSidByUserSid(applySid);
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java b/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java
new file mode 100644
index 0000000..4b78b88
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java
@@ -0,0 +1,124 @@
+package com.yxt.user.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.user.biz.systemlog.SystemLog;
+import com.yxt.user.biz.sysuser.SysUser;
+//import com.yxt.user.biz.systemlog.SystemLogService;
+import com.yxt.user.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 io.swagger.annotations.Api;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysStaffPostFeignFallback.java
+ * Class: com.yxt.user.biz.sysstaffpost.SysStaffPostRest
+ * Description: 员工岗位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "员工岗位关联表")
+@RestController
+@RequestMapping("v1/sysstaffpost")
+public class SysStaffPostRest {
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private SysStaffPostService sysStaffPostService;
+// @Autowired
+// private SystemLogService systemLogService;
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired(required = false)
+ private HttpServletRequest httpServletRequest;
+
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysStaffPostService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ public ResultBean> listAll(@RequestBody SysStaffPostQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysStaffPostService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list() {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysStaffPostService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysStaffPostDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ sysStaffPostService.saveOrUpdateDto(dto);
+ String token = httpServletRequest.getHeader("token");
+ String s = redisUtil.get(token);
+ SysUser sysUser = sysUserService.fetchByUserName(s);
+// SystemLog systemLog = new SystemLog();
+// systemLog.setUserSid(sysUser.getSid());
+// systemLog.setCreateTime(new Date());
+// systemLog.setEventName("人员岗位保存");
+// systemLog.setEventContent("");
+// systemLog.setEventUrl("/portal/v1/sysstaffpost/save");
+// systemLog.setUserIp("0.0.0.0");
+// systemLog.setUserName(sysUser.getUserName());
+// systemLogService.save(systemLog);
+ return rb.success();
+ }
+
+
+ public ResultBean update(SysStaffPostDto dto, String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ sysStaffPostService.updateBySid(dto.toMap(), sid);
+ return rb.success();
+ }
+
+
+ public ResultBean del(String ids) {
+ ResultBean rb = ResultBean.fireFail();
+ sysStaffPostService.delByIds(ids);
+ return rb.success();
+ }
+
+
+ public ResultBean fetch(String id) {
+ ResultBean rb = ResultBean.fireFail();
+ SysStaffPostVo vo = sysStaffPostService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean selectPost(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ String s = sysStaffPostService.selecctPost(sid);
+ if(StringUtils.isBlank(s)){
+ return rb.setMsg("操作失败");
+ }
+ return rb.success().setData(s);
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java b/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java
new file mode 100644
index 0000000..c3313e8
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java
@@ -0,0 +1,235 @@
+package com.yxt.user.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.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 io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
+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 java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoFeignFallback.java
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoRest
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "人员基础信息表")
+@RestController
+@RequestMapping("v1/sysstaffinfo")
+public class SysStaffinfoRest{
+
+ private final Long PAGECURRENT = 2L;
+ private final Long PAGESIZE = 2L;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+ @Autowired
+ private SysStaffinfoService sysStaffinfoService;
+
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+
+ /**
+ * 员工管理的分页列表
+ *
+ * @param pq 查询条件
+ * @return
+ */
+
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean> rb = ResultBean.fireFail();
+ IPage page = sysStaffinfoService.pagerList(pq);
+ PagerVo pv = new PagerVo<>();
+ PagerVo pv1 = PagerUtil.pageToVo(page, pv);
+ return rb.success().setData(pv1);
+ }
+
+ /**
+ * 员工信息的新增保存
+ *
+ * @param dto 数据传输对象
+ * @return
+ */
+
+ public ResultBean save(SysStaffinfoDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ ResultBean resultBean = sysStaffinfoService.saveStaffInfo(dto);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ return rb.success().setMsg(resultBean.getMsg());
+ }
+
+ /**
+ * 员工信息的修改保存
+ *
+ * @param dto 数据传输对象
+ * @param sid 员工信息sid
+ * @return
+ */
+
+ public ResultBean update(SysStaffinfoDto dto, String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ResultBean resultBean = sysStaffinfoService.updateStaffInfo(dto, sid);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ return rb.success().setMsg(resultBean.getMsg());
+ }
+
+ /**
+ * 进行删除操作，即设置员工类型为离职类型02的操作。
+ *
+ * @param sysStaffQuery 数据传输对象
+ * @return
+ */
+
+ public ResultBean del(SysStaffQuery sysStaffQuery) {
+ ResultBean rb = ResultBean.fireFail();
+ //查询员工是否是离职
+ SysStaffinfo sysStaffinfo = sysStaffinfoService.fetchBySid(sysStaffQuery.getSid());
+ if (sysStaffinfo == null) {
+ return rb.setMsg("员工不存在");
+ }
+ if ("01".equals(sysStaffinfo.getPersonTypeKey())) {
+ return rb.setMsg("此员工已是离职人员");
+
+ }
+ int i = sysStaffinfoService.del(sysStaffQuery);
+ if (i == 0) {
+ return rb.setMsg("失败");
+ }
+ return rb.success().setMsg("成功");
+ }
+
+
+ public ResultBean fetchBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysStaffinfoDetailsVo sysStaffinfo = sysStaffinfoService.selectDetailsBySid(sid);
+ if (sysStaffinfo == null) {
+ return rb.setData(new SysStaffinfoDetailsVo());
+ }
+ return rb.success().setData(sysStaffinfo);
+ }
+
+
+ public ResultBean>> getStaffName(String staffName, String deptSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List> staffNameList = sysStaffinfoService.getStaffName(staffName, deptSid);
+ return rb.success().setData(staffNameList);
+ }
+
+
+ public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List> staffNameList = sysStaffinfoService.getStaffNameByDeptSid(staffName, deptSid);
+ return rb.success().setData(staffNameList);
+ }
+
+
+
+ public ResultBean> selectAppContactsList(String names) {
+ return new ResultBean>().success().setData(sysStaffinfoService.selectAppContactsList());
+ }
+
+
+ public ResultBean selectAppContactsVO(String staffSid) {
+ if (StringUtils.isBlank(staffSid)) {
+ return new ResultBean().fail().setMsg("staffSid不能为空");
+ }
+ AppContactsDetailsVo appContactsDetailsVo = sysStaffinfoService.selectAppContactsVO(staffSid);
+ if (appContactsDetailsVo == null) {
+ return new ResultBean().fail().setMsg("查无此人信息");
+ }
+ if (StringUtils.isNotBlank(appContactsDetailsVo.getHeadImage())) {
+ appContactsDetailsVo.setHeadImage(fileUploadComponent.getUrlPrefix() + appContactsDetailsVo.getHeadImage());
+ }
+ List stringList = sysUserService.getPost(staffSid);
+ stringList.removeAll(Collections.singleton(null));
+ if (!stringList.isEmpty()) {
+ appContactsDetailsVo.setPosition(String.join("|", stringList));
+ }
+ return new ResultBean().success().setData(appContactsDetailsVo);
+ }
+
+
+ public ResultBean> searchAppContactsList(PagerQuery pq) {
+ String names = pq.getParams().getName();
+ if (StringUtils.isBlank(names))
+ return new ResultBean>().fail().setMsg("搜索内容不能为空");
+ PagerVo page1 = new PagerVo<>();
+ IPage iPage = sysStaffinfoService.searchAppContactsList(pq, names);
+ //把Ipage转换为PageVo
+ PagerVo pv_result = PagerUtil.pageToVo(iPage, page1);
+ pv_result.setMsg("找到 " + pv_result.getTotal() + " 个联系人 ");
+ return new ResultBean>().success().setData(pv_result);
+ }
+
+
+ public ResultBean> searchAppContactsList2(PagerQuery pq) {
+ PagerVo page1 = new PagerVo<>();
+ IPage iPage = sysStaffinfoService.searchAppContactsList2(pq);
+ //把Ipage转换为PageVo
+ PagerVo pv_result = PagerUtil.pageToVo(iPage, page1);
+ pv_result.setMsg("找到 " + pv_result.getTotal() + " 个联系人 ");
+ return new ResultBean>().success().setData(pv_result);
+ }
+
+
+ public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
+ return sysStaffinfoService.selectStaffList(pcSysStaffQuery);
+ }
+
+
+ public ResultBean> getUserList(PagerQuery pagerQuery) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = sysStaffinfoService.getUserList(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+
+ public ResultBean> getGressionUserList(String userSid) {
+ return sysStaffinfoService.getGressionUserList(userSid, "");
+ }
+
+
+ public ResultBean> getGressionUserList(String userSid, String orgPath) {
+ return sysStaffinfoService.getGressionUserList(userSid, orgPath);
+ }
+
+
+ public ResultBean> selectStaffLists() {
+ return sysStaffinfoService.selectStaffLists();
+ }
+
+
+ public ResultBean> selectStaffListss() {
+ return sysStaffinfoService.selectStaffListss();
+ }
+
+
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java b/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java
new file mode 100644
index 0000000..804ea25
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java
@@ -0,0 +1,34 @@
+package com.yxt.user.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 io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:26
+ * @Description
+ */
+@Api(tags = "用户默认的组织机构")
+@RestController
+@RequestMapping("v1/sysuserdefaultorg")
+public class SysUserDefaultOrgRest {
+
+ @Autowired
+ private SysUserDefaultOrgService sysUserDefaultOrgService;
+
+
+ public ResultBean getList(String userSid) {
+ return sysUserDefaultOrgService.getList(userSid);
+ }
+
+
+ public ResultBean saveOrUpdate(SysUserDefaultOrgDto dto) {
+ return sysUserDefaultOrgService.saveDefaultOrg(dto);
+ }
+}
diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java b/src/main/java/com/yxt/user/apiadmin/SysUserRest.java
new file mode 100644
index 0000000..c0cee35
--- /dev/null
+++ b/src/main/java/com/yxt/user/apiadmin/SysUserRest.java
@@ -0,0 +1,619 @@
+package com.yxt.user.apiadmin;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.base.config.RedisUtil;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysUserFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysuser.SysUserRest
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "用户表")
+@RestController
+@RequestMapping("v1/sysuser")
+public class SysUserRest {
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired
+ private SysStaffinfoService sysStaffinfoService;
+ @Autowired
+ private SysStaffOrgService sysStaffOrgService;
+ @Autowired
+ private SysStaffPostService sysStaffPostService;
+ @Autowired
+ private SysOrganizationService sysOrganizationService;
+ @Autowired
+ private SysPostService sysPostService;
+ @Autowired
+ private HttpServletRequest httpServletRequest;
+// @Autowired
+// private SystemLogService systemLogService;
+ // 定义点选文字图片验证码允许的误差值
+ private static final int ERROR_AMOUNT = 50;// 定义允许的误差值，单位是px
+
+
+ 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) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysUserService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean> list() {
+ ResultBean rb = ResultBean.fireFail();
+ List list = sysUserService.listVo();
+ return rb.success().setData(list);
+ }
+
+
+ public ResultBean save(SysUserDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ //手机号
+ String mobile = dto.getMobile();
+ //姓名
+ String name = dto.getName();
+ //用户类型
+ int userType = dto.getUserType();
+ //部门sid
+ String deptSid = dto.getDeptSid();
+ //岗位sid
+ String postSid = dto.getPostSid();
+ //验证码
+ String verificationCode = dto.getVerificationCode();
+
+ if (StringUtils.isBlank(mobile)) {
+ return new ResultBean().fail().setMsg("手机号不能为空");
+ } else {
+ SysUser one = sysUserService.fetchByUserName(mobile);
+ if (null != one) {
+ return new ResultBean().fail().setMsg("手机号重复!`");
+ }
+ }
+ if (StringUtils.isBlank(name)) {
+ return new ResultBean().fail().setMsg("姓名不能为空");
+ }
+ if (userType == 0) {
+ return new ResultBean().fail().setMsg("用户类型不能为空");
+ }
+ if (StringUtils.isBlank(verificationCode)) {
+ return new ResultBean().fail().setMsg("验证码不能为空");
+ } else {
+ Map stringObjectMap = sysUserService.mobileValidateRegister(mobile, verificationCode);
+ String code = stringObjectMap.get("code").toString();
+ String details = stringObjectMap.get("details").toString();
+ if (Tools.CODE_FAIL.equals(code)) {
+ return ResultBean.fireFail().setMessage(details).setMsg(details);
+ }
+ }
+ //"15097329653";
+ String password = mobile.substring(5, 11);
+ String md5 = Encodes.md5(password);
+ SysStaffinfo ssi = new SysStaffinfo();
+ SysUser su = new SysUser();
+ dto.fillEntity(su);
+ su.setStaffSid(ssi.getSid());
+ su.setUserName(mobile);
+ su.setPassword(md5);
+ su.setIsAdmin("1");
+ sysUserService.save(su);
+ ssi.setName(name);
+ ssi.setMobile(mobile);
+ ssi.setPinYinName(PinYinUtils.getPinYinName(name));
+ ssi.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(name));
+ sysStaffinfoService.save(ssi);
+ if (StringUtils.isNotBlank(deptSid)) {
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(deptSid);
+ SysStaffOrg sso = new SysStaffOrg();
+ sso.setOrgName(sysOrganization.getName());
+ sso.setOrgSid(sysOrganization.getSid());
+ sso.setStaffSid(ssi.getSid());
+ sso.setOrgSidPath(sysOrganization.getOrgSidPath());
+ sso.setOrgNamePath(sysOrganization.getName());
+ sso.setManageType("3");
+ sysStaffOrgService.save(sso);
+ }
+ if (StringUtils.isNotBlank(postSid)) {
+ SysPost sysPost = sysPostService.fetchBySid(postSid);
+ SysStaffPost ssp = new SysStaffPost();
+ ssp.setStaffSid(ssi.getSid());
+ ssp.setOrgSid(deptSid);
+ ssp.setPostSid(postSid);
+ ssp.setStartDate(new Date());
+ ssp.setIsDepetHead(0);
+ sysStaffPostService.save(ssp);
+ }
+ return rb.success();
+ }
+
+
+ public ResultBean delSysUserByMobile(String mobile) {
+ int i = sysUserService.delSysUserByMobile(mobile);
+ if (i == 0) {
+ return new ResultBean().fail().setMsg("删除失败");
+ }
+ return new ResultBean().success().setMsg("删除成功");
+ }
+
+
+ public ResultBean getSysUserByMobile(String staffSid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysStaffinfoVo user = sysUserService.getSysUserByMobile(staffSid);
+ return rb.success().setData(user);
+ }
+
+
+ public ResultBean update(SysUserDto dto, String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ sysUserService.updateBySid(dto.toMap(), sid);
+ //部门sid
+ String deptSid = dto.getDeptSid();
+ //岗位sid
+ String postSid = dto.getPostSid();
+ SysUser sysUser = sysUserService.fetchBySid(sid);
+ SysStaffinfo ssi = sysStaffinfoService.fetchBySid(sysUser.getStaffSid());
+ ssi.setMobile(dto.getMobile());
+ ssi.setName(dto.getName());
+ sysStaffinfoService.updateById(ssi);
+ if (StringUtils.isNotBlank(deptSid)) {
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(deptSid);
+ sysStaffOrgService.deleteByStaffSid(sysUser.getStaffSid());
+ SysStaffOrg sso = new SysStaffOrg();
+ sso.setOrgName(sysOrganization.getName());
+ sso.setOrgSid(sysOrganization.getSid());
+ sso.setStaffSid(ssi.getSid());
+ sso.setOrgSidPath(sysOrganization.getOrgSidPath());
+ sso.setOrgNamePath(sysOrganization.getName());
+ sso.setManageType("3");
+ sysStaffOrgService.save(sso);
+ }
+ if (StringUtils.isNotBlank(postSid)) {
+ SysPost sysPost = sysPostService.fetchBySid(postSid);
+ sysStaffPostService.deleteByStaffSid(sysUser.getStaffSid());
+ SysStaffPost ssp = new SysStaffPost();
+ ssp.setStaffSid(ssi.getSid());
+ ssp.setOrgSid(deptSid);
+ ssp.setPostSid(postSid);
+ ssp.setStartDate(new Date());
+ ssp.setIsDepetHead(0);
+ sysStaffPostService.save(ssp);
+ }
+ return rb.success();
+ }
+
+ /**
+ * 修改密码(★)
+ *
+ * @param original 原始密码
+ * @param password 密码
+ * @param confirmPassword 确认密码
+ * @return
+ */
+
+ public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) {
+ String token = httpServletRequest.getHeader("token");
+ // 根据redisToken查询用户信息
+ SysUser user = sysUserService.fetchBySid(userSid);
+ if (user == null) {
+ return ResultBean.fireFail().setMsg("抱歉，用户不存在");
+ }
+ if (!password
+ .matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,16}$")) {
+ return ResultBean.fireFail().setMsg("密码格式错误，必须为8至16位大小写字母和数字的组合");
+ }
+ String newPassword = Encodes.md5(original);
+ if (!newPassword.equals(user.getPassword())) {
+ return ResultBean.fireFail().setMsg("原始密码输入错误");
+ }
+ if (!password.equals(confirmPassword)) {
+ return ResultBean.fireFail().setMsg("密码和确认密码不一致");
+ }
+ int i = sysUserService.updatePassword(user.getSid(), Encodes.md5(password));
+ if (i == 0) {
+ return ResultBean.fireFail().setMsg("修改失败");
+ }
+ redisUtil.remove(token);
+ return ResultBean.fireSuccess().setMsg("修改成功");
+ }
+
+
+ public ResultBean del(String ids) {
+ ResultBean rb = ResultBean.fireFail();
+ sysUserService.delByIds(ids);
+ return rb.success();
+ }
+
+
+ public ResultBean delBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ sysUserService.delBySid(sid);
+ return rb.success();
+ }
+
+
+ public ResultBean selectByUserName(String mobile) {
+ SysUser user = sysUserService.selectByUserName(mobile);
+ SysUserVo sysUserVo = new SysUserVo();
+ BeanUtil.copyProperties(user, sysUserVo);
+ return new ResultBean().success().setData(sysUserVo);
+ }
+
+
+ public ResultBean fetch(String id) {
+ ResultBean rb = ResultBean.fireFail();
+ SysUserVo vo = sysUserService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean fetchBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ SysUserVo vo = sysUserService.fetchBySidVo(sid);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean> fetchBySids(String sids) {
+ ResultBean rb = ResultBean.fireFail();
+ List vo = sysUserService.fetchBySidSVo(sids);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean reGetPwd(String userName, String userPhone) {
+ return sysUserService.reGetPwd(userName, userPhone);
+ }
+
+
+ public ResultBean initPwd(String sid) {
+ if (!sysUserService.initPwd(sid)) {
+ return ResultBean.fireFail().setMsg("初始化密码失败");
+ }
+ return ResultBean.fireSuccess().setMsg("初始化密码成功");
+ }
+
+ @PostMapping("/login")
+ @ResponseBody
+ @ApiOperation(value = "3、登录")
+ @ApiOperationSupport(order = 30)
+ public ResultBean login(SysUserQuery userQuery) {
+ String userName = userQuery.getUserName();
+ String password = userQuery.getPassword();
+ String verifyCode = userQuery.getVerifyCode();
+ String type =userQuery.getType();
+ SysUser user = null;
+ //密码登录
+ if(type.equals("1")){
+ if (StringUtils.isBlank(userName)) {
+ return new ResultBean().fail().setMsg("用户名不能为空");
+ }
+ if (StringUtils.isBlank(password)) {
+ return new ResultBean().fail().setMsg("密码不能为空");
+ }
+
+ // 验证通过之后删除redis上的验证过的该条uuid
+ user = sysUserService.selectByUserName(userName);
+ String md5 = Encodes.md5(password);
+ if (user == null) {
+ //根据手机号查询用户是否存在
+ user = sysUserService.selectByMobile(userName);
+ if (user == null) {
+ return new ResultBean().fail().setMsg("用户名或密码错误");
+ } else {
+ if (!md5.equals(user.getPassword())) {
+ return new ResultBean().fail().setMsg("用户名或密码错误");
+ }
+ }
+ } else {
+ if (!(md5.equals(user.getPassword()))) {
+ return new ResultBean().fail().setMsg("用户名或密码错误");
+ }
+ }
+ }else{
+ //验证码登录
+ if (StringUtils.isBlank(verifyCode)) return new ResultBean().fail().setMsg("验证码不能为空");
+ String codeFromRedis = redisUtil.get("loginCode" + userName);
+ if (StringUtils.isBlank(codeFromRedis))
+ return new ResultBean().fail().setMsg("短信验证码已失效，请重新发送");
+ if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
+ user = sysUserService.selectByUserName(userName);
+ if(user==null){
+ return new ResultBean().fail().setMsg("用户名不存在");
+ }
+ redisUtil.remove("loginCode" + userName);
+ } else {
+ return new ResultBean().fail().setMsg("短信验证码错误或已失效，请重新获取");
+ }
+ }
+ // 根据用户信息查询用户的角色信息
+ SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user);
+ if (userInfoOneVo == null) {
+ return new ResultBean().fail().setMsg("该用户不是公司员工");
+ }
+ return new ResultBean().success().setData(userInfoOneVo);
+ }
+
+
+ public ResultBean loginByNoVeriCode(SysUserQuery userQuery) {
+
+ String userName = userQuery.getUserName();
+ String password = userQuery.getPassword();
+ if (StringUtils.isBlank(userName)) {
+ return new ResultBean().fail().setMsg("用户名不能为空");
+ }
+ if (StringUtils.isBlank(password)) {
+ return new ResultBean().fail().setMsg("密码不能为空");
+ }
+ SysUser user = null;
+ // 验证通过之后删除redis上的验证过的该条uuid
+ user = sysUserService.selectByUserName(userName);
+ String md5 = Encodes.md5(password);
+ if (user == null) {
+ //根据手机号查询用户是否存在
+ user = sysUserService.selectByMobile(userName);
+ if (user == null) {
+ return new ResultBean().fail().setMsg("用户名或密码错误");
+ } else {
+ if (!md5.equals(user.getPassword())) {
+ return new ResultBean().fail().setMsg("用户名或密码错误");
+ }
+ }
+ } else {
+ if (!(md5.equals(user.getPassword()))) {
+ return new ResultBean().fail().setMsg("用户名或密码错误");
+ }
+ }
+ // 根据用户信息查询用户的角色信息
+ SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user);
+ if (userInfoOneVo == null) {
+ return new ResultBean().fail().setMsg("该用户不是公司员工");
+ }
+// SystemLog systemLog = new SystemLog();
+// systemLog.setUserName(user.getUserName());
+// String ip = WebUtil.getIpAddr(httpServletRequest);
+// systemLog.setUserIp(ip);
+// systemLog.setEventUrl("portal/v1/sysuser/login");
+// systemLog.setEventContent("用户登录");
+// systemLog.setEventName("用户登录");
+// systemLogService.save(systemLog);
+ return new ResultBean().success().setData(userInfoOneVo);
+
+ }
+
+
+ public ResultBean signOut(HttpServletRequest httpServletRequest) {
+ String token = httpServletRequest.getHeader("token");
+ String redisToken = redisUtil.get(token);
+ if (StringUtils.isBlank(redisToken)) {
+ return ResultBean.fireSuccess().setMsg("您已退出，请刷新");
+ }
+ redisUtil.remove(token);
+ return ResultBean.fireSuccess().setMsg("退出成功");
+ }
+
+ /**
+ * 获取验证码（注册）(★)
+ *
+ * @param mobile 手机号
+ * @return ResultBean
+ */
+
+ public ResultBean sendMessageCode(String mobile) {
+ if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) {
+ return new ResultBean().fail().setMsg("请输入正确的手机号");
+ }
+ String verificationCode = "";
+ return sysUserService.getVerificationCode(mobile, verificationCode);
+ }
+
+
+ public ResultBean selectByStaffsid(String staffsid) {
+ SysUserVo user = sysUserService.selectByStaffsid(staffsid);
+ if (user != null) {
+ return new ResultBean