From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index d1e5616..6c4f708 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -22,20 +22,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xxl.job.core.server.EmbedServer;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springblade.common.cache.SysCache;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
-import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.grid.entity.GridEntity;
@@ -57,8 +55,6 @@
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
import org.springblade.modules.label.vo.LabelVO;
-import org.springblade.modules.place.excel.PlaceExcel;
-import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
@@ -121,7 +117,7 @@
*/
@Override
public HouseVO getHouseDetail(HouseVO house) {
- if (house == null) {
+ if (ObjectUtils.isEmpty(house)) {
logger.error("house是空值", house);
return new HouseVO();
}
@@ -825,28 +821,26 @@
@Override
public Map<String, Object> getHouseStatistics(String code, String roleType, String aoiCode, String buildingCode, String unitCode) {
+ HouseVO house = new HouseVO();
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
Map<String, Object> objectObjectHashMap = new HashMap<>();
- if (roleType.equals("2")) {
- // result1 查询楼栋数 result2 查询房屋套数 result3 查询住户数 result4 查询单元数
- Integer result1 = baseMapper.getHouseStatisticsOne(code, null, aoiCode, buildingCode, unitCode, roleType);
- Integer result2 = baseMapper.getHouseStatisticsTwo(code, null, aoiCode, buildingCode, unitCode, roleType);
- Integer result3 = baseMapper.getHouseStatisticsThree(code, null, aoiCode, buildingCode, unitCode, roleType);
- Integer result4 = baseMapper.getHouseStatisticsFour(code, null, aoiCode, buildingCode, unitCode, roleType);
- objectObjectHashMap.put("result1", result1);
- objectObjectHashMap.put("result2", result2);
- objectObjectHashMap.put("result3", result3);
- objectObjectHashMap.put("result4", result4);
- } else {
-
- Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
- Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
- Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
- Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
- objectObjectHashMap.put("result1", result1);
- objectObjectHashMap.put("result2", result2);
- objectObjectHashMap.put("result3", result3);
- objectObjectHashMap.put("result4", result4);
+ Long userId = null;
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName) && roleName.equals("mj")){
+ userId = AuthUtil.getUserId();
}
+ List<String> communityCodeList = Func.toStrList(code);
+ Integer result1 = baseMapper.getHouseStatisticsOne(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
+ Integer result2 = baseMapper.getHouseStatisticsTwo(communityCodeList, aoiCode, buildingCode, unitCode, house,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList());
+ Integer result3 = baseMapper.getHouseStatisticsThree(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
+ Integer result4 = baseMapper.getHouseStatisticsFour(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
+ objectObjectHashMap.put("result1", result1);
+ objectObjectHashMap.put("result2", result2);
+ objectObjectHashMap.put("result3", result3);
+ objectObjectHashMap.put("result4", result4);
return objectObjectHashMap;
}
@@ -936,10 +930,8 @@
public List<Map<String, Object>> getHouseLabelStatistic(HouseVO house) {
CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
// 按房屋标签统计
- List<Map<String, Object>> list = baseMapper.getHouseLabelStatistic(house,
- commonParamSet.getIsAdministrator(),
- commonParamSet.getRegionChildCodesList(),
- commonParamSet.getGridCodeList());
+ List<String> communityCodeList = Func.toStrList(house.getCode());
+ List<Map<String, Object>> list = baseMapper.getHouseLabelStatistic(house,communityCodeList);
// 返回
return list;
}
@@ -1034,4 +1026,9 @@
}
return true;
}
+
+ @Override
+ public Map<String, Object> getHoseTotalAndAreaTotalByDistrictCode(List<String> aoiCodeList) {
+ return baseMapper.getHoseTotalAndAreaTotalByDistrictCode(aoiCodeList);
+ }
}
--
Gitblit v1.9.3