Skip to content

C
cloud-platform
Commit d7cfcda3 authored by jiaorz's avatar jiaorz
Browse files
Options

取消预定和出车的bug

parent e0eb276d
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 140 deletions
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
View file @ d7cfcda3
...@@ -30,6 +30,7 @@ import org.apache.commons.beanutils.BeanUtils; ...@@ -30,6 +30,7 @@ import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatter;
...@@ -40,10 +41,7 @@ import org.springframework.stereotype.Service; ...@@ -40,10 +41,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example; import tk.mybatis.mapper.entity.Example;
import java.util.Arrays; import java.util.*;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -76,30 +74,32 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -76,30 +74,32 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
VehicleUpkeepService vehicleUpkeepService; VehicleUpkeepService vehicleUpkeepService;
@Override @Override
public UserFeign getUserFeign() {return userFeign;} public UserFeign getUserFeign() {
return userFeign;
}
public void save(VehicleBookRecord vehicleBookRecord) { public void save(VehicleBookRecord vehicleBookRecord) {
insertSelectiveRe(vehicleBookRecord); insertSelectiveRe(vehicleBookRecord);
} }
public int changeRecordStatus( Map<String,Object> updateParam) { public int changeRecordStatus(Map<String, Object> updateParam) {
return mapper.changeRecordStatus( updateParam); return mapper.changeRecordStatus(updateParam);
} }
public QueryVehicleBookRecordVo getById(Long id, DateTime endDate) throws Exception{ public QueryVehicleBookRecordVo getById(Long id, DateTime endDate) throws Exception {
Map<String,Object> recordParams =Maps.newHashMap(); Map<String, Object> recordParams = Maps.newHashMap();
recordParams.put("id",id); recordParams.put("id", id);
recordParams.put("tbName",TB_NAME_REAL); recordParams.put("tbName", TB_NAME_REAL);
DateTime selectedMonthDate = endDate.withMillisOfDay(0).withDayOfMonth(1); DateTime selectedMonthDate = endDate.withMillisOfDay(0).withDayOfMonth(1);
String bookRecordAccItemTbName = TB_ACC_ITEM_NAME_REAL; String bookRecordAccItemTbName = TB_ACC_ITEM_NAME_REAL;
if(selectedMonthDate.compareTo(DateTime.now().plusMonths(-1).withDayOfMonth(1).withMillisOfDay(0)) < 0){ if (selectedMonthDate.compareTo(DateTime.now().plusMonths(-1).withDayOfMonth(1).withMillisOfDay(0)) < 0) {
recordParams.put("tbName",getTbName(String.valueOf(selectedMonthDate.getYear()))); recordParams.put("tbName", getTbName(String.valueOf(selectedMonthDate.getYear())));
bookRecordAccItemTbName = getAccItemTbName(String.valueOf(selectedMonthDate.getYear())); bookRecordAccItemTbName = getAccItemTbName(String.valueOf(selectedMonthDate.getYear()));
} }
VehicleBookRecord vehicleBookRecord = mapper.getById(recordParams); VehicleBookRecord vehicleBookRecord = mapper.getById(recordParams);
QueryVehicleBookRecordVo queryVehicleBookRecordVo = new QueryVehicleBookRecordVo(); QueryVehicleBookRecordVo queryVehicleBookRecordVo = new QueryVehicleBookRecordVo();
BeanUtils.copyProperties(queryVehicleBookRecordVo,vehicleBookRecord); BeanUtils.copyProperties(queryVehicleBookRecordVo, vehicleBookRecord);
Map<Long,Map<Integer,Integer>> rs = getRelatedAccItemsAndAmount(Lists.newArrayList(queryVehicleBookRecordVo),bookRecordAccItemTbName); Map<Long, Map<Integer, Integer>> rs = getRelatedAccItemsAndAmount(Lists.newArrayList(queryVehicleBookRecordVo), bookRecordAccItemTbName);
queryVehicleBookRecordVo.setAccItemAndAmount(rs.get(queryVehicleBookRecordVo.getId())); queryVehicleBookRecordVo.setAccItemAndAmount(rs.get(queryVehicleBookRecordVo.getId()));
return queryVehicleBookRecordVo; return queryVehicleBookRecordVo;
} }
...@@ -110,14 +110,14 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -110,14 +110,14 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
vehicleBookRecordQueryVo.setPage(pageNo); vehicleBookRecordQueryVo.setPage(pageNo);
vehicleBookRecordQueryVo.setLimit(pageSize); vehicleBookRecordQueryVo.setLimit(pageSize);
UserDTO userDTO = getAdminUserInfo(); UserDTO userDTO = getAdminUserInfo();
if(userDTO == null) { if (userDTO == null) {
return RestResponse.codeAndMessage(235, "token失效"); return RestResponse.codeAndMessage(235, "token失效");
} }
List<Integer> companyList = Lists.newArrayList(); List<Integer> companyList = Lists.newArrayList();
if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据 if (DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
companyList = dataCompany(userDTO.getDataZone(), userDTO.getDataCompany()); companyList = dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
if(vehicleBookRecordQueryVo.getCompanyId() != null) { if (vehicleBookRecordQueryVo.getCompanyId() != null) {
if(companyList.contains(vehicleBookRecordQueryVo.getCompanyId())) { //如果权限中有这个公司就允许查询， 否则就直接返回空 if (companyList.contains(vehicleBookRecordQueryVo.getCompanyId())) { //如果权限中有这个公司就允许查询， 否则就直接返回空
companyList.clear(); companyList.clear();
companyList.add(vehicleBookRecordQueryVo.getCompanyId()); companyList.add(vehicleBookRecordQueryVo.getCompanyId());
} else { } else {
...@@ -125,7 +125,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -125,7 +125,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
} }
} }
} else { } else {
if(vehicleBookRecordQueryVo.getCompanyId() != null) { if (vehicleBookRecordQueryVo.getCompanyId() != null) {
companyList.add(vehicleBookRecordQueryVo.getCompanyId()); companyList.add(vehicleBookRecordQueryVo.getCompanyId());
} }
} }
...@@ -143,23 +143,23 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -143,23 +143,23 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
vehicleBookRecordQueryVo.setPage(pageNo); vehicleBookRecordQueryVo.setPage(pageNo);
vehicleBookRecordQueryVo.setLimit(pageSize); vehicleBookRecordQueryVo.setLimit(pageSize);
UserDTO userDTO = getAdminUserInfo(); UserDTO userDTO = getAdminUserInfo();
if(userDTO == null) { if (userDTO == null) {
return RestResponse.codeAndMessage(235, "token失效"); return RestResponse.codeAndMessage(235, "token失效");
} }
vehicleBookRecordQueryVo.setUserCompany(userDTO.getCompanyId()); vehicleBookRecordQueryVo.setUserCompany(userDTO.getCompanyId());
List<Integer> companyList = Lists.newArrayList(); List<Integer> companyList = Lists.newArrayList();
if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据 if (DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
companyList = dataCompany(userDTO.getDataZone(), userDTO.getDataCompany()); companyList = dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
if(vehicleBookRecordQueryVo.getCompanyId() != null) { if (vehicleBookRecordQueryVo.getCompanyId() != null) {
if(companyList.contains(vehicleBookRecordQueryVo.getCompanyId())) { //如果权限中有这个公司就允许查询， 否则就直接返回空 if (companyList.contains(vehicleBookRecordQueryVo.getCompanyId())) { //如果权限中有这个公司就允许查询， 否则就直接返回空
companyList.clear(); companyList.clear();
companyList.add(vehicleBookRecordQueryVo.getCompanyId()); companyList.add(vehicleBookRecordQueryVo.getCompanyId());
} else { } else {
return RestResponse.suc(); return RestResponse.suc();
} }
} }
if(vehicleBookRecordQueryVo.getLiftCompany() != null) { if (vehicleBookRecordQueryVo.getLiftCompany() != null) {
if(companyList.contains(vehicleBookRecordQueryVo.getLiftCompany())) { //如果权限中有这个公司就允许查询， 否则就直接返回空 if (companyList.contains(vehicleBookRecordQueryVo.getLiftCompany())) { //如果权限中有这个公司就允许查询， 否则就直接返回空
companyList.clear(); companyList.clear();
companyList.add(vehicleBookRecordQueryVo.getLiftCompany()); companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
} else { } else {
...@@ -167,59 +167,59 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -167,59 +167,59 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
} }
} }
} else { } else {
if(vehicleBookRecordQueryVo.getCompanyId() != null) { if (vehicleBookRecordQueryVo.getCompanyId() != null) {
companyList.add(vehicleBookRecordQueryVo.getCompanyId()); companyList.add(vehicleBookRecordQueryVo.getCompanyId());
} }
if(vehicleBookRecordQueryVo.getLiftCompany() != null) { if (vehicleBookRecordQueryVo.getLiftCompany() != null) {
companyList.add(vehicleBookRecordQueryVo.getLiftCompany()); companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
} }
} }
vehicleBookRecordQueryVo.setCompanyIds(companyList); vehicleBookRecordQueryVo.setCompanyIds(companyList);
Query query = new Query(vehicleBookRecordQueryVo); Query query = new Query(vehicleBookRecordQueryVo);
if(vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 2) { if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 2) {
List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper()); List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
removeStatus2(list); removeStatus2(list);
//PageHelper.startPage(vehicleBookRecordQueryVo.getPage().intValue(), vehicleBookRecordQueryVo.getLimit().intValue()); //PageHelper.startPage(vehicleBookRecordQueryVo.getPage().intValue(), vehicleBookRecordQueryVo.getLimit().intValue());
PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list); PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
vehicleBookRecordVoPageInfo.setPageSize(vehicleBookRecordQueryVo.getLimit());
vehicleBookRecordVoPageInfo.setPageNum(vehicleBookRecordQueryVo.getPage());
getupKeeps(vehicleBookRecordVoPageInfo.getList()); getupKeeps(vehicleBookRecordVoPageInfo.getList());
return RestResponse.suc(PageDataVO.pageInfo(vehicleBookRecordVoPageInfo)); vehicleBookRecordVoPageInfo.setList(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
return RestResponse.suc(getVehicleBookRecordVoPageInfo(PageDataVO.pageInfo(vehicleBookRecordVoPageInfo), pageNo, pageSize));
} }
PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper())); PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
getupKeeps(pageDataVO.getData()); getupKeeps(pageDataVO.getData());
return RestResponse.suc(pageDataVO); return RestResponse.suc(pageDataVO);
} }
public void removeStatus2(List<VehicleBookRecordVo> list) { public void removeStatus2(List<VehicleBookRecordVo> list) {
Iterator<VehicleBookRecordVo> iterator = list.iterator(); Iterator<VehicleBookRecordVo> iterator = list.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
if(iterator.next().getVehicleDepartureLogVo() != null) { if (iterator.next().getVehicleDepartureLogVo() != null) {
iterator.remove(); iterator.remove();
} }
} }
} }
/**
* 获取随身物品 /**
*/ * 获取随身物品
public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) { */
for(VehicleBookRecordVo vehicleBookRecordVo : vehicleBookRecordVos) { public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
if(vehicleBookRecordVo.getBookType() == BookType.MAINTAIN.getCode()) {//获取 保养项目 for (VehicleBookRecordVo vehicleBookRecordVo : vehicleBookRecordVos) {
if(StringUtils.isNotBlank(vehicleBookRecordVo.getUpkeepIds())) { if (vehicleBookRecordVo.getBookType() == BookType.MAINTAIN.getCode()) {//获取 保养项目
List<Integer> upKeeps = Arrays.asList(vehicleBookRecordVo.getUpkeepIds().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList()); if (StringUtils.isNotBlank(vehicleBookRecordVo.getUpkeepIds())) {
if(upKeeps.size() > 0) { List<Integer> upKeeps = Arrays.asList(vehicleBookRecordVo.getUpkeepIds().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
List<VehicleUpkeepItem> vehicleUpkeepItems = vehicleUpkeepService.getUpkeepsByIds(upKeeps); if (upKeeps.size() > 0) {
vehicleBookRecordVo.setVehicleUpkeepItems(vehicleUpkeepItems); List<VehicleUpkeepItem> vehicleUpkeepItems = vehicleUpkeepService.getUpkeepsByIds(upKeeps);
} vehicleBookRecordVo.setVehicleUpkeepItems(vehicleUpkeepItems);
} }
}
} }
} }
return vehicleBookRecordVos; return vehicleBookRecordVos;
} }
public RestResponse<Integer> lift(Integer operatorId, String userName, LiftVehicleVo liftVehicleVo) throws Exception{ public RestResponse<Integer> lift(Integer operatorId, String userName, LiftVehicleVo liftVehicleVo) throws Exception {
Map<String, Object> params = PropertyUtils.describe(liftVehicleVo); Map<String, Object> params = PropertyUtils.describe(liftVehicleVo);
params.put("reviewerLift", operatorId); params.put("reviewerLift", operatorId);
params.put("reviewerNameLift", userName); params.put("reviewerNameLift", userName);
...@@ -227,22 +227,22 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -227,22 +227,22 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
params.put("conditionStatus", VehicleBookRecordStatus.APPROVE.getCode()); params.put("conditionStatus", VehicleBookRecordStatus.APPROVE.getCode());
params.put("mileageLift", liftVehicleVo.getMileageLift()); params.put("mileageLift", liftVehicleVo.getMileageLift());
Integer effected = mapper.liftOrRet(params); Integer effected = mapper.liftOrRet(params);
if(effected == 0){ if (effected == 0) {
return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_STATUS_CHANGED.getCode()); return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_STATUS_CHANGED.getCode());
} }
return RestResponse.suc(); return RestResponse.suc();
} }
public RestResponse<Integer> retVehicle(Integer operatorId, String userName, RetVehicleVo retVehicleVo) throws Exception{ public RestResponse<Integer> retVehicle(Integer operatorId, String userName, RetVehicleVo retVehicleVo) throws Exception {
VehicleBookRecord record=mapper.selectByPrimaryKey( retVehicleVo.getId()); VehicleBookRecord record = mapper.selectByPrimaryKey(retVehicleVo.getId());
Integer mileageRet=retVehicleVo.getMileageRet(); Integer mileageRet = retVehicleVo.getMileageRet();
if(record==null||mileageRet==null){ if (record == null || mileageRet == null) {
//return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode()); //return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode()); throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
} }
Integer mileageLift=record.getMileageLift(); Integer mileageLift = record.getMileageLift();
if(mileageLift!=null&&mileageRet>=mileageLift){ if (mileageLift != null && mileageRet >= mileageLift) {
Map<String, Object> params = PropertyUtils.describe(retVehicleVo); Map<String, Object> params = PropertyUtils.describe(retVehicleVo);
params.put("targetStatus", VehicleBookRecordStatus.RETURNED.getCode()); params.put("targetStatus", VehicleBookRecordStatus.RETURNED.getCode());
params.put("conditionStatus", VehicleBookRecordStatus.LIFTED.getCode()); params.put("conditionStatus", VehicleBookRecordStatus.LIFTED.getCode());
...@@ -251,10 +251,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -251,10 +251,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
params.put("mileageRet", mileageRet); params.put("mileageRet", mileageRet);
params.put("haveViolation", retVehicleVo.getHaveViolation()); params.put("haveViolation", retVehicleVo.getHaveViolation());
Integer effected = mapper.liftOrRet(params); Integer effected = mapper.liftOrRet(params);
if(effected == 0){ if (effected == 0) {
return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_STATUS_CHANGED.getCode()); return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_STATUS_CHANGED.getCode());
} }
}else{ } else {
throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode()); throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
} }
return RestResponse.suc(); return RestResponse.suc();
...@@ -262,38 +262,39 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -262,38 +262,39 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
/** /**
* 按页查询 * 按页查询
*
* @param vehicleBookRecordQueryVo * @param vehicleBookRecordQueryVo
* @return * @return
* @throws Exception * @throws Exception
*/ */
public PageDataVO<QueryVehicleBookRecordVo> page(VehicleBookRecordQueryVo vehicleBookRecordQueryVo, List<Integer> companyList) throws Exception{ public PageDataVO<QueryVehicleBookRecordVo> page(VehicleBookRecordQueryVo vehicleBookRecordQueryVo, List<Integer> companyList) throws Exception {
Map<String, Object> params = PropertyUtils.describe(vehicleBookRecordQueryVo); Map<String, Object> params = PropertyUtils.describe(vehicleBookRecordQueryVo);
String bookRecordAccItemTbName = TB_ACC_ITEM_NAME_REAL; String bookRecordAccItemTbName = TB_ACC_ITEM_NAME_REAL;
params.put("tbName",TB_NAME_REAL); params.put("tbName", TB_NAME_REAL);
if(params.get("selectedMonth") != null) { if (params.get("selectedMonth") != null) {
String selectedMonth = (String)params.get("selectedMonth"); String selectedMonth = (String) params.get("selectedMonth");
if(StringUtils.isBlank(selectedMonth)){ if (StringUtils.isBlank(selectedMonth)) {
throw new BaseException(" no month selected "); throw new BaseException(" no month selected ");
} }
DateTime selectedMonthDate = DateTime.parse(selectedMonth,YEARMONTH_DATE_TIME_FORMATTER); DateTime selectedMonthDate = DateTime.parse(selectedMonth, YEARMONTH_DATE_TIME_FORMATTER);
if(selectedMonthDate.compareTo(DateTime.now().plusMonths(-1).withDayOfMonth(1).withMillisOfDay(0)) < 0){ if (selectedMonthDate.compareTo(DateTime.now().plusMonths(-1).withDayOfMonth(1).withMillisOfDay(0)) < 0) {
params.put("tbName",getTbName(String.valueOf(selectedMonthDate.getYear()))); params.put("tbName", getTbName(String.valueOf(selectedMonthDate.getYear())));
bookRecordAccItemTbName = getAccItemTbName(String.valueOf(selectedMonthDate.getYear())); bookRecordAccItemTbName = getAccItemTbName(String.valueOf(selectedMonthDate.getYear()));
} }
params.put("bookedStartDate",selectedMonthDate.withDayOfMonth(1).toString()); params.put("bookedStartDate", selectedMonthDate.withDayOfMonth(1).toString());
params.put("bookedEndDate",selectedMonthDate.plusMonths(1).withDayOfMonth(1).toDate()); params.put("bookedEndDate", selectedMonthDate.plusMonths(1).withDayOfMonth(1).toDate());
} }
Integer pageSize = (Integer) params.get("limit"); Integer pageSize = (Integer) params.get("limit");
params.remove("pageSize"); params.remove("pageSize");
Integer pageNo = (Integer) params.get("page"); Integer pageNo = (Integer) params.get("page");
params.remove("pageNo"); params.remove("pageNo");
params.put("companyList", companyList); params.put("companyList", companyList);
PageHelper.startPage(pageNo,pageSize); PageHelper.startPage(pageNo, pageSize);
List<QueryVehicleBookRecordVo> bookRecordAndVehicleInfo = mapper.getByPage(params); List<QueryVehicleBookRecordVo> bookRecordAndVehicleInfo = mapper.getByPage(params);
Map<Long,Map<Integer,Integer>> rs = getRelatedAccItemsAndAmount(bookRecordAndVehicleInfo, Map<Long, Map<Integer, Integer>> rs = getRelatedAccItemsAndAmount(bookRecordAndVehicleInfo,
bookRecordAccItemTbName); bookRecordAccItemTbName);
//获取相关随行物品信息 //获取相关随行物品信息
for(QueryVehicleBookRecordVo queryVehicleBookRecordVo:bookRecordAndVehicleInfo){ for (QueryVehicleBookRecordVo queryVehicleBookRecordVo : bookRecordAndVehicleInfo) {
queryVehicleBookRecordVo.setAccItemAndAmount(rs.get(queryVehicleBookRecordVo.getId())); queryVehicleBookRecordVo.setAccItemAndAmount(rs.get(queryVehicleBookRecordVo.getId()));
} }
PageInfo<QueryVehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(bookRecordAndVehicleInfo); PageInfo<QueryVehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(bookRecordAndVehicleInfo);
...@@ -307,29 +308,30 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -307,29 +308,30 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
/** /**
* 获取相关申请记录对应随行物品的数量，并放入map * 获取相关申请记录对应随行物品的数量，并放入map
*
* @param bookRecordAndVehicleInfos * @param bookRecordAndVehicleInfos
* @return * @return
*/ */
public Map<Long,Map<Integer,Integer>> getRelatedAccItemsAndAmount(List<QueryVehicleBookRecordVo> bookRecordAndVehicleInfos, public Map<Long, Map<Integer, Integer>> getRelatedAccItemsAndAmount(List<QueryVehicleBookRecordVo> bookRecordAndVehicleInfos,
String tbName){ String tbName) {
List<Long> bookRecordIds = Lists.newArrayList(); List<Long> bookRecordIds = Lists.newArrayList();
if(CollectionUtils.isEmpty(bookRecordAndVehicleInfos)){ if (CollectionUtils.isEmpty(bookRecordAndVehicleInfos)) {
return null; return null;
} }
for(QueryVehicleBookRecordVo queryVehicleBookRecordVo:bookRecordAndVehicleInfos){ for (QueryVehicleBookRecordVo queryVehicleBookRecordVo : bookRecordAndVehicleInfos) {
bookRecordIds.add(queryVehicleBookRecordVo.getId()); bookRecordIds.add(queryVehicleBookRecordVo.getId());
} }
List<BookRecordAccItem> bookRecordAccItems = bookRecordAccItemMapper.getByRecords(ImmutableMap.of("bookRecordIds",bookRecordIds, List<BookRecordAccItem> bookRecordAccItems = bookRecordAccItemMapper.getByRecords(ImmutableMap.of("bookRecordIds", bookRecordIds,
"tbName",tbName)); "tbName", tbName));
Map<Long,Map<Integer,Integer>> rs = Maps.newHashMap(); Map<Long, Map<Integer, Integer>> rs = Maps.newHashMap();
for(BookRecordAccItem bookRecordAccItem : bookRecordAccItems){ for (BookRecordAccItem bookRecordAccItem : bookRecordAccItems) {
if(!rs.containsKey(bookRecordAccItem.getBookRecordId())){ if (!rs.containsKey(bookRecordAccItem.getBookRecordId())) {
rs.put(bookRecordAccItem.getBookRecordId(),Maps.newHashMap()); rs.put(bookRecordAccItem.getBookRecordId(), Maps.newHashMap());
} }
rs.get(bookRecordAccItem.getBookRecordId()). rs.get(bookRecordAccItem.getBookRecordId()).
put(bookRecordAccItem.getAccItemId(),bookRecordAccItem.getAmount()); put(bookRecordAccItem.getAccItemId(), bookRecordAccItem.getAmount());
} }
return rs; return rs;
} }
...@@ -340,7 +342,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -340,7 +342,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
* 每年一张表 * 每年一张表
*/ */
@Scheduled(cron = "0 0 1 1 * ?")//每月1号1点触发 @Scheduled(cron = "0 0 1 1 * ?")//每月1号1点触发
public void transfer2HistoryTb(){ public void transfer2HistoryTb() {
try { try {
//获取表格名称 //获取表格名称
DateTime now = DateTime.now();//当前获取的时间为标准 DateTime now = DateTime.now();//当前获取的时间为标准
...@@ -350,7 +352,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -350,7 +352,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
//每月初将上上月数据从当前信息表中删除 //每月初将上上月数据从当前信息表中删除
delDataTheMonthBeforeLast(now); delDataTheMonthBeforeLast(now);
} }
}catch(Exception e){ } catch (Exception e) {
log.error(e.getMessage()); log.error(e.getMessage());
} }
...@@ -361,15 +363,15 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -361,15 +363,15 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
* 获取上月数据，并复制到历史表 * 获取上月数据，并复制到历史表
*/ */
@Transactional @Transactional
public Boolean copyDataLastMoth(DateTime now) throws Exception{ public Boolean copyDataLastMoth(DateTime now) throws Exception {
String lastMonthStr = now.plusMonths(-1).toString(YEARMONTH_DATE_TIME_FORMATTER); String lastMonthStr = now.plusMonths(-1).toString(YEARMONTH_DATE_TIME_FORMATTER);
String redisKey = RedisKey.TRANSFER_BOOK_RECORD_LOCK_PREFIX +lastMonthStr; String redisKey = RedisKey.TRANSFER_BOOK_RECORD_LOCK_PREFIX + lastMonthStr;
String tbName = getTbName(now.plusMonths(-1).toString("yyyy")); String tbName = getTbName(now.plusMonths(-1).toString("yyyy"));
String accItemTbName = getAccItemTbName(now.plusMonths(-1).toString("yyyy")); String accItemTbName = getAccItemTbName(now.plusMonths(-1).toString("yyyy"));
Boolean hasSuc = customRedisTemplate.opsForValue().setIfAbsent(redisKey,String.valueOf(DateTime.now().getMillis())); Boolean hasSuc = customRedisTemplate.opsForValue().setIfAbsent(redisKey, String.valueOf(DateTime.now().getMillis()));
if(hasSuc){//设置1天后过期 if (hasSuc) {//设置1天后过期
customRedisTemplate.expire(redisKey,1, TimeUnit.DAYS); customRedisTemplate.expire(redisKey, 1, TimeUnit.DAYS);
}else{ } else {
log.info("[预定记录迁移]乐观锁获取失败，该线程不执行任务。"); log.info("[预定记录迁移]乐观锁获取失败，该线程不执行任务。");
return Boolean.FALSE; return Boolean.FALSE;
} }
...@@ -387,19 +389,19 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -387,19 +389,19 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
vehicleBookRecords = mapper.getByPage4Month(params); vehicleBookRecords = mapper.getByPage4Month(params);
//复制相关随行物品关系 //复制相关随行物品关系
copyAccItemRel2His(vehicleBookRecords, accItemTbName); copyAccItemRel2His(vehicleBookRecords, accItemTbName);
if(CollectionUtils.isNotEmpty(vehicleBookRecords)){ if (CollectionUtils.isNotEmpty(vehicleBookRecords)) {
//插入数据到历史表 //插入数据到历史表
for(VehicleBookRecord vehicleBookRecord : vehicleBookRecords){ for (VehicleBookRecord vehicleBookRecord : vehicleBookRecords) {
VehicleBookRecordAndTbNameVo vehicleBookRecordAndTbNameVo = new VehicleBookRecordAndTbNameVo(); VehicleBookRecordAndTbNameVo vehicleBookRecordAndTbNameVo = new VehicleBookRecordAndTbNameVo();
BeanUtils.copyProperties(vehicleBookRecordAndTbNameVo,vehicleBookRecord); BeanUtils.copyProperties(vehicleBookRecordAndTbNameVo, vehicleBookRecord);
vehicleBookRecordAndTbNameVo.setTbName(tbName); vehicleBookRecordAndTbNameVo.setTbName(tbName);
mapper.insertHis(vehicleBookRecordAndTbNameVo); mapper.insertHis(vehicleBookRecordAndTbNameVo);
} }
} }
curPageNo++; curPageNo++;
log.info("【复制上月预定记录至历史表中】，当前复制页【"+curPageNo+"】，页大小【"+COPY_BATCH_SIZE+"】"); log.info("【复制上月预定记录至历史表中】，当前复制页【" + curPageNo + "】，页大小【" + COPY_BATCH_SIZE + "】");
}while(CollectionUtils.isNotEmpty(vehicleBookRecords)); } while (CollectionUtils.isNotEmpty(vehicleBookRecords));
log.info("复制上月预定记录至历史表中完成，总页数【"+(curPageNo-1)+"】"); log.info("复制上月预定记录至历史表中完成，总页数【" + (curPageNo - 1) + "】");
return Boolean.TRUE; return Boolean.TRUE;
} }
...@@ -408,7 +410,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -408,7 +410,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
* 删除上上月数据 * 删除上上月数据
*/ */
@Transactional @Transactional
public void delDataTheMonthBeforeLast(DateTime now){ public void delDataTheMonthBeforeLast(DateTime now) {
Integer effected = 0; Integer effected = 0;
Integer total = 0; Integer total = 0;
Map<String, Object> params = Maps.newHashMap(); Map<String, Object> params = Maps.newHashMap();
...@@ -420,58 +422,60 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -420,58 +422,60 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
List<Long> bookRecordIds = mapper.getIdInYearMothLimit(params); List<Long> bookRecordIds = mapper.getIdInYearMothLimit(params);
deleteAccItemRelByRecord(bookRecordIds); deleteAccItemRelByRecord(bookRecordIds);
effected = mapper.del4YearMoth(params); effected = mapper.del4YearMoth(params);
total+=effected; total += effected;
log.info("开始删除预定记录数据，删除总数【"+total+"】"); log.info("开始删除预定记录数据，删除总数【" + total + "】");
}while(effected!=0); } while (effected != 0);
log.info("删除预定记录数据完成"); log.info("删除预定记录数据完成");
} }
/** /**
* 删除随影订车记录的随行物品记录 * 删除随影订车记录的随行物品记录
*
* @param bookRecordIds * @param bookRecordIds
*/ */
private void deleteAccItemRelByRecord(List<Long> bookRecordIds){ private void deleteAccItemRelByRecord(List<Long> bookRecordIds) {
if(CollectionUtils.isEmpty(bookRecordIds)){ if (CollectionUtils.isEmpty(bookRecordIds)) {
return; return;
} }
Example example = new Example(BookRecordAccItem.class); Example example = new Example(BookRecordAccItem.class);
Example.Criteria criteria = example.createCriteria(); Example.Criteria criteria = example.createCriteria();
criteria.andIn("bookRecordId",bookRecordIds); criteria.andIn("bookRecordId", bookRecordIds);
bookRecordAccItemMapper.deleteByExample(example); bookRecordAccItemMapper.deleteByExample(example);
} }
/** /**
* 复制相应预定记录的随行物品信息 * 复制相应预定记录的随行物品信息
* （注意了参数列表中的记录的历史年份必须属于当前月） * （注意了参数列表中的记录的历史年份必须属于当前月）
*
* @param vehicleBookRecords * @param vehicleBookRecords
*/ */
@Transactional @Transactional
public void copyAccItemRel2His(List<VehicleBookRecord> vehicleBookRecords,String accItemTbName){ public void copyAccItemRel2His(List<VehicleBookRecord> vehicleBookRecords, String accItemTbName) {
if(CollectionUtils.isEmpty(vehicleBookRecords)){ if (CollectionUtils.isEmpty(vehicleBookRecords)) {
return ; return;
} }
List<Long> recordIds = Lists.newArrayList(); List<Long> recordIds = Lists.newArrayList();
for(VehicleBookRecord vehicleBookRecord : vehicleBookRecords){ for (VehicleBookRecord vehicleBookRecord : vehicleBookRecords) {
recordIds.add(vehicleBookRecord.getId()); recordIds.add(vehicleBookRecord.getId());
} }
List<BookRecordAccItem> bookRecordAccItems = bookRecordAccItemMapper.getByRecords( List<BookRecordAccItem> bookRecordAccItems = bookRecordAccItemMapper.getByRecords(
ImmutableMap.of("bookRecordIds",recordIds,"tbName",TB_ACC_ITEM_NAME_REAL)); ImmutableMap.of("bookRecordIds", recordIds, "tbName", TB_ACC_ITEM_NAME_REAL));
if(CollectionUtils.isEmpty(bookRecordAccItems)){ if (CollectionUtils.isEmpty(bookRecordAccItems)) {
return; return;
} }
List<Map<String,Object>> bookRecordAccItemsTemp = Lists.newArrayList(); List<Map<String, Object>> bookRecordAccItemsTemp = Lists.newArrayList();
for(Integer index = 0;index <bookRecordAccItems.size();index ++){ for (Integer index = 0; index < bookRecordAccItems.size(); index++) {
bookRecordAccItemsTemp.add(ImmutableMap.of( bookRecordAccItemsTemp.add(ImmutableMap.of(
"id",bookRecordAccItems.get(index).getId(), "id", bookRecordAccItems.get(index).getId(),
"bookRecordId",bookRecordAccItems.get(index).getBookRecordId(), "bookRecordId", bookRecordAccItems.get(index).getBookRecordId(),
"accItemId",bookRecordAccItems.get(index).getAccItemId(), "accItemId", bookRecordAccItems.get(index).getAccItemId(),
"amount",bookRecordAccItems.get(index).getAmount() "amount", bookRecordAccItems.get(index).getAmount()
)); ));
if(index == COPY_BATCH_SIZE || index == bookRecordAccItems.size() -1){ if (index == COPY_BATCH_SIZE || index == bookRecordAccItems.size() - 1) {
bookRecordAccItemMapper.batchAdd2Tb(ImmutableMap.of( bookRecordAccItemMapper.batchAdd2Tb(ImmutableMap.of(
"list",bookRecordAccItemsTemp, "list", bookRecordAccItemsTemp,
"tbName",accItemTbName "tbName", accItemTbName
)); ));
bookRecordAccItemsTemp = Lists.newArrayList(); bookRecordAccItemsTemp = Lists.newArrayList();
} }
} }
...@@ -479,54 +483,56 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -479,54 +483,56 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
} }
public PageDataVO<VehicleRecordInfoVo> getListByParam(VehiclePlanDto vehiclePlanDto) { public PageDataVO<VehicleRecordInfoVo> getListByParam(VehiclePlanDto vehiclePlanDto) {
Query query = new Query(vehiclePlanDto); Query query = new Query(vehiclePlanDto);
PageDataVO<VehicleRecordInfoVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getByParam(query.getSuper())); PageDataVO<VehicleRecordInfoVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getByParam(query.getSuper()));
return pageDataVO; return pageDataVO;
} }
private String getTbNameNow(){ private String getTbNameNow() {
return TB_NAME_PREFIX+ DateTime.now().toString(YEAR_DATE_TIME_FORMATTER); return TB_NAME_PREFIX + DateTime.now().toString(YEAR_DATE_TIME_FORMATTER);
} }
/** /**
* 获取历史表名称 * 获取历史表名称
*
* @param year * @param year
* @return * @return
*/ */
private String getTbName(String year){ private String getTbName(String year) {
return TB_NAME_PREFIX+ year; return TB_NAME_PREFIX + year;
} }
private String getAccItemTbNameNow(){ private String getAccItemTbNameNow() {
return TB_ACC_ITEM_NAME_PREFIX+ DateTime.now().toString(YEAR_DATE_TIME_FORMATTER); return TB_ACC_ITEM_NAME_PREFIX + DateTime.now().toString(YEAR_DATE_TIME_FORMATTER);
} }
/** /**
* 获取历史表名称 * 获取历史表名称
*
* @param year * @param year
* @return * @return
*/ */
private String getAccItemTbName(String year){ private String getAccItemTbName(String year) {
return TB_ACC_ITEM_NAME_PREFIX+ year; return TB_ACC_ITEM_NAME_PREFIX + year;
} }
/** /**
* 创建当年相关表格 * 创建当年相关表格
*/ */
private void createTbIfNotExists(String tbName){ private void createTbIfNotExists(String tbName) {
mapper.createTbIfNotExists(tbName); mapper.createTbIfNotExists(tbName);
} }
private void createAccItemTbIfNotExists(String tbName){ private void createAccItemTbIfNotExists(String tbName) {
bookRecordAccItemMapper.createTbIfNotExists(tbName); bookRecordAccItemMapper.createTbIfNotExists(tbName);
} }
public List<Integer> dataCompany(String dataZone, String dataCompany) { public List<Integer> dataCompany(String dataZone, String dataCompany) {
List<BranchCompany> zoneCompanys = branchCompanyBiz.dataCompany(dataZone); List<BranchCompany> zoneCompanys = branchCompanyBiz.dataCompany(dataZone);
//((VehicleBiz)AopContext.currentProxy()).dataCompany(dataZone); //((VehicleBiz)AopContext.currentProxy()).dataCompany(dataZone);
List<Integer> zoneCompanyIds = zoneCompanys.parallelStream().map(BranchCompany::getId).collect(Collectors.toList()); List<Integer> zoneCompanyIds = zoneCompanys.parallelStream().map(BranchCompany::getId).collect(Collectors.toList());
if(StringUtils.isNotBlank(dataCompany)) { if (StringUtils.isNotBlank(dataCompany)) {
List<Integer> dataCompanyIds = Arrays.asList(dataCompany.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList()); List<Integer> dataCompanyIds = Arrays.asList(dataCompany.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
zoneCompanyIds.addAll(dataCompanyIds); zoneCompanyIds.addAll(dataCompanyIds);
} }
...@@ -534,4 +540,29 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic ...@@ -534,4 +540,29 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
return zoneCompanyIds.parallelStream().distinct().collect(Collectors.toList()); return zoneCompanyIds.parallelStream().distinct().collect(Collectors.toList());
} }
public List<VehicleBookRecordVo> getData(List<VehicleBookRecordVo> data, Integer currentPage, Integer pageSize) {
int fromIndex = (currentPage - 1) * pageSize;
if (fromIndex >= data.size()) {
return Collections.emptyList();//空数组
}
if (fromIndex < 0) {
return Collections.emptyList();//空数组
}
int toIndex = currentPage * pageSize;
if (toIndex >= data.size()) {
toIndex = data.size();
}
return data.subList(fromIndex, toIndex);
}
public PageDataVO<VehicleBookRecordVo> getVehicleBookRecordVoPageInfo(PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageInfo, Integer currentPage, Integer pageSize) {
if (vehicleBookRecordVoPageInfo.getData() == null) {
return vehicleBookRecordVoPageInfo;
}
vehicleBookRecordVoPageInfo.setPageNum(currentPage);
vehicleBookRecordVoPageInfo.setPageSize(pageSize);
vehicleBookRecordVoPageInfo.setTotalCount((long)vehicleBookRecordVoPageInfo.getData().size());
vehicleBookRecordVoPageInfo.setTotalPage((vehicleBookRecordVoPageInfo.getData().size() + pageSize - 1) / pageSize);
return vehicleBookRecordVoPageInfo;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment