diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java index c7a51aa..48b2193 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -2,6 +2,8 @@ import com.casic.accessControl.event.dto.EventDto; import com.casic.accessControl.event.manager.EventManager; +import com.casic.accessControl.task.dto.TaskDto; +import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; import org.springframework.stereotype.Controller; @@ -24,6 +26,8 @@ @Resource private EventManager eventManager; + @Resource + private TaskManager taskManager; @RequestMapping("get-event-list") @ResponseBody @@ -42,6 +46,16 @@ result.put("success", "true"); return result; } + @RequestMapping("save-event") + @ResponseBody + public Map saveEvent(@RequestParam(value="eventInfo")EventDto eventInfo,@RequestParam(value="taskId") String taskId, + @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map res = eventManager.saveEvent(eventInfo,taskDto,fileNames,fileBuffers); + res.put("success","true"); + res.put("message","保存成功"); + return res; + } } diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java index c7a51aa..48b2193 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -2,6 +2,8 @@ import com.casic.accessControl.event.dto.EventDto; import com.casic.accessControl.event.manager.EventManager; +import com.casic.accessControl.task.dto.TaskDto; +import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; import org.springframework.stereotype.Controller; @@ -24,6 +26,8 @@ @Resource private EventManager eventManager; + @Resource + private TaskManager taskManager; @RequestMapping("get-event-list") @ResponseBody @@ -42,6 +46,16 @@ result.put("success", "true"); return result; } + @RequestMapping("save-event") + @ResponseBody + public Map saveEvent(@RequestParam(value="eventInfo")EventDto eventInfo,@RequestParam(value="taskId") String taskId, + @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map res = eventManager.saveEvent(eventInfo,taskDto,fileNames,fileBuffers); + res.put("success","true"); + res.put("message","保存成功"); + return res; + } } diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 7675e1f..baf52ba 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -343,51 +343,53 @@ // System.out.println(request.getServletContext().getRealPath("/")); WritableWorkbook book = Workbook.createWorkbook(new File(request.getServletContext().getRealPath("/") + "/xls/marker" + userId + ".xls")); WritableSheet sheet = book.createSheet("第一页", 0); - Label[][] labels = new Label[markerDtos.size() + 1][18]; - labels[0][0] = new Label(0, 0, "标识器编号"); -// labels[0][1] = new Label(1, 0, "标识器名称"); - labels[0][2] = new Label(2, 0, "标识器ID号"); -// labels[0][3] = new Label(3, 0, "三级区域"); -// labels[0][4] = new Label(4, 0, "三级线路"); - labels[0][5] = new Label(5, 0, "类型"); - labels[0][6] = new Label(6, 0, "埋深"); -// labels[0][7] = new Label(7, 0, "里程1"); -// labels[0][8] = new Label(8, 0, "里程2"); - labels[0][9] = new Label(9, 0, "权属单位"); - labels[0][10] = new Label(10, 0, "安装时间"); + Label[][] labels = new Label[markerDtos.size() + 1][20]; + labels[0][0] = new Label(0, 0, "管线种类"); + labels[0][1] = new Label(1, 0, "管线直径");//管线种类 + labels[0][2] = new Label(2, 0, "管线材质"); + labels[0][3] = new Label(3, 0, "埋设方式"); + labels[0][4] = new Label(4, 0, "管线埋深"); + labels[0][5] = new Label(5, 0, "所属道路"); + labels[0][6] = new Label(6, 0, "建设年代"); + labels[0][7] = new Label(7, 0, "所属单位"); + labels[0][8] = new Label(8, 0, "标示对象ID"); + labels[0][9] = new Label(9, 0, "标识器ID"); + labels[0][10] = new Label(10, 0, "标识器埋深"); labels[0][11] = new Label(11, 0, "安装人员"); labels[0][12] = new Label(12, 0, "经度"); labels[0][13] = new Label(13, 0, "纬度"); - labels[0][14] = new Label(14, 0, "备注"); - labels[0][15] = new Label(15, 0, "标识器埋深"); - labels[0][16] = new Label(16, 0, "管材"); - labels[0][17] = new Label(17, 0, "管径"); + labels[0][14] = new Label(14, 0, "最后修改时间"); + labels[0][15] = new Label(15, 0, "备注"); + labels[0][16] = new Label(16, 0, "下层管种类"); + labels[0][17] = new Label(17, 0, "下层管埋深"); + labels[0][18] = new Label(18, 0, "下层管直径"); + labels[0][19] = new Label(19, 0, "下层管材料"); for (int i = 0; i < markerDtos.size(); i++) { MarkerDto markerDto = markerDtos.get(i); - labels[i + 1][0] = new Label(0, i + 1, markerDto.getId().toString()); -// labels[i + 1][1] = new Label(1, i + 1, markerDto.getMarkerName()); - labels[i + 1][2] = new Label(2, i + 1, markerDto.getMarkerId()); -// labels[i + 1][3] = new Label(3, i + 1, markerDto.getFeatureId().toString()); -// labels[i + 1][4] = new Label(4, i + 1, markerDto.getLineId().toString()); - labels[i + 1][5] = new Label(5, i + 1, markerDto.getMarkerObjectType()); - labels[i + 1][6] = new Label(6, i + 1, markerDto.getDepth().toString()); -// labels[i + 1][7] = new Label(7, i + 1, markerDto.getMileage()); -// labels[i + 1][8] = new Label(8, i + 1, markerDto.getMileage2()); - labels[i + 1][9] = new Label(9, i + 1, markerDto.getOwnerComp()); - labels[i + 1][10] = new Label(10, i + 1, markerDto.getCreateTime()); + labels[i + 1][0] = new Label(0, i + 1,markerDto.getMarkerObjectType()); + labels[i + 1][1] = new Label(1, i + 1, markerDto.getPipeDiameter()); + labels[i + 1][2] = new Label(2, i + 1, markerDto.getPipeMaterial()); + labels[i + 1][3] = new Label(3, i + 1, markerDto.getLayStyle()); + labels[i + 1][4] = new Label(4, i + 1, markerDto.getDepth()); + labels[i + 1][5] = new Label(5, i + 1, markerDto.getRoad()); + labels[i + 1][6] = new Label(6, i + 1, markerDto.getConstructTime()); + labels[i + 1][7] = new Label(7, i + 1, markerDto.getOwnerComp()); + labels[i + 1][8] = new Label(8, i + 1, markerDto.getMarkerObjectId()); + labels[i + 1][9] = new Label(9, i + 1, markerDto.getMarkerId()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerDepth()); labels[i + 1][11] = new Label(11, i + 1, markerDto.getCreator()); labels[i + 1][12] = new Label(12, i + 1, markerDto.getLongitude().toString()); labels[i + 1][13] = new Label(13, i + 1, markerDto.getLatitude().toString()); - labels[i + 1][14] = new Label(14, i + 1, markerDto.getMemo()); - String markerDepth = markerDto.getMarkerDepth()==null?" ":markerDto.getMarkerDepth().toString(); - labels[i + 1][15] = new Label(15, i + 1, markerDepth); - labels[i + 1][16] = new Label(16, i + 1, markerDto.getPipeMaterial()); - String pipeDiameter = markerDto.getPipeDiameter()==null?" ": markerDto.getPipeDiameter().toString(); - labels[i + 1][17] = new Label(17, i + 1, pipeDiameter); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getCreateTime()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getMemo()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getBelowType()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowDepth()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDiameter()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowMaterial()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 18; j++) { + for (int j = 0; j < 20; j++) { sheet.addCell(labels[i][j]); } }