From 4ee00850f197d769481f73acb8ed79ab1c75b84d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 14 十一月 2025 11:41:24 +0800
Subject: [PATCH] 问题修复
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 124 insertions(+), 23 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 2612c9a..bc14916 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,6 +9,7 @@
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.utils.DateUtil;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -38,6 +41,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 杞﹁締淇℃伅琛⊿ervice瀹炵幇
@@ -72,14 +77,14 @@
if(loginUserInfo == null){
loginUserInfo = model.getLoginUserInfo();
}
- if(StringUtils.isBlank(model.getCode())
+ /* if(StringUtils.isBlank(model.getCode())
||model.getType()==null
||model.getCateId()==null
||model.getType()<0
||model.getType()>3
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+ }*/
if(model.getMemberId()!=null){
//妫�鏌ヨ溅涓讳俊鎭�
@@ -108,9 +113,9 @@
model.setCreateDate(new Date());
model.setCreator(loginUserInfo.getId());
model.setEditDate(new Date());
+ model.setIsdeleted(Constants.ZERO);
model.setEdirot(loginUserInfo.getId());
model.setStatus(Constants.ZERO);
- model.setIsdeleted(Constants.ZERO);
model.setHkStatus(Constants.ZERO);
model.setAuthStatus(Constants.ZERO);
model.setRemark("");
@@ -131,24 +136,25 @@
}
Date date = new Date();
//鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
- dealCancelBookBiz(car.getCode(),date);
- Cars model = new Cars();
- model.setEditDate(date);
- model.setEdirot(user.getId());
- model.setId(id);
- model.setIsdeleted(Constants.ONE);
+ dealCancelBookBiz(car.getCode(),date,parkBookJoinMapper);
+// Cars model = new Cars();
+// model.setEditDate(date);
+// model.setEdirot(user.getId());
+// model.setId(id);
+// model.setIsdeleted(Constants.ONE);
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
- .eq(Cars::getId,model.getId())
+ .eq(Cars::getId,id)
.set(Cars::getStartTime,null)
.set(Cars::getEndTime,null)
+ .set(Cars::getAuthTimeType,null)
.set(Cars::getAuthStatus,Constants.ZERO)
.set(Cars::getIsdeleted,Constants.ONE)
- .set(Cars::getEditDate,model.getEditDate())
- .set(Cars::getEdirot,model.getEdirot())
+ .set(Cars::getEditDate,date)
+ .set(Cars::getEdirot,user.getId())
);
- carsMapper.updateById(model);
+// carsMapper.updateById(model);
}
- public boolean dealCancelBookBiz(String code,Date date){
+ public static boolean dealCancelBookBiz(String code,Date date,ParkBookMapper parkBookJoinMapper){
List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
.selectAll(ParkBook.class )
@@ -267,7 +273,7 @@
if(loginUserInfo == null){
loginUserInfo = model.getLoginUserInfo();
}
- if(StringUtils.isBlank(model.getCode())
+ /* if(StringUtils.isBlank(model.getCode())
||model.getId()==null
||model.getType()==null
||model.getCateId()==null
@@ -275,7 +281,7 @@
||model.getType()>3
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+ }*/
Cars car = carJoinMapper.selectById(model.getId());
if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
@@ -310,7 +316,7 @@
model.setHkStatus(Constants.ZERO);
model.setRemark("");
model.setAuthStatus(Constants.ZERO);
- dealCancelBookBiz(car.getCode(),model.getEditDate());
+ dealCancelBookBiz(car.getCode(),model.getEditDate(),parkBookJoinMapper);
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
.eq(Cars::getId,model.getId())
.set(Cars::getAuthStatus,Constants.ZERO)
@@ -321,6 +327,7 @@
.set(Cars::getEditDate,model.getEditDate())
.set(Cars::getEdirot,model.getEdirot())
.set(Cars::getMemberId,model.getMemberId())
+ .set(Cars::getAuthTimeType,null)
.set(Cars::getStartTime,null)
.set(Cars::getEndTime,null)
);
@@ -353,10 +360,26 @@
@Override
public List<Cars> findList(Cars cars) {
+ if(Objects.nonNull(cars) && Objects.nonNull(cars.getType())
+ && Constants.equalsInteger(Constants.ZERO,cars.getType())){
+ return this.getGwCar();
+ }
+ cars.setType(null);
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
wrapper.lambda().eq(Cars::getIsdeleted,Constants.ZERO);
return carsMapper.selectList(wrapper);
}
+
+ public List<Cars> getGwCar(){
+ List<Cars> list = carsMapper.selectJoinList(Cars.class,
+ new MPJLambdaWrapper<Cars>().selectAll(Cars.class)
+ .leftJoin(Category.class,Category::getId,Cars::getCateId)
+ .eq(Category::getBizType,Constants.FOUR)
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ );
+ return list;
+ }
+
@Override
public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
@@ -365,6 +388,7 @@
queryWrapper.selectAll(Cars.class);
queryWrapper.selectAs(Member::getType,Cars::getMemberType);
queryWrapper.selectAs(Member::getName,Cars::getMemberName);
+ queryWrapper.selectAs(Member::getIsdeleted,Cars::getMemberDeleted);
queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
queryWrapper.selectAs(Member::getSex,Cars::getMemberSex);
@@ -421,6 +445,9 @@
cars.setGroupCateName(StringUtils.defaultString(cars.getCatePName(),"") + "/" + StringUtils.defaultString(cars.getCateName(),""));
}
cars.setParkBookList(getParkbookListByCode(cars,parkBooks));
+ if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
+ cars.setMemberId(null);
+ }
}
}
return PageData.from(result);
@@ -458,6 +485,7 @@
.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
.selectAs(ParkBook::getParkId,CarsDTO::getParkId)
+ .selectAs(Member::getIsdeleted,CarsDTO::getMemberDeleted)
.selectAs(ParkBook::getRemark,CarsDTO::getRemark)
.selectAs(Parks::getName,CarsDTO::getParkName)
.selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
@@ -470,7 +498,13 @@
.selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
wrapper.orderByDesc(ParkBook::getCreateDate);
IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);
-
+ if(carsDTOIPage!=null && carsDTOIPage.getRecords()!=null && carsDTOIPage.getRecords().size()>0){
+ for(CarsDTO cars :carsDTOIPage.getRecords()){
+ if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
+ cars.setMemberId(null);
+ }
+ }
+ }
return PageData.from(carsDTOIPage);
}
@@ -481,7 +515,7 @@
if(importing!=null && importing){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄨ溅杈嗗鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
}
- redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_CARS,true);
+ redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_CARS,true,30, TimeUnit.MINUTES);
try {
ExcelImporter ie = null;
List<CarsImport> dataList =null;
@@ -519,7 +553,7 @@
model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
if(StringUtils.isBlank(model.getCode())
&&StringUtils.isBlank(model.getCategoryName())
- &&StringUtils.isBlank(model.getType())
+// &&StringUtils.isBlank(model.getType())
&&StringUtils.isBlank(model.getSex())
&&StringUtils.isBlank(model.getIdcard())
&&StringUtils.isBlank(model.getParkName())
@@ -564,7 +598,7 @@
,List<Company> companyList
,List<Category> categoryList ) {
if(StringUtils.isBlank(model.getCode())
- ||StringUtils.isBlank(model.getType())
+// ||StringUtils.isBlank(model.getType())
||StringUtils.isBlank(model.getCategoryName())
||StringUtils.isBlank(model.getCompanyName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+2)+"琛岃溅杈嗕俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -592,14 +626,14 @@
cars.setIsnew(Constants.ZERO);
updateList.add(cars);
}
- //绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
+ /* //绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
if(StringUtils.equals(model.getType(),"瀹夋嘲鍏姟杞�")){
cars.setType(Constants.ZERO);
}else if(StringUtils.equals(model.getType(),"瀹夋嘲鑷湁鐗╂祦杞�")){
cars.setType(Constants.ONE);
}else{
cars.setType(Constants.TWO);
- }
+ }*/
cars.setCode(model.getCode());
Company company = findCompanyFromList(model.getCompanyName(),companyList);
if(company == null){
@@ -681,4 +715,71 @@
}
+
+ @Override
+ public void jdyPushCarInfo(String dataInfo){
+ JSONObject dataInfoJSON = JSONObject.parseObject(dataInfo);
+ if(dataInfoJSON.isEmpty()){
+ return;
+ }
+ String op = dataInfoJSON.getString("op");
+ //鍒犻櫎锛歞ata_remove 鏂板锛歞ata_add 淇敼锛歞ata_update
+ if(StringUtils.isEmpty(op)){
+ return;
+ }
+ JSONObject dataJSON = dataInfoJSON.getJSONObject("data");
+ String no = dataJSON.getString("_id");
+ if(StringUtils.isEmpty(no)){
+ return;
+ }
+ if(op.equals("data_remove")){
+ carsMapper.update(new UpdateWrapper<Cars>().lambda()
+ .set(Cars::getEditDate, DateUtil.getCurrDate())
+ .set(Cars::getIsdeleted,Constants.ONE).eq(Cars::getJdyId,no));
+ return;
+ }
+
+ String status = dataJSON.getString("status");
+ String carCode = dataJSON.getString("car_code");
+ Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>()
+ .lambda().eq(Cars::getJdyId,no).last("limit 1"));
+ if(Objects.isNull(cars)){
+ cars = new Cars();
+ cars.setCreateDate(new Date());
+ cars.setEditDate(new Date());
+ cars.setJdyId(no);
+ }else{
+ cars.setEditDate(new Date());
+ }
+ cars.setIsdeleted(Constants.ZERO);
+ cars.setCode(StringUtils.isBlank(carCode)?null:carCode);
+ cars.setStatus(StringUtils.isNotBlank(status)&&StringUtils.equals(status,"鍙敤")?0:1);
+ JSONObject driverJSON = dataJSON.getJSONObject("driver");
+ if(!driverJSON.isEmpty()){
+ String driverName = driverJSON.getString("name");
+ String driverUserName = driverJSON.getString("username");
+ if(StringUtils.isNotBlank(driverUserName)){
+ Member driverMember = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getDdId,driverUserName).last("limit 1 "));
+ if(Objects.nonNull(driverMember)){
+ cars.setMemberId(driverMember.getId());
+ }
+ }
+ }
+ JSONObject createJSON = dataJSON.getJSONObject("creator");
+ if(!createJSON.isEmpty()){
+ String createName = createJSON.getString("name");
+ String createUserName = createJSON.getString("username");
+ if(StringUtils.isNotBlank(createUserName)){
+ Member createMember = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getDdId,createUserName).last("limit 1 "));
+ if(Objects.nonNull(createMember)){
+ cars.setMemberId(createMember.getId());
+ }
+ }
+ }
+ carsMapper.insertOrUpdate(cars);
+ }
+
+
+
+
}
--
Gitblit v1.9.3