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 48b2193..4f01bab 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -6,11 +6,13 @@ import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; +import com.google.gson.Gson; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - +import org.springframework.web.multipart.MultipartFile; +import com.sun.org.apache.xml.internal.security.utils.Base64; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import java.util.HashMap; @@ -46,15 +48,72 @@ result.put("success", "true"); return result; } +// @RequestMapping("save-event") +// @ResponseBody +// public Map saveEvent(@RequestParam(value="eventInfo")String eventInfo,@RequestParam(value="taskId") String taskId, +// @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ +// TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); +// EventDto eventDto = new Gson().fromJson(eventInfo,EventDto.class); +// Map res = eventManager.saveEvent(eventDto,taskDto,fileNames,fileBuffers); +// res.put("success","true"); +// res.put("message","保存成功"); +// return res; +// } + @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; + public Map post(@RequestParam(value = "taskId",required = false) String taskId, + @RequestParam(value = "fileBuffer1",required = false) MultipartFile fileBuffer1, + @RequestParam(value = "fileBuffer2",required = false) MultipartFile fileBuffer2, + @RequestParam(value = "fileBuffer3",required = false) MultipartFile fileBuffer3, + @RequestParam(value = "eventInfo",required = false) String eventInfo) + { + + Map result = new HashMap(); + try + { + String [] fileNames = new String[3]; + String [] fileBuffers = new String[3]; + + if (fileBuffer1!=null) + { + fileNames[0]=fileBuffer1.getOriginalFilename(); + byte[] fis = fileBuffer1.getBytes(); + fileBuffers[0] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer2!=null) + { + fileNames[1]=fileBuffer2.getOriginalFilename(); + byte[] fis = fileBuffer2.getBytes(); + fileBuffers[1] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer3!=null) + { + fileNames[2]=fileBuffer3.getOriginalFilename(); + byte[] fis = fileBuffer3.getBytes(); + fileBuffers[2] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + + Gson gson = new Gson(); + EventDto eventDto = gson.fromJson(eventInfo, EventDto.class); + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers); + if (temp!=null) + { + result.put("success", true); + result.put("message", temp.get("uploadFile")); + } + else + { + result.put("success", false); + result.put("message", "上传失败"); + } + } catch (Exception e) + { + result.put("success", false); + result.put("message", e.getMessage()); + } + return result; } 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 48b2193..4f01bab 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -6,11 +6,13 @@ import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; +import com.google.gson.Gson; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - +import org.springframework.web.multipart.MultipartFile; +import com.sun.org.apache.xml.internal.security.utils.Base64; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import java.util.HashMap; @@ -46,15 +48,72 @@ result.put("success", "true"); return result; } +// @RequestMapping("save-event") +// @ResponseBody +// public Map saveEvent(@RequestParam(value="eventInfo")String eventInfo,@RequestParam(value="taskId") String taskId, +// @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ +// TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); +// EventDto eventDto = new Gson().fromJson(eventInfo,EventDto.class); +// Map res = eventManager.saveEvent(eventDto,taskDto,fileNames,fileBuffers); +// res.put("success","true"); +// res.put("message","保存成功"); +// return res; +// } + @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; + public Map post(@RequestParam(value = "taskId",required = false) String taskId, + @RequestParam(value = "fileBuffer1",required = false) MultipartFile fileBuffer1, + @RequestParam(value = "fileBuffer2",required = false) MultipartFile fileBuffer2, + @RequestParam(value = "fileBuffer3",required = false) MultipartFile fileBuffer3, + @RequestParam(value = "eventInfo",required = false) String eventInfo) + { + + Map result = new HashMap(); + try + { + String [] fileNames = new String[3]; + String [] fileBuffers = new String[3]; + + if (fileBuffer1!=null) + { + fileNames[0]=fileBuffer1.getOriginalFilename(); + byte[] fis = fileBuffer1.getBytes(); + fileBuffers[0] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer2!=null) + { + fileNames[1]=fileBuffer2.getOriginalFilename(); + byte[] fis = fileBuffer2.getBytes(); + fileBuffers[1] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer3!=null) + { + fileNames[2]=fileBuffer3.getOriginalFilename(); + byte[] fis = fileBuffer3.getBytes(); + fileBuffers[2] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + + Gson gson = new Gson(); + EventDto eventDto = gson.fromJson(eventInfo, EventDto.class); + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers); + if (temp!=null) + { + result.put("success", true); + result.put("message", temp.get("uploadFile")); + } + else + { + result.put("success", false); + result.put("message", "上传失败"); + } + } catch (Exception e) + { + result.put("success", false); + result.put("message", e.getMessage()); + } + return result; } diff --git a/src/main/java/com/casic/accessControl/marker/domain/Marker.java b/src/main/java/com/casic/accessControl/marker/domain/Marker.java index a93de23..c646fa6 100644 --- a/src/main/java/com/casic/accessControl/marker/domain/Marker.java +++ b/src/main/java/com/casic/accessControl/marker/domain/Marker.java @@ -1,8 +1,6 @@ package com.casic.accessControl.marker.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 48b2193..4f01bab 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -6,11 +6,13 @@ import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; +import com.google.gson.Gson; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - +import org.springframework.web.multipart.MultipartFile; +import com.sun.org.apache.xml.internal.security.utils.Base64; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import java.util.HashMap; @@ -46,15 +48,72 @@ result.put("success", "true"); return result; } +// @RequestMapping("save-event") +// @ResponseBody +// public Map saveEvent(@RequestParam(value="eventInfo")String eventInfo,@RequestParam(value="taskId") String taskId, +// @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ +// TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); +// EventDto eventDto = new Gson().fromJson(eventInfo,EventDto.class); +// Map res = eventManager.saveEvent(eventDto,taskDto,fileNames,fileBuffers); +// res.put("success","true"); +// res.put("message","保存成功"); +// return res; +// } + @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; + public Map post(@RequestParam(value = "taskId",required = false) String taskId, + @RequestParam(value = "fileBuffer1",required = false) MultipartFile fileBuffer1, + @RequestParam(value = "fileBuffer2",required = false) MultipartFile fileBuffer2, + @RequestParam(value = "fileBuffer3",required = false) MultipartFile fileBuffer3, + @RequestParam(value = "eventInfo",required = false) String eventInfo) + { + + Map result = new HashMap(); + try + { + String [] fileNames = new String[3]; + String [] fileBuffers = new String[3]; + + if (fileBuffer1!=null) + { + fileNames[0]=fileBuffer1.getOriginalFilename(); + byte[] fis = fileBuffer1.getBytes(); + fileBuffers[0] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer2!=null) + { + fileNames[1]=fileBuffer2.getOriginalFilename(); + byte[] fis = fileBuffer2.getBytes(); + fileBuffers[1] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer3!=null) + { + fileNames[2]=fileBuffer3.getOriginalFilename(); + byte[] fis = fileBuffer3.getBytes(); + fileBuffers[2] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + + Gson gson = new Gson(); + EventDto eventDto = gson.fromJson(eventInfo, EventDto.class); + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers); + if (temp!=null) + { + result.put("success", true); + result.put("message", temp.get("uploadFile")); + } + else + { + result.put("success", false); + result.put("message", "上传失败"); + } + } catch (Exception e) + { + result.put("success", false); + result.put("message", e.getMessage()); + } + return result; } diff --git a/src/main/java/com/casic/accessControl/marker/domain/Marker.java b/src/main/java/com/casic/accessControl/marker/domain/Marker.java index a93de23..c646fa6 100644 --- a/src/main/java/com/casic/accessControl/marker/domain/Marker.java +++ b/src/main/java/com/casic/accessControl/marker/domain/Marker.java @@ -1,8 +1,6 @@ package com.casic.accessControl.marker.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 baf52ba..350e0ec 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -343,7 +343,7 @@ // 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][20]; + Label[][] labels = new Label[markerDtos.size() + 1][21]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -364,6 +364,7 @@ labels[0][17] = new Label(17, 0, "下层管埋深"); labels[0][18] = new Label(18, 0, "下层管直径"); labels[0][19] = new Label(19, 0, "下层管材料"); + labels[0][20] = new Label(20, 0, "标识对象类别"); for (int i = 0; i < markerDtos.size(); i++) { MarkerDto markerDto = markerDtos.get(i); labels[i + 1][0] = new Label(0, i + 1,markerDto.getMarkerObjectType()); @@ -386,10 +387,11 @@ 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()); + labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 20; j++) { + for (int j = 0; j < 21; j++) { sheet.addCell(labels[i][j]); } } 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 48b2193..4f01bab 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -6,11 +6,13 @@ import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; +import com.google.gson.Gson; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - +import org.springframework.web.multipart.MultipartFile; +import com.sun.org.apache.xml.internal.security.utils.Base64; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import java.util.HashMap; @@ -46,15 +48,72 @@ result.put("success", "true"); return result; } +// @RequestMapping("save-event") +// @ResponseBody +// public Map saveEvent(@RequestParam(value="eventInfo")String eventInfo,@RequestParam(value="taskId") String taskId, +// @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ +// TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); +// EventDto eventDto = new Gson().fromJson(eventInfo,EventDto.class); +// Map res = eventManager.saveEvent(eventDto,taskDto,fileNames,fileBuffers); +// res.put("success","true"); +// res.put("message","保存成功"); +// return res; +// } + @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; + public Map post(@RequestParam(value = "taskId",required = false) String taskId, + @RequestParam(value = "fileBuffer1",required = false) MultipartFile fileBuffer1, + @RequestParam(value = "fileBuffer2",required = false) MultipartFile fileBuffer2, + @RequestParam(value = "fileBuffer3",required = false) MultipartFile fileBuffer3, + @RequestParam(value = "eventInfo",required = false) String eventInfo) + { + + Map result = new HashMap(); + try + { + String [] fileNames = new String[3]; + String [] fileBuffers = new String[3]; + + if (fileBuffer1!=null) + { + fileNames[0]=fileBuffer1.getOriginalFilename(); + byte[] fis = fileBuffer1.getBytes(); + fileBuffers[0] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer2!=null) + { + fileNames[1]=fileBuffer2.getOriginalFilename(); + byte[] fis = fileBuffer2.getBytes(); + fileBuffers[1] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer3!=null) + { + fileNames[2]=fileBuffer3.getOriginalFilename(); + byte[] fis = fileBuffer3.getBytes(); + fileBuffers[2] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + + Gson gson = new Gson(); + EventDto eventDto = gson.fromJson(eventInfo, EventDto.class); + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers); + if (temp!=null) + { + result.put("success", true); + result.put("message", temp.get("uploadFile")); + } + else + { + result.put("success", false); + result.put("message", "上传失败"); + } + } catch (Exception e) + { + result.put("success", false); + result.put("message", e.getMessage()); + } + return result; } diff --git a/src/main/java/com/casic/accessControl/marker/domain/Marker.java b/src/main/java/com/casic/accessControl/marker/domain/Marker.java index a93de23..c646fa6 100644 --- a/src/main/java/com/casic/accessControl/marker/domain/Marker.java +++ b/src/main/java/com/casic/accessControl/marker/domain/Marker.java @@ -1,8 +1,6 @@ package com.casic.accessControl.marker.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 baf52ba..350e0ec 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -343,7 +343,7 @@ // 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][20]; + Label[][] labels = new Label[markerDtos.size() + 1][21]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -364,6 +364,7 @@ labels[0][17] = new Label(17, 0, "下层管埋深"); labels[0][18] = new Label(18, 0, "下层管直径"); labels[0][19] = new Label(19, 0, "下层管材料"); + labels[0][20] = new Label(20, 0, "标识对象类别"); for (int i = 0; i < markerDtos.size(); i++) { MarkerDto markerDto = markerDtos.get(i); labels[i + 1][0] = new Label(0, i + 1,markerDto.getMarkerObjectType()); @@ -386,10 +387,11 @@ 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()); + labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 20; j++) { + for (int j = 0; j < 21; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 875c23c..8ad3417 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,8 +1,5 @@ package com.casic.accessControl.rs; -import com.casic.accessControl.feature.domain.Feature; -import com.casic.accessControl.feature.dto.FeatureDto; -import com.casic.accessControl.feature.manager.FeatureManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; import com.casic.accessControl.task.dto.TaskDto; 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 48b2193..4f01bab 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -6,11 +6,13 @@ import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; +import com.google.gson.Gson; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - +import org.springframework.web.multipart.MultipartFile; +import com.sun.org.apache.xml.internal.security.utils.Base64; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import java.util.HashMap; @@ -46,15 +48,72 @@ result.put("success", "true"); return result; } +// @RequestMapping("save-event") +// @ResponseBody +// public Map saveEvent(@RequestParam(value="eventInfo")String eventInfo,@RequestParam(value="taskId") String taskId, +// @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ +// TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); +// EventDto eventDto = new Gson().fromJson(eventInfo,EventDto.class); +// Map res = eventManager.saveEvent(eventDto,taskDto,fileNames,fileBuffers); +// res.put("success","true"); +// res.put("message","保存成功"); +// return res; +// } + @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; + public Map post(@RequestParam(value = "taskId",required = false) String taskId, + @RequestParam(value = "fileBuffer1",required = false) MultipartFile fileBuffer1, + @RequestParam(value = "fileBuffer2",required = false) MultipartFile fileBuffer2, + @RequestParam(value = "fileBuffer3",required = false) MultipartFile fileBuffer3, + @RequestParam(value = "eventInfo",required = false) String eventInfo) + { + + Map result = new HashMap(); + try + { + String [] fileNames = new String[3]; + String [] fileBuffers = new String[3]; + + if (fileBuffer1!=null) + { + fileNames[0]=fileBuffer1.getOriginalFilename(); + byte[] fis = fileBuffer1.getBytes(); + fileBuffers[0] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer2!=null) + { + fileNames[1]=fileBuffer2.getOriginalFilename(); + byte[] fis = fileBuffer2.getBytes(); + fileBuffers[1] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer3!=null) + { + fileNames[2]=fileBuffer3.getOriginalFilename(); + byte[] fis = fileBuffer3.getBytes(); + fileBuffers[2] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + + Gson gson = new Gson(); + EventDto eventDto = gson.fromJson(eventInfo, EventDto.class); + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers); + if (temp!=null) + { + result.put("success", true); + result.put("message", temp.get("uploadFile")); + } + else + { + result.put("success", false); + result.put("message", "上传失败"); + } + } catch (Exception e) + { + result.put("success", false); + result.put("message", e.getMessage()); + } + return result; } diff --git a/src/main/java/com/casic/accessControl/marker/domain/Marker.java b/src/main/java/com/casic/accessControl/marker/domain/Marker.java index a93de23..c646fa6 100644 --- a/src/main/java/com/casic/accessControl/marker/domain/Marker.java +++ b/src/main/java/com/casic/accessControl/marker/domain/Marker.java @@ -1,8 +1,6 @@ package com.casic.accessControl.marker.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 baf52ba..350e0ec 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -343,7 +343,7 @@ // 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][20]; + Label[][] labels = new Label[markerDtos.size() + 1][21]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -364,6 +364,7 @@ labels[0][17] = new Label(17, 0, "下层管埋深"); labels[0][18] = new Label(18, 0, "下层管直径"); labels[0][19] = new Label(19, 0, "下层管材料"); + labels[0][20] = new Label(20, 0, "标识对象类别"); for (int i = 0; i < markerDtos.size(); i++) { MarkerDto markerDto = markerDtos.get(i); labels[i + 1][0] = new Label(0, i + 1,markerDto.getMarkerObjectType()); @@ -386,10 +387,11 @@ 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()); + labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 20; j++) { + for (int j = 0; j < 21; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 875c23c..8ad3417 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,8 +1,5 @@ package com.casic.accessControl.rs; -import com.casic.accessControl.feature.domain.Feature; -import com.casic.accessControl.feature.dto.FeatureDto; -import com.casic.accessControl.feature.manager.FeatureManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; import com.casic.accessControl.task.dto.TaskDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index 2a988f3..cd1be3b 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -1,7 +1,5 @@ package com.casic.accessControl.task.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 48b2193..4f01bab 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -6,11 +6,13 @@ import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; +import com.google.gson.Gson; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - +import org.springframework.web.multipart.MultipartFile; +import com.sun.org.apache.xml.internal.security.utils.Base64; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import java.util.HashMap; @@ -46,15 +48,72 @@ result.put("success", "true"); return result; } +// @RequestMapping("save-event") +// @ResponseBody +// public Map saveEvent(@RequestParam(value="eventInfo")String eventInfo,@RequestParam(value="taskId") String taskId, +// @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ +// TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); +// EventDto eventDto = new Gson().fromJson(eventInfo,EventDto.class); +// Map res = eventManager.saveEvent(eventDto,taskDto,fileNames,fileBuffers); +// res.put("success","true"); +// res.put("message","保存成功"); +// return res; +// } + @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; + public Map post(@RequestParam(value = "taskId",required = false) String taskId, + @RequestParam(value = "fileBuffer1",required = false) MultipartFile fileBuffer1, + @RequestParam(value = "fileBuffer2",required = false) MultipartFile fileBuffer2, + @RequestParam(value = "fileBuffer3",required = false) MultipartFile fileBuffer3, + @RequestParam(value = "eventInfo",required = false) String eventInfo) + { + + Map result = new HashMap(); + try + { + String [] fileNames = new String[3]; + String [] fileBuffers = new String[3]; + + if (fileBuffer1!=null) + { + fileNames[0]=fileBuffer1.getOriginalFilename(); + byte[] fis = fileBuffer1.getBytes(); + fileBuffers[0] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer2!=null) + { + fileNames[1]=fileBuffer2.getOriginalFilename(); + byte[] fis = fileBuffer2.getBytes(); + fileBuffers[1] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer3!=null) + { + fileNames[2]=fileBuffer3.getOriginalFilename(); + byte[] fis = fileBuffer3.getBytes(); + fileBuffers[2] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + + Gson gson = new Gson(); + EventDto eventDto = gson.fromJson(eventInfo, EventDto.class); + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers); + if (temp!=null) + { + result.put("success", true); + result.put("message", temp.get("uploadFile")); + } + else + { + result.put("success", false); + result.put("message", "上传失败"); + } + } catch (Exception e) + { + result.put("success", false); + result.put("message", e.getMessage()); + } + return result; } diff --git a/src/main/java/com/casic/accessControl/marker/domain/Marker.java b/src/main/java/com/casic/accessControl/marker/domain/Marker.java index a93de23..c646fa6 100644 --- a/src/main/java/com/casic/accessControl/marker/domain/Marker.java +++ b/src/main/java/com/casic/accessControl/marker/domain/Marker.java @@ -1,8 +1,6 @@ package com.casic.accessControl.marker.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 baf52ba..350e0ec 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -343,7 +343,7 @@ // 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][20]; + Label[][] labels = new Label[markerDtos.size() + 1][21]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -364,6 +364,7 @@ labels[0][17] = new Label(17, 0, "下层管埋深"); labels[0][18] = new Label(18, 0, "下层管直径"); labels[0][19] = new Label(19, 0, "下层管材料"); + labels[0][20] = new Label(20, 0, "标识对象类别"); for (int i = 0; i < markerDtos.size(); i++) { MarkerDto markerDto = markerDtos.get(i); labels[i + 1][0] = new Label(0, i + 1,markerDto.getMarkerObjectType()); @@ -386,10 +387,11 @@ 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()); + labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 20; j++) { + for (int j = 0; j < 21; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 875c23c..8ad3417 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,8 +1,5 @@ package com.casic.accessControl.rs; -import com.casic.accessControl.feature.domain.Feature; -import com.casic.accessControl.feature.dto.FeatureDto; -import com.casic.accessControl.feature.manager.FeatureManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; import com.casic.accessControl.task.dto.TaskDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index 2a988f3..cd1be3b 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -1,7 +1,5 @@ package com.casic.accessControl.task.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 cb08a86..eb6e1eb 100644 --- a/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java +++ b/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java @@ -1,6 +1,5 @@ package com.casic.accessControl.task.dto; -import com.casic.accessControl.feature.domain.Feature; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; import com.casic.accessControl.user.domain.User; 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 48b2193..4f01bab 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -6,11 +6,13 @@ import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; +import com.google.gson.Gson; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - +import org.springframework.web.multipart.MultipartFile; +import com.sun.org.apache.xml.internal.security.utils.Base64; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import java.util.HashMap; @@ -46,15 +48,72 @@ result.put("success", "true"); return result; } +// @RequestMapping("save-event") +// @ResponseBody +// public Map saveEvent(@RequestParam(value="eventInfo")String eventInfo,@RequestParam(value="taskId") String taskId, +// @RequestParam(value="fileNames")String[] fileNames, @RequestParam(value="fileBuffers")String[] fileBuffers){ +// TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); +// EventDto eventDto = new Gson().fromJson(eventInfo,EventDto.class); +// Map res = eventManager.saveEvent(eventDto,taskDto,fileNames,fileBuffers); +// res.put("success","true"); +// res.put("message","保存成功"); +// return res; +// } + @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; + public Map post(@RequestParam(value = "taskId",required = false) String taskId, + @RequestParam(value = "fileBuffer1",required = false) MultipartFile fileBuffer1, + @RequestParam(value = "fileBuffer2",required = false) MultipartFile fileBuffer2, + @RequestParam(value = "fileBuffer3",required = false) MultipartFile fileBuffer3, + @RequestParam(value = "eventInfo",required = false) String eventInfo) + { + + Map result = new HashMap(); + try + { + String [] fileNames = new String[3]; + String [] fileBuffers = new String[3]; + + if (fileBuffer1!=null) + { + fileNames[0]=fileBuffer1.getOriginalFilename(); + byte[] fis = fileBuffer1.getBytes(); + fileBuffers[0] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer2!=null) + { + fileNames[1]=fileBuffer2.getOriginalFilename(); + byte[] fis = fileBuffer2.getBytes(); + fileBuffers[1] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + if (fileBuffer3!=null) + { + fileNames[2]=fileBuffer3.getOriginalFilename(); + byte[] fis = fileBuffer3.getBytes(); + fileBuffers[2] = new String(Base64.encode(fis,Base64.BASE64DEFAULTLENGTH)); + } + + Gson gson = new Gson(); + EventDto eventDto = gson.fromJson(eventInfo, EventDto.class); + TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim())); + Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers); + if (temp!=null) + { + result.put("success", true); + result.put("message", temp.get("uploadFile")); + } + else + { + result.put("success", false); + result.put("message", "上传失败"); + } + } catch (Exception e) + { + result.put("success", false); + result.put("message", e.getMessage()); + } + return result; } diff --git a/src/main/java/com/casic/accessControl/marker/domain/Marker.java b/src/main/java/com/casic/accessControl/marker/domain/Marker.java index a93de23..c646fa6 100644 --- a/src/main/java/com/casic/accessControl/marker/domain/Marker.java +++ b/src/main/java/com/casic/accessControl/marker/domain/Marker.java @@ -1,8 +1,6 @@ package com.casic.accessControl.marker.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 baf52ba..350e0ec 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -343,7 +343,7 @@ // 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][20]; + Label[][] labels = new Label[markerDtos.size() + 1][21]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -364,6 +364,7 @@ labels[0][17] = new Label(17, 0, "下层管埋深"); labels[0][18] = new Label(18, 0, "下层管直径"); labels[0][19] = new Label(19, 0, "下层管材料"); + labels[0][20] = new Label(20, 0, "标识对象类别"); for (int i = 0; i < markerDtos.size(); i++) { MarkerDto markerDto = markerDtos.get(i); labels[i + 1][0] = new Label(0, i + 1,markerDto.getMarkerObjectType()); @@ -386,10 +387,11 @@ 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()); + labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 20; j++) { + for (int j = 0; j < 21; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 875c23c..8ad3417 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,8 +1,5 @@ package com.casic.accessControl.rs; -import com.casic.accessControl.feature.domain.Feature; -import com.casic.accessControl.feature.dto.FeatureDto; -import com.casic.accessControl.feature.manager.FeatureManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; import com.casic.accessControl.task.dto.TaskDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index 2a988f3..cd1be3b 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -1,7 +1,5 @@ package com.casic.accessControl.task.domain; -import com.casic.accessControl.feature.domain.Feature; - import javax.persistence.*; import java.util.Date; 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 cb08a86..eb6e1eb 100644 --- a/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java +++ b/src/main/java/com/casic/accessControl/task/dto/TaskDetailDto.java @@ -1,6 +1,5 @@ package com.casic.accessControl.task.dto; -import com.casic.accessControl.feature.domain.Feature; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; import com.casic.accessControl.user.domain.User; diff --git a/src/main/resources/spring/applicationContext-filter.xml b/src/main/resources/spring/applicationContext-filter.xml index 5d7c322..a08c5fc 100644 --- a/src/main/resources/spring/applicationContext-filter.xml +++ b/src/main/resources/spring/applicationContext-filter.xml @@ -35,7 +35,7 @@ /user/ill-login.do /marker/exportMarker.do /marker/batchSave-na.do - /feature/org-list-na.do + /event/save-event.do /task/get-task.do /xls/*