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()); } //前端保证了角色不为空 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
New file @@ -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); // } } 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); } /** * 修改家族 */ ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanManageController.java
File was deleted zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -180,7 +180,7 @@ private Long momId; /** * 母亲的id * 家族的id */ private Integer clanId;
New file @@ -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; } 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; /** * 管理员id */ private Integer adminId; } zhang-content/src/main/java/com/ruoyi/domain/ZfClanManage.java
File was deleted zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
New file @@ -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> { } zhang-content/src/main/java/com/ruoyi/mapper/ZfClanManageMapper.java
File was deleted 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); zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
New file @@ -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); } zhang-content/src/main/java/com/ruoyi/service/ZfClanManageService.java
File was deleted zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
@@ -18,4 +18,6 @@ AjaxResult deleteData(Long ids); AjaxResult selectDataList(ZfClan zfClan); } 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; } zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
New file @@ -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; } /** * * 获取当前用户的sysUserId * @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); // } // } // }); // // // }} } zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanManageServiceImpl.java
File was deleted 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中的数据
