From 269d0db0c285fa05ecc093b7d0579b3bd8057273 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 10 十二月 2025 10:53:51 +0800
Subject: [PATCH] 处理设备消息推送
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index c11c859..cb0dc57 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -2,16 +2,16 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.ParkBookMapper;
import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ParkBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 杞﹁締棰勭害璁板綍淇℃伅琛⊿ervice瀹炵幇
@@ -121,6 +120,7 @@
}
hkSyncParkService.syncParkBookBySingleModel(model);
}
+
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public String batchAuth(Cars cars) {
@@ -180,7 +180,7 @@
model.setAuthTimeType(cars.getAuthTimeType());
model.setStartTime(startTime);
model.setEndTime(endTime);
- dealCarAuthByModel(model,cars.getLoginUserInfo(),parksList,date);
+ dealCarAuthByModel(model,cars.getLoginUserInfo().getId(),parksList,date,parkBookMapper);
model.setAuthStatus(Constants.ONE);//宸叉巿鏉�
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
.eq(Cars::getId,model.getId())
@@ -195,7 +195,7 @@
}
- private int dealCarAuthByModel(Cars model, LoginUserInfo loginUserInfo, List<Parks> parksList,Date date) {
+ public static int dealCarAuthByModel(Cars model, Integer userId, List<Parks> parksList,Date date,ParkBookMapper parkBookMapper) {
//鍒犻櫎杞﹂噺搴撹褰曟暟鎹�
parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
.eq(ParkBook::getCarCode,model.getCode())
@@ -208,8 +208,8 @@
ParkBook parkBook = new ParkBook();
parkBook.setIsdeleted(Constants.ZERO);
parkBook.setCreateDate(date);
- parkBook.setCreator(loginUserInfo.getId());
- parkBook.setEditor(loginUserInfo.getId());
+ parkBook.setCreator(userId);
+ parkBook.setEditor(userId);
parkBook.setEditDate(date);
parkBook.setCarCode(model.getCode());
parkBook.setParkId(parks.getId());
@@ -245,11 +245,11 @@
MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(ParkBook.class);
- queryWrapper.selectAs(Parks::getName,Cars::getParksName);
- queryWrapper.selectAs(Member::getType,Cars::getMemberType);
- queryWrapper.selectAs(Member::getName,Cars::getMemberName);
- queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
- queryWrapper.selectAs(Company::getName,Cars::getCompanyName);
+ queryWrapper.selectAs(Parks::getName,ParkBook::getParksName);
+ queryWrapper.selectAs(Member::getType,ParkBook::getMemberType);
+ queryWrapper.selectAs(Member::getName,ParkBook::getMemberName);
+ queryWrapper.selectAs(Member::getPhone,ParkBook::getMemberPhone);
+ queryWrapper.selectAs(Company::getName,ParkBook::getCompanyName);
queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
queryWrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId);
@@ -271,7 +271,7 @@
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarCode()),ParkBook::getCarCode,pageWrap.getModel().getCarCode());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParksName()),Parks::getName,pageWrap.getModel().getParksName());
- queryWrapper.orderByDesc(ParkBook::getCreateDate);
+ queryWrapper.orderByDesc(ParkBook::getCreateDate,ParkBook::getId);
IPage<ParkBook> result = parkBookJoinMapper.selectJoinPage(page, ParkBook.class,queryWrapper);
--
Gitblit v1.9.3