From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001 From: DESKTOP-71BH0QO\L、ming <172680469@qq.com> Date: 星期五, 26 三月 2021 10:08:46 +0800 Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java index 5a8a658..55dad24 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java @@ -12,6 +12,7 @@ import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.service.ComActService; import org.springframework.beans.BeanUtils; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,11 +38,20 @@ */ @Override public R addCommunity(ComActVO comActVO) { + String password = comActVO.getPassword(); + String encode = new BCryptPasswordEncoder().encode(password); + comActVO.setPassword(encode); ComActDO comActDO=new ComActDO(); + Integer integer = comActDAO.selectCount(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName())); + if (integer>0) { + return R.fail("社区已经存在"); + } BeanUtils.copyProperties(comActVO,comActDO); int insert = comActDAO.insert(comActDO); if (insert>0) { - return R.ok(); + ComActDO comActDO1 = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName())); + BeanUtils.copyProperties(comActDO1,comActVO); + return R.ok(comActVO); } return R.fail(); } @@ -55,9 +65,26 @@ @Override public R putCommunity(ComActVO comActVO) { ComActDO comActDO=new ComActDO(); + String password = comActVO.getPassword(); + String account = comActVO.getAccount(); + Long communityId = comActVO.getCommunityId(); +// String contacts = comActVO.getContacts(); + int a=0; + if (!ObjectUtils.isEmpty(password)) { + String encode = new BCryptPasswordEncoder().encode(password); + comActVO.setPassword(encode); + a=1; + } +// if(!ObjectUtils.isEmpty(account)||!ObjectUtils.isEmpty(contacts)){ +// a=1; +// } BeanUtils.copyProperties(comActVO,comActDO); int update = comActDAO.updateById(comActDO); if (update>0) { + if (a==1) { +// 修改登录账户的密码 + comActDAO.updateAccountPassword(comActVO.getPassword(),account,communityId); + } return R.ok(); } return R.fail(); @@ -135,7 +162,20 @@ return R.ok(comActVOS); } - + /** + * 删除社区 + * + * @param communityId 社区id + * @return 删除结果 + */ + @Override + public R delectCommunity(Long communityId) { + int delete = comActDAO.deleteById(communityId); + if (delete>0) { + return R.ok(); + } + return R.fail(); + } } -- Gitblit v1.7.1