提交 cb43be84 authored 作者: zhoushaopan's avatar zhoushaopan

feat(配发模块,自查模块): 修改了日志,打印500

修改了日志,打印500
上级 b6c46282
...@@ -331,9 +331,10 @@ public class TaskSelectController { ...@@ -331,9 +331,10 @@ public class TaskSelectController {
else { else {
split = new String[0]; split = new String[0];
} }
List<DeviceLibrary> newDeviceList = new ArrayList<>();
if (str4 != null) { if (str4 != null) {
String[] split2 = str4.split("\\."); String[] split2 = str4.split("\\.");
List<DeviceLibrary> newDeviceList = new ArrayList<>(); // List<DeviceLibrary> newDeviceList = new ArrayList<>();
for (String rfid : split2) { for (String rfid : split2) {
if (rfid.length() > 0) { if (rfid.length() > 0) {
DeviceLibrary d = new DeviceLibrary(); DeviceLibrary d = new DeviceLibrary();
...@@ -348,8 +349,10 @@ public class TaskSelectController { ...@@ -348,8 +349,10 @@ public class TaskSelectController {
} }
} }
//添加新增的 //添加新增的
list.add(newDeviceList); // list.add(newDeviceList);
} }
list.add(newDeviceList);
// if (str4 == null) { // if (str4 == null) {
// List<DeviceLibrary> newDeviceList = new ArrayList<>(); // List<DeviceLibrary> newDeviceList = new ArrayList<>();
// list.add(newDeviceList); // list.add(newDeviceList);
...@@ -380,14 +383,16 @@ public class TaskSelectController { ...@@ -380,14 +383,16 @@ public class TaskSelectController {
} }
stopWatch.stop(); stopWatch.stop();
log.info("查询历史表的时间:{}",stopWatch.getTotalTimeMillis()+"ms"); log.info("查询历史表的时间:{}",stopWatch.getTotalTimeMillis()+"ms");
List<HistoryDeviceBill> billList1 = // List<HistoryDeviceBill> billList1 =
historyDeviceBillList.stream().filter(historyDeviceBill -> historyDeviceBill.getCheckResult() == 1) // historyDeviceBillList.stream().filter(historyDeviceBill -> historyDeviceBill.getCheckResult() == 1)
.collect(Collectors.toList()); // .collect(Collectors.toList());
// list.add(libraryEntities1); // list.add(libraryEntities1);
list.add(billList1); list.add(historyDeviceBillList);
if (selfExaminationBillEntity.getUnStockDetail()!=null){ if (selfExaminationBillEntity.getUnStockDetail()!=null){
list.add(JacksonUtil.readValue(selfExaminationBillEntity.getUnStockDetail(), new TypeReference<List<DeviceLibrary>>() { list.add(JacksonUtil.readValue(selfExaminationBillEntity.getUnStockDetail(), new TypeReference<List<DeviceLibrary>>() {
})); }));
}else {
list.addAll(new ArrayList<>());
} }
return ResponseEntity.ok(new ResultObj(list, "查询成功")); return ResponseEntity.ok(new ResultObj(list, "查询成功"));
case 19: case 19:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论