-
+
diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp
index 5f265bc..e9db731 100644
--- a/src/main/webapp/content/marker/marker-info-edit-new.jsp
+++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>
<%@include file="/taglibs.jsp" %>
<%pageContext.setAttribute("currentMenu", "marker1");%>
地下管线电子标识系统
<%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
<%@include file="/common/layout/footer.jsp" %>
<%----%>
\ No newline at end of file
+<%@page contentType="text/html;charset=UTF-8" %>
<%@include file="/taglibs.jsp" %>
<%pageContext.setAttribute("currentMenu", "marker1");%>
地下管线电子标识系统
<%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
<%@include file="/common/layout/footer.jsp" %>
<%----%>
\ No newline at end of file
diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp
index 3ca4763..bf229bf 100644
--- a/src/main/webapp/content/marker/marker-info-list.jsp
+++ b/src/main/webapp/content/marker/marker-info-list.jsp
@@ -1 +1 @@
-<%@page contentType="text/html;charset=UTF-8" %>
<%@include file="/taglibs.jsp" %>
<%pageContext.setAttribute("currentMenu", "markerManagerMenu");%>
地下管线电子标识系统
<%--
--%>
<%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
<%----%>
<%----%>
<%--| id | --%>
<%--标识器编号 | --%>
<%--标识器名称 | --%>
<%--区域 | --%>
<%--线路 | --%>
<%--类型 | --%>
<%--埋深 | --%>
<%--里程1 | --%>
<%--里程2 | --%>
<%--安装时间 | --%>
<%--安装人员 | --%>
<%--备注 | --%>
<%--编辑 | --%>
<%--删除 | --%>
<%--
--%>
<%----%>
<%@include file="/common/layout/footer.jsp" %>
<%----%>
<%----%>
\ No newline at end of file
+<%@page contentType="text/html;charset=UTF-8" %>
<%@include file="/taglibs.jsp" %>
<%pageContext.setAttribute("currentMenu", "markerManagerMenu");%>
地下管线电子标识系统
<%--
--%>
<%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
<%----%>
<%----%>
<%--| id | --%>
<%--标识器编号 | --%>
<%--标识器名称 | --%>
<%--区域 | --%>
<%--线路 | --%>
<%--类型 | --%>
<%--埋深 | --%>
<%--里程1 | --%>
<%--里程2 | --%>
<%--安装时间 | --%>
<%--安装人员 | --%>
<%--备注 | --%>
<%--编辑 | --%>
<%--删除 | --%>
<%--
--%>
<%----%>
<%@include file="/common/layout/footer.jsp" %>
<%----%>
<%----%>
\ No newline at end of file
diff --git a/src/main/java/com/casic/accessControl/marker/domain/Marker.java b/src/main/java/com/casic/accessControl/marker/domain/Marker.java
index c646fa6..0575cfe 100644
--- a/src/main/java/com/casic/accessControl/marker/domain/Marker.java
+++ b/src/main/java/com/casic/accessControl/marker/domain/Marker.java
@@ -63,6 +63,10 @@
private Integer isValid;
@Column(name = "company_id")
private Long companyId;
+ @Column(name = "area")
+ private String area;
+ @Column(name = "line")
+ private String line;
@@ -295,82 +299,20 @@
public void setCreator(String creator) {
this.creator = creator;
}
-// public String getMarkerObjectName() {
-// return markerObjectName;
-// }
-//
-// public void setMarkerObjectName(String markerObjectName) {
-// this.markerObjectName = markerObjectName;
-// }
-//
-//
-//
-// public Feature getBelongFeature() {
-// return belongFeature;
-// }
-//
-// public void setBelongFeature(Feature belongFeature) {
-// this.belongFeature = belongFeature;
-// }
-// public String getMarkerName() {
-// return markerName;
-// }
-//
-// public void setMarkerName(String markerName) {
-// this.markerName = markerName;
-// }
-//
-//
-// public String getDesignComp() {
-// return designComp;
-// }
-//
-// public void setDesignComp(String designComp) {
-// this.designComp = designComp;
-// }
-//
-// public String getWorkComp() {
-// return workComp;
-// }
-//
-// public void setWorkComp(String workComp) {
-// this.workComp = workComp;
-// }
-//
-//
-//
-// public String getMileage() {
-// return mileage;
-// }
-//
-// public void setMileage(String mileage) {
-// this.mileage = mileage;
-// }
-//
-// public String getMileage2() {
-// return mileage2;
-// }
-//
-// public void setMileage2(String mileage2) {
-// this.mileage2 = mileage2;
-// }
-//
-//
-//
-// public String getCreator() {
-// return creator;
-// }
-//
-// public void setCreator(String creator) {
-// this.creator = creator;
-// }
-//
-// public Feature getBelongLine() {
-// return belongLine;
-// }
-//
-// public void setBelongLine(Feature belongLine) {
-// this.belongLine = belongLine;
-// }
+ public String getLine() {
+ return line;
+ }
+
+ public void setLine(String line) {
+ this.line = line;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 22030b0..05a7c0f 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -13,35 +13,6 @@
* Created by lenovo on 2016/5/16.
*/
public class MarkerDto {
- // private Long id;
-// private String markerName;
-// private String markerId;
-// private String markerType;
-// private String markerDepth;//高程
-// private Double longitude;//经度
-// private Double latitude;//纬度
-// private String depth;//埋深
-// private String markerObjectId;
-// private String markerObjectType;
-// private String markerObjectName;
-// private String creator;
-// private String createTime;
-// private String ownerComp;//权属单位
-// private String designComp;
-// private String workComp;
-// private Integer isValid;
-// private Long featureId;//所属位置点
-// private Long lineId;
-// private Long userId;
-// private String mileage;//里程1
-// private String mileage2;//里程2
-// private String memo;//备注
-// private String featureName;//区域名称
-// private String lineName;//线路名称
-// private String sDate;
-// private String eDate;
-// private String pipeMaterial;
-// private String pipeDiameter;
private Long id;
private String markerObjectType;
private String pipeMaterial;
@@ -70,6 +41,8 @@
private String sDate;
private String eDate;
private Long userId;
+ private String area;
+ private String line;
private String btnEdit = "
编辑";
private String btnDelete = "
删除";
@@ -315,6 +288,22 @@
this.companyId = companyId;
}
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+ public String getLine() {
+ return line;
+ }
+
+ public void setLine(String line) {
+ this.line = line;
+ }
+
public static MarkerDto convert2MarkerDto(Marker marker) {
if (marker == null) return null;
MarkerDto result = new MarkerDto();
@@ -344,15 +333,13 @@
result.setConstructTime(doNullChange(marker.getConstructTime()));
result.setRecordType(marker.getRecordType());
result.setRoad(doNullChange(marker.getRoad()));
+ result.setArea(doNullChange(marker.getArea()));
+ result.setLine(doNullChange(marker.getLine()));
return result;
}
private static String doNullChange(Object obj) {
- if (null == obj) {
- return "";
- } else {
- return String.valueOf(obj);
- }
+ return obj==null?"":String.valueOf(obj);
}
public static List
convert2MarkerDtoList(List markers) {
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index d4998d8..11d0b1f 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -18,9 +18,7 @@
import com.casic.accessControl.xls.Common;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
+import jxl.*;
import jxl.read.biff.BiffException;
import jxl.write.Label;
import jxl.write.WritableSheet;
@@ -44,6 +42,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
+import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -205,6 +204,8 @@
marker.setOwnerComp(markerDto.getOwnerComp());
marker.setPipeDiameter(markerDto.getPipeDiameter());
marker.setPipeMaterial(markerDto.getPipeMaterial());
+ marker.setArea(markerDto.getArea());
+ marker.setLine(markerDto.getLine());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
try {
if (StringUtils.isNotBlank(markerDto.getCreateTime())) {
@@ -353,7 +354,7 @@
case "建设年代":
indexMap.put("constructTime", i);
break;
- case "所属单位":
+ case "权属单位":
indexMap.put("ownerComp", i);
break;
case "标识器ID":
@@ -368,7 +369,7 @@
case "标识器埋深":
indexMap.put("markerDepth", i);
break;
- case "安装人员":
+ case "安装部门":
indexMap.put("creator", i);
break;
case "经度":
@@ -425,8 +426,10 @@
}
}
-
+ /* DecimalFormat decimalFormatter = new DecimalFormat("###.#############");*/
for (int i = 1; i < rows; i++) {
+ //TODO LIST:写一个判断excel行内容全部为空的方法
+ if(isEmptyRow(sheet.getRow(i))) continue;
MarkerDto markerDto = new MarkerDto();
if (recordTypeFlag == 1) {
markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
@@ -449,8 +452,22 @@
markerDto.setMarkerId(sheet.getCell(indexMap.get("markerId"), i).getContents());
markerDto.setMarkerType(sheet.getCell(indexMap.get("markerType"), i).getContents());
markerDto.setMarkerDepth(sheet.getCell(indexMap.get("markerDepth"), i).getContents());
- markerDto.setLongitude(Double.valueOf(empty2zero(sheet.getCell(indexMap.get("longitude"), i).getContents())));
- markerDto.setLatitude(Double.valueOf(empty2zero(sheet.getCell(indexMap.get("latitude"), i).getContents())));
+ Cell loCell1 = sheet.getCell(indexMap.get("longitude"), i);
+ Cell latCell1 =sheet.getCell(indexMap.get("latitude"), i);
+ /*String longtitudetmp = sheet.getCell(indexMap.get("longitude"), i).getContents();*/
+// c10.getType() == CellType.NUMBER
+ if(loCell1.getType()!= CellType.NUMBER||latCell1.getType()!=CellType.NUMBER){
+ //经纬度坐标格式不符合要求
+ return 3;
+ }
+ NumberCell longCell = (NumberCell)sheet.getCell(indexMap.get("longitude"), i);
+ NumberCell latCell =(NumberCell)sheet.getCell(indexMap.get("latitude"), i);
+ double longtitudetmp = longCell.getValue();
+ double latitudetmp = latCell.getValue();
+ /* markerDto.setLongitude(Double.valueOf(empty2zero(longtitudetmp)));*/
+ markerDto.setLongitude(longtitudetmp);
+ markerDto.setLatitude(latitudetmp);
+// markerDto.setLatitude(Double.valueOf(empty2zero(sheet.getCell(indexMap.get("latitude"), i).getContents())));
markerDto.setIsValid(1);
markerDto.setRecordType(recordTypeFlag);
markerDto.setCreateTime(sheet.getCell(indexMap.get("createTime"), i).getContents());
@@ -466,10 +483,21 @@
} catch (IOException e) {
logger.error(e.getMessage());
return 4;
+ }catch(Exception e){
+ logger.error(e.getMessage());
+ return 4;
}
return 0;
}
+ private boolean isEmptyRow(Cell []cells){
+ for(Cell cell:cells){
+ if(StringUtils.isBlank(cell.getContents()))continue;
+ return false;
+ }
+ return true;
+ }
+
/**
*
* @param companyId 操作用户的公司ID
@@ -483,57 +511,28 @@
//打开文件
WritableWorkbook book = Workbook.createWorkbook(new File(outPath));
WritableSheet sheet = book.createSheet("第一页", 0);
- 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, "管线材质");
- labels[0][3] = new Label(3, 0, "埋设方式");
- labels[0][4] = new Label(4, 0, "管线埋深");
- labels[0][5] = new Label(5, 0, "所属道路");
- labels[0][6] = new Label(6, 0, "建设年代");
- labels[0][7] = new Label(7, 0, "所属单位");
- labels[0][8] = new Label(8, 0, "标示对象ID");
- labels[0][9] = new Label(9, 0, "标识器ID");
- labels[0][10] = new Label(10, 0, "标识器类型");
- labels[0][11] = new Label(11, 0, "标识器埋深");
- labels[0][12] = new Label(12, 0, "安装人员");
- labels[0][13] = new Label(13, 0, "经度");
- labels[0][14] = new Label(14, 0, "纬度");
- labels[0][15] = new Label(15, 0, "最后修改时间");
- labels[0][16] = new Label(16, 0, "备注");
- labels[0][17] = new Label(17, 0, "下层管种类");
- labels[0][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, "标识对象类别");
+ String [] titleTxt ={"管线种类","管线直径","管线材质","埋设方式","管线埋深",
+ "所属区域","所属线路","所属道路","建设年代","权属单位","标示对象ID",
+ "标识器ID","标识器类型","标识器埋深","安装部门","经度",
+ "纬度", "最后修改时间","备注","下层管种类", "下层管埋深",
+ "下层管直径", "下层管材料", "标识对象类别"};
+ Label[][] labels = new Label[markerDtos.size() + 1][titleTxt.length];
+ for(int k=0;k 1) {
+
+ if(flag > 0){
+ //提示友好改进
+ if (flag == 1) {//Excel表不含内容返回1
+ res.put("message", "Excel表无有效内容，导入失败");
+ return res;
+ }
+ if (flag == 3) {
+ res.put("message", "经纬度坐标包含无效数据，请检查是否全部为数字，导入失败");
+ return res;
+ }
return res;
}
res.put("success", true);
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 1b0147b..18f1d40 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -164,7 +164,7 @@