lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-07-25 07:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(orderCarNumberBind): 新增订单与车号绑定功能

Browse Source 
- 创建 OrderCarNumberBind 相关的 DTO、Entity、Mapper、Repository 和 Service
- 实现订单与车号的创建、更新、删除和查询功能
- 添加批量导入功能，支持一次性绑定多个车号
- 在 PurchaseOrderEntity 和 SaleOrderEntity 中添加与 OrderCarNumberBind 的关联
This commit is contained in:
lihongjie0209
2025-06-12 20:35:52 +08:00
parent 497fd6771e
commit db20a3d7e5
12 changed files with 389 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/cn/lihongjie/coal/orderCarNumberBind/controller/OrderCarNumberBindController.java Normal file
View File

@@ -0,0 +1,61 @@
package cn.lihongjie.coal.orderCarNumberBind.controller;
import cn.lihongjie.coal.annotation.OrgScope;
import cn.lihongjie.coal.annotation.SysLog;
import cn.lihongjie.coal.base.dto.CommonQuery;
import cn.lihongjie.coal.base.dto.IdRequest;
import cn.lihongjie.coal.orderCarNumberBind.dto.BatchImportDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.CreateOrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.OrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.UpdateOrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.service.OrderCarNumberBindService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/orderCarNumberBind")
@SysLog(module = "")
@Slf4j
@OrgScope
public class OrderCarNumberBindController {
@Autowired private OrderCarNumberBindService service;
@PostMapping("/create")
public OrderCarNumberBindDto create(@RequestBody CreateOrderCarNumberBindDto request) {
return this.service.create(request);
}
@PostMapping("/update")
public OrderCarNumberBindDto update(@RequestBody UpdateOrderCarNumberBindDto request) {
return this.service.update(request);
}
@PostMapping("/delete")
public Object delete(@RequestBody IdRequest request) {
this.service.delete(request);
return true;
}
@PostMapping("/getById")
public OrderCarNumberBindDto getById(@RequestBody IdRequest request) {
return this.service.getById(request.getId());
}
@PostMapping("/list")
public Page<OrderCarNumberBindDto> list(@RequestBody CommonQuery request) {
return this.service.list(request);
}
@PostMapping("/batchImport")
public Object batchImport(@RequestBody BatchImportDto request) {
return this.service.batchImport(request);
}
}

23
src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/BatchImportDto.java Normal file
View File

@@ -0,0 +1,23 @@
package cn.lihongjie.coal.orderCarNumberBind.dto;
import jakarta.persistence.ManyToOne;
import lombok.Data;
import java.util.*;
@Data
public class BatchImportDto {
@ManyToOne
private String saleOrder;
@ManyToOne private String purchaseOrder;
private List<String> carNumbers;
}

19
src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/CreateOrderCarNumberBindDto.java Normal file
View File

@@ -0,0 +1,19 @@
package cn.lihongjie.coal.orderCarNumberBind.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import jakarta.persistence.ManyToOne;
import lombok.Data;
@Data
public class CreateOrderCarNumberBindDto extends OrgCommonDto {
private String carNumber;
@ManyToOne
private String saleOrder;
@ManyToOne private String purchaseOrder;
}

18
src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/OrderCarNumberBindDto.java Normal file
View File

@@ -0,0 +1,18 @@
package cn.lihongjie.coal.orderCarNumberBind.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.base.dto.SimpleDto;
import jakarta.persistence.ManyToOne;
import lombok.Data;
@Data
public class OrderCarNumberBindDto extends OrgCommonDto {
private String carNumber;
@ManyToOne private SimpleDto saleOrder;
@ManyToOne private SimpleDto purchaseOrder;
}

21
src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/UpdateOrderCarNumberBindDto.java Normal file
View File

@@ -0,0 +1,21 @@
package cn.lihongjie.coal.orderCarNumberBind.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import jakarta.persistence.ManyToOne;
import lombok.Data;
@Data
public class UpdateOrderCarNumberBindDto extends OrgCommonDto {
private String carNumber;
@ManyToOne
private String saleOrder;
@ManyToOne private String purchaseOrder;
}

