From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 28 五月 2021 16:17:08 +0800 Subject: [PATCH] 修改bug --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 199 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 199 insertions(+), 0 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 new file mode 100644 index 0000000..2b66938 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java @@ -0,0 +1,199 @@ +package com.panzhihua.service_community.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.panzhihua.common.model.dtos.community.PageComActDTO; +import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; +import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.model.vos.community.ComActVO; +import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO; +import com.panzhihua.service_community.dao.ComActDAO; +import com.panzhihua.service_community.dao.ComActVillageDAO; +import com.panzhihua.service_community.dao.ComStreetDAO; +import com.panzhihua.service_community.model.dos.ComActDO; +import com.panzhihua.service_community.model.dos.ComMngVillageDO; +import com.panzhihua.service_community.model.dos.ComStreetDO; +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; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @program: springcloud_k8s_panzhihuazhihuishequ + * @description: 社区 + * @author: huang.hongfa weixin hhf9596 qq 959656820 + * @create: 2020-12-15 10:13 + **/ +@Service +public class ComActServiceImpl implements ComActService { + @Resource + private ComActDAO comActDAO; + @Resource + private ComStreetDAO comStreetDAO; + + /** + * 新增社区 + * + * @param comActVO 社区信息 + * @return 新增结果 + */ + @Override + public R addCommunity(ComActVO comActVO) { + String password = comActVO.getPassword(); + String encode = new BCryptPasswordEncoder().encode(password); + comActVO.setPassword(encode); + ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId()); + if (comStreetDO == null) { + return R.fail("当前街道不存在!"); + } + 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) { + ComActDO comActDO1 = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName())); + BeanUtils.copyProperties(comActDO1, comActVO); + return R.ok(comActVO); + } + return R.fail(); + } + + /** + * 编辑社区 + * + * @param comActVO 编辑内容 + * @return 编辑结果 + */ + @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; + } + ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId()); + if (comStreetDO == null) { + return R.fail("当前街道不存在!"); + } +// 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(); + } + + /** + * 查询社区 + * + * @param comActVO 登录人的经纬度、或者指定区域的社区 + * @return 社区集合 + */ + @Override + public R listCommunity(ComActVO comActVO) { + List<ComActVO> comActVOS = comActDAO.listCommunity(comActVO); + return R.ok(comActVOS); + } + + /** + * 社区详情 + * + * @param communityId 社区id + * @return 社区详情 + */ + @Override + public R detailCommunity(Long communityId) { + ComActDO comActDO = comActDAO.selectById(communityId); + if (ObjectUtils.isEmpty(comActDO)) { + return R.fail(); + } + ComActVO comActVO = new ComActVO(); + BeanUtils.copyProperties(comActDO, comActVO); + comActVO.setAreaName(comActDAO.selectAreaName(comActVO.getAreaCode())); + return R.ok(comActVO); + } + + /** + * 分页查询社区 + * + * @param pageComActDTO 查询参数 + * @return 分页集合 + */ + @Override + public R pageCommunity(PageComActDTO pageComActDTO) { + Page page = new Page<>(); + Long pageNum = pageComActDTO.getPageNum(); + Long pageSize = pageComActDTO.getPageSize(); + if (null == pageNum || 0 == pageNum) { + pageNum = 1l; + } + if (null == pageSize || 0 == pageSize) { + pageSize = 10l; + } + page.setSize(pageSize); + page.setCurrent(pageNum); + IPage<ComActVO> iPage = comActDAO.pageCommunity(page, pageComActDTO); + return R.ok(iPage); + } + + /** + * 查询平台所有的社区 + * + * @return 社区集合 按照创建顺序倒序排列 + */ + @Override + public R listCommunityAll() { + List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0) + .eq(ComActDO::getCityCode, "510400") + .orderByDesc(ComActDO::getCreateAt)); + List<ComActVO> comActVOS = new ArrayList<>(); + if (!ObjectUtils.isEmpty(comActDOS)) { + comActDOS.forEach(comActDO -> { + ComActVO comActVO = new ComActVO(); + BeanUtils.copyProperties(comActDO, comActVO); + comActVOS.add(comActVO); + }); + } + 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