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/ScreenWorkServiceImpl.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
index 99a8c83..f6ad587 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
@@ -6,6 +6,17 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.NumberUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.panzhihua.common.model.vos.DateVO;
+import com.panzhihua.common.model.vos.community.building.admin.BuildingListHeaderStatisticsAdminVo;
+import com.panzhihua.common.model.vos.community.building.admin.PageBuildingListAdminVo;
+import com.panzhihua.common.model.vos.puda.BasicDataVO;
+import com.panzhihua.common.model.vos.puda.CitizenInfoVO;
+import com.panzhihua.common.model.vos.puda.DynamicVO;
+import com.panzhihua.common.model.vos.puda.SpecialPeopleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.service_community.service.ComActBuildingService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -47,6 +58,10 @@
private ComPbDynDAO comPbDynDAO;
@Resource
private ComActEasyPhotoDAO comActEasyPhotoDAO;
+ @Resource
+ private ComScreenDao comScreenDao;
+ @Resource
+ private ComActBuildingService comActBuildingService;
@Override
public R statisticNeighborCircle(Long communityId) {
@@ -317,34 +332,104 @@
return R.ok(workScreenVO);
}
+ @Override
+ public R autonomyDynamic(Long communityId) {
+ DynamicVO dynamicVO =comScreenDao.autonomyDynamic(communityId);
+ return R.ok(dynamicVO);
+ }
+
+ @Override
+ public R property(Long communityId) {
+ return R.ok(comScreenDao.propertyData(communityId));
+ }
+
+ @Override
+ public R partyData(Long communityId) {
+ return R.ok(comScreenDao.partyData(communityId));
+ }
+
+ @Override
+ public R yard(Long communityId) {
+ return R.ok(comScreenDao.yard(communityId));
+ }
+
+ @Override
+ public R citizenInfo(Long communityId) {
+ DateVO vo=new DateVO();
+ vo.setCommunityId(communityId);
+ //当前日期
+ vo.setNow(DateUtil.now());
+ //16年前
+ vo.setOffset16(DateUtil.offsetMonth(DateUtil.date(), -192).toDateStr());
+ //27年前
+ vo.setOffset27(DateUtil.offsetMonth(DateUtil.date(), -324).toDateStr());
+ //35年前
+ vo.setOffset35(DateUtil.offsetMonth(DateUtil.date(), -420).toDateStr());
+ //45年前
+ vo.setOffset45(DateUtil.offsetMonth(DateUtil.date(), -540).toDateStr());
+ //55年前
+ vo.setOffset55(DateUtil.offsetMonth(DateUtil.date(), -660).toDateStr());
+ CitizenInfoVO citizenInfoVO = comScreenDao.ageRange(vo);
+ citizenInfoVO.setTotal(comScreenDao.buildingListHeaderStatisticsAdmin(communityId).getPopulationNum());
+ citizenInfoVO.setMaleRate(NumberUtil.div(citizenInfoVO.getMaleNum(), citizenInfoVO.getTotal(), 2));
+ citizenInfoVO.setFemaleRate(NumberUtil.div(citizenInfoVO.getFemaleNum(), citizenInfoVO.getTotal(), 2));
+ //男性占比
+ return R.ok(citizenInfoVO);
+ }
+
+ @Override
+ public R specialPeople(Long communityId) {
+ SpecialPeopleVO vo=new SpecialPeopleVO();
+ vo.setTotal(0);
+ List<SpecialPeopleVO> specialPeopleVOS = comScreenDao.specialPeople(communityId);
+ //求和
+ for (SpecialPeopleVO specialPeopleVO : specialPeopleVOS) {
+ vo.setTotal(vo.getTotal()+specialPeopleVO.getCount());
+ }
+ //计算占比
+ for (SpecialPeopleVO specialPeopleVO : specialPeopleVOS) {
+ specialPeopleVO.setRate(NumberUtil.div(specialPeopleVO.getCount(),vo.getTotal() ,2 ));
+ }
+ vo.setChildList(specialPeopleVOS);
+ return R.ok(vo);
+ }
+
+ @Override
+ public R basicData(Long communityId) {
+ BuildingListHeaderStatisticsAdminVo buildingListHeaderStatisticsAdminVo=comScreenDao.buildingListHeaderStatisticsAdmin(communityId);
+ BasicDataVO vo=new BasicDataVO();
+ vo.setVillage(buildingListHeaderStatisticsAdminVo.getBuildNum());
+ vo.setPeople(buildingListHeaderStatisticsAdminVo.getPopulationNum());
+ vo.setBuildings(buildingListHeaderStatisticsAdminVo.getHouseNum());
+// vo.setBuildings(comScreenDao.assetAnalysis(communityId));
+ return R.ok(vo);
+ }
+
private List<DynamicWorkVO> listHalfYearByDyn() {
List<DynamicWorkVO> dateList = new ArrayList<>();
Date now = new Date();
- for (int i = 6; i >= 1; i--) {
+ for (int i = 5; i >= 0; i--) {
Date date = DateUtils.getDateM(now, -i);
DateTime endDay = DateUtil.endOfMonth(date);
int m = DateUtil.month(endDay);
m++;
- if (m == 12) {
- m = 0;
- }
int day = DateUtil.dayOfMonth(endDay);
int half = day / 2;
String month = DateUtil.format(date, moth_format_str);
DynamicWorkVO dynamicWorkVO = new DynamicWorkVO();
- dynamicWorkVO.setMonth(monthStr[m] + "月上旬");
+ dynamicWorkVO.setMonth(monthStr[m-1] + "月上旬");
dynamicWorkVO.setStart(month + "-01 00:00:00");
dynamicWorkVO.setEnd(month + "-" + half + " 23:59:58");
dateList.add(dynamicWorkVO);
DynamicWorkVO dynamicWorkVO1 = new DynamicWorkVO();
- dynamicWorkVO1.setMonth(monthStr[m] + "月下旬");
+ dynamicWorkVO1.setMonth(monthStr[m-1] + "月下旬");
dynamicWorkVO1.setStart(month + "-" + half + " 23:59:58");
dynamicWorkVO1.setEnd(DateUtils.getDateFormatString(endDay, "yyyy-MM-dd HH:mm:ss"));
dateList.add(dynamicWorkVO1);
}
return dateList;
-
}
+
}
--
Gitblit v1.7.1