36
src/main/java/cn/lihongjie/coal/orderCarNumberBind/entity/OrderCarNumberBindEntity.java Normal file
View File

@@ -0,0 +1,36 @@
package cn.lihongjie.coal.orderCarNumberBind.entity;
import cn.lihongjie.coal.base.entity.OrgCommonEntity;
import cn.lihongjie.coal.purchaseOrder.entity.PurchaseOrderEntity;
import cn.lihongjie.coal.saleOrder.entity.SaleOrderEntity;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.Data;
@Data
@Entity
@Table(
indexes =
@jakarta.persistence.Index(
name = "idx_orderCarNumberBind_org_id",
columnList = "organization_id"))
public class OrderCarNumberBindEntity extends OrgCommonEntity {
private String carNumber;
@ManyToOne private SaleOrderEntity saleOrder;
@ManyToOne private PurchaseOrderEntity purchaseOrder;
}

23
src/main/java/cn/lihongjie/coal/orderCarNumberBind/mapper/OrderCarNumberBindMapper.java Normal file
View File

@@ -0,0 +1,23 @@
package cn.lihongjie.coal.orderCarNumberBind.mapper;
import cn.lihongjie.coal.base.mapper.BaseMapper;
import cn.lihongjie.coal.base.mapper.CommonEntityMapper;
import cn.lihongjie.coal.base.mapper.CommonMapper;
import cn.lihongjie.coal.orderCarNumberBind.dto.CreateOrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.OrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.UpdateOrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.entity.OrderCarNumberBindEntity;
import org.mapstruct.Mapper;
import org.mapstruct.control.DeepClone;
@Mapper(
componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
uses = {CommonMapper.class, CommonEntityMapper.class},
mappingControl = DeepClone.class)
public interface OrderCarNumberBindMapper
extends BaseMapper<
OrderCarNumberBindEntity,
OrderCarNumberBindDto,
CreateOrderCarNumberBindDto,
UpdateOrderCarNumberBindDto> {}

15
src/main/java/cn/lihongjie/coal/orderCarNumberBind/repository/OrderCarNumberBindRepository.java Normal file
View File

@@ -0,0 +1,15 @@
package cn.lihongjie.coal.orderCarNumberBind.repository;
import cn.lihongjie.coal.base.dao.BaseRepository;
import cn.lihongjie.coal.orderCarNumberBind.entity.OrderCarNumberBindEntity;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface OrderCarNumberBindRepository extends BaseRepository<OrderCarNumberBindEntity> {
@Query("select false")
boolean isLinked(List<String> ids);
}

149
src/main/java/cn/lihongjie/coal/orderCarNumberBind/service/OrderCarNumberBindService.java Normal file
View File

