|
@@ -128,32 +128,39 @@ public class IndexController {
|
|
|
res.put("sn", devicePage.getSn());
|
|
|
res.put("imei", devicePage.getImei());
|
|
|
res.put("status", devicePage.getStatus());
|
|
|
+ res.put("deliverTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getDeliverTime()), DateUtils.YMDHMS));
|
|
|
List<Map<String,String>> timeStream = new ArrayList<>();
|
|
|
Map<String , String > map = new HashMap<>();
|
|
|
- map.put("deliverTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getDeliverTime()), DateUtils.YMDHMS));
|
|
|
+ map.put("addTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getAddTime()), DateUtils.YMDHMS));
|
|
|
+ map.put("label", "录入时间");
|
|
|
timeStream.add(map);
|
|
|
|
|
|
map = new HashMap<>();
|
|
|
map.put("instorageTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getInstorageTime()), DateUtils.YMDHMS));
|
|
|
timeStream.add(map);
|
|
|
+ map.put("label", "入库时间");
|
|
|
|
|
|
map = new HashMap<>();
|
|
|
map.put("transferTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getTransferTime()), DateUtils.YMDHMS));
|
|
|
timeStream.add(map);
|
|
|
+ map.put("label", "调拨时间");
|
|
|
|
|
|
map = new HashMap<>();
|
|
|
map.put("transferBackTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getTransferBackTime()), DateUtils.YMDHMS));
|
|
|
timeStream.add(map);
|
|
|
+ map.put("label", "回调时间");
|
|
|
|
|
|
map = new HashMap<>();
|
|
|
map.put("outstorageTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getOutstorageTime()), DateUtils.YMDHMS));
|
|
|
timeStream.add(map);
|
|
|
+ map.put("label", "出库时间");
|
|
|
|
|
|
map = new HashMap<>();
|
|
|
map.put("handleTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getHandleTime()), DateUtils.YMDHMS));
|
|
|
timeStream.add(map);
|
|
|
|
|
|
res.put("timeStream", timeStream);
|
|
|
+ map.put("label", "处置时间");
|
|
|
|
|
|
|
|
|
if (devicePage.getStatus() == 2 || devicePage.getStatus() == 3){
|