From c8a96c5e4ce5d5013a5ec508e2422f40ecdc311e Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 25 七月 2024 19:10:59 +0800
Subject: [PATCH] 家族
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java | 59 ++++++
zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java | 2
zhang-content/src/main/java/com/ruoyi/domain/ZfClanDate.java | 31 +++
zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java | 6
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanManageServiceImpl.java | 225 ++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanManageController.java | 49 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 39 ++-
zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java | 8
zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java | 8
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 81 +++++---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 5
11 files changed, 453 insertions(+), 60 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 570aa81..e8857d0 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
@@ -172,24 +172,29 @@
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
- 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())){
+ if (user.getFid() != null){
+ ZInfoUser father = zInfoUserService.getById(user.getFid());
+ if (father.getIsMyFamily() == 1)
+ System.out.println("11111111111111111111111111111111/");
+ infoUser.setFamilyId(father.getFamilyId());
+ }
}
- else if(user.getMid() != null){
- ZInfoUser mother = zInfoUserService.getById(user.getMid());
- if (mother.getIsMyFamily() == 1)
- System.out.println("2222222222222222222222222222222222/");
- infoUser.setFamilyId(mother.getFamilyId());
- }
- else if (user.getSpouseId()!=null) {
- ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
- System.out.println("33333333333333333333333333333333333333333/");
- infoUser.setFamilyId(spouse.getFamilyId());
- infoUser.setSpouseId(user.getSpouseId());
- }
+// else if(user.getMid() != null){
+// ZInfoUser mother = zInfoUserService.getById(user.getMid());
+// if (mother.getIsMyFamily() == 1)
+// System.out.println("2222222222222222222222222222222222/");
+// infoUser.setFamilyId(mother.getFamilyId());
+// }
+ 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());
+ }
+ }
zInfoUserService.saveOrUpdate(infoUser);
if(user.getSpouseId()!=null) {
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
new file mode 100644
index 0000000..4126b65
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
@@ -0,0 +1,59 @@
+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.Meeting;
+import com.ruoyi.domain.ZfClan;
+import com.ruoyi.service.ZfClanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import static com.ruoyi.common.core.page.TableSupport.*;
+
+@RestController
+@RequestMapping("/ZfClan")
+public class ZfClanController {
+ @Autowired
+ ZfClanService zfClanService;
+
+ @GetMapping("/all")
+ public AjaxResult listAll(ZfClan zfClan){
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfClanService.selectDataList(zfClan, pageNo, pageSize);
+ }
+
+ /**
+ * 鏂板瀹舵棌
+ */
+ @Log(title = "瀹舵棌", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZfClan zfClan)
+ {
+ return zfClanService.addData(zfClan);
+ }
+
+ /**
+ * 淇敼瀹舵棌
+ */
+ @Log(title = "瀹舵棌", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZfClan zfClan) {
+ return zfClanService.updateData(zfClan);
+ }
+
+
+ /**
+ * 鎵归噺鍒犻櫎瀹舵棌
+ */
+ @Log(title = "瀹舵棌", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long ids) {
+ return zfClanService.deleteData(ids);
+ }
+
+}
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
new file mode 100644
index 0000000..0c3a846
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanManageController.java
@@ -0,0 +1,49 @@
+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 f0cfd64..5f86811 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -180,6 +180,11 @@
private Long momId;
/**
+ * 姣嶄翰鐨刬d
+ */
+ private Integer clanId;
+
+ /**
* 鍑虹敓骞存湀鏃�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
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 899a696..b53eb00 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
@@ -8,7 +8,7 @@
@Data
@TableName("zf_clan")
public class ZfClan {
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "clan_id", type = IdType.AUTO)
private Integer clanId;
/**
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfClanDate.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfClanDate.java
new file mode 100644
index 0000000..505a8ea
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClanDate.java
@@ -0,0 +1,31 @@
+package com.ruoyi.domain;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+@Data
+public class ZfClanDate {
+
+ private Integer clanId;
+
+ /**
+ * 瀹舵棌鍚嶇О
+ */
+ private String clanName;
+
+ /**
+ * 鐖朵翰鍚嶅瓧
+ */
+ private HashMap<Integer,String> dadName;
+
+ /**
+ * 姣嶄翰鍚嶅瓧
+ */
+ private HashMap<Integer,String> momName;
+
+ /**
+ * 绠＄悊鍛樺悕瀛�
+ */
+ private HashMap<Integer,String> adminName;
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java
index 6d434a6..7ba9c4c 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java
@@ -10,6 +10,9 @@
@TableName("zf_clan_manage")
public class ZfClanManage {
@TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+
private Integer clanId;
/**
@@ -17,4 +20,9 @@
*/
private Integer memberId;
+ /**
+ * 鎴愬憳瑙掕壊绫诲瀷role_id
+ */
+ private Integer roleId;
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java
index f3dff3c..6b58517 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java
@@ -7,10 +7,14 @@
import com.ruoyi.domain.ZfClanManage;
public interface ZfClanManageService extends IService<ZfClanManage> {
- AjaxResult selectDataList(ZfClanManage zfClanManage, Integer pageNum, Integer pageSize);
+ 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(Long[] ids);
+ 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 5bd5cbe..bbefcc5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
@@ -6,14 +6,16 @@
import com.ruoyi.domain.Meeting;
import com.ruoyi.domain.ZfClan;
+import java.util.List;
+
public interface ZfClanService extends IService<ZfClan> {
- AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize);
+ AjaxResult selectDataList(ZfClan zfClan, Integer pageNo, Integer pageSize);
AjaxResult addData(ZfClan zfClan);
AjaxResult updateData(ZfClan zfClan);
- AjaxResult deleteData(Long[] ids);
+ AjaxResult deleteData(Long ids);
}
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
index b08c7de..7d56973 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanManageServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanManageServiceImpl.java
@@ -1,28 +1,239 @@
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.ZfClanManageService;
+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(ZfClanManage zfClanManage, Integer pageNum, Integer pageSize) {
- return null;
+ 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<Integer, String>> zInfoUsers = new ArrayList<>();
+
+ for (ZfClanManage beanRecord:beanRecords) {
+ HashMap<Integer,String> idAndName = new HashMap<>();
+ String name = zInfoUserService.getById(Long.valueOf(beanRecord.getMemberId())).getNickName();
+ idAndName.put(beanRecord.getMemberId(),name);
+ zInfoUsers.add(idAndName);
+ }
+
+ List<HashMap<Integer, 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) {
- return null;
+// 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(Long[] ids) {
- return null;
+ 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 8c5a3d5..194fad3 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
@@ -8,14 +8,9 @@
import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfClan;
-import com.ruoyi.domain.ZfLog;
+import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfClanMapper;
-import com.ruoyi.service.EsService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfClanService;
-import com.ruoyi.service.ZfLogService;
+import com.ruoyi.service.*;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.RequestOptions;
@@ -25,10 +20,7 @@
import javax.annotation.Resource;
import java.io.IOException;
import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
@Service
public class ZfClanServiceImpl extends ServiceImpl<ZfClanMapper,ZfClan> implements ZfClanService {
@@ -48,25 +40,29 @@
@Resource
private ZfClanService zfClanService;
+ @Resource
+ private ZfClanManageService zfClanManageService;
+
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() !=0, ZfClan::getAdminId, zfClan.getAdminId())
- .like(zfClan.getDadId() !=0 , ZfClan::getDadId, zfClan.getDadId())
- .like(zfClan.getMomId() !=0, ZfClan::getMomId, zfClan.getMomId());
+ .like(zfClan.getAdminId() != null, ZfClan::getAdminId, zfClan.getAdminId())
+ .like(zfClan.getMomId() != null, ZfClan::getDadId, zfClan.getDadId())
+ .like(zfClan.getDadId() != null, ZfClan::getMomId, zfClan.getMomId());
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() !=0, ZfClan::getAdminId, zfClan.getAdminId());
- lqw.eq(zfClan.getDadId() !=0 , ZfClan::getDadId, zfClan.getDadId());
- lqw.eq(zfClan.getMomId() !=0, ZfClan::getMomId, zfClan.getMomId());
+ 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;
}
+
/**
*
@@ -75,22 +71,37 @@
*/
public Long getUserId(){
ZInfoUser myself = zInfoUserService.getMyself();
+
return myself.getUserId();
}
+
@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<>();
- Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
- Page<ZfClan> pageResult = page(zfClanPage, lqw);
- List<ZfClan> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
-// System.out.println(beanRecords);
+ 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);
+ }
- HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
- return AjaxResult.success(data);
+ return AjaxResult.success(zfClanDates);
}
@@ -99,9 +110,13 @@
LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
List<ZfClan> list = list(lqw);
+
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅瀹舵棌");
}
+
+
+
if (save(zfClan)) {
EsModel esModel = new EsModel();
@@ -116,6 +131,10 @@
// 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 {
@@ -128,8 +147,10 @@
@Override
public AjaxResult updateData(ZfClan zfClan) {
- List<ZfClan> lqw = list(buildCondition(zfClan));
-
+// if (!Long.valueOf(zfClanService.getById(zfClan.getClanId()).getAdminId()).equals(getUserId())) {
+// throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏淇敼璇ュ鏃忎俊鎭�");
+//
+// }
ZfLog zfLog = new ZfLog();
zfLog.setUpdateTime(LocalDateTime.now());
zfLog.setModule("瀹舵棌");
@@ -175,13 +196,10 @@
}
@Override
- public AjaxResult deleteData(Long[] ids) {
+ public AjaxResult deleteData(Long ids) {
List<ZfClan> zfClans = listByIds(Arrays.asList(ids));
- for (ZfClan zfClan : zfClans) {
- if (!zfClan.getAdminId().equals(getUserId())) {
- throw new RuntimeException("鎮ㄤ笉鏄鐞嗗憳,娌℃湁鏉冨姏鍒犻櫎璇ュ鏃�");
- }
- }
+
+ zfClanManageService.deleteMember(ids);
if (zfClanService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
@@ -197,6 +215,7 @@
}
});
+
return AjaxResult.success();
} else {
return AjaxResult.error();
--
Gitblit v1.9.1