From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
index 25b90f0..110a540 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -8,6 +9,8 @@
import com.google.common.collect.Lists;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.switchs.CommunitySwitchAllAppletsVO;
+import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import org.springframework.beans.BeanUtils;
@@ -35,6 +38,10 @@
@Resource
private ComStreetDAO comStreetDAO;
+
+
+ @Resource
+ private ComActDAO comActDAO;
@Override
public R getProvince() {
@@ -76,9 +83,12 @@
@Override
public R getCityTreeByProvinceCode(Integer provinceAdcode,String areaCode) {
+ //省份
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
+ //市
List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(new QueryWrapper<>());
+
List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(new QueryWrapper<>());
List<ComMngAreaVO> vos = new ArrayList<>();
provinceDOS.forEach(p -> {
@@ -105,7 +115,7 @@
}
@Override
- public R getCityTreeByCode(Integer provinceAdcode, String areaCode) {
+ public R getCityTreeByCode(Integer provinceAdcode, String areaCode,String appId) {
//四川省
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
@@ -134,14 +144,27 @@
ComStreetVO comStreetVO=new ComStreetVO();
comStreetVO.setAreaCode(d.getDistrictAdcode());
if (comStreetVO.getAreaCode() != null) {
- param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
+ param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode())
+ .eq(ComStreetDO::getAppId, appId);
}
List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
comStreetDOS.forEach(dos ->
{
- ComMngAreaVO csd = new ComMngAreaVO(0, dos.getName(),dos.getStreetId()+"");
+ ComMngAreaVO csd = new ComMngAreaVO(0, dos.getName());
BeanUtils.copyProperties(dos, csd);
districtVo.getChildren().add(csd);
+
+ // 查询街道下社区列表
+ List<CommunitySwitchAllAppletsVO> communityList = comActDAO.getCommunityListByStreetId(dos.getStreetId());
+
+ communityList.forEach(commItem ->
+ {
+ ComMngAreaVO cssd = new ComMngAreaVO(0, commItem.getName(),commItem.getCommunityId()+"");
+ BeanUtils.copyProperties(commItem, cssd);
+ csd.getChildren().add(cssd);
+ });
+
+
});
--
Gitblit v1.7.1