Skip to content

D
device-back
提交 7d778e81 authored 作者: zhoushaopan's avatar zhoushaopan
浏览文件
操作

提交代码

上级 396ac942
隐藏空白字符变更
内嵌 并排
正在显示 包含 87 行增加 和 5 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ 7d778e81
......@@ -281,9 +281,18 @@ public class AllotBillController {
deviceLibraryEntity.setMatchingRange(1);
}
else {
PackingLibrary packingLibrary1 ;
//判断是否存在省以下纵向的相同列装装备
PackingLibrary packingLibrary = packingLibraryService.getOne(deviceLibraryEntity.getPackingId());
PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(), 1, packingLibrary.getType(), packingLibrary.getStyle(), packingLibrary.getName(), packingLibrary.getSecretLevel(), packingLibrary.getInvisibleRange());
if(packingLibrary.getIsPart() == 1){
//拿到装备目录
PackingLibrary devLibrary = getPackingLibrary(packingLibrary);
List<PackingLibrary> packingLibraries = packingLibraryService.findSamePacking1(devLibrary.getPartParentId(), 1, devLibrary.getType(), packingLibrary.getStyle(), devLibrary.getName(), packingLibrary.getSecretLevel(), devLibrary.getInvisibleRange());
List<PackingLibrary> collect = packingLibraries.stream().sorted(Comparator.comparing(PackingLibrary::getCreateTime).reversed()).collect(Collectors.toList());
packingLibrary1 = collect.get(0);
}else {
packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(), 1, packingLibrary.getType(), packingLibrary.getStyle(), packingLibrary.getName(), packingLibrary.getSecretLevel(), packingLibrary.getInvisibleRange());
}
//不存在直接抛出异常
if (packingLibrary1 == null) {
throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为" + deviceLibraryEntity.getSeqNumber() + "的装备所属列装不存在配用范围为省对下纵向的相同列装装备")));
......@@ -413,6 +422,7 @@ public class AllotBillController {
allotBill.setSendFileList(FilesUtil.stringFileToList(allotBill.getSendFiles()));
allotBill.setReplyFileList(FilesUtil.stringFileToList(allotBill.getReplyFiles()));
//输出配发单给前端
System.out.println("46131");
return ResponseEntity.ok(new ResultObj(allotBill, "发起成功"));
}
......@@ -1023,14 +1033,11 @@ public class AllotBillController {
}
public void getPackingLibrary2(PackingLibrary packingLibrary,Integer newId,Integer matchingRange){
ModelMapper mapper = BeanHelper.getUserMapper();
// PackingLibrary newPackingLibrary = mapper.map(packingLibrary,PackingLibrary.class);
PackingLibrary newPackingLibrary = new PackingLibrary();
BeanUtils.copyProperties(packingLibrary,newPackingLibrary);
newPackingLibrary.setId(null);
newPackingLibrary.setPartParentId(newId);
newPackingLibrary.setMatchingRange(matchingRange);
// packingLibraryService.addEntity(newPackingLibrary);
PackingLibrary pl = packingLibraryDao.save(newPackingLibrary);
log.info("pl:{}",pl);
......@@ -1065,7 +1072,6 @@ public class AllotBillController {
PackingLibrary library = getPackingLibrary(packingLibrary);
getPackingLibrary2(library,library.getPartParentId(),1);
}
}
}
//横向配发
......
dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java
浏览文件 @ 7d778e81
......@@ -160,6 +160,7 @@ public interface PackingLibraryService {
*/
PackingLibrary findSamePacking(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
List<PackingLibrary> findSamePacking1(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
/**
* @param packingLibraries 父子结构列装
* 拆分父子结构列装
......@@ -172,4 +173,10 @@ public interface PackingLibraryService {
Boolean hasSamePack(Integer parentId,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
List<PackingLibrary> getAllByPartPackingId(Integer partPackingId);
/**
* @param packingLibraryEntity 添加配发使用
*/
Boolean addAllotPacking(PackingLibrary packingLibraryEntity);
}
dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java
浏览文件 @ 7d778e81
......@@ -614,6 +614,18 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
}
}
@Override
public List<PackingLibrary> findSamePacking1(Integer parentId, Integer matchingRange, Integer type, Integer style, String name, Integer secretLevel, Integer invisibleRange) {
List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(parentId,matchingRange,2,name);
if (packingLibraries.isEmpty()){
return null;
}
else {
return packingLibraries;
}
}
/**
* @param packingLibraries 父子结构列装
* 拆分父子结构列装
......@@ -650,6 +662,63 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
return packingLibraryDao.findAllByPartParentId(partPackingId);
}
@Override
public Boolean addAllotPacking(PackingLibrary packingLibraryEntity) {
//相同名称的同级列装
Boolean aBoolean = hasSamePack(packingLibraryEntity.getPartParentId(), packingLibraryEntity.getType(), packingLibraryEntity.getStyle(), packingLibraryEntity.getName(), packingLibraryEntity.getSecretLevel(), packingLibraryEntity.getInvisibleRange());
if (aBoolean){
//同级列装是否有同级范围的
Boolean matchingRangeIsExist = matchingRangeIsExist(packingLibraryEntity.getPartParentId(), packingLibraryEntity.getMatchingRange(), packingLibraryEntity.getType(), packingLibraryEntity.getStyle(), packingLibraryEntity.getName(), packingLibraryEntity.getSecretLevel(), packingLibraryEntity.getInvisibleRange());
if (matchingRangeIsExist) {
Map<String, Object> map = new HashMap<>();
map.put("error", "型号" + packingLibraryEntity.getModel() + "下配用范围为" + configCache.getMatchingRangeMap().get(packingLibraryEntity.getMatchingRange()) + "的该装备已存在");
return false;
}
}
PackingLibrary packingLibrary1 = getOne(packingLibraryEntity.getPartParentId());
if (packingLibrary1.getIsRoot()==1){
//不是配件
packingLibraryEntity.setIsPart(0);
String message = "添加列装型号"+packingLibraryEntity.getModel()+"下的装备:"+packingLibraryEntity.getName();
//发送阅知信息
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
MessageBto messageBto = new MessageBto(0,1,message,userIds,0);
messageBto.setRecord(packingLibrary1.getId().toString());
messageService.add(messageBto);
//添加列装日志
PackingLog packingLog = new PackingLog();
packingLog.setRemark(message);
packingLog.setPackingId(packingLibrary1.getId());
packingLogService.add(packingLog);
}
else {
//是配件
packingLibraryEntity.setIsPart(1);
String message = "添加列装型号"+packingLibraryEntity.getModel()+"下的装备附件:"+packingLibraryEntity.getName();
// //添加业务日志
// TaskLogBto taskLogBto2 = new TaskLogBto(saveEntity.getId(), message, null);
// taskLogService.addLog(taskLogBto2);
//发送阅知信息
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
MessageBto messageBto = new MessageBto(0,1,message,userIds,0);
messageBto.setRecord(packingLibrary1.getId().toString());
messageService.add(messageBto);
//添加列装日志
PackingLog packingLog = new PackingLog();
packingLog.setRemark(message);
packingLog.setPackingId(packingLibrary1.getId());
packingLogService.add(packingLog);
}
PackingLibrary packingLibrary2 = addEntity(packingLibraryEntity);
//添加列装日志
PackingLog packingLog = new PackingLog();
packingLog.setRemark("添加列装");
packingLog.setPackingId(packingLibrary2.getId());
packingLogService.add(packingLog);
return true;
}
private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
Integer level = userUtils.getCurrentUnitLevel();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论