From 29c3367d8c8f9777bde6a86fa26c86d19a35bc07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 15:18:25 +0800
Subject: [PATCH] Merge branch 'zzj' of http://182.151.2.19:9380/root/zhihuishequ into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 623b9db..ea5703a 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
@@ -9,6 +9,7 @@
import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
+import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngCarVO;
@@ -18,11 +19,14 @@
import com.panzhihua.common.utlis.ParamRegularUtil;
import com.panzhihua.service_community.dao.ComMngCarDAO;
import com.panzhihua.service_community.dao.ComMngStructAreaDAO;
+import com.panzhihua.service_community.dao.ComMngVillageDAO;
import com.panzhihua.service_community.model.dos.ComCvtServeDO;
import com.panzhihua.service_community.model.dos.ComMngCarDO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
+import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngCarService;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -42,7 +46,11 @@
@Resource
private ComMngStructAreaDAO comMngStructAreaDAO;
@Resource
+ private ComMngVillageDAO comMngVillageDAO;
+ @Resource
private UserService userService;
+ @Value("${domain.aesKey:}")
+ private String aesKey;
@Override
@@ -105,17 +113,25 @@
return R.ok("车辆已存在");
}
}
- ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(comMngCarSaveDTO.getAreaId());
- if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
+ ComMngVillageDO comMngVillageDO = comMngVillageDAO.selectById(comMngCarSaveDTO.getAreaId());
+ if (ObjectUtils.isEmpty(comMngVillageDO)) {
return R.fail("小区不存在");
}
if (ObjectUtils.isEmpty(comMngCarSaveDTO.getMobile())) {
return R.fail("车主手机号码不能为空");
}
+ if (ObjectUtils.isEmpty(comMngCarSaveDTO.getCardNo())) {
+ return R.fail("车主身份证号码不能为空");
+ }
ComMngCarDO comMngCarDO = new ComMngCarDO();
BeanUtils.copyProperties(comMngCarSaveDTO, comMngCarDO);
- comMngCarDO.setAreaName(comMngStructAreaDO.getAreaName());
- comMngCarDO.setCommunityId(comMngStructAreaDO.getCommunityId());
+ comMngCarDO.setAreaName(comMngVillageDO.getGroupAt());
+ comMngCarDO.setCommunityId(comMngVillageDO.getCommunityId());
+ try {
+ comMngCarDO.setCardNo(AESUtil.encrypt128(comMngCarSaveDTO.getCardNo(),aesKey));
+ }catch (Exception e){
+
+ }
comMngCarDO.setCreateAt(new Date());
comMngCarDO.setSource(2);
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(comMngCarSaveDTO.getMobile());
@@ -161,6 +177,11 @@
if (count == 0 && areaMap.containsKey(vo.getAreaName())) {
ComMngCarDO comMngCarDO = new ComMngCarDO();
BeanUtils.copyProperties(vo, comMngCarDO);
+ 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());
--
Gitblit v1.7.1