From 997b03f08f01f87112227b617e446515b22c6c74 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 28 七月 2024 22:07:58 +0800
Subject: [PATCH] 家族
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java | 7
zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java | 14
zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java | 58 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 153 ++++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 59 +--
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 2
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 6
zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java | 11
/dev/null | 240 ----------------
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 9
zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java | 2
zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java | 21 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 38 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java | 273 ++++++++++++++++++
14 files changed, 591 insertions(+), 302 deletions(-)
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 e8857d0..bfd8dbb 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
@@ -11,9 +11,11 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfAncestor;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.sysUserAndUserInfo;
import com.ruoyi.service.ZInfoUserService;
+import com.ruoyi.service.ZfAncestorService;
import com.ruoyi.service.ZfFamilyService;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +70,9 @@
private ZInfoUserService zInfoUserService;
@Resource
private ZfFamilyService zfFamilyService;
+
+ @Resource
+ private ZfAncestorService zfAncestorService;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
@@ -172,29 +177,29 @@
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
-
- if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
if (user.getFid() != null){
- ZInfoUser father = zInfoUserService.getById(user.getFid());
- if (father.getIsMyFamily() == 1)
- System.out.println("11111111111111111111111111111111/");
- infoUser.setFamilyId(father.getFamilyId());
- }
- }
+ if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
+ ZInfoUser father = zInfoUserService.getById(user.getFid());
+ System.out.println("11111111111111111111111111111111/");
+ infoUser.setFamilyId(father.getFamilyId());
+ infoUser.setClanId(father.getClanId());
+
+ }}
// else if(user.getMid() != null){
// ZInfoUser mother = zInfoUserService.getById(user.getMid());
// if (mother.getIsMyFamily() == 1)
// System.out.println("2222222222222222222222222222222222/");
// infoUser.setFamilyId(mother.getFamilyId());
// }
+ if (user.getSpouseId() != null){
if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
System.out.println("33333333333333333333333333333333333333333/");
infoUser.setFamilyId(spouse.getFamilyId());
- infoUser.setSpouseId(user.getSpouseId());
+ infoUser.setClanId(spouse.getClanId());
}
- }
+ }}
zInfoUserService.saveOrUpdate(infoUser);
if(user.getSpouseId()!=null) {
@@ -203,6 +208,7 @@
zu.setSpouseId(infoUser.getUserId());
zInfoUserService.updateById(zu);
}
+
// zInfoUserService.update(infoUser);
// .saveOrUpdate(infoUser);
return AjaxResult.success();
@@ -247,7 +253,8 @@
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
userService.insertUser(user);
//鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
-//
+
+
// ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
ZInfoUser infoUser = new ZInfoUser();
infoUser.setSysId(user.getUserId());
@@ -284,14 +291,19 @@
if (userAll.getFid() != null && userAll.getMid() != null){
ZInfoUser father = zInfoUserService.getById(userAll.getFid());
ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
- if (father.getIsMyFamily() == 1)
+ if (father.getIsMyFamily() == 1){
infoUser.setFamilyId(father.getFamilyId());
- else if (mother.getIsMyFamily() == 1)
+ infoUser.setClanId(father.getClanId());}
+ else if (mother.getIsMyFamily() == 1){
infoUser.setFamilyId(mother.getFamilyId());
+ infoUser.setClanId(mother.getClanId());
+
+ }
}
else {
ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
infoUser.setFamilyId(spouse.getFamilyId());
+ infoUser.setClanId(spouse.getClanId());
}
//鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
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
new file mode 100644
index 0000000..578030a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -0,0 +1,153 @@
+package com.ruoyi.web.controller.zhang;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.domain.ZInfoUser;
+import com.ruoyi.domain.ZfAncestor;
+import com.ruoyi.domain.ZfClan;
+import com.ruoyi.service.ZInfoUserService;
+import com.ruoyi.service.ZfAncestorService;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.*;
+
+@RestController
+@RequestMapping("/ZfAncestor")
+public class ZfAncestorController {
+ @Autowired
+ ZfAncestorService zfAncestorService;
+
+ @Autowired
+ private ISysUserService userService;
+
+ @Autowired
+ private SysUserMapper userMapper;
+
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @GetMapping("/all/{clanId}")
+ public AjaxResult listAll(@PathVariable Integer clanId){
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfAncestorService.selectDataList(clanId, pageNo, pageSize);
+ }
+
+ public Long addAncestor(ZfAncestor zfAncestor){
+
+ SysUser us = new SysUser();
+ us.setNickName(zfAncestor.getName());
+ us.setStatus(String.valueOf(zfAncestor.getStatus()));
+ us.setSex(String.valueOf(zfAncestor.getSex()));
+ us.setPassword("123456");
+ us.setUserName(zfAncestor.getName());
+
+// us.setUserId(Long.valueOf(zfAncestor.getSysId()));
+
+ if (!userService.checkUserNameUnique(us))
+ {
+ throw new RuntimeException("鏂板绁栧厛'" + us.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+// ZInfoUser myself = zInfoUserService.getMyself();
+// us.setCreateBy(myself.getNickName());
+ us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
+ userService.insertUser(us);
+
+
+ ZInfoUser infoUser = new ZInfoUser();
+ infoUser.setClanId(zfAncestor.getClanId());
+ infoUser.setSex(zfAncestor.getSex());
+ infoUser.setNickName(zfAncestor.getName());
+ infoUser.setSysId(us.getUserId());
+ infoUser.setRoleId(Long.valueOf(zfAncestor.getRoleId()));
+ infoUser.setIsMyFamily(zfAncestor.getSex() == 0?1:0);
+ infoUser.setSpouseId(zfAncestor.getSpouseId().longValue());
+
+ zInfoUserService.save(infoUser);
+ if(zfAncestor.getSpouseId()!=null)
+ {
+ ZInfoUser zu = new ZInfoUser();
+ zu.setUserId(Long.valueOf(zfAncestor.getSpouseId()));
+ zu.setSpouseId(infoUser.getUserId());
+ zInfoUserService.updateById(zu);
+ }
+ return us.getUserId();
+ }
+
+ public void updateAncestor(ZfAncestor zfAncestor){
+ SysUser us = new SysUser();
+ Long userId = zInfoUserService.getInfoBysysId(zfAncestor.getSysId()).getUserId();
+ us.setUserId(zfAncestor.getSysId());
+
+ us.setUserName(zfAncestor.getName());
+ us.setNickName(zfAncestor.getName());
+ us.setSex(String.valueOf(zfAncestor.getSex()));
+// us.setRemark(zfAncestor.getRemark());
+ userService.updateUser(us);
+
+ // System.out.println(user.getFamilyId());
+ // System.out.println("[[[[]]]]]]");
+ ZInfoUser infoUser = new ZInfoUser();
+ infoUser.setUserId(userId);
+ infoUser.setOldName(zfAncestor.getName());
+ infoUser.setNickName(zfAncestor.getName());
+
+ infoUser.setSex(zfAncestor.getSex());
+// infoUser.setFamilyId(user.getFamilyId());
+ infoUser.setSysId(zfAncestor.getSysId());
+
+ zInfoUserService.updateById(infoUser);
+ }
+
+ /**
+ * 淇敼绁栧厛淇℃伅
+ */
+ @Log(title = "绁栧厛", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZfAncestor zfAncestor) {
+
+ zfAncestorService.update(zfAncestor);
+ updateAncestor(zfAncestor);
+
+ return AjaxResult.success();
+ }
+
+
+ /**
+ * 鏂板绁栧厛
+ */
+ @Log(title = "绁栧厛", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZfAncestor zfAncestor)
+ {
+ Long sysId = zfAncestorService.addData(zfAncestor);
+ zfAncestor.setSpouseId(sysId.intValue());
+ zfAncestor.setSysId(addAncestor(zfAncestor));
+ zfAncestorService.updateById(zfAncestor);
+ return AjaxResult.success();
+ }
+
+
+// /**
+// * 鎵归噺鍒犻櫎瀹舵棌鎴愬憳
+// */
+// @Log(title = "瀹舵棌绠＄悊", businessType = BusinessType.DELETE)
+// @DeleteMapping("/{clanId}/{id}")
+// public AjaxResult remove(@PathVariable Integer id, @PathVariable Integer clanId) {
+// return zfAncestorService.deleteData(clanId,id);
+// }
+}
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 4126b65..3591202 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
@@ -27,6 +27,11 @@
return zfClanService.selectDataList(zfClan, pageNo, pageSize);
}
+ @GetMapping("/satisfy")
+ public AjaxResult listSatisfy(ZfClan zfClan){
+ return zfClanService.selectDataList(zfClan);
+ }
+
/**
* 鏂板瀹舵棌
*/
@@ -34,9 +39,11 @@
@PostMapping
public AjaxResult add(@RequestBody ZfClan zfClan)
{
+
return zfClanService.addData(zfClan);
}
+
/**
* 淇敼瀹舵棌
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanManageController.java
deleted file mode 100644
index 0c3a846..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanManageController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ruoyi.web.controller.zhang;
-
-
-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.domain.ZfClanManage;
-import com.ruoyi.service.ZfClanManageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.method.P;
-import org.springframework.web.bind.annotation.*;
-
-import static com.ruoyi.common.core.page.TableSupport.*;
-
-@RestController
-@RequestMapping("/ZfClanManage")
-public class ZfClanManageController {
- @Autowired
- ZfClanManageService zfClanManageService;
-
- @GetMapping("/all/{clanId}")
- public AjaxResult listAll(@PathVariable Integer clanId){
- Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
- Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return zfClanManageService.selectDataList(clanId, pageNo, pageSize);
- }
-
- /**
- * 鏂板瀹舵棌鎴愬憳
- */
- @Log(title = "瀹舵棌绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ZfClanManage zfClanManage)
- {
- return zfClanManageService.addData(zfClanManage);
- }
-
-
- /**
- * 鎵归噺鍒犻櫎瀹舵棌鎴愬憳
- */
- @Log(title = "瀹舵棌绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{clanId}/{id}")
- public AjaxResult remove(@PathVariable Integer id, @PathVariable Integer clanId) {
- return zfClanManageService.deleteData(clanId,id);
- }
-}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 5f86811..b78ce3f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -180,7 +180,7 @@
private Long momId;
/**
- * 姣嶄翰鐨刬d
+ * 瀹舵棌鐨刬d
*/
private Integer clanId;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
new file mode 100644
index 0000000..a774553
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java
@@ -0,0 +1,58 @@
+
+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("zf_ancestor")
+public class ZfAncestor {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+
+ /**
+ * 瀹舵棌id
+ */
+ private Integer clanId;
+
+
+ /**
+ * 绁栧厛鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 绁栧厛sysId
+ */
+ private Long sysId;
+
+ /**
+ * 绁栧厛鎬у埆
+ */
+ private Integer sex;
+
+ /**
+ * 绁栧厛绫诲瀷
+ */
+ private Integer roleId;
+
+ /**
+ * 鐘舵��
+ */
+ private Integer status;
+
+ /**
+ * 鏄惁鏈
+ */
+ private Integer isMyFamily;
+
+ /**
+ *閰嶅伓id
+ */
+ private Integer spouseId;
+
+}
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 b53eb00..9351669 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
@@ -16,18 +16,4 @@
*/
private String clanName;
- /**
- * 鐖朵翰id
- */
- private Integer dadId;
-
- /**
- * 姣嶄翰id
- */
- private Integer momId;
-
- /**
- * 绠＄悊鍛榠d
- */
- private Integer adminId;
}
\ No newline at end of file
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java
deleted file mode 100644
index 7ba9c4c..0000000
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package com.ruoyi.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("zf_clan_manage")
-public class ZfClanManage {
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
-
- private Integer clanId;
-
- /**
- * 鎴愬憳sysUser_id
- */
- private Integer memberId;
-
- /**
- * 鎴愬憳瑙掕壊绫诲瀷role_id
- */
- private Integer roleId;
-
-}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
new file mode 100644
index 0000000..e4a206f
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
@@ -0,0 +1,11 @@
+
+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.ZfAncestor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ZfAncestorMapper extends BaseMapper<ZfAncestor> {
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfClanManageMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfClanManageMapper.java
deleted file mode 100644
index 1063571..0000000
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfClanManageMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-
-package com.ruoyi.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.domain.ZfClanManage;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ZfClanManageMapper extends BaseMapper<ZfClanManage> {
-
-}
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 88d20d7..3b2e60e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -21,11 +21,15 @@
public interface ZInfoUserService extends IService<ZInfoUser> {
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+
Boolean findByuid(Long uid, Long tfid);
+
+ List<ZInfoUser> selectByClanId(Integer clanId);
List<ZInfoUser> getDataBySex(Integer sex);
public ZInfoUser getInfoBysysId(Long sysid);
+
AjaxResult getInfoByfid(Long fid);
// AjaxResult updateBySysId()
@@ -48,7 +52,9 @@
AjaxResult addParent(Long fatherId, Long motherId);
AjaxResult listAllExceptAdmin();
+
AjaxResult listAllFamilyPeople();
+
AjaxResult listMySelfAndSpouse(Long id);
AjaxResult listGenealogy(Genealogy genealogy,Integer pageNum,Integer pageSize);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
new file mode 100644
index 0000000..c3d4eef
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
@@ -0,0 +1,21 @@
+
+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZfAncestor;
+
+public interface ZfAncestorService extends IService<ZfAncestor> {
+ AjaxResult selectDataList(Integer clanId, Integer pageNo, Integer pageSize);
+
+ boolean count(Integer clanId);
+
+ void deleteMember(Long ids);
+
+ Long addData(ZfAncestor zfAncestor);
+
+ AjaxResult deleteData(Integer clanId, Integer id);
+
+ void update(ZfAncestor zfAncestor);
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java
deleted file mode 100644
index 6b58517..0000000
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-
-package com.ruoyi.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.domain.ZfClan;
-import com.ruoyi.domain.ZfClanManage;
-
-public interface ZfClanManageService extends IService<ZfClanManage> {
- AjaxResult selectDataList(Integer clanId, Integer pageNo, Integer pageSize);
-
- void addA(Integer clanId,Integer memberId,Integer roleId);
-
- void deleteMember(Long ids);
-
- AjaxResult addData(ZfClanManage zfClanManage);
-
- AjaxResult deleteData(Integer clanId, Integer id);
-
-}
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 bbefcc5..b0b6e7a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
@@ -18,4 +18,6 @@
AjaxResult deleteData(Long ids);
+ AjaxResult selectDataList(ZfClan zfClan);
+
}
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 fe666be..29ee9cd 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
@@ -83,6 +83,14 @@
}
@Override
+ public List<ZInfoUser> selectByClanId(Integer clanId) {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setClanId(clanId);
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ return list(lqw);
+ }
+
+ @Override
public ZInfoUser getInfoBysysId(Long sysid) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getSysId, sysid);
@@ -133,6 +141,7 @@
lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+ lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
return lqw;
}
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
new file mode 100644
index 0000000..f0f1aa5
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
@@ -0,0 +1,273 @@
+
+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.domain.ZInfoUser;
+import com.ruoyi.domain.ZfAncestor;
+import com.ruoyi.domain.ZfClan;
+import com.ruoyi.mapper.ZfAncestorMapper;
+import com.ruoyi.service.*;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class ZfAncestorServiceImpl extends ServiceImpl<ZfAncestorMapper, ZfAncestor> implements ZfAncestorService {
+
+ @Resource
+ private EsService esSer;
+
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ private RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ private ZfAncestorService zfAncestorService;
+
+ @Resource
+ private ZfClanService zfClanService;
+
+
+ private LambdaQueryWrapper<ZfAncestor> buildCondition(ZfAncestor zfAncestor) {
+ LambdaQueryWrapper<ZfAncestor> lqw = new LambdaQueryWrapper<>();
+ lqw.orderByDesc(ZfAncestor::getId);
+ lqw.eq(zfAncestor.getClanId() !=null , ZfAncestor::getClanId, zfAncestor.getClanId());
+
+ return lqw;
+ }
+
+ private LambdaQueryWrapper<ZfAncestor> uniqueCondition(ZfAncestor zfAncestor){
+ LambdaQueryWrapper<ZfAncestor> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zfAncestor.getClanId() !=null , ZfAncestor::getClanId, zfAncestor.getClanId());
+ lqw.eq(zfAncestor.getSysId() !=null , ZfAncestor::getSysId, zfAncestor.getSysId());
+ return lqw;
+ }
+
+ /**
+ *
+ * 鑾峰彇褰撳墠鐢ㄦ埛鐨剆ysUserId
+ * @return
+ */
+ public Long getUserId(){
+ ZInfoUser myself = zInfoUserService.getMyself();
+
+ return zInfoUserService.getInfoBysysId( myself.getUserId()).getUserId();
+
+ }
+
+ @Override
+ public boolean count(Integer clanId){
+ ZfAncestor zfAncestor = new ZfAncestor();
+ zfAncestor.setClanId(clanId);
+ return list(buildCondition(zfAncestor)).size() < 2;
+ }
+
+ @Override
+ public AjaxResult selectDataList(Integer clanId, Integer pageNo, Integer pageSize) {
+// ZfAncestor zfAncestor = new ZfAncestor();
+// zfAncestor.setClanId(clanId);
+// LambdaQueryWrapper<ZfAncestor> lqw = buildCondition(zfAncestor);
+// List<ZfAncestor> beanRecords = list(lqw);
+// List<HashMap<String, String>> zInfoUsers = new ArrayList<>();
+//
+// for (ZfAncestor beanRecord:beanRecords) {
+// HashMap<String,String> idAndName = new HashMap<>();
+// String name = zInfoUserService.getById(Long.valueOf(beanRecord.getMemberId())).getNickName();
+// idAndName.put("鍚嶅瓧",name);
+// idAndName.put("瑙掕壊绫诲瀷",String.valueOf(beanRecord.getRoleId()));
+// zInfoUsers.add(idAndName);
+// }
+//
+// List<HashMap<String, String>> record = zInfoUsers.stream().skip((pageNo-1)*pageSize).limit(pageSize).collect(Collectors.toList());
+//
+// int totalPage = (record.size() -1) / pageSize +1;
+//
+// Page<String> zInfoUserPage = new Page<>(pageNo, pageSize,totalPage);
+// HashMap<String, Object> data = MapUtils.getShareResult(zInfoUserPage, record,zInfoUsers.size());
+// return AjaxResult.success(data);
+
+// List<ZfAncestor> beanRecords = list(lqw);
+ List<ZInfoUser> zInfoUsers = zInfoUserService.selectByClanId(clanId);
+ HashMap<String,Long> members = new HashMap<>();
+ for (ZInfoUser zInfoUser: zInfoUsers) {
+ members.put(zInfoUser.getNickName(),zInfoUser.getRoleId());
+ }
+
+ return AjaxResult.success(members);
+ }
+
+
+
+
+ @Override
+ public Long addData(ZfAncestor zfAncestor) {
+ LambdaQueryWrapper<ZfAncestor> lqw = buildCondition(zfAncestor);
+ List<ZfAncestor> list = list(lqw);
+ Long sysID = 0L;
+ if(list.size()>2){
+ 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();
+ }
+
+
+// if (!Long.valueOf(zfClanService.getById(zfClanManage.getClanId()).getAdminId()).equals(getUserId())) {
+// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏娣诲姞鎴愬憳");
+//
+// }
+
+
+ /**
+ * 鍦ㄧ敤鎴蜂俊鎭〃娣诲姞瀹舵棌鍙�
+ */
+// ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(zfAncestor.getSysId());
+// zInfoUser.setClanId(zfAncestor.getClanId());
+// 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);
+// System.out.println(esModel);
+
+ return sysID;
+
+ }
+
+ /**
+ *閫氳繃id鍒犻櫎
+ */
+ @Override
+ public AjaxResult deleteData(Integer clanId,Integer id) {
+// ZfAncestor zfAncestor1 = new ZfAncestor();
+// zfAncestor1.setMemberId(id);
+// zfAncestor1.setClanId(clanId);
+// List<ZfAncestor> zfAncestors =list(buildCondition(zfAncestor1));
+//// for (ZfClanManage zfClanManage : zfClanManages) {
+//// if (!zfClanManages.getAdminId().equals(getUserId())) {
+//// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎璇ュ鏃�");
+//// }
+//// }
+//
+//// if (!Long.valueOf(zfClanService.getById(zfClanManages.get(0).getClanId()).getAdminId()).equals(getUserId())) {
+//// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎鎴愬憳");
+//// }
+// /**
+// * 鍦ㄧ敤鎴蜂俊鎭〃鍒犻櫎瀹舵棌鍙�
+// */
+// ZInfoUser zInfoUser = zInfoUserService.getById(Long.valueOf(zfAncestors.get(0).getMemberId()));
+// zInfoUser.setClanId(0);
+// zInfoUserService.saveOrUpdate(zInfoUser);
+//
+// if (zfAncestorService.removeByIds(Arrays.asList(zfAncestors.get(0).getId()))) {
+//
+// //鍒犻櫎es涓殑鏁版嵁
+// zfAncestors.stream().forEach(zfAncestor -> {
+// EsModel esModel = esSer.findByCtId((zfAncestor.getId().intValue()), "瀹舵棌绠＄悊");
+// if (esModel != null) {
+// DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+// try {
+// restHighLevelClient.delete(deleteRequest, RequestOptions.DEFAULT);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+// }
+// });
+//
+// return AjaxResult.success();
+// } else {
+// return AjaxResult.error();
+// }
+ return null;
+ }
+
+ @Override
+ public void update(ZfAncestor zfAncestor) {
+ LambdaQueryWrapper<ZfAncestor> lqw = uniqueCondition(zfAncestor);
+ List<ZfAncestor> list = list(lqw);
+ System.out.println(list);
+ ZInfoUser updateDate =zInfoUserService.getInfoBysysId(zfAncestor.getSysId());
+ ZfAncestor zfAncestor1 = new ZfAncestor();
+ zfAncestor1.setId(list.get(0).getId());
+ zfAncestor1.setName(zfAncestor.getName());
+ if((updateDate.getSpouseId() != null || updateDate.getSpouseId() != 0) && zfAncestor.getSex() !=null){
+ Long spouseId=updateDate.getSpouseId();
+ if (zInfoUserService.getById(spouseId).getSex().equals(zfAncestor.getSex())){
+ throw new RuntimeException("绁栧厛涓や綅涓嶈兘涓哄悓鎬�");}
+ zfAncestor.setSex(zfAncestor.getSex());}
+
+ zfAncestorService.updateById(zfAncestor1);
+
+ }
+
+ /**
+ *
+ *閫氳繃瀹舵棌id鍒犻櫎
+ */
+ @Override
+ public void deleteMember(Long ids) {
+// LambdaQueryWrapper<ZfAncestor> lqw = new LambdaQueryWrapper<>();
+// lqw.eq(ZfAncestor::getClanId,ids);
+// List<ZfAncestor> zfAncestors =list(lqw) ;
+//// for (ZfClanManage zfClanManage : zfClanManages) {
+//// if (!zfClanManages.getAdminId().equals(getUserId())) {
+//// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎璇ュ鏃�");
+//// }
+//// }
+//
+//// if (!Long.valueOf(zfClanService.getById(zfClanManages.get(0).getClanId()).getAdminId()).equals(getUserId())) {
+//// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎鎴愬憳");
+//// }
+// List<Integer> id = new ArrayList<>() ;
+// for (ZfAncestor zfAncestor : zfAncestors) {
+// ZInfoUser zInfoUser = zInfoUserService.getById(Long.valueOf(zfAncestor.getMemberId()));
+// zInfoUser.setClanId(0);
+// System.out.println(zInfoUser);
+// zInfoUserService.saveOrUpdate(zInfoUser);
+// id.add(zfAncestor.getId());
+
+ }
+ /**
+ * 鍦ㄧ敤鎴蜂俊鎭〃鍒犻櫎瀹舵棌鍙�
+ */
+
+
+
+// if (zfAncestorService.removeByIds(id)) {
+// //鍒犻櫎es涓殑鏁版嵁
+// zfAncestors.stream().forEach(zfAncestor -> {
+// EsModel esModel = esSer.findByCtId((zfAncestor.getId().intValue()), "瀹舵棌绠＄悊");
+// if (esModel != null) {
+// DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+// try {
+// restHighLevelClient.delete(deleteRequest, RequestOptions.DEFAULT);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+// }
+// });
+//
+//
+// }}
+ }
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanManageServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanManageServiceImpl.java
deleted file mode 100644
index 988b870..0000000
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanManageServiceImpl.java
+++ /dev/null
@@ -1,240 +0,0 @@
-
-package com.ruoyi.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.ZfClanManage;
-import com.ruoyi.mapper.ZfClanManageMapper;
-import com.ruoyi.service.*;
-import org.elasticsearch.action.delete.DeleteRequest;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service
-public class ZfClanManageServiceImpl extends ServiceImpl<ZfClanManageMapper, ZfClanManage> implements ZfClanManageService {
-
- @Resource
- private EsService esSer;
-
- @Resource
- ZInfoUserService zInfoUserService;
-
- @Resource
- private RestHighLevelClient restHighLevelClient;
-
- @Resource
- private ZfClanManageService zfClanManageService;
-
- @Resource
- private ZfClanService zfClanService;
-
-// @Resource
-// private ISysUserService iSysUserService;
-
- private LambdaQueryWrapper<ZfClanManage> buildCondition(ZfClanManage zfClanManage) {
- LambdaQueryWrapper<ZfClanManage> lqw = new LambdaQueryWrapper<>();
- lqw.orderByDesc(ZfClanManage::getId);
- lqw.like(zfClanManage.getClanId() !=null , ZfClanManage::getClanId, zfClanManage.getClanId())
- .like(zfClanManage.getMemberId() !=null, ZfClanManage::getClanId, zfClanManage.getClanId());
- return lqw;
- }
-
- private LambdaQueryWrapper<ZfClanManage> uniqueCondition(ZfClanManage zfClanManage){
- LambdaQueryWrapper<ZfClanManage> lqw = new LambdaQueryWrapper<>();
- lqw.eq(zfClanManage.getClanId() !=null , ZfClanManage::getClanId, zfClanManage.getClanId());
- lqw.eq(zfClanManage.getMemberId() !=null, ZfClanManage::getMemberId, zfClanManage.getMemberId());
- return lqw;
- }
-
- /**
- *
- * 鑾峰彇褰撳墠鐢ㄦ埛鐨剆ysUserId
- * @return
- */
- public Long getUserId(){
- ZInfoUser myself = zInfoUserService.getMyself();
-
- return zInfoUserService.getInfoBysysId( myself.getUserId()).getUserId();
-
- }
-
-
- @Override
- public AjaxResult selectDataList(Integer clanId, Integer pageNo, Integer pageSize) {
- ZfClanManage zfClanManage = new ZfClanManage();
- zfClanManage.setClanId(clanId);
- LambdaQueryWrapper<ZfClanManage> lqw = buildCondition(zfClanManage);
- List<ZfClanManage> beanRecords = list(lqw);
- List<HashMap<String, String>> zInfoUsers = new ArrayList<>();
-
- for (ZfClanManage beanRecord:beanRecords) {
- HashMap<String,String> idAndName = new HashMap<>();
- String name = zInfoUserService.getById(Long.valueOf(beanRecord.getMemberId())).getNickName();
- idAndName.put("鍚嶅瓧",name);
- idAndName.put("瑙掕壊绫诲瀷",String.valueOf(beanRecord.getRoleId()));
- zInfoUsers.add(idAndName);
- }
-
- List<HashMap<String, String>> record = zInfoUsers.stream().skip((pageNo-1)*pageSize).limit(pageSize).collect(Collectors.toList());
-
- int totalPage = (record.size() -1) / pageSize +1;
-
- Page<String> zInfoUserPage = new Page<>(pageNo, pageSize,totalPage);
- HashMap<String, Object> data = MapUtils.getShareResult(zInfoUserPage, record,zInfoUsers.size());
- return AjaxResult.success(data);
- }
-
- @Override
- public void addA(Integer clanId,Integer memberId,Integer roleId){
- ZfClanManage zfClanManage = new ZfClanManage();
- zfClanManage.setClanId(clanId);
- zfClanManage.setMemberId(memberId);
- zfClanManage.setRoleId(roleId);
- addData(zfClanManage);
- }
-
- @Override
- public AjaxResult addData(ZfClanManage zfClanManage) {
-// LambdaQueryWrapper<ZfClanManage> lqw = uniqueCondition(zfClanManage);
-// List<ZfClanManage> list = list(lqw);
-// if(list.size()>0){
-// throw new RuntimeException("璇峰嬁閲嶅娣诲姞鍚屼竴鎴愬憳");
-// }
-
-
-// if (!Long.valueOf(zfClanService.getById(zfClanManage.getClanId()).getAdminId()).equals(getUserId())) {
-// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏娣诲姞鎴愬憳");
-//
-// }
- /**
- * 鍦ㄧ敤鎴蜂俊鎭〃娣诲姞瀹舵棌鍙�
- */
- ZInfoUser zInfoUser = zInfoUserService.getById(Long.valueOf(zfClanManage.getMemberId()));
- zInfoUser.setClanId(zfClanManage.getClanId());
- zInfoUserService.saveOrUpdate(zInfoUser);
-
- if (save(zfClanManage)) {
- EsModel esModel = new EsModel();
- Integer inte =zfClanManage.getClanId();
- String uuid = UUID.randomUUID().toString().replace("-","");
- esModel.setId(uuid);
- esModel.setCtId(Long.valueOf(inte));
- esModel.setCtTableName("瀹舵棌绠＄悊");
- esModel.setBy10(zfClanManage.getMemberId());
-
- esModel.setBy5("/zfClanManage");
-// esModel.setFid(familyId);
- esSer.insertTable(esModel);
-// System.out.println(esModel);
-
- return AjaxResult.success();
- } else {
- return AjaxResult.error();
-
- }
- }
-
- /**
- *閫氳繃id鍒犻櫎
- */
- @Override
- public AjaxResult deleteData(Integer clanId,Integer id) {
- ZfClanManage zfClanManage1 = new ZfClanManage();
- zfClanManage1.setMemberId(id);
- zfClanManage1.setClanId(clanId);
- List<ZfClanManage> zfClanManages =list(buildCondition(zfClanManage1));
-// for (ZfClanManage zfClanManage : zfClanManages) {
-// if (!zfClanManages.getAdminId().equals(getUserId())) {
-// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎璇ュ鏃�");
-// }
-// }
-
-// if (!Long.valueOf(zfClanService.getById(zfClanManages.get(0).getClanId()).getAdminId()).equals(getUserId())) {
-// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎鎴愬憳");
-// }
- /**
- * 鍦ㄧ敤鎴蜂俊鎭〃鍒犻櫎瀹舵棌鍙�
- */
- ZInfoUser zInfoUser = zInfoUserService.getById(Long.valueOf(zfClanManages.get(0).getMemberId()));
- zInfoUser.setClanId(0);
- zInfoUserService.saveOrUpdate(zInfoUser);
-
- if (zfClanManageService.removeByIds(Arrays.asList(zfClanManages.get(0).getId()))) {
-
- //鍒犻櫎es涓殑鏁版嵁
- zfClanManages.stream().forEach(zfClanManage -> {
- EsModel esModel = esSer.findByCtId((zfClanManage.getId().intValue()), "瀹舵棌绠＄悊");
- if (esModel != null) {
- DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
- try {
- restHighLevelClient.delete(deleteRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- });
-
- return AjaxResult.success();
- } else {
- return AjaxResult.error();
- }
- }
-
- /**
- *閫氳繃瀹舵棌id鍒犻櫎
- */
- @Override
- public void deleteMember(Long ids) {
- LambdaQueryWrapper<ZfClanManage> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZfClanManage::getClanId,ids);
- List<ZfClanManage> zfClanManages =list(lqw) ;
-// for (ZfClanManage zfClanManage : zfClanManages) {
-// if (!zfClanManages.getAdminId().equals(getUserId())) {
-// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎璇ュ鏃�");
-// }
-// }
-
-// if (!Long.valueOf(zfClanService.getById(zfClanManages.get(0).getClanId()).getAdminId()).equals(getUserId())) {
-// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎鎴愬憳");
-// }
- List<Integer> id = new ArrayList<>() ;
- for (ZfClanManage zfClanManage: zfClanManages) {
- ZInfoUser zInfoUser = zInfoUserService.getById(Long.valueOf(zfClanManage.getMemberId()));
- zInfoUser.setClanId(0);
- System.out.println(zInfoUser);
- zInfoUserService.saveOrUpdate(zInfoUser);
- id.add(zfClanManage.getId());
- }
- /**
- * 鍦ㄧ敤鎴蜂俊鎭〃鍒犻櫎瀹舵棌鍙�
- */
-
-
-
- if (zfClanManageService.removeByIds(id)) {
- //鍒犻櫎es涓殑鏁版嵁
- zfClanManages.stream().forEach(zfClanManage -> {
- EsModel esModel = esSer.findByCtId((zfClanManage.getId().intValue()), "瀹舵棌绠＄悊");
- if (esModel != null) {
- DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
- try {
- restHighLevelClient.delete(deleteRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- });
-
-
- }}}
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 194fad3..9c72768 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
@@ -41,25 +41,19 @@
private ZfClanService zfClanService;
@Resource
- private ZfClanManageService zfClanManageService;
+ private ZfAncestorService zfAncestorService;
private LambdaQueryWrapper<ZfClan> buildCondition(ZfClan zfClan) {
LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfClan::getClanId);
- lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName())
- .like(zfClan.getAdminId() != null, ZfClan::getAdminId, zfClan.getAdminId())
- .like(zfClan.getMomId() != null, ZfClan::getDadId, zfClan.getDadId())
- .like(zfClan.getDadId() != null, ZfClan::getMomId, zfClan.getMomId());
+ lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
return lqw;
}
private LambdaQueryWrapper<ZfClan> uniqueCondition(ZfClan zfClan){
LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
lqw.eq(!StringUtils.isEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
- lqw.eq(zfClan.getAdminId() !=null, ZfClan::getAdminId, zfClan.getAdminId());
- lqw.eq(zfClan.getDadId() !=null , ZfClan::getDadId, zfClan.getDadId());
- lqw.eq(zfClan.getMomId() !=null, ZfClan::getMomId, zfClan.getMomId());
return lqw;
}
@@ -80,30 +74,30 @@
@Override
public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
- List<ZfClan> beanRecords = list(lqw);
- List<ZfClanDate> zfClanDates=new ArrayList<>();
- System.out.println(beanRecords);
- for (ZfClan zfClan1: beanRecords) {
- ZfClanDate zfClanDate = new ZfClanDate();
- HashMap<Integer,String> adminName = new HashMap<>();
- adminName.put(zfClan1.getAdminId(),zInfoUserService.getById(zfClan1.getAdminId()).getNickName());
- zfClanDate.setAdminName(adminName);
- HashMap<Integer,String> momName = new HashMap<>();
- momName.put(zfClan1.getMomId(),zInfoUserService.getById(zfClan1.getMomId()).getNickName());
- zfClanDate.setMomName(momName);
- HashMap<Integer,String> dadName = new HashMap<>();
- dadName.put(zfClan1.getDadId(),zInfoUserService.getById(zfClan1.getDadId()).getNickName());
- zfClanDate.setDadName(dadName);
- zfClanDate.setClanId(zfClan1.getClanId());
- zfClanDate.setClanName(zfClan1.getClanName());
- zfClanDates.add(zfClanDate);
+ Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
+ 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 selectDataList(ZfClan zfClan){
+ LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
+ List<ZfClan> zfClans = list(lqw);
+ List<ZfClan> satisfyList = new ArrayList<>();
+ for (ZfClan zfClan1: zfClans) {
+ if (zfAncestorService.count(zfClan1.getClanId())){
+ satisfyList.add(zfClan1);}
}
-
- return AjaxResult.success(zfClanDates);
-
-}
+ return AjaxResult.success(satisfyList);
+ }
@Override
public AjaxResult addData(ZfClan zfClan) {
@@ -131,10 +125,7 @@
// esModel.setFid(familyId);
esSer.insertTable(esModel);
// System.out.println(esModel);
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getDadId(),2);
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getMomId(),2);
-// if (!zfClan.getDadId().equals(zfClan.getAdminId()) && !zfClan.getMomId().equals(zfClan.getAdminId()) )
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getAdminId(),1);
+
return AjaxResult.success();
} else {
@@ -199,7 +190,7 @@
public AjaxResult deleteData(Long ids) {
List<ZfClan> zfClans = listByIds(Arrays.asList(ids));
- zfClanManageService.deleteMember(ids);
+// zfClanManageService.deleteMember(ids);
if (zfClanService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
--
Gitblit v1.9.1