From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java | 29 ++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 9
zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java | 5
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 15 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 11
zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorHelper.java | 35 +++
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 4
zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 1
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 37 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 4
zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java | 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 18 +
zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 22 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java | 88 ++++++--
zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 186 +++++++++++++++++
zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java | 3
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 21 +
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 2
zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java | 12 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java | 21 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 1
zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java | 3
zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java | 5
zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java | 16 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 8
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 6
30 files changed, 509 insertions(+), 75 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 1fbaeeb..a0b08c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -83,11 +83,13 @@
public AjaxResult getInfo()
{
SysUser user = SecurityUtils.getLoginUser().getUser();
+ // System.out.println(user);
+ // System.out.println("===========0-000000000000000000");
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
Set<String> permissions = permissionService.getMenuPermission(user);
- System.out.println(permissions);
+ // System.out.println(permissions);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c35bcf9..5f2914d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -88,6 +88,8 @@
public TableDataInfo list(SysUser user)
{
startPage();
+ System.out.println(user.getClanId());
+ System.out.println("----------------++++++++++++==0------------");
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
}
@@ -128,7 +130,7 @@
@GetMapping(value = { "/", "/{userId}" })
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
{
- userService.checkUserDataScope(userId);
+ // userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
//濡傛灉鏄痑dmin鍒欑洿鎺ヨ繑鍥炴墍鏈夌殑瑙掕壊锛屽惁鍒欏氨杩斿洖涓嶆槸绠＄悊鍛樼殑瑙掕壊淇℃伅
@@ -246,6 +248,7 @@
user.setSex(userAll.getSex());
user.setRemark(userAll.getRemark());
user.setUpdateBy(userAll.getUpdateBy());
+ user.setClanId(userAll.getClanId());
// user.setSex(userAll.getSex()=="鐢�"?"1":"0");
// user.setPostIds(userAll.getPostIds());
// user.set
@@ -313,7 +316,8 @@
ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
if (father.getIsMyFamily() == 1){
infoUser.setFamilyId(father.getFamilyId());
- infoUser.setClanId(father.getClanId());}
+ infoUser.setClanId(father.getClanId());
+ }
else if (mother.getIsMyFamily() == 1){
infoUser.setFamilyId(mother.getFamilyId());
infoUser.setClanId(mother.getClanId());
@@ -343,7 +347,8 @@
zu.setSpouseId(infoUser.getUserId());
zInfoUserService.updateById(zu);
}
- }}
+ }
+ }
// zInfoUserService.saveOrUpdate(infoUser);
// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index b904ad3..b2ba6e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -292,16 +292,16 @@
* 瀹舵牴缃�
*/
@GetMapping("/root")
- public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
- return zInfoUserService.listWithTree(depth);
+ public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth,@PathParam("clanId") Integer clanId){
+ return zInfoUserService.listWithTree(depth, clanId);
}
/**
* 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
*/
@GetMapping("/allFamInfo")
- public AjaxResult listAllFamilyPeople()
+ public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
{
- return zInfoUserService.listAllFamilyPeople();
+ return zInfoUserService.listAllFamilyPeople(clanId);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index f25f866..f0c0446 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -9,11 +9,12 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfAncestor;
-import com.ruoyi.domain.ZfClan;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.AncestorHelper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfAncestorService;
+import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
@@ -26,6 +27,7 @@
import java.util.ArrayList;
import java.util.List;
+import static com.ruoyi.common.core.domain.AjaxResult.error;
import static com.ruoyi.common.core.page.TableSupport.*;
@RestController
@@ -46,12 +48,22 @@
@Resource
private SysUserRoleMapper sysUserRoleMapper;
+ @Resource
+ private ZfFamilyService zfFamilyService;
+
@GetMapping("/all/{clanId}")
public AjaxResult listAll(@PathVariable Integer clanId){
- Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zfAncestorService.selectDataList(clanId, pageNo, pageSize);
}
+ @GetMapping("/all")
+ public AjaxResult listAll(ZfAncestor zfAncestor){
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfAncestorService.selectDataList(zfAncestor, pageNo, pageSize);
+ }
+
public Long addAncestor(ZfAncestor zfAncestor){
@@ -150,12 +162,168 @@
*/
@Log(title = "绁栧厛", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ZfAncestor zfAncestor)
+ public AjaxResult add(@RequestBody AncestorHelper ancestorHelper)
{
- Long sysId = zfAncestorService.addData(zfAncestor);
- zfAncestor.setSpouseId(sysId.intValue());
- zfAncestor.setSysId(addAncestor(zfAncestor));
- zfAncestorService.updateById(zfAncestor);
+ //淇濆瓨绁栧厛
+ System.out.println(ancestorHelper);
+ System.out.println("+++++++++++------------+++++++++");
+ if(ancestorHelper.getRoleId()==4) {
+
+ //鏂板涓�涓粯璁ょ殑瀹跺涵鍙�
+ ZfFamily zfFamily = new ZfFamily();
+ zfFamily.setName("榛樿涓�鍙峰搴�");
+ zfFamily.setFid(0L);
+ zfFamily.setMid(0L);
+ zfFamily.setClanId(ancestorHelper.getClanId());
+ zfFamilyService.addFamily(zfFamily);
+
+
+
+ //鍐欏叆sys_user琛�,鍏朵腑鐨勪竴涓鍏�
+ SysUser us = new SysUser();
+ us.setNickName(ancestorHelper.getName());
+ // us.setStatus(String.valueOf(zfAncestor.getStatus()));
+ us.setSex(String.valueOf(ancestorHelper.getSex()));
+ us.setPassword("123456");
+ us.setUserName(ancestorHelper.getName());
+ us.setClanId(ancestorHelper.getClanId());
+ if (!userService.checkUserNameUnique(us)) {
+ return error("鏂板绁栧厛'" + us.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+
+ us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
+ userService.insertUser(us);
+ //鍐欏叆sys_user琛�,鍙﹀涓�涓鍏�
+ SysUser usa = new SysUser();
+ usa.setNickName(ancestorHelper.getFname());
+ // us.setStatus(String.valueOf(zfAncestor.getStatus()));
+ usa.setSex(String.valueOf(ancestorHelper.getFsex()));
+ usa.setPassword("123456");
+ usa.setClanId(ancestorHelper.getClanId());
+ usa.setUserName(ancestorHelper.getFname());
+ if (!userService.checkUserNameUnique(usa)) {
+ return error("鏂板绁栧厛1'" + usa.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+
+ us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
+ userService.insertUser(usa);
+
+
+
+ //鍐欏叆鍒皕_info_user琛�
+ ZInfoUser infoUser = new ZInfoUser();
+ infoUser.setSysId(us.getUserId());
+ // infoUser.setUserId(user.getUserId());
+ infoUser.setNickName(us.getNickName());
+ infoUser.setOldName(us.getUserName());
+// infoUser.setPhoneNumber(userAll.getPhonenumber());
+ infoUser.setSex(Integer.parseInt(us.getSex()));
+ infoUser.setFatherId(0L);
+ infoUser.setMomId(0L);
+ infoUser.setIsMyFamily(1);
+ infoUser.setFamilyId(zfFamily.getId());
+ //灏戜竴涓猣amilyId
+
+ //瀹舵棌id
+ infoUser.setClanId(ancestorHelper.getClanId());
+ infoUser.setRoleId(3L);
+ zInfoUserService.save(infoUser);
+
+
+
+ //鍙﹀涓�涓鍏堝啓鍏_info_user
+ ZInfoUser infoUsera = new ZInfoUser();
+ infoUsera.setSysId(usa.getUserId());
+ // infoUser.setUserId(user.getUserId());
+ infoUsera.setNickName(usa.getNickName());
+ infoUsera.setOldName(usa.getUserName());
+// infoUser.setPhoneNumber(userAll.getPhonenumber());
+ infoUsera.setSex(Integer.parseInt(usa.getSex()));
+ infoUsera.setFatherId(0L);
+ infoUsera.setMomId(0L);
+ infoUsera.setIsMyFamily(1);
+ //灏戜竴涓猣amilyId
+ infoUsera.setFamilyId(zfFamily.getId());
+ //瀹舵棌id
+ infoUsera.setClanId(ancestorHelper.getClanId());
+ infoUsera.setRoleId(3L);
+ infoUsera.setSpouseId(infoUser.getUserId());
+ zInfoUserService.save(infoUsera);
+
+
+ //鏇存柊绗竴涓鍏堢殑閰嶅伓淇℃伅
+ infoUser.setSpouseId(infoUsera.getUserId());
+ zInfoUserService.saveOrUpdate(infoUser);
+
+
+ //淇濆瓨绁栧厛淇℃伅鍒皕fAncestor
+ ZfAncestor zfAncestor = new ZfAncestor();
+ zfAncestor.setClanId(ancestorHelper.getClanId());
+ zfAncestor.setName(ancestorHelper.getName());
+ zfAncestor.setSex(ancestorHelper.getSex());
+ zfAncestor.setRoleId(4);
+ zfAncestor.setPassword(SecurityUtils.encryptPassword("123456"));
+ zfAncestor.setStatus(0);
+ zfAncestor.setSysId(us.getUserId());
+ zfAncestorService.addData(zfAncestor);
+
+ //淇濆瓨鍙﹀涓�涓鍏堜俊鎭�
+ ZfAncestor zfAncestor1 = new ZfAncestor();
+ zfAncestor1.setClanId(ancestorHelper.getClanId());
+ zfAncestor1.setName(ancestorHelper.getFname());
+ zfAncestor1.setSex(ancestorHelper.getFsex());
+ zfAncestor1.setRoleId(4);
+ zfAncestor1.setPassword(SecurityUtils.encryptPassword("123456"));
+ zfAncestor1.setStatus(0);
+ zfAncestor1.setSysId(usa.getUserId());
+ zfAncestorService.addData(zfAncestor1);
+
+
+
+
+ }
+ else{
+ //淇濆瓨绁栧厛绠＄悊鍛�,涔熷厛淇濆瓨鍒皊ys_user
+ SysUser us = new SysUser();
+ us.setNickName(ancestorHelper.getName());
+ // us.setStatus(String.valueOf(zfAncestor.getStatus()));
+ us.setSex(String.valueOf(ancestorHelper.getSex()));
+ us.setPassword("123456");
+ us.setUserName(ancestorHelper.getName());
+ us.setClanId(ancestorHelper.getClanId());
+ System.out.println(ancestorHelper.getClanId());
+ System.out.println("0000_______+++++++++++++999999999999");
+ if (!userService.checkUserNameUnique(us)) {
+ return error("鏂板绁栧厛绠＄悊鍛�'" + us.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+
+ us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
+ userService.insertUser(us);
+
+
+ //鍐欏埌鐢ㄦ埛涓庤鑹插搴旂殑琛�
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setUserId(us.getUserId());
+ sysUserRole.setRoleId(1L);
+ List<SysUserRole> sysUserRoles = new ArrayList<>();
+ sysUserRoles.add(sysUserRole);
+ sysUserRoleMapper.batchUserRole(sysUserRoles);
+
+
+ //淇濆瓨绁栧厛淇℃伅鍒皕fAncestor
+ ZfAncestor zfAncestor = new ZfAncestor();
+ zfAncestor.setClanId(ancestorHelper.getClanId());
+ zfAncestor.setName(ancestorHelper.getName());
+ zfAncestor.setSex(ancestorHelper.getSex());
+ zfAncestor.setRoleId(2);
+ zfAncestor.setPassword(SecurityUtils.encryptPassword("123456"));
+ zfAncestor.setStatus(0);
+ zfAncestor.setSysId(us.getUserId());
+
+ zfAncestorService.addData(zfAncestor);
+
+
+ }
return AjaxResult.success();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
index 7264cab..66fd587 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
@@ -3,12 +3,17 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.Meeting;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfClan;
+import com.ruoyi.domain.ZfClean;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfClanService;
import com.ruoyi.system.mapper.SysUserRoleMapper;
@@ -17,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -39,10 +45,16 @@
@GetMapping("/all")
public AjaxResult listAll(ZfClan zfClan){
- Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zfClanService.selectDataList(zfClan, pageNo, pageSize);
}
+ @GetMapping("/allZfInfo")
+ public AjaxResult listAllInfo(){
+
+ return zfClanService.selectData();
+ }
+
@GetMapping("/satisfy")
public AjaxResult listSatisfy(ZfClan zfClan){
@@ -56,6 +68,8 @@
@PostMapping
public AjaxResult add(@RequestBody ZfClan zfClan)
{
+
+
return zfClanService.addData(zfClan);
}
@@ -87,4 +101,17 @@
return zfClanService.deleteData(ids);
}
+ /**
+ * 瀵煎嚭璁板綍
+ */
+ @Log(title = "瀹舵棌璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ZfClan zfClean)
+ {
+ List<ZfClan> list = zfClanService.selectByCondition(zfClean);
+ // log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfClan> util = new ExcelUtil<>(ZfClan.class);
+ util.exportExcel(response, list, "瀹舵棌鍙�");
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index 6cae23e..5e766e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
@@ -2,7 +2,9 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
@@ -14,6 +16,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* @Author Jinquan_Ou
@@ -29,8 +34,10 @@
ZfFamilyService zfFamilyService;
@GetMapping("/all")
- public AjaxResult getAllFamily(){
- return AjaxResult.success(zfFamilyService.list());
+ public AjaxResult getAllFamily(ZfFamily zfFamily){
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfFamilyService.selectDataList(zfFamily, pageNo,pageSize);
}
/**
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 375730f..95347de 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,6 +3,8 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import lombok.Getter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -89,6 +91,17 @@
/** 瑙掕壊ID */
private Long roleId;
+
+ public Integer getClanId() {
+ return clanId;
+ }
+
+ private Integer clanId;
+
+ public void setClanId(Integer clanId) {
+ this.clanId = clanId;
+ }
+
public SysUser()
{
@@ -117,6 +130,7 @@
public static boolean isAdmin(Long userId)
{
//1鍙风敤鎴峰氨鏄鐞嗗憳
+ //杩欓噷闇�瑕佷慨鏀规垚绠＄悊鍛橈紝鏌ヨ鏁版嵁搴�
return userId != null && 1L == userId;
}
@@ -302,7 +316,9 @@
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
- .append("deptId", getDeptId())
+ .append("clanId", getClanId())
+
+ .append("deptId", getDeptId())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("email", getEmail())
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 1ec9396..1f2acbd 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -159,6 +159,7 @@
SysUser sysUser = userService.selectUserByUserName(username);
+
Long userId = sysUser.getUserId();
// 鐢熸垚token
String token = tokenService.createToken(loginUser);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index 1950cb7..622d5f7 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -60,6 +60,8 @@
public UserDetails createLoginUser(SysUser user)
{
+ // System.out.println(user);
+ // System.out.println("========--0023233333333333333");
return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
index 99c0c50..d341061 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -57,6 +57,15 @@
*/
public List<SysMenu> selectMenuTreeAll();
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
+ *
+ * @return 鑿滃崟鍒楄〃
+ */
+ public List<SysMenu> selectMenuTreeAllSuperAdmin();
+
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index be7a146..ce6f04a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -8,6 +8,9 @@
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+
+import com.ruoyi.domain.ZfAncestor;
+import com.ruoyi.service.ZfAncestorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.Constants;
@@ -43,6 +46,10 @@
@Autowired
private SysRoleMenuMapper roleMenuMapper;
+
+
+ @Autowired
+ private ZfAncestorService zfService;
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
@@ -131,9 +138,20 @@
public List<SysMenu> selectMenuTreeByUserId(Long userId)
{
List<SysMenu> menus = null;
- if (SecurityUtils.isAdmin(userId))
+ ZfAncestor zfAncestor = new ZfAncestor();
+ zfAncestor.setSysId(userId);
+ zfAncestor = zfService.selectZfAncestor(zfAncestor);
+ System.out.println("---------++++++++____________");
+ System.out.println(zfAncestor);
+ //鍒ゆ柇鏄惁鏄秴绾х鐞嗗憳
+ if(zfAncestor!=null && zfAncestor.getId()==1L && zfAncestor.getRoleId()==0L)
{
- //濡傛灉鏄秴绾х鐞嗗憳锛屾妸宸︿晶鎵�鏈夌殑鐩綍鍜岃彍鍗曢兘鏌ュ嚭鏉�
+ menus = menuMapper.selectMenuTreeAllSuperAdmin();
+
+ }
+ else if(zfAncestor!=null && zfAncestor.getRoleId()==2)
+ {
+ //濡傛灉鏄櫘閫氱鐞嗗憳锛屾妸鏅�氱鐞嗗憳鐨勮彍鍗曟樉绀哄嚭鏉�
menus = menuMapper.selectMenuTreeAll();
}
else
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index a4034ef..54c4a1c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -257,6 +257,7 @@
@Override
public void checkUserDataScope(Long userId)
{
+ //鍒ゆ柇鏄惁鏄鐞嗗憳
if (!SysUser.isAdmin(SecurityUtils.getUserId()))
{
SysUser user = new SysUser();
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index e295da0..ad955d6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -53,7 +53,11 @@
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 and m.menu_id in (1, 100, 118)
order by m.parent_id, m.order_num
</select>
-
+ <select id="selectMenuTreeAllSuperAdmin" resultMap="SysMenuResult">
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+ from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 and m.menu_id in (11, 12, 13)
+ order by m.parent_id, m.order_num
+ </select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2e6ca32..32147da 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -22,6 +22,7 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="clanId" column="clan_id" />
<result property="remark" column="remark" />
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
@@ -47,7 +48,7 @@
</resultMap>
<sql id="selectUserVo">
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ select u.clan_id,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
@@ -67,7 +68,7 @@
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
- where u.del_flag = '0'
+ where u.del_flag = '0' and u.clan_id = #{clanId}
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>
@@ -94,7 +95,7 @@
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.clan_id, u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -162,7 +163,9 @@
<if test="sex != null and sex != ''">sex,</if>
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
+ <if test="clanId != null and clanId != 0">clan_id,</if>
+
+ <if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
)values(
@@ -176,7 +179,9 @@
<if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
+ <if test="clanId != null and clanId != ''">#{clanId},</if>
+
+ <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
sysdate()
)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
index c23c2dd..bcabd02 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
@@ -55,4 +55,9 @@
*/
private Integer spouseId;
+ /**
+ *瀵嗙爜
+ */
+ private String password;
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
index 9351669..473a64e 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
@Data
@@ -14,6 +15,7 @@
/**
* 瀹舵棌鍚嶇О
*/
+ @Excel(name = "鍚嶅瓧")
private String clanName;
}
\ No newline at end of file
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
index ff54f44..38025f6 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
@@ -44,4 +44,7 @@
+ private Integer clanId;
+
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java
new file mode 100644
index 0000000..4dd402d
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java
@@ -0,0 +1,16 @@
+package com.ruoyi.domain.dto;
+
+import com.ruoyi.domain.ZfAncestor;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class AncestorClan extends ZfAncestor implements Serializable {
+
+ private String clanName;
+
+
+ private String roleName;
+
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorHelper.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorHelper.java
new file mode 100644
index 0000000..19e2b6c
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorHelper.java
@@ -0,0 +1,35 @@
+package com.ruoyi.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class AncestorHelper {
+
+ private String name;
+ private String fname;
+ private Integer id;
+ /**
+ * 瀹舵棌id
+ */
+ private Integer clanId;
+
+
+
+ /**
+ * 绁栧厛sysId
+ */
+ private Long sysId;
+
+
+ private Long fsysId;
+ /**
+ * 绁栧厛鎬у埆
+ */
+ private Integer sex;
+
+ private Integer fsex;
+ /**
+ * 绁栧厛绫诲瀷
+ */
+ private Integer roleId;
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
index 2eb3536..94d2f3a 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
@@ -20,6 +20,8 @@
private Long userId;
+
+ private Integer clanId;
@Excel(name = "绗嚑浠�")
private Integer identity;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
index c8ded2b..2fab50c 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
@@ -72,4 +72,7 @@
private Long mid;
private Long sysId;
+
+
+ private Integer clanId;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
index e4a206f..5ea78e6 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
@@ -1,11 +1,23 @@
package com.ruoyi.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.domain.ZfAncestor;
+import com.ruoyi.domain.dto.AncestorClan;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
@Mapper
public interface ZfAncestorMapper extends BaseMapper<ZfAncestor> {
+ @Select("select * , zf_role.name as roleName from zf_ancestor, zf_clan,zf_role where zf_ancestor.clan_id = zf_clan.clan_id and zf_ancestor.role_id = zf_role.id ${ew.customSqlSegment}")
+ Page<AncestorClan> selectInfo(Page page, @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index 3b2e60e..d9f78bd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -47,13 +47,13 @@
// AjaxResult empower(EmpowerDto empowerDto);
- AjaxResult listWithTree(Integer depth);
+ AjaxResult listWithTree(Integer depth, Integer clanId);
AjaxResult addParent(Long fatherId, Long motherId);
AjaxResult listAllExceptAdmin();
- AjaxResult listAllFamilyPeople();
+ AjaxResult listAllFamilyPeople(Integer clanId);
AjaxResult listMySelfAndSpouse(Long id);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
index 8685cde..81f09d1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
@@ -7,6 +7,7 @@
public interface ZfAncestorService extends IService<ZfAncestor> {
AjaxResult selectDataList(Integer clanId, Integer pageNo, Integer pageSize);
+ AjaxResult selectDataList(ZfAncestor zfAncestor, Integer pageNo, Integer pageSize);
boolean count(Integer clanId);
@@ -18,4 +19,6 @@
ZfAncestor update(ZfAncestor zfAncestor);
+ ZfAncestor selectZfAncestor(ZfAncestor zfAncestor);
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
index b0b6e7a..1adb3cb 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
@@ -5,13 +5,14 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.Meeting;
import com.ruoyi.domain.ZfClan;
+import com.ruoyi.domain.ZfClean;
import java.util.List;
public interface ZfClanService extends IService<ZfClan> {
AjaxResult selectDataList(ZfClan zfClan, Integer pageNo, Integer pageSize);
-
+ AjaxResult selectData();
AjaxResult addData(ZfClan zfClan);
AjaxResult updateData(ZfClan zfClan);
@@ -20,4 +21,6 @@
AjaxResult selectDataList(ZfClan zfClan);
+ List<ZfClan> selectByCondition(ZfClan zfClan);
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
index 967eadb..00a43e0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.dto.UserInfoDto;
import org.springframework.stereotype.Service;
@@ -18,7 +19,8 @@
@Service
public interface ZfFamilyService extends IService<ZfFamily> {
- ZfFamily getByNameAndUser(ZfFamily zfFamily);
+ public AjaxResult selectDataList(ZfFamily zfFamily, Integer pageNum, Integer pageSize);
+ ZfFamily getByNameAndUser(ZfFamily zfFamily);
/**
* 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 29ee9cd..0e898f9 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -352,9 +352,11 @@
* @return
*/
@Override
- public AjaxResult listWithTree(Integer depth) {
-
- List<ZInfoUser> allPeopleList = list();
+ public AjaxResult listWithTree(Integer depth, Integer clanId) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(clanId!=null, ZInfoUser::getClanId, clanId);
+ // List<ZfEvent> list = list(lqw);
+ List<ZInfoUser> allPeopleList = list(lqw);
List<ZInfoUser> result = null;
// try {
// result = allPeopleList.stream().filter(people -> people.getUserId()!=1&&(people.getFatherId() == 0||people.getMomId()==0))
@@ -397,9 +399,9 @@
// System.out.println(people);
return people;
}).collect(Collectors.toList());
-
-System.out.println("--------------++++++++++++++++--------------");
-System.out.println(result);
+//
+//System.out.println("--------------++++++++++++++++--------------");
+//System.out.println(result);
return AjaxResult.success(result);
}
@@ -417,7 +419,7 @@
lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
// lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
-
+ lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId());
List<ZInfoUser> allPeopleList = list(lqw);
// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
@@ -717,7 +719,17 @@
public ZInfoUser getMyself() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return getById(userId);
+ // System.out.println(userId);
+ //System.out.println("-----------------++++++++9999++++++++++----------");
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setSysId(userId);
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zInfoUser.getSysId() != null, ZInfoUser::getSysId, zInfoUser.getSysId());
+ List<ZInfoUser> list = list(lqw);
+ if(!list.isEmpty())
+ return list.get(0);
+ else
+ return null;
}
@Override
@@ -769,13 +781,18 @@
}
@Override
- public AjaxResult listAllFamilyPeople() {
+ public AjaxResult listAllFamilyPeople(Integer clanId) {
// List<ZInfoUser> lis = list();
// for(ZInfoUser tm: lis)
// {
// System.out.println(tm.getRoleId());
// }
- List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+ LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getClanId, clanId);
+ List<ZInfoUser> lis = list(zInfoUserLambdaQueryWrapper);
+ List<ZInfoUser> collect = lis.stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+
+
return AjaxResult.success(collect);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
index 158945a..32e8358 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
@@ -1,13 +1,20 @@
package com.ruoyi.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.EsModel;
+import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfAncestor;
import com.ruoyi.domain.ZfClan;
+import com.ruoyi.domain.dto.AncestorClan;
import com.ruoyi.mapper.ZfAncestorMapper;
import com.ruoyi.service.*;
import org.elasticsearch.action.delete.DeleteRequest;
@@ -27,6 +34,8 @@
private EsService esSer;
@Resource
+ private ZfAncestorMapper zfAncestorMapper;
+ @Resource
ZInfoUserService zInfoUserService;
@Resource
@@ -42,7 +51,7 @@
private LambdaQueryWrapper<ZfAncestor> buildCondition(ZfAncestor zfAncestor) {
LambdaQueryWrapper<ZfAncestor> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfAncestor::getId);
- lqw.eq(zfAncestor.getClanId() !=null , ZfAncestor::getClanId, zfAncestor.getClanId());
+ lqw.eq(zfAncestor.getName()!=null, ZfAncestor::getName,zfAncestor.getName());
return lqw;
}
@@ -107,28 +116,41 @@
return AjaxResult.success(members);
}
+ @Override
+ public AjaxResult selectDataList(ZfAncestor zfAncestor, Integer pageNo, Integer pageSize) {
+ QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(zfAncestor.getClanId() !=null , " zf_ancestor.clan_id", zfAncestor.getClanId());
+ queryWrapper.eq(zfAncestor.getSysId() !=null , " zf_ancestor.sys_id ", zfAncestor.getSysId());
+
+ Page<AncestorClan> info = zfAncestorMapper.selectInfo(new Page<>(pageNo, pageSize),queryWrapper);
+ //page(pa, wrapper);
+ // List<AncestorClan> orders = page(pa, wrapper);
+ List<AncestorClan> list =info.getRecords();
+ HashMap<String, Object> data = MapUtils.getResult(info, list);
+ return AjaxResult.success(data);
+ }
@Override
public Long addData(ZfAncestor zfAncestor) {
- LambdaQueryWrapper<ZfAncestor> lqw = buildCondition(zfAncestor);
- List<ZfAncestor> list = list(lqw);
- Long sysID = 0L;
- System.out.println("15dniwru/"+list);
- if(list.size()>2){
- throw new RuntimeException("璇峰嬁閲嶅娣诲姞绁栧厛");
- }
+// LambdaQueryWrapper<ZfAncestor> lqw = buildCondition(zfAncestor);
+// List<ZfAncestor> list = list(lqw);
+// Long sysID = 0L;
+// System.out.println("15dniwru/"+list);
+// if(list.size()>0){
+// throw new RuntimeException("璇峰嬁閲嶅娣诲姞绁栧厛");
+// }
- else if (list.size() == 1){
- if (list.get(0).getSex().equals(zfAncestor.getSex())){
- throw new RuntimeException("涓や綅绁栧厛涓嶈兘涓哄悓鎬�");
- }
+// else if (list.size() == 1){
+// if (list.get(0).getSex().equals(zfAncestor.getSex())){
+// throw new RuntimeException("涓や綅绁栧厛涓嶈兘涓哄悓鎬�");
+// }
- sysID = zInfoUserService.getInfoBysysId(list.get(0).getSysId()).getUserId();
- }
-
+ // sysID = zInfoUserService.getInfoBysysId(list.get(0).getSysId()).getUserId();
+// }
+//
// if (!Long.valueOf(zfClanService.getById(zfClanManage.getClanId()).getAdminId()).equals(getUserId())) {
// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏娣诲姞鎴愬憳");
@@ -144,20 +166,20 @@
// zInfoUserService.saveOrUpdate(zInfoUser);
save(zfAncestor);
- EsModel esModel = new EsModel();
- Integer inte = zfAncestor.getClanId();
- String uuid = UUID.randomUUID().toString().replace("-","");
- esModel.setId(uuid);
- esModel.setCtId(Long.valueOf(inte));
- esModel.setCtTableName("瀹舵棌绠＄悊");
- esModel.setBy1(zfAncestor.getName());
-
- esModel.setBy5("/zfClanManage");
-// esModel.setFid(familyId);
- esSer.insertTable(esModel);
+// EsModel esModel = new EsModel();
+// Integer inte = zfAncestor.getClanId();
+// String uuid = UUID.randomUUID().toString().replace("-","");
+// esModel.setId(uuid);
+// esModel.setCtId(Long.valueOf(inte));
+// esModel.setCtTableName("瀹舵棌绠＄悊");
+// esModel.setBy1(zfAncestor.getName());
+//
+// esModel.setBy5("/zfClanManage");
+//// esModel.setFid(familyId);
+// esSer.insertTable(esModel);
// System.out.println(esModel);
- return sysID;
+ return 1L;
}
@@ -240,6 +262,18 @@
return zfAncestor2;
}
+ @Override
+ public ZfAncestor selectZfAncestor(ZfAncestor zfAncestor) {
+ LambdaQueryWrapper<ZfAncestor> queryWraper = new LambdaQueryWrapper<>();
+
+ queryWraper.eq(zfAncestor.getSysId() !=null , ZfAncestor::getSysId, zfAncestor.getSysId());
+ List lis = this.list(queryWraper);
+ if(lis.size()>0)
+ return (ZfAncestor) lis.get(0);
+ else
+ return null;
+ }
+
/**
*
*閫氳繃瀹舵棌id鍒犻櫎
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
index ab4f6e0..b34ee23 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -80,12 +80,15 @@
Page<ZfClan> pageResult = page(zfClanPage, lqw);
List<ZfClan> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
-// System.out.println(beanRecords);
-
-
HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
return AjaxResult.success(data); }
+
+ @Override
+ public AjaxResult selectData() {
+ List<ZfClan> lis = this.list();
+ return AjaxResult.success(lis);
+ }
@Override
public AjaxResult selectDataList(ZfClan zfClan){
@@ -100,10 +103,18 @@
}
@Override
+ public List<ZfClan> selectByCondition(ZfClan zfClan) {
+
+
+ LambdaQueryWrapper<ZfClan> lambdaQueryWrapper = buildCondition(zfClan);
+ List<ZfClan> beanRecords = list(lambdaQueryWrapper);
+ return beanRecords;
+ }
+
+ @Override
public AjaxResult addData(ZfClan zfClan) {
LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
List<ZfClan> list = list(lqw);
-
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅瀹舵棌");
@@ -145,7 +156,7 @@
ZfLog zfLog = new ZfLog();
zfLog.setUpdateTime(LocalDateTime.now());
zfLog.setModule("瀹舵棌");
- zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+// zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
zfLogService.save(zfLog);
// System.out.println("===================================="+meeting);
if(updateById(zfClan)){
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
index 0ef749d..30d1aab 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
@@ -2,13 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.dto.UserInfoDto;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.mapper.ZfFamilyMapper;
@@ -21,6 +24,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,6 +45,23 @@
ZfFamilyService zfFamilyService;
@Override
+ public AjaxResult selectDataList(ZfFamily zfFamily, Integer pageNum, Integer pageSize) {
+
+
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+
+ lqw.eq(zfFamily.getClanId()!=null,ZfFamily::getClanId,zfFamily.getClanId());
+ lqw.like(zfFamily.getName()!=null,ZfFamily::getName,zfFamily.getName());
+ Page<ZfFamily> zfPropertyPage = new Page<>(pageNum, pageSize);
+ Page<ZfFamily> pageResult = page(zfPropertyPage, lqw);
+
+ List<ZfFamily> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+
+ return AjaxResult.success(data);
+ }
+
+ @Override
public ZfFamily getByNameAndUser(ZfFamily zfFamily) {
LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZfFamily::getName,zfFamily.getName()).or().eq(ZfFamily::getFid, zfFamily.getFid());
--
Gitblit v1.9.1