diff --git a/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java b/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java index eb6e1eb..ad499da 100644 --- a/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java +++ b/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java @@ -24,6 +24,7 @@ private String imagePath; private String description; private String finishTime; + private String markerIdReal;//物理上的标签ID,在移动端需要使用 public Long getId() { return id; @@ -121,6 +122,13 @@ this.latitude = latitude; } + public String getMarkerIdReal() { + return markerIdReal; + } + + public void setMarkerIdReal(String markerIdReal) { + this.markerIdReal = markerIdReal; + } public static TaskDetailDto Convert(TaskDetail taskDetail) { if (taskDetail == null) { @@ -132,6 +140,7 @@ taskDetailDto.setIsNormal(taskDetail.getIsNormal()); taskDetailDto.setImagePath(taskDetail.getImagePath()); taskDetailDto.setDescription(taskDetail.getDescription()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (taskDetail.getFinishTime() != null) taskDetailDto.setFinishTime(sdf.format(taskDetail.getFinishTime())); @@ -148,6 +157,9 @@ taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; } + + + public static List Converts(List taskDetails) { List taskDetailDtos= new ArrayList(); diff --git a/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java b/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java index eb6e1eb..ad499da 100644 --- a/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java +++ b/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java @@ -24,6 +24,7 @@ private String imagePath; private String description; private String finishTime; + private String markerIdReal;//物理上的标签ID,在移动端需要使用 public Long getId() { return id; @@ -121,6 +122,13 @@ this.latitude = latitude; } + public String getMarkerIdReal() { + return markerIdReal; + } + + public void setMarkerIdReal(String markerIdReal) { + this.markerIdReal = markerIdReal; + } public static TaskDetailDto Convert(TaskDetail taskDetail) { if (taskDetail == null) { @@ -132,6 +140,7 @@ taskDetailDto.setIsNormal(taskDetail.getIsNormal()); taskDetailDto.setImagePath(taskDetail.getImagePath()); taskDetailDto.setDescription(taskDetail.getDescription()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (taskDetail.getFinishTime() != null) taskDetailDto.setFinishTime(sdf.format(taskDetail.getFinishTime())); @@ -148,6 +157,9 @@ taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; } + + + public static List Converts(List taskDetails) { List taskDetailDtos= new ArrayList(); diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js index 31d1811..ec6fe12 100644 --- a/src/main/webapp/s/app/task/task.js +++ b/src/main/webapp/s/app/task/task.js @@ -420,7 +420,7 @@ if (r.success) {//请求成功 for (var data in r.data) { var id = r.data[data].id; - var markerName = r.data[data].markerName; + var markerName = r.data[data].markerIdReal; var latitude = r.data[data].latitude; var longitude = r.data[data].longitude; var finishTime = r.data[data].finishTime == null ? "" : r.data[data].finishTime;