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/ComMngCarServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
index 8d708cc..8cf20eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -111,7 +111,7 @@
List<ComMngCarDO> existList = comMngCarDAO.selectList(
new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()));
if (!existList.isEmpty()) {
- return R.ok("车辆已存在");
+ return R.fail("车辆已存在");
}
}
ComMngVillageDO comMngVillageDO = comMngVillageDAO.selectById(comMngCarSaveDTO.getAreaId());
@@ -180,26 +180,28 @@
@Override
public R listSaveMngCarExcelVO(List<ComMngCarExcelVO> list, Long communityId) {
// 获取社区下所有的小区
- List<ComMngStructAreaDO> comMngStructAreaDOs = comMngStructAreaDAO.selectList(
- new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getCommunityId, communityId));
- Map<String, ComMngStructAreaDO> areaMap = new HashMap<>(comMngStructAreaDOs.size());
- comMngStructAreaDOs.forEach(comMngStructAreaDO -> {
- areaMap.put(comMngStructAreaDO.getAreaName(), comMngStructAreaDO);
+ List<ComMngVillageDO> comMngVillageDOS = comMngVillageDAO.selectList(
+ new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
+ Map<String, ComMngVillageDO> areaMap = new HashMap<>(comMngVillageDOS.size());
+ comMngVillageDOS.forEach(comMngVillageDO -> {
+ areaMap.put(comMngVillageDO.getName(),comMngVillageDO);
});
List<ComMngCarDO> comMngCarDOS = new ArrayList<>();
list.forEach(vo -> {
int count = comMngCarDAO.selectCount(new QueryWrapper<ComMngCarDO>().lambda()
.eq(ComMngCarDO::getPlateNum, vo.getPlateNum()).and(wrapper -> wrapper.eq(ComMngCarDO::getSource, 2)));
- if (count == 0 && areaMap.containsKey(vo.getAreaName())) {
- ComMngCarDO comMngCarDO = new ComMngCarDO();
- BeanUtils.copyProperties(vo, comMngCarDO);
+ ComMngCarDO comMngCarDO = new ComMngCarDO();
+ BeanUtils.copyProperties(vo, comMngCarDO);
+ if (count == 0 ) {
+ if(StringUtils.isNotEmpty(vo.getAreaName())&&areaMap.containsKey(vo.getAreaName())){
+ comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getVillageId());
+ }
try {
comMngCarDO.setCardNo(AESUtil.encrypt128(vo.getCardNo(), aesKey));
} catch (Exception e) {
}
comMngCarDO.setCommunityId(communityId);
- comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getId());
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(vo.getMobile());
if (R.isOk(sysUserVOR)) {
SysUserVO sysUserVO =
@@ -210,8 +212,13 @@
comMngCarDOS.add(comMngCarDO);
}
});
- this.saveBatch(comMngCarDOS);
- return R.ok("共计导入车辆数量：" + comMngCarDOS.size());
+ if(comMngCarDOS.isEmpty()){
+ return R.fail("导入数据有误");
+ }
+ else {
+ this.saveBatch(comMngCarDOS);
+ return R.ok("共计导入车辆数量：" + comMngCarDOS.size());
+ }
}
@Override
--
Gitblit v1.7.1