From 8555f974846ca5b4f4734f52b51e39cd4502df44 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 02 四月 2021 15:46:30 +0800
Subject: [PATCH] fix：修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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 1cc4178..17a626f 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
@@ -47,7 +47,7 @@
public R addComMngCarApplet(ComMngCarAppletDTO comCvtBusinessDTO) {
int count = comMngCarDAO.selectCount(new QueryWrapper<ComMngCarDO>().lambda()
.eq(ComMngCarDO::getPlateNum, comCvtBusinessDTO.getPlateNum())
- .and(wrapper->wrapper.eq(ComMngCarDO::getSource,1)));
+ .and(wrapper -> wrapper.eq(ComMngCarDO::getSource, 1)));
if (count > 0) {
return R.ok("车辆已存在");
}
@@ -64,10 +64,10 @@
@Override
public R userComMngCarList(Long userId) {
List<ComMngCarVO> comMngCarVOS = new ArrayList<>();
- List<ComMngCarDO> carDOS = comMngCarDAO.selectList(new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getUserId,userId));
- carDOS.forEach(carDO->{
+ List<ComMngCarDO> carDOS = comMngCarDAO.selectList(new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getUserId, userId));
+ carDOS.forEach(carDO -> {
ComMngCarVO carVO = new ComMngCarVO();
- BeanUtils.copyProperties(carDO,carVO);
+ BeanUtils.copyProperties(carDO, carVO);
comMngCarVOS.add(carVO);
});
return R.ok(comMngCarVOS);
@@ -93,14 +93,14 @@
@Override
public R saveComMngCar(ComMngCarSaveDTO comMngCarSaveDTO) {
boolean carResult = ParamRegularUtil.carNumRegular(comMngCarSaveDTO.getPlateNum());
- if(!carResult){
+ if (!carResult) {
return R.fail("车牌号有误！");
}
- ComMngCarDO exist= comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>()
- .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()).and(wrapper->wrapper.eq(ComMngCarDO::getSource,2)));
- /*if (comMngCarSaveDTO.getId()!=0 && exist.getId()!=comMngCarSaveDTO.getId()) {
+ ComMngCarDO exist = comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>()
+ .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()));
+ if (exist != null) {
return R.ok("车辆已存在");
- }*/
+ }
ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(comMngCarSaveDTO.getAreaId());
if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
return R.fail("小区不存在");
@@ -115,16 +115,16 @@
comMngCarDO.setCreateAt(new Date());
comMngCarDO.setSource(2);
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(comMngCarSaveDTO.getMobile());
- if(R.isOk(sysUserVOR)){
- SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()),SysUserVO.class);
+ if (R.isOk(sysUserVOR)) {
+ SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()), SysUserVO.class);
comMngCarSaveDTO.setUserId(sysUserVO.getUserId());
}
- if(null!=comMngCarDO.getId() && comMngCarDO.getId()!=0){
+ if (null != comMngCarDO.getId() && comMngCarDO.getId() != 0) {
boolean update = this.updateById(comMngCarDO);
if (update) {
return R.ok();
}
- }else{
+ } else {
boolean insert = this.save(comMngCarDO);
if (insert) {
return R.ok();
@@ -136,7 +136,7 @@
@Override
public R deleteComMngCar(Long id) {
int delete = comMngCarDAO.deleteById(id);
- if (delete==0) {
+ if (delete == 0) {
return R.fail("车辆信息不存在");
}
return R.ok();
@@ -145,23 +145,23 @@
@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<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<ComMngCarDO> comMngCarDOS = new ArrayList<>();
- list.forEach(vo->{
+ 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())){
+ .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);
+ BeanUtils.copyProperties(vo, comMngCarDO);
comMngCarDO.setCommunityId(communityId);
comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getId());
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(vo.getMobile());
- if(R.isOk(sysUserVOR)){
- SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()),SysUserVO.class);
+ if (R.isOk(sysUserVOR)) {
+ SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()), SysUserVO.class);
comMngCarDO.setUserId(sysUserVO.getUserId());
}
comMngCarDO.setSource(2);
@@ -169,6 +169,6 @@
}
});
this.saveBatch(comMngCarDOS);
- return R.ok("共计导入车辆数量："+comMngCarDOS.size());
+ return R.ok("共计导入车辆数量：" + comMngCarDOS.size());
}
}
--
Gitblit v1.7.1