数据仓库查询功能修复BUG

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

@@ -289,9 +289,9 @@ public class ReportServiceImpl implements IReportService {
 				+endTime.substring(0,2) + ":" + endTime.substring(2,4)+":"+endTime.substring(4,6);
 		List<Map<String,Object>> resList = new ArrayList<Map<String,Object>>();
 		if("".equals(range) ||  "".equals(timeRange)){
-			return new ArrayList<>();
+			return new ArrayList();
 		} else{
-			Map<String,Object> descStr = new HashMap<>();
+			Map<String,Object> descStr = new HashMap();
 			IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
 			map.put("start",start);
 			map.put("end",end);
@@ -299,7 +299,7 @@ public class ReportServiceImpl implements IReportService {
 			List<Map<String, String>>  DDYZLFXBList = db.getMybatisMapper(IReportBatchMapper.class).selectXlgzzData(map);
 			int maxZz = 0;
 			String maxXlName = "";
-			Map<String,Object> rstMap = new HashMap<>();
+			Map<String,Object> rstMap = new HashMap();
 			JSONObject jo = new JSONObject();
 			if(DDYZLFXBList != null && !DDYZLFXBList.isEmpty()){
 				int size = DDYZLFXBList.size();

src/main/java/com/minpay/common/util/ExcelTemplateUtil.java

@@ -9,6 +9,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,12 +35,13 @@ public class ExcelTemplateUtil {
         }else if(fileName.endsWith(".xls")){
             hssfWorkbook = new HSSFWorkbook(excel.getInputStream());//Excel 2003
         }
-        int numSheets = hssfWorkbook.getNumberOfSheets();
+        int numSheets = 0;//hssfWorkbook.getNumberOfSheets();
         List<String[]> listWK = new ArrayList<String[]>();
         //取所有sheet页的表头
         if ( numSheets == 0) {
             flag = false;
         } else {
+            Map<String,List<String[]>> temp = new HashMap<String,List<String[]>>();
             for (int numSheet = 0; numSheet < numSheets; numSheet++) {//遍历Sheet
                 Sheet hssfSheet = hssfWorkbook.getSheetAt(numSheet);
                 if (hssfSheet == null) {
@@ -55,7 +57,7 @@ public class ExcelTemplateUtil {
                     if (hssfRow != null) {
                         for (int cloNum = 0; cloNum < cols; cloNum++){//遍历列
                             Cell value = hssfRow.getCell(cloNum);
-                            colsValue[cloNum] = value.toString();
+                            colsValue[cloNum] = StringUtil.ObjectToString(value);
                         }
                     }
                     listWK.add(colsValue);

src/main/java/com/minpay/common/util/StringUtil.java

@@ -22,7 +22,7 @@ public class StringUtil extends StringUtils {
         if(obj == null || "".equals(obj)){
             return "";
         }else{
-            return String.valueOf(obj).trim();
+            return String.valueOf(obj).replaceAll(" ","");
         }
     }
 
@@ -98,9 +98,9 @@ public class StringUtil extends StringUtils {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
         DateTimeFormatter fa = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         if(obj instanceof Date){
-            if("1".equals(type)){
+            if("1".equals(type)){//年月日
                 return simpleDateFormat.parse(obj.toString().replaceAll("/","-"));
-            }else if ("2".equals(type)){
+            }else if ("2".equals(type)){//年月日 时分秒
                 return simpleDateFormat2.parse(obj.toString().replaceAll("/","-"));
             }
         }else{
@@ -123,4 +123,7 @@ public class StringUtil extends StringUtils {
         }
         return null;
     }
+    public static Date objNumToDate(Object Obj){
+        return null;
+    }
 }

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

@@ -104,7 +104,7 @@ public class DataWareManageAction implements IMINAction {
 		rows.setSeparateSql(true);
 		Map<String, Object> param = new HashMap<String, Object>();
 		
-		param.put("date", date);
+		param.put("date", StringUtil.ObjectToString(date).replaceAll("-",""));
 		param.put("fileName", fileName);
 		param.put("type", type);
 		
@@ -1107,7 +1107,75 @@ public class DataWareManageAction implements IMINAction {
         	ExportExcelUtil<DwFileDetail07> util = new ExportExcelUtil<DwFileDetail07>();
         	String[] header = {"系统编号","原EXCEL编号","类型","单位","设备名称","发生时间","事项类型","馈线自动化动作情况","跳闸类型","故障原因","重合闸动作情况","处理纪事","异常概况","所属文件id"};
         	util.exportExcel(date, selectByExample, os, "2007", header);
-        }
+        }else if (Constant.FILE_DETAIL_TYPE_07.equals(type)) {//客户明细
+
+		}else if (Constant.FILE_DETAIL_TYPE_08.equals(type)) {//配变过重载
+			response.setContentType("application/application/vnd.ms-excel");
+			response.setHeader("Content-disposition","attachment;filename=" + URLEncoder.encode("配变过重载数据.xls", "UTF-8"));
+			DwFileDetail09Example example = new DwFileDetail09Example();
+//			example.createCriteria().andWcsjGreaterThanOrEqualTo().andWcsjLessThanOrEqualTo();
+			example.setOrderByClause("dfd9_sequ");
+			List<DwFileDetail09> selectByExample = db.getMybatisMapper(DwFileDetail09Mapper.class).selectByExample(example);
+			ExportExcelUtil<DwFileDetail09> util = new ExportExcelUtil<DwFileDetail09>();
+			String[] header = {"系统编号","月份",
+					"单位",
+					"班组名称",
+					"公变名称",
+					"线路名称",
+					"负载率(%) ",
+					"最大负载率(%)",
+					"最大负载率发生时刻时间",
+					"额定容量(kVA) ",
+					"过(重)载原因分类 ",
+					"具体原因（详细说明原因情况）",
+					"解决措施分类 ",
+					"具体解决措施（详细说明解决措施）",
+					"完成时间",
+					"三相不平衡率(%)(最大负荷) ",
+					"A相电流(A)",
+					"B相电流(A)",
+					"C相电流(A)",
+					"过载时长(小时)",
+					"用户数量",
+					"重载时长",
+					"营销ID",
+					"PMSID",
+					"所属文件ID","","原EXCEL编号"};
+			util.exportExcel("配变过重载数据", selectByExample, os, "2007", header);
+		}else if (Constant.FILE_DETAIL_TYPE_09.equals(type)) {//线路过重载
+			response.setContentType("application/application/vnd.ms-excel");
+			response.setHeader("Content-disposition","attachment;filename=" + URLEncoder.encode("线路过重载数据.xls", "UTF-8"));
+			DwFileDetail10Example example = new DwFileDetail10Example();
+//			example.createCriteria().andDateGreaterThanOrEqualTo();
+			example.setOrderByClause("dfd10_sequ");
+			List<DwFileDetail10> selectByExample = db.getMybatisMapper(DwFileDetail10Mapper.class).selectByExample(example);
+			ExportExcelUtil<DwFileDetail10> util = new ExportExcelUtil<DwFileDetail10>();
+			String[] header = {"系统编号","月份",
+					"所属县公司",
+					"班组名称 ",
+					"变电站名称",
+					"线路名称 ",
+					"额定电流(A)",
+					"负载率(%) ",
+					"过(重)载原因分类",
+					"具体原因（详细说明原因情况） ",
+					"解决措施分类 ",
+					"具体解决措施（详细说明解决措施） ",
+					"完成时间 ",
+					"过载时长(小时) ",
+					"运行电流(A)",
+					"发生时刻 ",
+					"最大电流(A)",
+					"最大值发生时刻",
+					"配变数量(台)",
+					"配变容量(kVA)",
+					"是否自动化",
+					"PMSID",
+					"所属文件ID",
+					"",
+					"原EXCEL编号"};
+			util.exportExcel("线路过重载数据", selectByExample, os, "2007", header);
+		}
         return response;
     }
 }

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

@@ -487,9 +487,9 @@ public class ReportManageAction implements IMINAction {
 
 	/**
 	 * 低电压分析表提交
-	 * @param reportId
-	 * @param excelList
-	 * @param reportName
+	 * @param range
+	 * @param fileName
+	 * @param reportInf
 	 * @param session
 	 * @return
 	 * @throws MINBusinessException