任务BUG修改
This commit is contained in:
秦鸿展
+76
-31
@@ -1,5 +1,6 @@
|
||||
package com.mhd.basic.application.service.Lease;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
@@ -188,56 +189,98 @@ public class LeaseApplicationService {
|
||||
|
||||
/**
|
||||
* 货主租赁明细
|
||||
* 定时任务：每天凌晨1点执行，计算前一天的货主租赁明细
|
||||
*/
|
||||
@Scheduled(cron = "0 0 1 * * ?")
|
||||
public void shipperLeaseDetails() {
|
||||
log.info("开始执行货主租赁明细定时任务");
|
||||
// 计算前一天的日期，将时间设置为当天的0点0分0秒，只保留日期部分
|
||||
final Date yesterday = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1));
|
||||
|
||||
LeaseDO leaseDO = new LeaseDO();
|
||||
leaseDO.setTime(new Date());
|
||||
//查询租赁
|
||||
leaseDO.setTime(yesterday);
|
||||
//查询有效期内的租赁
|
||||
List<LeasePO> leasePOS = queryList(leaseDO);
|
||||
// List<LeasePO> leasePOS = leaseDomainService.queryList(leaseDO);
|
||||
List<LeasePO> entireUnit = leasePOS.stream()
|
||||
.filter(lease -> lease.getLeaseType().equals("整租"))
|
||||
.collect(Collectors.toList());
|
||||
List<LeasePO> casualRental = leasePOS.stream()
|
||||
.filter(lease -> lease.getLeaseType().equals("散租"))
|
||||
.collect(Collectors.toList());
|
||||
List<ShipperLeaseDetails> shipperLeaseDetailsList = new ArrayList<>(); //建表后保存
|
||||
for (LeasePO en : entireUnit) {//整租
|
||||
|
||||
List<ShipperLeaseDetails> shipperLeaseDetailsList = new ArrayList<>(); //需要保存或更新的数据
|
||||
List<ShipperLeaseDetails> shipperLeaseDetailsToUpdate = new ArrayList<>(); //需要更新的数据
|
||||
|
||||
// 查询已存在的货主租赁明细数据（用于判断是新增还是更新）
|
||||
ShipperLeaseDetailsDO queryDO = new ShipperLeaseDetailsDO();
|
||||
queryDO.setBusinessDate(yesterday);
|
||||
List<ShipperLeaseDetailsPO> existingList = shipperLeaseDetailsService.queryList(queryDO);
|
||||
// 构建已存在数据的Map，key为：业务日期+货主ID+仓库ID+租赁类型
|
||||
Map<String, ShipperLeaseDetailsPO> existingMap = existingList.stream()
|
||||
.collect(Collectors.toMap(
|
||||
item -> buildKey(yesterday, item.getShipperId(), item.getWarehouseId(), item.getLeaseType()),
|
||||
item -> item,
|
||||
(existing, replacement) -> existing // 如果有重复key，保留第一个
|
||||
));
|
||||
|
||||
// 处理整租
|
||||
for (LeasePO en : entireUnit) {
|
||||
String key = buildKey(yesterday, en.getShipperId(), en.getWarehouseId(), en.getLeaseType());
|
||||
ShipperLeaseDetails shipperLeaseDetails = new ShipperLeaseDetails();
|
||||
BeanUtils.copyProperties(en, shipperLeaseDetails);
|
||||
shipperLeaseDetails.setBusinessDate(new Date());
|
||||
shipperLeaseDetailsList.add(shipperLeaseDetails);
|
||||
shipperLeaseDetails.setBusinessDate(yesterday);
|
||||
|
||||
// 如果已存在，则更新；否则新增
|
||||
if (existingMap.containsKey(key)) {
|
||||
ShipperLeaseDetailsPO existing = existingMap.get(key);
|
||||
shipperLeaseDetails.setId(existing.getId());
|
||||
shipperLeaseDetailsToUpdate.add(shipperLeaseDetails);
|
||||
} else {
|
||||
shipperLeaseDetailsList.add(shipperLeaseDetails);
|
||||
}
|
||||
}
|
||||
//当前货主当前仓库，库存查询页面所有面积加起来就是散租面积
|
||||
for (LeasePO ca : casualRental) {//散租
|
||||
|
||||
// 处理散租：从租赁管理页面维护的面积，效期内的散租客户面积之和
|
||||
for (LeasePO ca : casualRental) {
|
||||
String key = buildKey(yesterday, ca.getShipperId(), ca.getWarehouseId(), ca.getLeaseType());
|
||||
ShipperLeaseDetails shipperLeaseDetails = new ShipperLeaseDetails();
|
||||
BeanUtils.copyProperties(ca, shipperLeaseDetails);
|
||||
shipperLeaseDetails.setBusinessDate(new Date());
|
||||
//物料库存
|
||||
MaterialInventoryDTO materialInventoryDTO = new MaterialInventoryDTO();
|
||||
materialInventoryDTO.setShipperId(ca.getShipperId());
|
||||
materialInventoryDTO.setWarehouseId(ca.getWarehouseId());
|
||||
AjaxResult ajaxResult = wmsServiceFeign.materialInventoryApiListAll(materialInventoryDTO);
|
||||
BigDecimal area = BigDecimal.ZERO;
|
||||
if(String.valueOf(ajaxResult.get("code")).equals("200")) {
|
||||
JSONArray data = JSONObject.parseArray(JSON.toJSONString(ajaxResult.get("data")));
|
||||
for (Object datum : data) {
|
||||
JSONObject json = (JSONObject) datum;
|
||||
BigDecimal area1 = json.getBigDecimal("area");
|
||||
if (area1 == null) {
|
||||
area1 = BigDecimal.ZERO;
|
||||
}
|
||||
area = area.add(area1);
|
||||
}
|
||||
shipperLeaseDetails.setBusinessDate(yesterday);
|
||||
// 散租面积直接使用租赁管理页面维护的面积
|
||||
shipperLeaseDetails.setLeaseArea(ca.getLeaseArea());
|
||||
log.info("货主：{}，仓库：{}，散租面积：{}（来自租赁管理）", ca.getCargoOwnerName(), ca.getWarehouseName(), ca.getLeaseArea());
|
||||
|
||||
// 如果已存在，则更新；否则新增
|
||||
if (existingMap.containsKey(key)) {
|
||||
ShipperLeaseDetailsPO existing = existingMap.get(key);
|
||||
shipperLeaseDetails.setId(existing.getId());
|
||||
shipperLeaseDetailsToUpdate.add(shipperLeaseDetails);
|
||||
} else {
|
||||
shipperLeaseDetailsList.add(shipperLeaseDetails);
|
||||
}
|
||||
shipperLeaseDetails.setLeaseArea(area);
|
||||
shipperLeaseDetailsList.add(shipperLeaseDetails);
|
||||
}
|
||||
// 保存货主租赁明细(新建表)
|
||||
|
||||
// 批量新增货主租赁明细
|
||||
if (shipperLeaseDetailsList.size() > 0) {
|
||||
shipperLeaseDetailsService.saveBatch(shipperLeaseDetailsList);
|
||||
log.info("新增货主租赁明细{}条", shipperLeaseDetailsList.size());
|
||||
}
|
||||
|
||||
// 批量更新货主租赁明细
|
||||
if (shipperLeaseDetailsToUpdate.size() > 0) {
|
||||
shipperLeaseDetailsService.updateBatchById(shipperLeaseDetailsToUpdate);
|
||||
log.info("更新货主租赁明细{}条", shipperLeaseDetailsToUpdate.size());
|
||||
}
|
||||
|
||||
log.info("货主租赁明细定时任务执行完成，业务日期：{}", DateUtil.formatDate(yesterday));
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建唯一key：业务日期+货主ID+仓库ID+租赁类型
|
||||
*/
|
||||
private String buildKey(Date businessDate, Long shipperId, Long warehouseId, String leaseType) {
|
||||
String dateStr = DateUtil.formatDate(businessDate);
|
||||
return dateStr + "_" + shipperId + "_" + warehouseId + "_" + leaseType;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -247,9 +290,11 @@ public class LeaseApplicationService {
|
||||
* businessDateEnd 业务结束时间
|
||||
*/
|
||||
public List<WarehouseOccupancyRate> warehouseOccupancyRate(ShipperLeaseDetailsDO shipperLeaseDetailsDO) {
|
||||
//仓库id 和 开始结束时间作为查询条件 查数据库 差出来当前仓库所有的
|
||||
//仓库id 和 开始结束时间作为查询条件 查数据库 查出来当前仓库所有的
|
||||
List<ShipperLeaseDetailsPO> shipperLeaseDetailsList = shipperLeaseDetailsService.queryList(shipperLeaseDetailsDO);
|
||||
ShipperLeaseDetailsPO shipperLeaseDetailsPO = shipperLeaseDetailsList.get(0);
|
||||
if (shipperLeaseDetailsList == null || shipperLeaseDetailsList.isEmpty()) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
//按业务日期分组，并按日期排序
|
||||
TreeMap<Date, List<ShipperLeaseDetailsPO>> groupedByDate = shipperLeaseDetailsList.stream().collect(
|
||||
Collectors.groupingBy(
|
||||
|
||||
@@ -10,6 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="organizationId" column="organization_id" />
|
||||
<result property="organizationName" column="organization_name" />
|
||||
<result property="topOrganizationId" column="top_organization_id" />
|
||||
<result property="warehouseId" column="warehouse_id" />
|
||||
<result property="warehouseName" column="warehouse_name" />
|
||||
<result property="shipperId" column="shipper_id" />
|
||||
<result property="cargoOwnerName" column="cargo_owner_name" />
|
||||
<result property="leaseType" column="lease_type" />
|
||||
<result property="leaseArea" column="lease_area" />
|
||||
|
||||
Reference in New Issue
Block a user