diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java deleted file mode 100644 index e97f18b..0000000 --- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java +++ /dev/null @@ -1,65 +0,0 @@ -//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.user.domain.Company; -//import com.casic.accessControl.user.domain.User; -//import com.casic.accessControl.user.manager.UserManager; -//import com.google.gson.Gson; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.annotation.Resource; -//import javax.ws.rs.*; -//import javax.ws.rs.core.MediaType; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -//* Created by admin on 2015/1/15. -//*/ -//@Component -//@Path("feature") -//public class FeatureResource -//{ -// private static Logger logger = LoggerFactory.getLogger(FeatureResource.class); -// -// @Resource -// private UserManager userManager; -// -// @Resource -// private FeatureManager featureManager; -// -// @GET -// @Path("get") -// @Produces(MediaType.APPLICATION_JSON) -// public Map get(@QueryParam("userName") String userName ){ -// Map map = new HashMap(); -// try { -// User user = userManager.getUserByName(userName); -// if (user == null) { -// map.put("success", "false"); -// map.put("message", "人员不存在！"); -// return map; -// } -// Company company = user.getCompany(); -// if (company!=null) -// { -// List features = featureManager.getFeaturesByCompany(company); -// List featureDtos = FeatureDto.convert2FeatureDtos(features); -// map.put("success", "true"); -// map.put("message", featureDtos); -// } -// } -// catch (Exception e) -// { -// map.put("success", "false"); -// map.put("message", e.getMessage()); -// } -// return map; -// } -//} diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java deleted file mode 100644 index e97f18b..0000000 --- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java +++ /dev/null @@ -1,65 +0,0 @@ -//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.user.domain.Company; -//import com.casic.accessControl.user.domain.User; -//import com.casic.accessControl.user.manager.UserManager; -//import com.google.gson.Gson; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.annotation.Resource; -//import javax.ws.rs.*; -//import javax.ws.rs.core.MediaType; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -//* Created by admin on 2015/1/15. -//*/ -//@Component -//@Path("feature") -//public class FeatureResource -//{ -// private static Logger logger = LoggerFactory.getLogger(FeatureResource.class); -// -// @Resource -// private UserManager userManager; -// -// @Resource -// private FeatureManager featureManager; -// -// @GET -// @Path("get") -// @Produces(MediaType.APPLICATION_JSON) -// public Map get(@QueryParam("userName") String userName ){ -// Map map = new HashMap(); -// try { -// User user = userManager.getUserByName(userName); -// if (user == null) { -// map.put("success", "false"); -// map.put("message", "人员不存在！"); -// return map; -// } -// Company company = user.getCompany(); -// if (company!=null) -// { -// List features = featureManager.getFeaturesByCompany(company); -// List featureDtos = FeatureDto.convert2FeatureDtos(features); -// map.put("success", "true"); -// map.put("message", featureDtos); -// } -// } -// catch (Exception e) -// { -// map.put("success", "false"); -// map.put("message", e.getMessage()); -// } -// return map; -// } -//} diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml index a960c27..b5fb133 100644 --- a/src/main/resources/spring/applicationContext-hibernate.xml +++ b/src/main/resources/spring/applicationContext-hibernate.xml @@ -53,18 +53,14 @@ - com.casic.accessControl.user.domain.User com.casic.accessControl.user.domain.Company com.casic.accessControl.user.domain.Role - com.casic.accessControl.marker.domain.Marker com.casic.accessControl.task.domain.Task com.casic.accessControl.task.domain.TaskDetail com.casic.accessControl.task.domain.Position com.casic.accessControl.event.domain.Event - - diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java deleted file mode 100644 index e97f18b..0000000 --- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java +++ /dev/null @@ -1,65 +0,0 @@ -//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.user.domain.Company; -//import com.casic.accessControl.user.domain.User; -//import com.casic.accessControl.user.manager.UserManager; -//import com.google.gson.Gson; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.annotation.Resource; -//import javax.ws.rs.*; -//import javax.ws.rs.core.MediaType; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -//* Created by admin on 2015/1/15. -//*/ -//@Component -//@Path("feature") -//public class FeatureResource -//{ -// private static Logger logger = LoggerFactory.getLogger(FeatureResource.class); -// -// @Resource -// private UserManager userManager; -// -// @Resource -// private FeatureManager featureManager; -// -// @GET -// @Path("get") -// @Produces(MediaType.APPLICATION_JSON) -// public Map get(@QueryParam("userName") String userName ){ -// Map map = new HashMap(); -// try { -// User user = userManager.getUserByName(userName); -// if (user == null) { -// map.put("success", "false"); -// map.put("message", "人员不存在！"); -// return map; -// } -// Company company = user.getCompany(); -// if (company!=null) -// { -// List features = featureManager.getFeaturesByCompany(company); -// List featureDtos = FeatureDto.convert2FeatureDtos(features); -// map.put("success", "true"); -// map.put("message", featureDtos); -// } -// } -// catch (Exception e) -// { -// map.put("success", "false"); -// map.put("message", e.getMessage()); -// } -// return map; -// } -//} diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml index a960c27..b5fb133 100644 --- a/src/main/resources/spring/applicationContext-hibernate.xml +++ b/src/main/resources/spring/applicationContext-hibernate.xml @@ -53,18 +53,14 @@ - com.casic.accessControl.user.domain.User com.casic.accessControl.user.domain.Company com.casic.accessControl.user.domain.Role - com.casic.accessControl.marker.domain.Marker com.casic.accessControl.task.domain.Task com.casic.accessControl.task.domain.TaskDetail com.casic.accessControl.task.domain.Position com.casic.accessControl.event.domain.Event - - diff --git a/src/test/com/casic/accessControl/event/EventTest.java b/src/test/com/casic/accessControl/event/EventTest.java new file mode 100644 index 0000000..ac899c4 --- /dev/null +++ b/src/test/com/casic/accessControl/event/EventTest.java @@ -0,0 +1,10 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.basic.BasicTest; + +/** + * Created by lenovo on 2016/8/31. + */ +public class EventTest extends BasicTest{ + +} diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java deleted file mode 100644 index e97f18b..0000000 --- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java +++ /dev/null @@ -1,65 +0,0 @@ -//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.user.domain.Company; -//import com.casic.accessControl.user.domain.User; -//import com.casic.accessControl.user.manager.UserManager; -//import com.google.gson.Gson; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.annotation.Resource; -//import javax.ws.rs.*; -//import javax.ws.rs.core.MediaType; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -//* Created by admin on 2015/1/15. -//*/ -//@Component -//@Path("feature") -//public class FeatureResource -//{ -// private static Logger logger = LoggerFactory.getLogger(FeatureResource.class); -// -// @Resource -// private UserManager userManager; -// -// @Resource -// private FeatureManager featureManager; -// -// @GET -// @Path("get") -// @Produces(MediaType.APPLICATION_JSON) -// public Map get(@QueryParam("userName") String userName ){ -// Map map = new HashMap(); -// try { -// User user = userManager.getUserByName(userName); -// if (user == null) { -// map.put("success", "false"); -// map.put("message", "人员不存在！"); -// return map; -// } -// Company company = user.getCompany(); -// if (company!=null) -// { -// List features = featureManager.getFeaturesByCompany(company); -// List featureDtos = FeatureDto.convert2FeatureDtos(features); -// map.put("success", "true"); -// map.put("message", featureDtos); -// } -// } -// catch (Exception e) -// { -// map.put("success", "false"); -// map.put("message", e.getMessage()); -// } -// return map; -// } -//} diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml index a960c27..b5fb133 100644 --- a/src/main/resources/spring/applicationContext-hibernate.xml +++ b/src/main/resources/spring/applicationContext-hibernate.xml @@ -53,18 +53,14 @@ - com.casic.accessControl.user.domain.User com.casic.accessControl.user.domain.Company com.casic.accessControl.user.domain.Role - com.casic.accessControl.marker.domain.Marker com.casic.accessControl.task.domain.Task com.casic.accessControl.task.domain.TaskDetail com.casic.accessControl.task.domain.Position com.casic.accessControl.event.domain.Event - - diff --git a/src/test/com/casic/accessControl/event/EventTest.java b/src/test/com/casic/accessControl/event/EventTest.java new file mode 100644 index 0000000..ac899c4 --- /dev/null +++ b/src/test/com/casic/accessControl/event/EventTest.java @@ -0,0 +1,10 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.basic.BasicTest; + +/** + * Created by lenovo on 2016/8/31. + */ +public class EventTest extends BasicTest{ + +} diff --git a/src/test/com/casic/accessControl/event/MainTest.java b/src/test/com/casic/accessControl/event/MainTest.java new file mode 100644 index 0000000..73c3794 --- /dev/null +++ b/src/test/com/casic/accessControl/event/MainTest.java @@ -0,0 +1,33 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.util.HttpRequestUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +/** + * Created by lenovo on 2016/8/31. + */ +public class MainTest { + public void testGetEventList(){ + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/get-event-list.do", "taskId=4" ); + System.out.println(s); + } + public void testSaveEvent(){ +// @RequestParam(value = "taskId",required = true) 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 = "data",required = true) String eventInfo + + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/save-event.do", "taskId=4" ); + System.out.println(s); + } + public static void main(String [] args){ + MainTest mainTest = new MainTest(); + mainTest.testGetEventList(); + + } +} diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java deleted file mode 100644 index e97f18b..0000000 --- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java +++ /dev/null @@ -1,65 +0,0 @@ -//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.user.domain.Company; -//import com.casic.accessControl.user.domain.User; -//import com.casic.accessControl.user.manager.UserManager; -//import com.google.gson.Gson; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.annotation.Resource; -//import javax.ws.rs.*; -//import javax.ws.rs.core.MediaType; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -//* Created by admin on 2015/1/15. -//*/ -//@Component -//@Path("feature") -//public class FeatureResource -//{ -// private static Logger logger = LoggerFactory.getLogger(FeatureResource.class); -// -// @Resource -// private UserManager userManager; -// -// @Resource -// private FeatureManager featureManager; -// -// @GET -// @Path("get") -// @Produces(MediaType.APPLICATION_JSON) -// public Map get(@QueryParam("userName") String userName ){ -// Map map = new HashMap(); -// try { -// User user = userManager.getUserByName(userName); -// if (user == null) { -// map.put("success", "false"); -// map.put("message", "人员不存在！"); -// return map; -// } -// Company company = user.getCompany(); -// if (company!=null) -// { -// List features = featureManager.getFeaturesByCompany(company); -// List featureDtos = FeatureDto.convert2FeatureDtos(features); -// map.put("success", "true"); -// map.put("message", featureDtos); -// } -// } -// catch (Exception e) -// { -// map.put("success", "false"); -// map.put("message", e.getMessage()); -// } -// return map; -// } -//} diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml index a960c27..b5fb133 100644 --- a/src/main/resources/spring/applicationContext-hibernate.xml +++ b/src/main/resources/spring/applicationContext-hibernate.xml @@ -53,18 +53,14 @@ - com.casic.accessControl.user.domain.User com.casic.accessControl.user.domain.Company com.casic.accessControl.user.domain.Role - com.casic.accessControl.marker.domain.Marker com.casic.accessControl.task.domain.Task com.casic.accessControl.task.domain.TaskDetail com.casic.accessControl.task.domain.Position com.casic.accessControl.event.domain.Event - - diff --git a/src/test/com/casic/accessControl/event/EventTest.java b/src/test/com/casic/accessControl/event/EventTest.java new file mode 100644 index 0000000..ac899c4 --- /dev/null +++ b/src/test/com/casic/accessControl/event/EventTest.java @@ -0,0 +1,10 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.basic.BasicTest; + +/** + * Created by lenovo on 2016/8/31. + */ +public class EventTest extends BasicTest{ + +} diff --git a/src/test/com/casic/accessControl/event/MainTest.java b/src/test/com/casic/accessControl/event/MainTest.java new file mode 100644 index 0000000..73c3794 --- /dev/null +++ b/src/test/com/casic/accessControl/event/MainTest.java @@ -0,0 +1,33 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.util.HttpRequestUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +/** + * Created by lenovo on 2016/8/31. + */ +public class MainTest { + public void testGetEventList(){ + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/get-event-list.do", "taskId=4" ); + System.out.println(s); + } + public void testSaveEvent(){ +// @RequestParam(value = "taskId",required = true) 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 = "data",required = true) String eventInfo + + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/save-event.do", "taskId=4" ); + System.out.println(s); + } + public static void main(String [] args){ + MainTest mainTest = new MainTest(); + mainTest.testGetEventList(); + + } +} diff --git a/src/test/com/casic/accessControl/feature/TestFeature.java b/src/test/com/casic/accessControl/feature/TestFeature.java index 56ff326..97c4091 100644 --- a/src/test/com/casic/accessControl/feature/TestFeature.java +++ b/src/test/com/casic/accessControl/feature/TestFeature.java @@ -1,59 +1,59 @@ -package com.casic.accessControl.feature; - -import com.casic.accessControl.feature.dto.OrgDto; -import com.casic.accessControl.feature.manager.FeatureManager; -import com.casic.accessControl.user.domain.Company; -import com.casic.accessControl.user.domain.User; -import com.casic.accessControl.user.manager.UserManager; -import com.casic.accessControl.basic.BasicTest; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import org.junit.Test; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by lenovo on 2016/6/7. - */ - -public class TestFeature extends BasicTest { - @Resource - private FeatureManager featureManager; - @Resource - private UserManager userManager; - @Test - public void resovleFeatureList() {//测试解析ResolveList - User user = userManager.getUserById(1L);//获取当前登录用户 - Company company = user.getCompany(); - String orgList = featureManager.getOrgList(1,company); - System.out.println(orgList); - Gson gson = new Gson(); - List orgDtoList = gson.fromJson(orgList, new TypeToken>() { - }.getType()); - List children = new ArrayList(); - List grandChildren = new ArrayList(); - - for(OrgDto orgDto :orgDtoList){ - System.out.println(orgDto.getName()); - children.addAll(orgDto.getChildren()); - } - for(OrgDto orgDto:children){ - System.out.println(orgDto.getName()); - grandChildren.addAll(orgDto.getChildren()); - } - for(OrgDto orgDto:grandChildren){ - System.out.println(orgDto.getName()); - } - } - +//package com.casic.accessControl.feature; +// +//import com.casic.accessControl.feature.dto.OrgDto; +//import com.casic.accessControl.feature.manager.FeatureManager; +//import com.casic.accessControl.user.domain.Company; +//import com.casic.accessControl.user.domain.User; +//import com.casic.accessControl.user.manager.UserManager; +//import com.casic.accessControl.basic.BasicTest; +//import com.google.gson.Gson; +//import com.google.gson.reflect.TypeToken; +//import org.junit.Test; +// +//import javax.annotation.Resource; +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * Created by lenovo on 2016/6/7. +// */ +// +//public class TestFeature extends BasicTest { +// @Resource +// private FeatureManager featureManager; +// @Resource +// private UserManager userManager; // @Test -// public String long2String(Long param){ -// if(param==null){ -// return ""; -// }else if() +// public void resovleFeatureList() {//测试解析ResolveList +// User user = userManager.getUserById(1L);//获取当前登录用户 +// Company company = user.getCompany(); +// String orgList = featureManager.getOrgList(1,company); +// System.out.println(orgList); +// Gson gson = new Gson(); +// List orgDtoList = gson.fromJson(orgList, new TypeToken>() { +// }.getType()); +// List children = new ArrayList(); +// List grandChildren = new ArrayList(); +// +// for(OrgDto orgDto :orgDtoList){ +// System.out.println(orgDto.getName()); +// children.addAll(orgDto.getChildren()); +// } +// for(OrgDto orgDto:children){ +// System.out.println(orgDto.getName()); +// grandChildren.addAll(orgDto.getChildren()); +// } +// for(OrgDto orgDto:grandChildren){ +// System.out.println(orgDto.getName()); +// } // } - - -} +// +//// @Test +//// public String long2String(Long param){ +//// if(param==null){ +//// return ""; +//// }else if() +//// } +// +// +//} diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java deleted file mode 100644 index e97f18b..0000000 --- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java +++ /dev/null @@ -1,65 +0,0 @@ -//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.user.domain.Company; -//import com.casic.accessControl.user.domain.User; -//import com.casic.accessControl.user.manager.UserManager; -//import com.google.gson.Gson; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.annotation.Resource; -//import javax.ws.rs.*; -//import javax.ws.rs.core.MediaType; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -//* Created by admin on 2015/1/15. -//*/ -//@Component -//@Path("feature") -//public class FeatureResource -//{ -// private static Logger logger = LoggerFactory.getLogger(FeatureResource.class); -// -// @Resource -// private UserManager userManager; -// -// @Resource -// private FeatureManager featureManager; -// -// @GET -// @Path("get") -// @Produces(MediaType.APPLICATION_JSON) -// public Map get(@QueryParam("userName") String userName ){ -// Map map = new HashMap(); -// try { -// User user = userManager.getUserByName(userName); -// if (user == null) { -// map.put("success", "false"); -// map.put("message", "人员不存在！"); -// return map; -// } -// Company company = user.getCompany(); -// if (company!=null) -// { -// List features = featureManager.getFeaturesByCompany(company); -// List featureDtos = FeatureDto.convert2FeatureDtos(features); -// map.put("success", "true"); -// map.put("message", featureDtos); -// } -// } -// catch (Exception e) -// { -// map.put("success", "false"); -// map.put("message", e.getMessage()); -// } -// return map; -// } -//} diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml index a960c27..b5fb133 100644 --- a/src/main/resources/spring/applicationContext-hibernate.xml +++ b/src/main/resources/spring/applicationContext-hibernate.xml @@ -53,18 +53,14 @@ - com.casic.accessControl.user.domain.User com.casic.accessControl.user.domain.Company com.casic.accessControl.user.domain.Role - com.casic.accessControl.marker.domain.Marker com.casic.accessControl.task.domain.Task com.casic.accessControl.task.domain.TaskDetail com.casic.accessControl.task.domain.Position com.casic.accessControl.event.domain.Event - - diff --git a/src/test/com/casic/accessControl/event/EventTest.java b/src/test/com/casic/accessControl/event/EventTest.java new file mode 100644 index 0000000..ac899c4 --- /dev/null +++ b/src/test/com/casic/accessControl/event/EventTest.java @@ -0,0 +1,10 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.basic.BasicTest; + +/** + * Created by lenovo on 2016/8/31. + */ +public class EventTest extends BasicTest{ + +} diff --git a/src/test/com/casic/accessControl/event/MainTest.java b/src/test/com/casic/accessControl/event/MainTest.java new file mode 100644 index 0000000..73c3794 --- /dev/null +++ b/src/test/com/casic/accessControl/event/MainTest.java @@ -0,0 +1,33 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.util.HttpRequestUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +/** + * Created by lenovo on 2016/8/31. + */ +public class MainTest { + public void testGetEventList(){ + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/get-event-list.do", "taskId=4" ); + System.out.println(s); + } + public void testSaveEvent(){ +// @RequestParam(value = "taskId",required = true) 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 = "data",required = true) String eventInfo + + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/save-event.do", "taskId=4" ); + System.out.println(s); + } + public static void main(String [] args){ + MainTest mainTest = new MainTest(); + mainTest.testGetEventList(); + + } +} diff --git a/src/test/com/casic/accessControl/feature/TestFeature.java b/src/test/com/casic/accessControl/feature/TestFeature.java index 56ff326..97c4091 100644 --- a/src/test/com/casic/accessControl/feature/TestFeature.java +++ b/src/test/com/casic/accessControl/feature/TestFeature.java @@ -1,59 +1,59 @@ -package com.casic.accessControl.feature; - -import com.casic.accessControl.feature.dto.OrgDto; -import com.casic.accessControl.feature.manager.FeatureManager; -import com.casic.accessControl.user.domain.Company; -import com.casic.accessControl.user.domain.User; -import com.casic.accessControl.user.manager.UserManager; -import com.casic.accessControl.basic.BasicTest; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import org.junit.Test; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by lenovo on 2016/6/7. - */ - -public class TestFeature extends BasicTest { - @Resource - private FeatureManager featureManager; - @Resource - private UserManager userManager; - @Test - public void resovleFeatureList() {//测试解析ResolveList - User user = userManager.getUserById(1L);//获取当前登录用户 - Company company = user.getCompany(); - String orgList = featureManager.getOrgList(1,company); - System.out.println(orgList); - Gson gson = new Gson(); - List orgDtoList = gson.fromJson(orgList, new TypeToken>() { - }.getType()); - List children = new ArrayList(); - List grandChildren = new ArrayList(); - - for(OrgDto orgDto :orgDtoList){ - System.out.println(orgDto.getName()); - children.addAll(orgDto.getChildren()); - } - for(OrgDto orgDto:children){ - System.out.println(orgDto.getName()); - grandChildren.addAll(orgDto.getChildren()); - } - for(OrgDto orgDto:grandChildren){ - System.out.println(orgDto.getName()); - } - } - +//package com.casic.accessControl.feature; +// +//import com.casic.accessControl.feature.dto.OrgDto; +//import com.casic.accessControl.feature.manager.FeatureManager; +//import com.casic.accessControl.user.domain.Company; +//import com.casic.accessControl.user.domain.User; +//import com.casic.accessControl.user.manager.UserManager; +//import com.casic.accessControl.basic.BasicTest; +//import com.google.gson.Gson; +//import com.google.gson.reflect.TypeToken; +//import org.junit.Test; +// +//import javax.annotation.Resource; +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * Created by lenovo on 2016/6/7. +// */ +// +//public class TestFeature extends BasicTest { +// @Resource +// private FeatureManager featureManager; +// @Resource +// private UserManager userManager; // @Test -// public String long2String(Long param){ -// if(param==null){ -// return ""; -// }else if() +// public void resovleFeatureList() {//测试解析ResolveList +// User user = userManager.getUserById(1L);//获取当前登录用户 +// Company company = user.getCompany(); +// String orgList = featureManager.getOrgList(1,company); +// System.out.println(orgList); +// Gson gson = new Gson(); +// List orgDtoList = gson.fromJson(orgList, new TypeToken>() { +// }.getType()); +// List children = new ArrayList(); +// List grandChildren = new ArrayList(); +// +// for(OrgDto orgDto :orgDtoList){ +// System.out.println(orgDto.getName()); +// children.addAll(orgDto.getChildren()); +// } +// for(OrgDto orgDto:children){ +// System.out.println(orgDto.getName()); +// grandChildren.addAll(orgDto.getChildren()); +// } +// for(OrgDto orgDto:grandChildren){ +// System.out.println(orgDto.getName()); +// } // } - - -} +// +//// @Test +//// public String long2String(Long param){ +//// if(param==null){ +//// return ""; +//// }else if() +//// } +// +// +//} diff --git a/src/test/com/casic/accessControl/util/HttpRequestUtils.java b/src/test/com/casic/accessControl/util/HttpRequestUtils.java new file mode 100644 index 0000000..582120f --- /dev/null +++ b/src/test/com/casic/accessControl/util/HttpRequestUtils.java @@ -0,0 +1,129 @@ +package com.casic.accessControl.util; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.List; +import java.util.Map; + +/** + * Created by lenovo on 2016/8/31. + */ +public class HttpRequestUtils { + + /** + * 向指定URL发送GET方法的请求 + * + * @param url + * 发送请求的URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return URL 所代表远程资源的响应结果 + */ + public static String sendGet(String url, String param) { + String result = ""; + BufferedReader in = null; + try { + String urlNameString = url + "?" + param; + URL realUrl = new URL(urlNameString); + // 打开和URL之间的连接 + URLConnection connection = realUrl.openConnection(); + // 设置通用的请求属性 + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 建立实际的连接 + connection.connect(); + // 获取所有响应头字段 + Map> map = connection.getHeaderFields(); + // 遍历所有的响应头字段 + for (String key : map.keySet()) { + System.out.println(key + "--->" + map.get(key)); + } + // 定义 BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader( + connection.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送GET请求出现异常！" + e); + e.printStackTrace(); + } + // 使用finally块来关闭输入流 + finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception e2) { + e2.printStackTrace(); + } + } + return result; + } + + /** + * 向指定 URL 发送POST方法的请求 + * + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String sendPost(String url, String param) { + PrintWriter out = null; + BufferedReader in = null; + String result = ""; + try { + URL realUrl = new URL(url); + // 打开和URL之间的连接 + URLConnection conn = realUrl.openConnection(); + // 设置通用的请求属性 + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 发送POST请求必须设置如下两行 + conn.setDoOutput(true); + conn.setDoInput(true); + // 获取URLConnection对象对应的输出流 + out = new PrintWriter(conn.getOutputStream()); + // 发送请求参数 + out.print(param); + // flush输出流的缓冲 + out.flush(); + // 定义BufferedReader输入流来读取URL的响应 + in = new BufferedReader( + new InputStreamReader(conn.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送 POST 请求出现异常！"+e); + e.printStackTrace(); + } + //使用finally块来关闭输出流、输入流 + finally{ + try{ + if(out!=null){ + out.close(); + } + if(in!=null){ + in.close(); + } + } + catch(IOException ex){ + ex.printStackTrace(); + } + } + return result; + } + } \ No newline at end of file diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 4dfa0ad..ad9e494 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -144,11 +144,7 @@ { if (fileBuffers[i] != null&&fileNames[i]!=null) { - if(i==fileBuffers.length-1){ - fileName += fileNames[i]; - }else{ - fileName += fileNames[i]+","; - } + fileName += fileNames[i]+","; byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]); //对android传过来的图片字符串进行解码 File destDir = new File(toDir); @@ -161,6 +157,9 @@ fos.close(); } } + if(fileName.endsWith(",")){ + fileName = fileName.substring(0,fileName.length()-1); + } event.setImageName(fileName); event.setLatitude(eventInfo.getLatitude()==null?0:Double.valueOf(eventInfo.getLatitude())); event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude())); 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 bc77a3b..8333899 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -67,6 +67,11 @@ { Map result = new HashMap(); + if(StringUtils.isBlank(taskId)){ + result.put("message","请先执行工单，再进行事件上传！"); + result.put("success",false); + return result; + } try { String [] fileNames = new String[3]; 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 350e0ec..423724b 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -216,7 +216,7 @@ @ResponseBody public Map batchSaveNa(@RequestParam(value = "markers", required = true) String strMarkers) { Map map = new HashMap(); - map.put("message", "批量导入失败"); + map.put("message", "批量导入失败,或无导入标识器信息"); Gson gson = new Gson(); try { List markers = gson.fromJson(strMarkers, new TypeToken>() { @@ -232,7 +232,7 @@ // } else { // return map; // } - Long companyId = markers.get(0).getUserId(); + Long companyId = markers.get(0).getCompanyId(); if(companyId==null){ return map; } @@ -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][21]; + Label[][] labels = new Label[markerDtos.size() + 1][22]; labels[0][0] = new Label(0, 0, "管线种类"); labels[0][1] = new Label(1, 0, "管线直径");//管线种类 labels[0][2] = new Label(2, 0, "管线材质"); @@ -354,17 +354,18 @@ 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][18] = new Label(18, 0, "下层管直径"); - labels[0][19] = new Label(19, 0, "下层管材料"); - labels[0][20] = new Label(20, 0, "标识对象类别"); + 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][18] = new Label(18, 0, "下层管埋深"); + labels[0][19] = new Label(19, 0, "下层管直径"); + labels[0][20] = new Label(20, 0, "下层管材料"); + labels[0][21] = new Label(21, 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()); @@ -377,21 +378,22 @@ 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.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()); + labels[i + 1][10] = new Label(10, i + 1, markerDto.getMarkerType()); + labels[i + 1][11] = new Label(11, i + 1, markerDto.getMarkerDepth()); + labels[i + 1][12] = new Label(12, i + 1, markerDto.getCreator()); + labels[i + 1][13] = new Label(13, i + 1, markerDto.getLongitude().toString()); + labels[i + 1][14] = new Label(14, i + 1, markerDto.getLatitude().toString()); + labels[i + 1][15] = new Label(15, i + 1, markerDto.getCreateTime()); + labels[i + 1][16] = new Label(16, i + 1, markerDto.getMemo()); + labels[i + 1][17] = new Label(17, i + 1, markerDto.getBelowType()); + labels[i + 1][18] = new Label(18, i + 1, markerDto.getBelowDepth()); + labels[i + 1][19] = new Label(19, i + 1, markerDto.getBelowDiameter()); labels[i + 1][20] = new Label(20, i + 1, markerDto.getBelowMaterial()); + labels[i + 1][21] = new Label(21, i + 1, markerDto.getRecordType().toString()); } for (int i = 0; i < markerDtos.size() + 1; i++) { - for (int j = 0; j < 21; j++) { + for (int j = 0; j < 22; j++) { sheet.addCell(labels[i][j]); } } diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java deleted file mode 100644 index e97f18b..0000000 --- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java +++ /dev/null @@ -1,65 +0,0 @@ -//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.user.domain.Company; -//import com.casic.accessControl.user.domain.User; -//import com.casic.accessControl.user.manager.UserManager; -//import com.google.gson.Gson; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.annotation.Resource; -//import javax.ws.rs.*; -//import javax.ws.rs.core.MediaType; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -//* Created by admin on 2015/1/15. -//*/ -//@Component -//@Path("feature") -//public class FeatureResource -//{ -// private static Logger logger = LoggerFactory.getLogger(FeatureResource.class); -// -// @Resource -// private UserManager userManager; -// -// @Resource -// private FeatureManager featureManager; -// -// @GET -// @Path("get") -// @Produces(MediaType.APPLICATION_JSON) -// public Map get(@QueryParam("userName") String userName ){ -// Map map = new HashMap(); -// try { -// User user = userManager.getUserByName(userName); -// if (user == null) { -// map.put("success", "false"); -// map.put("message", "人员不存在！"); -// return map; -// } -// Company company = user.getCompany(); -// if (company!=null) -// { -// List features = featureManager.getFeaturesByCompany(company); -// List featureDtos = FeatureDto.convert2FeatureDtos(features); -// map.put("success", "true"); -// map.put("message", featureDtos); -// } -// } -// catch (Exception e) -// { -// map.put("success", "false"); -// map.put("message", e.getMessage()); -// } -// return map; -// } -//} diff --git a/src/main/resources/spring/applicationContext-hibernate.xml b/src/main/resources/spring/applicationContext-hibernate.xml index a960c27..b5fb133 100644 --- a/src/main/resources/spring/applicationContext-hibernate.xml +++ b/src/main/resources/spring/applicationContext-hibernate.xml @@ -53,18 +53,14 @@ - com.casic.accessControl.user.domain.User com.casic.accessControl.user.domain.Company com.casic.accessControl.user.domain.Role - com.casic.accessControl.marker.domain.Marker com.casic.accessControl.task.domain.Task com.casic.accessControl.task.domain.TaskDetail com.casic.accessControl.task.domain.Position com.casic.accessControl.event.domain.Event - - diff --git a/src/test/com/casic/accessControl/event/EventTest.java b/src/test/com/casic/accessControl/event/EventTest.java new file mode 100644 index 0000000..ac899c4 --- /dev/null +++ b/src/test/com/casic/accessControl/event/EventTest.java @@ -0,0 +1,10 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.basic.BasicTest; + +/** + * Created by lenovo on 2016/8/31. + */ +public class EventTest extends BasicTest{ + +} diff --git a/src/test/com/casic/accessControl/event/MainTest.java b/src/test/com/casic/accessControl/event/MainTest.java new file mode 100644 index 0000000..73c3794 --- /dev/null +++ b/src/test/com/casic/accessControl/event/MainTest.java @@ -0,0 +1,33 @@ +package com.casic.accessControl.event; + +import com.casic.accessControl.util.HttpRequestUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +/** + * Created by lenovo on 2016/8/31. + */ +public class MainTest { + public void testGetEventList(){ + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/get-event-list.do", "taskId=4" ); + System.out.println(s); + } + public void testSaveEvent(){ +// @RequestParam(value = "taskId",required = true) 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 = "data",required = true) String eventInfo + + String s = HttpRequestUtils.sendGet("http://localhost:8080/ems/event/save-event.do", "taskId=4" ); + System.out.println(s); + } + public static void main(String [] args){ + MainTest mainTest = new MainTest(); + mainTest.testGetEventList(); + + } +} diff --git a/src/test/com/casic/accessControl/feature/TestFeature.java b/src/test/com/casic/accessControl/feature/TestFeature.java index 56ff326..97c4091 100644 --- a/src/test/com/casic/accessControl/feature/TestFeature.java +++ b/src/test/com/casic/accessControl/feature/TestFeature.java @@ -1,59 +1,59 @@ -package com.casic.accessControl.feature; - -import com.casic.accessControl.feature.dto.OrgDto; -import com.casic.accessControl.feature.manager.FeatureManager; -import com.casic.accessControl.user.domain.Company; -import com.casic.accessControl.user.domain.User; -import com.casic.accessControl.user.manager.UserManager; -import com.casic.accessControl.basic.BasicTest; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import org.junit.Test; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by lenovo on 2016/6/7. - */ - -public class TestFeature extends BasicTest { - @Resource - private FeatureManager featureManager; - @Resource - private UserManager userManager; - @Test - public void resovleFeatureList() {//测试解析ResolveList - User user = userManager.getUserById(1L);//获取当前登录用户 - Company company = user.getCompany(); - String orgList = featureManager.getOrgList(1,company); - System.out.println(orgList); - Gson gson = new Gson(); - List orgDtoList = gson.fromJson(orgList, new TypeToken>() { - }.getType()); - List children = new ArrayList(); - List grandChildren = new ArrayList(); - - for(OrgDto orgDto :orgDtoList){ - System.out.println(orgDto.getName()); - children.addAll(orgDto.getChildren()); - } - for(OrgDto orgDto:children){ - System.out.println(orgDto.getName()); - grandChildren.addAll(orgDto.getChildren()); - } - for(OrgDto orgDto:grandChildren){ - System.out.println(orgDto.getName()); - } - } - +//package com.casic.accessControl.feature; +// +//import com.casic.accessControl.feature.dto.OrgDto; +//import com.casic.accessControl.feature.manager.FeatureManager; +//import com.casic.accessControl.user.domain.Company; +//import com.casic.accessControl.user.domain.User; +//import com.casic.accessControl.user.manager.UserManager; +//import com.casic.accessControl.basic.BasicTest; +//import com.google.gson.Gson; +//import com.google.gson.reflect.TypeToken; +//import org.junit.Test; +// +//import javax.annotation.Resource; +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * Created by lenovo on 2016/6/7. +// */ +// +//public class TestFeature extends BasicTest { +// @Resource +// private FeatureManager featureManager; +// @Resource +// private UserManager userManager; // @Test -// public String long2String(Long param){ -// if(param==null){ -// return ""; -// }else if() +// public void resovleFeatureList() {//测试解析ResolveList +// User user = userManager.getUserById(1L);//获取当前登录用户 +// Company company = user.getCompany(); +// String orgList = featureManager.getOrgList(1,company); +// System.out.println(orgList); +// Gson gson = new Gson(); +// List orgDtoList = gson.fromJson(orgList, new TypeToken>() { +// }.getType()); +// List children = new ArrayList(); +// List grandChildren = new ArrayList(); +// +// for(OrgDto orgDto :orgDtoList){ +// System.out.println(orgDto.getName()); +// children.addAll(orgDto.getChildren()); +// } +// for(OrgDto orgDto:children){ +// System.out.println(orgDto.getName()); +// grandChildren.addAll(orgDto.getChildren()); +// } +// for(OrgDto orgDto:grandChildren){ +// System.out.println(orgDto.getName()); +// } // } - - -} +// +//// @Test +//// public String long2String(Long param){ +//// if(param==null){ +//// return ""; +//// }else if() +//// } +// +// +//} diff --git a/src/test/com/casic/accessControl/util/HttpRequestUtils.java b/src/test/com/casic/accessControl/util/HttpRequestUtils.java new file mode 100644 index 0000000..582120f --- /dev/null +++ b/src/test/com/casic/accessControl/util/HttpRequestUtils.java @@ -0,0 +1,129 @@ +package com.casic.accessControl.util; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.List; +import java.util.Map; + +/** + * Created by lenovo on 2016/8/31. + */ +public class HttpRequestUtils { + + /** + * 向指定URL发送GET方法的请求 + * + * @param url + * 发送请求的URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return URL 所代表远程资源的响应结果 + */ + public static String sendGet(String url, String param) { + String result = ""; + BufferedReader in = null; + try { + String urlNameString = url + "?" + param; + URL realUrl = new URL(urlNameString); + // 打开和URL之间的连接 + URLConnection connection = realUrl.openConnection(); + // 设置通用的请求属性 + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 建立实际的连接 + connection.connect(); + // 获取所有响应头字段 + Map> map = connection.getHeaderFields(); + // 遍历所有的响应头字段 + for (String key : map.keySet()) { + System.out.println(key + "--->" + map.get(key)); + } + // 定义 BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader( + connection.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送GET请求出现异常！" + e); + e.printStackTrace(); + } + // 使用finally块来关闭输入流 + finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception e2) { + e2.printStackTrace(); + } + } + return result; + } + + /** + * 向指定 URL 发送POST方法的请求 + * + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String sendPost(String url, String param) { + PrintWriter out = null; + BufferedReader in = null; + String result = ""; + try { + URL realUrl = new URL(url); + // 打开和URL之间的连接 + URLConnection conn = realUrl.openConnection(); + // 设置通用的请求属性 + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 发送POST请求必须设置如下两行 + conn.setDoOutput(true); + conn.setDoInput(true); + // 获取URLConnection对象对应的输出流 + out = new PrintWriter(conn.getOutputStream()); + // 发送请求参数 + out.print(param); + // flush输出流的缓冲 + out.flush(); + // 定义BufferedReader输入流来读取URL的响应 + in = new BufferedReader( + new InputStreamReader(conn.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送 POST 请求出现异常！"+e); + e.printStackTrace(); + } + //使用finally块来关闭输出流、输入流 + finally{ + try{ + if(out!=null){ + out.close(); + } + if(in!=null){ + in.close(); + } + } + catch(IOException ex){ + ex.printStackTrace(); + } + } + return result; + } + } \ No newline at end of file diff --git a/src/test/com/casic/accessControl/util/MarkerUtil.java b/src/test/com/casic/accessControl/util/MarkerUtil.java new file mode 100644 index 0000000..f8c5bb5 --- /dev/null +++ b/src/test/com/casic/accessControl/util/MarkerUtil.java @@ -0,0 +1,241 @@ +package com.casic.accessControl.util; + +/** + * Created by lenovo on 2016/8/31. + */ +public class MarkerUtil { + private Long id; + private String markerObjectType; + private String pipeMaterial; + private String pipeDiameter; + private String layStyle;//埋设方式 + private String depth;//埋深 + private String belowType;//下层管种类 + private String belowDepth;//下层管埋深 + private String belowDiameter;//下层管直径 + private String belowMaterial;//下层管材料 + private String road;//所属道路 + private String constructTime;//建设年代 + private String ownerComp;//权属单位 + private String markerObjectId; + private String markerId; + private String markerType; + private String creator; + private String markerDepth;//标识器埋深 + private Double longitude;//经度 + private Double latitude;//纬度 + private String createTime; + private String memo;//备注 + private Integer recordType;//记录类型，1:管线，2:管线附属物,3:管线特征点,4:交叉穿越点 + private Integer isValid; + private Long companyId; + private Long userId; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMarkerObjectType() { + return markerObjectType; + } + + public void setMarkerObjectType(String markerObjectType) { + this.markerObjectType = markerObjectType; + } + + public String getPipeMaterial() { + return pipeMaterial; + } + + public void setPipeMaterial(String pipeMaterial) { + this.pipeMaterial = pipeMaterial; + } + + public String getPipeDiameter() { + return pipeDiameter; + } + + public void setPipeDiameter(String pipeDiameter) { + this.pipeDiameter = pipeDiameter; + } + + public String getLayStyle() { + return layStyle; + } + + public void setLayStyle(String layStyle) { + this.layStyle = layStyle; + } + + public String getDepth() { + return depth; + } + + public void setDepth(String depth) { + this.depth = depth; + } + + public String getBelowType() { + return belowType; + } + + public void setBelowType(String belowType) { + this.belowType = belowType; + } + + public String getBelowDepth() { + return belowDepth; + } + + public void setBelowDepth(String belowDepth) { + this.belowDepth = belowDepth; + } + + public String getBelowDiameter() { + return belowDiameter; + } + + public void setBelowDiameter(String belowDiameter) { + this.belowDiameter = belowDiameter; + } + + public String getBelowMaterial() { + return belowMaterial; + } + + public void setBelowMaterial(String belowMaterial) { + this.belowMaterial = belowMaterial; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + public String getConstructTime() { + return constructTime; + } + + public void setConstructTime(String constructTime) { + this.constructTime = constructTime; + } + + public String getOwnerComp() { + return ownerComp; + } + + public void setOwnerComp(String ownerComp) { + this.ownerComp = ownerComp; + } + + public String getMarkerObjectId() { + return markerObjectId; + } + + public void setMarkerObjectId(String markerObjectId) { + this.markerObjectId = markerObjectId; + } + + public String getMarkerId() { + return markerId; + } + + public void setMarkerId(String markerId) { + this.markerId = markerId; + } + + public String getMarkerType() { + return markerType; + } + + public void setMarkerType(String markerType) { + this.markerType = markerType; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getMarkerDepth() { + return markerDepth; + } + + public void setMarkerDepth(String markerDepth) { + this.markerDepth = markerDepth; + } + + public Double getLongitude() { + return longitude; + } + + public void setLongitude(Double longitude) { + this.longitude = longitude; + } + + public Double getLatitude() { + return latitude; + } + + public void setLatitude(Double latitude) { + this.latitude = latitude; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } + + public Integer getRecordType() { + return recordType; + } + + public void setRecordType(Integer recordType) { + this.recordType = recordType; + } + + public Integer getIsValid() { + return isValid; + } + + public void setIsValid(Integer isValid) { + this.isValid = isValid; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } +}