Merge branch 'master' of http://git.minpay.cc/dianwang/dianwangAdm.git

src/main/java/com/minpay/common/constant/Constant.java

@@ -301,7 +301,10 @@ public class Constant implements IMINBusinessConstant{
 	 */
 	public static final String FILE_DETAIL_TYPE_02 = "1000003";
 	
-	
+	/**
+	 * 原始文件类型 1000004:低电压
+	 */
+	public static final String FILE_DETAIL_TYPE_03 = "1000004";
 	
 	/**
 	 * 报表类型 TQTDRB:台区停电日报

src/main/java/com/minpay/common/service/impl/DianwangServiceImpl.java

@@ -11,12 +11,15 @@ import com.minpay.common.util.CommonUtil;
 import com.minpay.db.table.mapper.DwFileDetail00Mapper;
 import com.minpay.db.table.mapper.DwFileDetail01Mapper;
 import com.minpay.db.table.mapper.DwFileDetail02Mapper;
+import com.minpay.db.table.mapper.DwFileDetail03Mapper;
 import com.minpay.db.table.model.DwFileDetail00;
 import com.minpay.db.table.model.DwFileDetail00Example;
 import com.minpay.db.table.model.DwFileDetail01;
 import com.minpay.db.table.model.DwFileDetail01Example;
 import com.minpay.db.table.model.DwFileDetail02;
 import com.minpay.db.table.model.DwFileDetail02Example;
+import com.minpay.db.table.model.DwFileDetail03;
+import com.minpay.db.table.model.DwFileDetail03Example;
 import com.startup.minpay.frame.constant.IMINBusinessConstant;
 import com.startup.minpay.frame.exception.MINBusinessException;
 import com.startup.minpay.frame.jdbc.MINRowBounds;
@@ -73,6 +76,12 @@ public class DianwangServiceImpl implements IDianwangService {
     		List<DwFileDetail02> resList = db.selectByExample(DwFileDetail02Mapper.class, fileDetail02Example, rows);
     		resList = Service.lookup(IFormatService.class).formatDateTime(resList, "beginTime", "endTime");
     		return resList;
+    	}else if(Constant.FILE_DETAIL_TYPE_03.equals(fileType)){
+    		DwFileDetail03Example fileDetail03Example = new DwFileDetail03Example();
+    		fileDetail03Example.createCriteria().andFileIdEqualTo(fileId);
+    		List<DwFileDetail03> resList = db.selectByExample(DwFileDetail03Mapper.class, fileDetail03Example, rows);
+    		resList = Service.lookup(IFormatService.class).formatDate(resList, "sjrq");
+    		return resList;
     	}
     	return null;
 	}

src/main/java/com/minpay/reportManage/action/DataWareManageAction.java

@@ -2,6 +2,9 @@ package com.minpay.reportManage.action;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,6 +27,7 @@ import com.minpay.common.util.ListUtil;
 import com.minpay.db.table.mapper.DwFileDetail00Mapper;
 import com.minpay.db.table.mapper.DwFileDetail01Mapper;
 import com.minpay.db.table.mapper.DwFileDetail02Mapper;
+import com.minpay.db.table.mapper.DwFileDetail03Mapper;
 import com.minpay.db.table.mapper.DwFileInfMapper;
 import com.minpay.db.table.mapper.DwReporttypeFiletypeRelMapper;
 import com.minpay.db.table.mapper.ImUserMapper;
@@ -32,6 +36,7 @@ import com.minpay.db.table.model.DwFileDetail00Example;
 import com.minpay.db.table.model.DwFileDetail01;
 import com.minpay.db.table.model.DwFileDetail01Example;
 import com.minpay.db.table.model.DwFileDetail02;
+import com.minpay.db.table.model.DwFileDetail03;
 import com.minpay.db.table.model.DwFileInf;
 import com.minpay.db.table.model.DwReporttypeFiletypeRelExample;
 import com.minpay.db.table.model.DwReporttypeFiletypeRelKey;
@@ -52,6 +57,7 @@ import com.startup.minpay.frame.session.MINSession;
 import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
+import com.sun.tools.example.debug.expr.ParseException;
 
 import net.sf.json.JSONArray;
 
@@ -312,6 +318,52 @@ public class DataWareManageAction implements IMINAction {
 				fileDetail02.setFileId(fileId);
 				db.insertSelective(DwFileDetail02Mapper.class, fileDetail02);
 			}
+		}else if(Constant.FILE_DETAIL_TYPE_03.equals(fileType)){
+			String[] titleKey = new String[]{"no","sgsmc","xgsmc","bdzmc","xlmc","tqid","byqmc","yhgldw1","yhid","yhmc","yhgldw2","dymax","dymin","dyhgl","csxl","cxxl","dysc","gdlx","ljts","sjrq","gddw"};         
+			list = FilesUtil.readExecleasy(fileItem, titleKey, 3);
+			
+			if (list.size() == 0) {
+				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
+			}
+			// 详情数据存入数据库
+			for (Map<String,String> excelMap : list) {
+				String fileDetailId = db.getMybatisMapper(SequenceMapper.class).getSequence("FILE_DETAIL_03_NO");
+				String sjrq = excelMap.get("sjrq");
+				try {
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+					Date date = sdf.parse(sjrq);
+					SimpleDateFormat todf = new SimpleDateFormat("yyyyMMdd");// 设置日期格式
+					sjrq = todf.format(date);
+				} catch (Exception ex) {
+				}
+//				DateFormat formater = new SimpleDateFormat("yyyyMMdd");
+//				String sjrq = formater.format(excelMap.get("sjrq"));
+				DwFileDetail03 fileDetail03 = new DwFileDetail03();
+				fileDetail03.setId(fileDetailId);
+				fileDetail03.setNo(excelMap.get("no"));
+				fileDetail03.setSgsmc(excelMap.get("sgsmc"));
+				fileDetail03.setXgsmc(excelMap.get("xgsmc"));
+				fileDetail03.setBdzmc(excelMap.get("bdzmc"));
+				fileDetail03.setXlmc(excelMap.get("xlmc"));
+				fileDetail03.setTqid(excelMap.get("tqid"));
+				fileDetail03.setByqmc(excelMap.get("byqmc"));
+				fileDetail03.setYhgldw1(excelMap.get("yhgldw1"));
+				fileDetail03.setYhid(excelMap.get("yhid"));
+				fileDetail03.setYhmc(excelMap.get("yhmc"));
+				fileDetail03.setYhgldw2(excelMap.get("yhgldw2"));
+				fileDetail03.setDymax(excelMap.get("dymax"));
+				fileDetail03.setDymin(excelMap.get("dymin"));
+				fileDetail03.setDyhgl(excelMap.get("dyhgl"));
+				fileDetail03.setCsxl(excelMap.get("csxl"));
+				fileDetail03.setCxxl(excelMap.get("cxxl"));
+				fileDetail03.setDysc(excelMap.get("dysc"));
+				fileDetail03.setGdlx(excelMap.get("gdlx"));
+				fileDetail03.setLjts(excelMap.get("ljts"));
+				fileDetail03.setSjrq(sjrq);
+				fileDetail03.setGddw(excelMap.get("gddw"));
+				fileDetail03.setFileId(fileId);
+				db.insertSelective(DwFileDetail03Mapper.class, fileDetail03);
+			}
 		}
 		
 		// 文件名

src/main/webapp/admin/main.html

@@ -18,7 +18,7 @@
 		</style>
 	</head>
 	<body>
-		<img alt="" src="../images/homeBack.jpg" width = "100%" height = "100%">
+		<img alt="" src="../images/homeBack.png" width = "100%" height = "100%">
 		<script type="text/javascript">
 		</script>
 	</body>

src/main/webapp/admin/reprotManage/dataWare.html

@@ -149,6 +149,7 @@
       
       function showDetail(data){
     	  var openPageId = pageId + "-02";
+    	  debugger;
     	  openMainTabPage(openPageId, "详情查看", "reprotManage/dataWareDetail.html?pageId="+openPageId+"&fileId="+data.id+"&fileType="+data.type, '', pageId, null);
       }
       

src/main/webapp/admin/reprotManage/dataWareDetail.html

@@ -59,6 +59,30 @@
 			      ,{field: 'gzqhdhf', title: '故障前后段恢复'}
 			      ,{field: 'gzgl', title: '故障隔离'}
 			    ]];
+	}else if("1000004" == fileType){
+		cols = [[ 
+			      {field: 'no', title: '序号'}
+			      ,{field: 'sgsmc', title: '市公司名称'}
+			      ,{field: 'xgsmc', title: '县公司名称'}
+			      ,{field: 'bdzmc', title: '变电站名称'}
+			      ,{field: 'xlmc', title: '线路名称'}
+			      ,{field: 'tqid', title: '台区id'}
+			      ,{field: 'byqmc', title: '变压器名称'}
+			      ,{field: 'yhgldw1', title: '用户管理单位名称'}
+			      ,{field: 'yhid', title: '用户编号'}
+			      ,{field: 'yhmc', title: '用户名称'}
+			      ,{field: 'yhgldw2', title: '用户管理单位名称'}
+			      ,{field: 'dymax', title: '电压最大值'}
+			      ,{field: 'dymin', title: '电压最小值'}
+			      ,{field: 'dyhgl', title: '电压合格率'}
+			      ,{field: 'csxl', title: '超上限率'}
+			      ,{field: 'cxxl', title: '超下限率'}
+			      ,{field: 'dysc', title: '低压时长'}
+			      ,{field: 'gdlx', title: '供电类型'}
+			      ,{field: 'ljts', title: '累计天数'}
+			      ,{field: 'sjrq', title: '数据日期'}
+			      ,{field: 'gddw', title: '供电单位'}
+			    ]];
 	}
 	
      var table;