@@ -0,0 +1,149 @@
package cn.lihongjie.coal.orderCarNumberBind.service;
import cn.lihongjie.coal.base.dto.CommonQuery;
import cn.lihongjie.coal.base.dto.IdRequest;
import cn.lihongjie.coal.base.service.BaseService;
import cn.lihongjie.coal.dbFunctions.DbFunctionService;
import cn.lihongjie.coal.exception.BizException;
import cn.lihongjie.coal.orderCarNumberBind.dto.BatchImportDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.CreateOrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.OrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.dto.UpdateOrderCarNumberBindDto;
import cn.lihongjie.coal.orderCarNumberBind.entity.OrderCarNumberBindEntity;
import cn.lihongjie.coal.orderCarNumberBind.mapper.OrderCarNumberBindMapper;
import cn.lihongjie.coal.orderCarNumberBind.repository.OrderCarNumberBindRepository;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.convert.ConversionService;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@Slf4j
@Transactional
public class OrderCarNumberBindService
extends BaseService<OrderCarNumberBindEntity, OrderCarNumberBindRepository> {
@Autowired private OrderCarNumberBindRepository repository;
@Autowired private OrderCarNumberBindMapper mapper;
@Autowired private ConversionService conversionService;
@Autowired private DbFunctionService dbFunctionService;
public OrderCarNumberBindDto create(CreateOrderCarNumberBindDto request) {
OrderCarNumberBindEntity entity = mapper.toEntity(request);
Long count = this.count(
new Specification<OrderCarNumberBindEntity>() {
@Override
public Predicate toPredicate(
Root<OrderCarNumberBindEntity> root,
CriteriaQuery<?> query,
CriteriaBuilder criteriaBuilder) {
Predicate carNumberPredicate =
criteriaBuilder.equal(root.get("carNumber"), entity.getCarNumber());
Predicate saleOrderPredicate =
criteriaBuilder.equal(
root.get("saleOrder").get("id"), entity.getSaleOrder());
Predicate purchaseOrderPredicate =
criteriaBuilder.equal(
root.get("purchaseOrder").get("id"),
entity.getPurchaseOrder());
if (ObjectUtils.isEmpty(entity.getSaleOrder())) {
return criteriaBuilder.and(carNumberPredicate, purchaseOrderPredicate);
} else if (ObjectUtils.isEmpty(entity.getPurchaseOrder())) {
return criteriaBuilder.and(carNumberPredicate, saleOrderPredicate);
} else {
return criteriaBuilder.and(
carNumberPredicate, saleOrderPredicate, purchaseOrderPredicate);
}
}
});
if (count > 0) {
throw new BizException("车辆号已存在" + entity.getCarNumber() + "，请检查");
}
this.repository.save(entity);
return getById(entity.getId());
}
public OrderCarNumberBindDto update(UpdateOrderCarNumberBindDto request) {
OrderCarNumberBindEntity entity = this.repository.get(request.getId());
this.mapper.updateEntity(entity, request);
this.repository.save(entity);
return getById(entity.getId());
}
public void delete(IdRequest request) {
boolean linked = this.repository.isLinked(request.getIds());
if (linked) {
throw new BizException("数据已被关联，无法删除");
}
this.repository.deleteAllById(request.getIds());
}
public OrderCarNumberBindDto getById(String id) {
OrderCarNumberBindEntity entity = repository.get(id);
return mapper.toDto(entity);
}
public Page<OrderCarNumberBindDto> list(CommonQuery query) {
Page<OrderCarNumberBindEntity> page =
repository.findAll(
query.specification(conversionService),
PageRequest.of(
query.getPageNo(),
query.getPageSize(),
Sort.by(query.getOrders())));
return page.map(this.mapper::toDto);
}
public Object batchImport(BatchImportDto request) {
for (String carNumber : request.getCarNumbers()) {
CreateOrderCarNumberBindDto bindDto = new CreateOrderCarNumberBindDto();
bindDto.setCarNumber(carNumber);
bindDto.setSaleOrder(request.getSaleOrder());
bindDto.setPurchaseOrder(request.getPurchaseOrder());
this.create(bindDto);
}
return null;
}
}

3
src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java
View File

@@ -92,6 +92,9 @@ public class PurchaseOrderEntity extends OrgCommonEntity {
private Double dayAmount;
@Override
public void prePersist() {
super.prePersist();

2
src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java
View File

@@ -103,6 +103,8 @@ public class SaleOrderEntity extends OrgCommonEntity {
private Double dayAmount;
@Override
public void prePersist() {
super.prePersist();

19
src/main/resources/scripts/dict/enum/orderCarNumberBindDict.groovy Normal file
View File

@@ -0,0 +1,19 @@
package scripts.dict
import cn.lihongjie.coal.base.dto.CommonQuery
import cn.lihongjie.coal.orderCarNumberBind.controller.OrderCarNumberBindController
import com.fasterxml.jackson.databind.ObjectMapper
import org.springframework.context.ApplicationContext
ApplicationContext ioc = ioc
def controller = ioc.getBean(OrderCarNumberBindController.class)
def objectMapper = ioc.getBean(ObjectMapper.class) as ObjectMapper
return controller.list(params!=null ? objectMapper.convertValue(params, CommonQuery.class ) : new CommonQuery())