Skip to content

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

[装备管理模块]增加名称

上级 ca5f18e8
显示空白字符变更
内嵌 并排
正在显示 包含 142 行增加 和 64 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ 7e057efb
......@@ -159,7 +159,7 @@ public class BackController {
saveEntity = taskService.moveToSpecial(taskBto1,StatusEnum.ALLOT_BACKING,0);
}
//生成发件方上传退回单的子任务
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "["+allotBillSaveVo.getSendUnit().substring(0,3)+"]型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备共有"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "["+allotBillSaveVo.getReceiveUnit().substring(0,3)+"]型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备共有"+allotBillSaveVo.getAllotCount()+"件", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
taskService.start(taskBto2);
List<FileVo> fileVoList = new ArrayList<>();
//存装备日志
......
dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingLibraryController.java
浏览文件 @ 7e057efb
package com.tykj.dev.device.packing.controller;
import com.tykj.dev.config.cache.ConfigCache;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLibraryService;
......@@ -11,7 +12,6 @@ import com.tykj.dev.device.packing.subject.vo.*;
import com.tykj.dev.misc.utils.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.runtime.ListAdapter;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
......@@ -46,6 +46,9 @@ public class PackingLibraryController {
@Autowired
PackingLibraryDao packingLibraryDao;
@Autowired
private ConfigCache configCache;
@ApiOperation(value = "申请后入库获取父子结构列装（去除已入库序列号）", notes = "获取父子结构列装")
@PostMapping("/merge")
public ResponseEntity merge(@RequestBody List<PackingLibrary> packingLibraries){
......@@ -128,7 +131,9 @@ public class PackingLibraryController {
);
//resultList2 拿到所有的model
List<String> models = resultList2.stream().map(PackingLibrary::getModel).collect(Collectors.toList());
Set<String> names = resultList2.stream().map(PackingLibrary::getName).collect(Collectors.toSet());
Set<String> names = resultList.stream().filter(packingLibrary -> packingLibrary.getPackingStatus().equals(packingLibrarySelectVo.getPackingStatus()))
.map(PackingLibrary::getName).collect(Collectors.toSet());
// Set<String> names = resultList2.stream().map(PackingLibrary::getName).collect(Collectors.toSet());
// 交集集合
List<PackingLibrary> defectList = new ArrayList<>();
for (String model : models) {
......@@ -182,15 +187,31 @@ public class PackingLibraryController {
// }
// });
// }
packingLibraryEntities.forEach(PackingLibrary::setConfigName);
//返回父子结构
Map<Integer, PackingLibrary> nodeCollect =
packingLibraryEntities.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibraryEntity -> packingLibraryEntity));
List<PackingLibrary> packingLibraryList = GetTreeUtils.parseTreeFromDown(
packingLibraryEntities,
PackingLibrary::getId,
packingLibraryEntity -> Optional.ofNullable(nodeCollect.get(packingLibraryEntity.getPartParentId())),
PackingLibrary::addChildNode
).stream().sorted(Comparator.comparing(PackingLibrary::getModel)).collect(Collectors.toList());
Map<String,Object> map = new HashMap<>();
map.put("pages",packingLibraryEntities);
map.put("pages",packingLibraryList);
List<String> models = new ArrayList<>();
for (PackingLibrary p : packingLibraryEntities){
for (PackingLibrary p : packingLibraryList){
models.add(p.getModel());
}
//添加形态
Map<Integer, String> styleMap = configCache.getStyleMap();
Set<Integer> types = packingLibraryEntities.stream().map(PackingLibrary::getType).collect(Collectors.toSet());
Set<String> names = packingLibraryEntities.stream().map(PackingLibrary::getName).collect(Collectors.toSet());
//去重
models = models.stream().distinct().collect(Collectors.toList());
map.put("models",models);
map.put("types",types.stream().map(integer -> new PackingTypeVo(integer,styleMap.get(integer))).collect(Collectors.toList()));
map.put("names",names);
return ResultUtil.success(map);
}
......@@ -412,26 +433,55 @@ public class PackingLibraryController {
return packingLibrary;
}
public PackingLibrary getContext4(List<PackingLibrary> packingLibraries){ //12 6
//判断集合的长度 801 802 803 804 只操作804 或者803
//取出目录
PackingLibrary root = packingLibraries.get(0);
packingLibraries.removeIf(e -> Objects.equals(e,root));
List<PackingLibrary> finalPackingList = new ArrayList<>();
for (int i = 0; i < packingLibraries.size(); i++) {
//会造成覆盖
if (root.getChilds() != null){
List<PackingLibrary> childs = root.getChilds();
finalPackingList.addAll(childs);
finalPackingList.addAll(packingLibraries);
root.setChilds(finalPackingList);
}else {
//直接赋值
root.setChilds(packingLibraries);
}
}
return root;
}
// public PackingLibrary getContext4(List<PackingLibrary> packingLibraries){ //12 6
// //判断集合的长度 801 802 803 804 只操作804 或者803
// //取出目录
// PackingLibrary root = packingLibraries.get(0);
// packingLibraries.removeIf(e -> Objects.equals(e,root));
// List<PackingLibrary> finalPackingList = new ArrayList<>();
// for (int i = 0; i < packingLibraries.size(); i++) {
// //会造成覆盖
// if (root.getChilds() != null){
// List<PackingLibrary> childs = root.getChilds();
// finalPackingList.addAll(childs);
// finalPackingList.addAll(packingLibraries);
// root.setChilds(finalPackingList);
// }else {
// //直接赋值
// root.setChilds(packingLibraries);
// }
//
// }
// return root;
// }
// /**
// *
// * @param packingLibraries 有父子结构集合
// * @return
// */
// public List<PackingLibrary> getAllChilds(List<PackingLibrary> packingLibraries){
// List<PackingLibrary> packingLibraryList = new ArrayList<>();
// for (PackingLibrary packingLibrary : packingLibraries) {
// List<PackingLibrary> allChilds2 = getAllChilds2(packingLibrary);
// packingLibraryList.addAll(allChilds2);
// }
// return packingLibraryList;
// }
//
// //取出所有的子
// public List<PackingLibrary> getAllChilds2(PackingLibrary packingLibrary){
// List<PackingLibrary> list = new ArrayList<>();
// if (packingLibrary.getChilds().size()>0){
// List<PackingLibrary> childs = packingLibrary.getChilds();
// for (PackingLibrary child : childs) {
// list.add(packingLibrary);
// list.add(child);
// return getAllChilds2(child);
// }
// }else {
// list.add(packingLibrary);
// }
// return list;
// }
}
dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java
浏览文件 @ 7e057efb
......@@ -146,16 +146,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
@Override
public List<PackingLibrary> getList1(PackingLibrarySelectVo packingLibrarySelectVo) {
List<PackingLibrary> packingLibraryEntities = packingLibraryDao.findAll(getSelectSpecification(packingLibrarySelectVo));
packingLibraryEntities.forEach(PackingLibrary::setConfigName);
//返回父子结构
Map<Integer, PackingLibrary> nodeCollect =
packingLibraryEntities.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibraryEntity -> packingLibraryEntity));
return GetTreeUtils.parseTreeFromDown(
packingLibraryEntities,
PackingLibrary::getId,
packingLibraryEntity -> Optional.ofNullable(nodeCollect.get(packingLibraryEntity.getPartParentId())),
PackingLibrary::addChildNode
).stream().sorted(Comparator.comparing(PackingLibrary::getModel)).collect(Collectors.toList());
return packingLibraryEntities;
}
......@@ -898,8 +889,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
predicateBuilder.eq("model", packingLibrarySelectVo.getModel());
}
if (packingLibrarySelectVo.getName() != null) {
// predicateBuilder.eq("name", packingLibrarySelectVo.getName());
predicateBuilder.like("name", "%"+packingLibrarySelectVo.getName()+"%");
predicateBuilder.eq("name", packingLibrarySelectVo.getName());
// predicateBuilder.like("name", "%"+packingLibrarySelectVo.getName()+"%");
}
if (packingLibrarySelectVo.getType() != null) {
predicateBuilder.eq("type", packingLibrarySelectVo.getType());
......@@ -1003,4 +994,15 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
private List<PackingLibrary> findByModelAndIsRoot(List<String> models){
return packingLibraryDao.findAllByModelInAndIsRootAndPackingStatus(models,1,2);
}
/**
* 得到所有的子并进行父子结构的组装
* @param packingLibrary
* @return
*/
// public List<PackingLibrary> getChilds(PackingLibrary packingLibrary){
// //通过目录查询所有的退装或者回收站的装备并进行拼装
// packingLibraryDao.findAllByNameAndPackingStatus(packingLibrary.getName(),)
// }
}
dev-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingTypeVo.java 0 → 100644
浏览文件 @ 7e057efb
package com.tykj.dev.device.packing.subject.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* DATE:2021-8-9
* Author:zsp
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("形态vo")
public class PackingTypeVo {
@ApiModelProperty("形态id")
private Integer id;
@ApiModelProperty("形态名称")
private String typeName;
}
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 7e057efb
......@@ -1602,6 +1602,7 @@ public class RepairController {
List<Integer> integerList = new ArrayList<>();
integerList.add(1);
integerList.add(9);
integerList.add(0);
//筛选维修状态为1，9的
List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatusIn(integerList, repairTaskSelectVo.getPageable().getSort());
repairDetails.forEach(repairDetail -> {
......@@ -1726,33 +1727,35 @@ public class RepairController {
//按照时间排序
List<RepairDetail> repairDetailList = repairDetails2.stream().sorted(Comparator.comparing(RepairDetail::getUpdateTime)).collect(Collectors.toList());
return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), repairDetailList, repairTaskSelectVo.getPageable()));
} else if (type == 6) {
//0
List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(0, repairTaskSelectVo.getPageable().getSort());
repairDetails.forEach(repairDetail -> {
repairDetail.setConfigName();
});
//所在在当前单位的
List<RepairDetail> repairDetails2 = repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).collect(Collectors.toList());
List<WaitingRepairEquipmentVo> waitingRepairEquipments = new ArrayList<>();
for (RepairDetail repairDetail : repairDetails2) {
// TaskBto taskBto = taskService.getParentTaskIsNull(repairDetail.getDeviceRepairBillId(), 5);
// TaskBto taskBto = taskService.get(repairDetail.getDeviceRepairBillId(), 5);
List<TaskBto> taskBtoList = taskService.findAllByBillIdAndBusinessType2(repairDetail.getDeviceRepairBillId(), 5);
List<TaskBto> collect = taskBtoList.stream().sorted(Comparator.comparing(TaskBto::getId)).collect(Collectors.toList());
WaitingRepairEquipmentVo waitingRepairEquipment = new WaitingRepairEquipmentVo();
if (taskBtoList.size() == 2){
waitingRepairEquipment.setTaskUserVos(collect.get(1).toVo());
}else {
waitingRepairEquipment.setTaskUserVos(collect.get(0).toVo());
}
BeanUtils.copyProperties(repairDetail, waitingRepairEquipment);
waitingRepairEquipments.add(waitingRepairEquipment);
}
//按照时间排序
List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), waitingRepairEquipmentVoList, repairTaskSelectVo.getPageable()));
}else if (type == 7) {
// else if (type == 6) {
// //0
// List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(0, repairTaskSelectVo.getPageable().getSort());
// repairDetails.forEach(repairDetail -> {
// repairDetail.setConfigName();
// });
// //所在在当前单位的
// List<RepairDetail> repairDetails2 = repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).collect(Collectors.toList());
// List<WaitingRepairEquipmentVo> waitingRepairEquipments = new ArrayList<>();
// for (RepairDetail repairDetail : repairDetails2) {
//// TaskBto taskBto = taskService.getParentTaskIsNull(repairDetail.getDeviceRepairBillId(), 5);
//// TaskBto taskBto = taskService.get(repairDetail.getDeviceRepairBillId(), 5);
// List<TaskBto> taskBtoList = taskService.findAllByBillIdAndBusinessType2(repairDetail.getDeviceRepairBillId(), 5);
// List<TaskBto> collect = taskBtoList.stream().sorted(Comparator.comparing(TaskBto::getId)).collect(Collectors.toList());
// WaitingRepairEquipmentVo waitingRepairEquipment = new WaitingRepairEquipmentVo();
// if (taskBtoList.size() == 2){
// waitingRepairEquipment.setTaskUserVos(collect.get(1).toVo());
// }else {
// waitingRepairEquipment.setTaskUserVos(collect.get(0).toVo());
// }
// BeanUtils.copyProperties(repairDetail, waitingRepairEquipment);
// waitingRepairEquipments.add(waitingRepairEquipment);
// }
// //按照时间排序
// List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
// return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), waitingRepairEquipmentVoList, repairTaskSelectVo.getPageable()));
// }
else if (type == 7) {
//0
//List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(2, repairTaskSelectVo.getPageable().getSort());
List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(7, repairTaskSelectVo.getPageable().getSort());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论