张天森
2022-10-12 3c884ccd7b51edf3b36840bf99de5edaa41a38a7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -7,6 +7,8 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import com.panzhihua.service_community.util.MyAESUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
@@ -63,6 +65,7 @@
            return R.fail("社区已经存在");
        }
        BeanUtils.copyProperties(comActVO, comActDO);
        comActDO.setPlaintextPassword(password);
        int insert = comActDAO.insert(comActDO);
        if (insert > 0) {
            ComActDO comActDO1 =
@@ -91,6 +94,7 @@
        if (!ObjectUtils.isEmpty(password)) {
            String encode = new BCryptPasswordEncoder().encode(password);
            comActVO.setPassword(encode);
            comActDO.setPlaintextPassword(password);
            a = 1;
        }
        ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId());
@@ -101,7 +105,6 @@
        // a=1;
        // }
        BeanUtils.copyProperties(comActVO, comActDO);
//        ComActDO selectOne = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAccount, account));
//        if (null != selectOne && selectOne.getAccount().equals(comActVO.getAccount())) {
//            return R.fail("该登录账号重复,请重新修改");
@@ -146,6 +149,13 @@
        ComActVO comActVO = new ComActVO();
        BeanUtils.copyProperties(comActDO, comActVO);
        comActVO.setAreaName(comActDAO.selectAreaName(comActVO.getAreaCode()));
        comActVO.setAccount(null);
        comActVO.setPassword(null);
        comActVO.setAddress(null);
        comActVO.setContacts(null);
        comActVO.setCreateAt(null);
        comActVO.setState(null);
        comActVO.setDistance(null);
        return R.ok(comActVO);
    }
@@ -179,9 +189,9 @@
     * @return 社区集合 按照创建顺序倒序排列
     */
    @Override
    public R listCommunityAll() {
    public R listCommunityAll(String areaCode) {
        List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0)
            .eq(ComActDO::getCityCode, "510400").orderByDesc(ComActDO::getCreateAt));
            .eq(ComActDO::getAreaCode, areaCode).orderByDesc(ComActDO::getCreateAt));
        List<ComActVO> comActVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comActDOS)) {
            comActDOS.forEach(comActDO -> {
@@ -215,13 +225,13 @@
     * @return 社区列表
     */
    @Override
    public R getCommunityLists() {
        return R.ok(this.comActDAO.getCommunityLists());
    public R getCommunityLists(String appId) {
        return R.ok(this.comActDAO.getCommunityLists(appId));
    }
    @Override
    public R getWestCommunityLists() {
        return R.ok(this.comActDAO.getWestCommunityLists());
    public R getWestCommunityLists(String areaCode) {
        return R.ok(this.comActDAO.getWestCommunityLists(areaCode));
    }
    /**
@@ -230,9 +240,9 @@
     * @return 社区列表
     */
    @Override
    public R getCommunityAllList() {
    public R getCommunityAllList(String appId) {
        // 查询街道列表
        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList();
        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(appId);
        streetList.forEach(street -> {
            // 查询街道下社区列表
            List<CommunitySwitchAllAppletsVO> communityList =
@@ -255,8 +265,8 @@
     * @return 社区列表
     */
    @Override
    public R communitySwitchSearchList(String name) {
        return R.ok(this.comActDAO.getCommunityListByName(name));
    public R communitySwitchSearchList(String name,String appId) {
        return R.ok(this.comActDAO.getCommunityListByName(name,appId));
    }
    /**
@@ -271,4 +281,15 @@
        return R.ok(this.comActDAO.getCommunityListByNearby(communityDTO));
    }
    @Override
    public R getCommunityPassword(Long communityId){
        ComActPasswordVo comActPasswordVo=comActDAO.getCommunityPassword(communityId);
        try {
            comActPasswordVo.setPassword(MyAESUtil.Decrypt(comActPasswordVo.getPassword(),"Ryo7M3n8loC5Abcd"));
        } catch (Exception e) {
            e.printStackTrace();
        }
        return R.ok(comActPasswordVo);
    }
}