重过载日报周报功能

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

@@ -279,6 +279,7 @@ public class ReportServiceImpl implements IReportService {
 	 * @return
 	 */
 	private Map<String,Object> reportTypeXlgzzRb(Map<String,Object> map, MINHttpServletRequestContext request) throws MINBusinessException {
+		String reportTypeId = StringUtil.ObjectToString(map.get("reportTypeId"));
 		String range = StringUtil.ObjectToString(map.get("range"));//日期范围
 		String timeRange = StringUtil.ObjectToString(map.get("timeRange"));//时间范围
 		String[] s1 = range.split("-");
@@ -298,10 +299,14 @@ public class ReportServiceImpl implements IReportService {
 			IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
 			map.put("start",start);
 			map.put("end",end);
-			map.put("type","1");
-			List<Map<String, String>>  DDYZLFXBList = db.getMybatisMapper(IReportBatchMapper.class).selectXlgzzData2(map);
+			if("XLGZZRB".equals(reportTypeId)){
+				map.put("type","1");
+			}else if("XLGZZZB".equals(reportTypeId)){
+				map.put("type","2");
+			}
 			//线路重载
-			Float maxZzsc = 0f;//
+			List<Map<String, String>>  DDYZLFXBList = db.getMybatisMapper(IReportBatchMapper.class).selectXlgzzData2(map);
+			Float maxZzsc = 0f;//重载时长
 			String maxXlName = "";//最长时长线路
 			Map<String,Object> ttMap = new HashMap();
 			JSONArray ja = new JSONArray();
@@ -331,7 +336,11 @@ public class ReportServiceImpl implements IReportService {
 					}
 				}
 			}
-			map.put("type","2");
+			if("XLGZZRB".equals(reportTypeId)){
+				map.put("type","3");
+			}else if("XLGZZZB".equals(reportTypeId)){
+				map.put("type","4");
+			}
 			//线路过载
 			List<Map<String, String>>  DDYZLFXBList2 = db.getMybatisMapper(IReportBatchMapper.class).selectXlgzzData2(map);
 			Float maxZzsc2 = 0f;//
@@ -364,7 +373,12 @@ public class ReportServiceImpl implements IReportService {
 					}
 				}
 			}
-			//配变
+			//配变重过载明细数据
+			if("XLGZZRB".equals(reportTypeId)){
+				map.put("type","1");
+			}else if("XLGZZZB".equals(reportTypeId)){
+				map.put("type","2");
+			}
 			List<Map<String, String>>  pbgzzList = db.getMybatisMapper(IReportBatchMapper.class).selectPbgzzData2(map);
 			Map<String,Object> pbTemp = new HashMap<String,Object>();
 			Map<String,Object> pbTemp2 = new HashMap<String,Object>();
@@ -377,9 +391,10 @@ public class ReportServiceImpl implements IReportService {
 				int size = pbgzzList.size();
 				for (int i = 0; i < pbgzzList.size(); i++) {
 					Map<String,String> temp = pbgzzList.get(i);
-					Object fzl = temp.get("DFD13_FZL");
+//					Object fzl = temp.get("DFD13_FZL");
+					String dataType = temp.get("DFD13_DATA_TYPE");
 					String key = temp.get("KEYSS");
-					if(StringUtil.ObjToFloat(fzl) > 100){//过载
+					if("3".equals(dataType)){//过载
 						if(pbTemp.containsKey(key)){
 							continue;
 						}else{
@@ -390,7 +405,7 @@ public class ReportServiceImpl implements IReportService {
 							jo3.put("avg",ArithUtils.div(str.get("pjfzl"),str.get("xlts")));
 							ja3.add(jo3);
 						}
-					}else if(StringUtil.ObjToFloat(fzl) <= 100 && StringUtil.ObjToFloat(fzl) >= 80){//重载
+					}else if("1".equals(dataType)){//重载
 						if(pbTemp2.containsKey(key)){
 							continue;
 						}else{

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

@@ -162,9 +162,9 @@ public class AuxiliaryTools {
                 String key = jo.getString("KEYSS");
                 if(key.equals(maxGb)){
                     avg = jo.getString("avg");
-                    maxGb = jo.getString("DFD9_GBMC");
+                    maxGb = jo.getString("DFD13_GBMC");
                 }
-                String unit = jo.getString("DFD9_UNIT");
+                String unit = jo.getString("DFD13_UNIT");
                 if(temp.containsKey(unit)){
                     temp.put(unit,Integer.valueOf(String.valueOf(temp.get(unit))) + 1);
                 }else{
@@ -189,7 +189,7 @@ public class AuxiliaryTools {
                     .append("。");
             descStr.append("不涉及电采暖线路。");
         }else{
-            descStr.append("监测发现公变过载。");
+            descStr.append("监测未发现公变过载。");
         }
         //重载
         StringBuffer descStr2 = new StringBuffer();
@@ -206,9 +206,9 @@ public class AuxiliaryTools {
                 String key = jo.getString("KEYSS");
                 if(key.equals(maxGb2)){
                     avg2 = jo.getString("avg");
-                    maxGb2 = jo.getString("DFD9_GBMC");
+                    maxGb2 = jo.getString("DFD13_GBMC");
                 }
-                String unit = jo.getString("DFD9_UNIT");
+                String unit = jo.getString("DFD13_UNIT");
                 if(temp.containsKey(unit)){
                     temp.put(unit,Integer.valueOf(String.valueOf(temp.get(unit))) + 1);
                 }else{
@@ -234,7 +234,7 @@ public class AuxiliaryTools {
                     .append("。");
             descStr2.append("不涉及电采暖线路。");
         }else{
-            descStr2.append("监测发现公变过载。");
+            descStr2.append("监测未发现公变过载。");
         }
         list.add(descStr.toString());
         list.add(descStr2.toString());
@@ -252,7 +252,7 @@ public class AuxiliaryTools {
         if(list != null && !list.isEmpty()){
             for (int i = 0; i < list.size(); i++) {
                 Map<String, String> temp = list.get(i);
-                Object fzl = temp.get("DFD9_FZL");
+                Object fzl = temp.get("DFD13_FZL");
                 if(StringUtil.ObjToFloat(fzl) > 100){
                     tempList1.add(temp);
                 }else if(StringUtil.ObjToFloat(fzl) <= 100 && StringUtil.ObjToFloat(fzl) >= 80){
@@ -268,12 +268,12 @@ public class AuxiliaryTools {
             int size = tempList1.size();
             for (int i = 0; i < size; i++) {
                 Map<String, String> temp = tempList1.get(i);
-                float fzl = StringUtil.ObjToFloat(temp.get("DFD9_GZSC"));
+                float fzl = StringUtil.ObjToFloat(temp.get("DFD13_GZSC"));
                 if(maxPb1 < fzl){
                     maxPb1 = fzl;
-                    param.put("gbmc1",temp.get("DFD9_GBMC"));//公变名称
-                    param.put("reason1",temp.get("DFD9_JTYY"));//具体原因
-                    param.put("cs1",temp.get("DFD9_JTJJCS"));//具体解决措施
+                    param.put("gbmc1",temp.get("DFD13_GBMC"));//公变名称
+                    param.put("reason1",temp.get("DFD13_JTYY"));//具体原因
+                    param.put("cs1",temp.get("DFD13_JTJJCS"));//具体解决措施
                     param.put("maxPbName1",temp.get("KEYSS"));
                 }
             }
@@ -284,12 +284,12 @@ public class AuxiliaryTools {
             int size = tempList2.size();
             for (int i = 0; i < size; i++) {
                 Map<String, String> temp = tempList2.get(i);
-                float fzl = StringUtil.ObjToFloat(temp.get("DFD9_ZZSC"));
+                float fzl = StringUtil.ObjToFloat(temp.get("DFD13_ZZSC"));
                 if(maxPb2 < fzl){
                     maxPb2 = fzl;
-                    param.put("gbmc2",temp.get("DFD9_GBMC"));//公变名称
-                    param.put("reason2",temp.get("DFD9_JTYY"));//具体原因
-                    param.put("cs2",temp.get("DFD9_JTJJCS"));//具体解决措施
+                    param.put("gbmc2",temp.get("DFD13_GBMC"));//公变名称
+                    param.put("reason2",temp.get("DFD13_JTYY"));//具体原因
+                    param.put("cs2",temp.get("DFD13_JTJJCS"));//具体解决措施
                     param.put("maxPbName2",temp.get("KEYSS"));
                 }
             }

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

@@ -974,13 +974,13 @@ public class DataWareManageAction implements IMINAction {
 		}else if(Constant.FILE_DETAIL_TYPE_17.equals(fileType) || Constant.FILE_DETAIL_TYPE_18.equals(fileType)
 				|| Constant.FILE_DETAIL_TYPE_19.equals(fileType) || Constant.FILE_DETAIL_TYPE_20.equals(fileType)){
 			String ytype = "1";
-			if(Constant.FILE_DETAIL_TYPE_13.equals(fileType)){
+			if(Constant.FILE_DETAIL_TYPE_17.equals(fileType)){
 				ytype = "1";
-			}else if(Constant.FILE_DETAIL_TYPE_14.equals(fileType)){
+			}else if(Constant.FILE_DETAIL_TYPE_18.equals(fileType)){
 				ytype = "2";
-			}else if(Constant.FILE_DETAIL_TYPE_15.equals(fileType)){
+			}else if(Constant.FILE_DETAIL_TYPE_19.equals(fileType)){
 				ytype = "3";
-			}else if(Constant.FILE_DETAIL_TYPE_16.equals(fileType)){
+			}else if(Constant.FILE_DETAIL_TYPE_20.equals(fileType)){
 				ytype = "4";
 			}
 			//标题对应key
@@ -1530,6 +1530,11 @@ public class DataWareManageAction implements IMINAction {
 			DwFileDetail13Example DwFileDetail13Example = new DwFileDetail13Example();
 			DwFileDetail13Example.createCriteria().andFileIdEqualTo(fileId);
 			db.deleteByExample(DwFileDetail13Mapper.class,DwFileDetail13Example);
+		}else if(Constant.FILE_DETAIL_TYPE_17.equals(fileType) || Constant.FILE_DETAIL_TYPE_18.equals(fileType)
+				|| Constant.FILE_DETAIL_TYPE_19.equals(fileType) || Constant.FILE_DETAIL_TYPE_20.equals(fileType)){
+			DwFileDetail17Example DwFileDetail17Example = new DwFileDetail17Example();
+			DwFileDetail17Example.createCriteria().andFileIdEqualTo(fileId);
+			db.deleteByExample(DwFileDetail17Mapper.class,DwFileDetail17Example);
 		}
     	return res;
     }

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

@@ -276,7 +276,7 @@ public class XlgzzReportAction implements IMINAction {
         // 标题数组
         String[] titleArray = new String[]{"单位","供电所","线路名称","重载时长(h)","平均负载率(%)"};
         // 字段名数组
-        String[] fieldArray = new String[]{"DFD10_XGSMC","DFD10_BZMC","DFD10_XLMC","sum","avg"};
+        String[] fieldArray = new String[]{"DFD17_XGSMC","DFD17_BZMC","DFD17_XLMC","sum","avg"};
         Map<String,Object> temp = (Map<String, Object>) map.get("resList");
         List<String> tempList = (List<String>) temp.get("descStr");
         StringBuffer descxl = new StringBuffer();
@@ -300,7 +300,7 @@ public class XlgzzReportAction implements IMINAction {
 
         //******************************************公变过载明细******************************************//
         String[] titleArray2 = new String[]{"单位","供电所","公变名称","重载时长(h)","平均负载率(%)","原因","解决措施"};
-        String[] fieldArray2 = new String[]{"DFD9_UNIT","DFD9_BZMC","DFD9_GBMC","DFD9_ZZSC","avg","DFD9_JTYY","DFD9_JTJJCS"};
+        String[] fieldArray2 = new String[]{"DFD13_UNIT","DFD13_BZMC","DFD13_GBMC","DFD13_ZZSC","avg","DFD13_JTYY","DFD13_JTJJCS"};
         List<String> tempList2 = (List<String>) temp.get("descStr2");
         StringBuffer descxl2 = new StringBuffer();
         descxl2
@@ -317,17 +317,17 @@ public class XlgzzReportAction implements IMINAction {
 
         //******************************************公变重载明细******************************************//
         titleArray2[3] = "过载时长(h)";
-        fieldArray2[3] = "DFD9_GZSC";
+        fieldArray2[3] = "DFD13_GZSC";
         List<Map<String,String>> dataList3 = (List<Map<String, String>>) temp.get("result3");
         index = ExportUtils.XlzgzCreateSheet(wb,index,"公变过载明细",titleArray2,fieldArray2,"",dataList3,new HashMap<String,String>());
 
-        //******************************************抢修类工单明细******************************************//
-        String[] titleArray3 = new String[]{"单位","客户总量（户）","平均到达现场时间（分）","工单处理平均时长（分）","到达现场超时数",
-                "工单时长超70分钟数","故障类型#客户内部故障","故障类型#低压故障","故障类型#非电力故障","故障类型#电能质量等故障","疑似虚假回单","工单总数","万户报修率"};
-        String[] fieldArray3 = new String[]{"DFD11_GDDW","KHZS","DDXCSJ","GDCLSJ","DDXCCSS","GDCSZS","GZLS-A","GZLS-B","GZLS-C","GZLS-D","YSXJHD","GDZS","WH","","","",""};
-        List<Map<String,String>> dataList5 = (List<Map<String, String>>) temp.get("result5");
-        String tempList3 =  String.valueOf(temp.get("descStr3"));
-        ExportUtils.XlzgzCreateSheet(wb,index,"抢修类工单报表明细",titleArray3,fieldArray3,tempList3,dataList5,new HashMap<String,String>());
+//        //******************************************抢修类工单明细******************************************//
+//        String[] titleArray3 = new String[]{"单位","客户总量（户）","平均到达现场时间（分）","工单处理平均时长（分）","到达现场超时数",
+//                "工单时长超70分钟数","故障类型#客户内部故障","故障类型#低压故障","故障类型#非电力故障","故障类型#电能质量等故障","疑似虚假回单","工单总数","万户报修率"};
+//        String[] fieldArray3 = new String[]{"DFD11_GDDW","KHZS","DDXCSJ","GDCLSJ","DDXCCSS","GDCSZS","GZLS-A","GZLS-B","GZLS-C","GZLS-D","YSXJHD","GDZS","WH","","","",""};
+//        List<Map<String,String>> dataList5 = (List<Map<String, String>>) temp.get("result5");
+//        String tempList3 =  String.valueOf(temp.get("descStr3"));
+//        ExportUtils.XlzgzCreateSheet(wb,index,"抢修类工单报表明细",titleArray3,fieldArray3,tempList3,dataList5,new HashMap<String,String>());
         return wb;
     }
 }

src/main/resources/com/minpay/db/table/own/mapper/ReportBatchMapper.xml

@@ -383,11 +383,23 @@
             DFD13_JTYY,
             DFD13_JJCSFL,
             DFD13_JTJJCS,
-            DFD13_GZSC
+            DFD13_GZSC,
+            DFD13_DATA_TYPE
         FROM
             DW_FILE_DETAIL_13
             WHERE 1 = 1
             AND DFD13_ZDFZLFSSK BETWEEN #{start} AND #{end}
+        <choose>
+            <when test="type != null and type != '' and  type.toString() == '1'.toString() ">
+                and DFD13_DATA_TYPE  in ('1','3')
+            </when>
+            <otherwise>
+                and DFD13_DATA_TYPE  in ('2','4')
+            </otherwise>
+        </choose>
+            <if test="type != null  and type != ''">
+
+            </if>
             AND DFD13_STATE = '0'
             ORDER BY   DFD13_UNIT,DFD13_BZMC,DFD13_GBMC
     </select>

src/main/webapp/admin/xlgzz/reportManageDetailXlgzz.html

@@ -78,8 +78,9 @@
             layui.use(['element','table'], function(){
                 $element= layui.element;
                 $table = layui.table;
+                tableYulan();
             });
-            tableYulan();
+
             // 预览
             function tableYulan() {
                 // 查询符合条件的明细数据,生成预览数据
@@ -99,15 +100,15 @@
                                 ,cols: [[ //表头
                                     {field: 'SEQU',title:'序号',type:'numbers',width:60}
                                     ,{field: 'DFD17_XGSMC', title: '单位',templet:function(d){
-                                            return appData.formattercenter(d.DFD10_XGSMC);
+                                            return appData.formattercenter(d.DFD17_XGSMC);
                                         }
                                     }
                                     ,{field: 'DFD17_BZMC', title: '供电所',templet:function(d){
-                                            return appData.formatterleft(d.DFD10_BZMC);
+                                            return appData.formatterleft(d.DFD17_BZMC);
                                         }
                                     }
                                     ,{field: 'DFD17_XLMC', title: '线路名称',templet:function(d){
-                                            return appData.formatterleft(d.DFD10_XLMC);
+                                            return appData.formatterleft(d.DFD17_XLMC);
                                         }
                                     }
                                     ,{field: 'sum', title: '重载时长(h)',templet:function(d){
@@ -141,15 +142,15 @@
                                     {field: 'SEQU',title:'序号',type:'numbers',width:60}
                                     ,{field: 'DFD13_UNIT', title: '单位'}
                                     ,{field: 'DFD13_BZMC', title: '供电所',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_BZMC);
+                                            return appData.formatterleft(d.DFD13_BZMC);
                                         }
                                     }
                                     ,{field: 'DFD13_GBMC', title: '公变名称',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_GBMC);
+                                            return appData.formatterleft(d.DFD13_GBMC);
                                         }
                                     }
                                     ,{field: 'DFD13_ZZSC', title: '重载时长(h)',templet:function(d){
-                                            return appData.formatterright(d.DFD9_ZZSC);
+                                            return appData.formatterright(d.DFD13_ZZSC);
                                         }
                                     }
                                     ,{field: 'avg', title: '平均负载率(%)',templet:function(d){
@@ -157,11 +158,11 @@
                                         }
                                     }
                                     ,{field: 'DFD13_JTYY', title: '原因',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_JTYY);
+                                            return appData.formatterleft(d.DFD13_JTYY);
                                         }
                                     }
                                     ,{field: 'DFD13_JTJJCS', title: '解决措施',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_JTJJCS);
+                                            return appData.formatterleft(d.DFD13_JTJJCS);
                                         }
                                     }
                                 ]],
@@ -174,15 +175,15 @@
                                     {field: 'SEQU',title:'序号',type:'numbers',width:60}
                                     ,{field: 'DFD13_UNIT', title: '单位'}
                                     ,{field: 'DFD13_BZMC', title: '供电所',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_BZMC);
+                                            return appData.formatterleft(d.DFD13_BZMC);
                                         }
                                     }
                                     ,{field: 'DFD13_GBMC', title: '公变名称',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_GBMC);
+                                            return appData.formatterleft(d.DFD13_GBMC);
                                         }
                                     }
                                     ,{field: 'DFD13_GZSC', title: '过载时长(h)',templet:function(d){
-                                            return appData.formatterright(d.DFD9_GZSC);
+                                            return appData.formatterright(d.DFD13_GZSC);
                                         }
                                     }
                                     ,{field: 'avg', title: '平均负载率(%)',templet:function(d){
@@ -190,11 +191,11 @@
                                         }
                                     }
                                     ,{field: 'DFD13_JTYY', title: '原因',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_JTYY);
+                                            return appData.formatterleft(d.DFD13_JTYY);
                                         }
                                     }
                                     ,{field: 'DFD13_JTJJCS', title: '解决措施',templet:function(d){
-                                            return appData.formatterleft(d.DFD9_JTJJCS);
+                                            return appData.formatterleft(d.DFD13_JTJJCS);
                                         }
                                     }
                                 ]],

src/main/webapp/js/customcomm.js

@@ -2,13 +2,13 @@
    function baseUtils(){
        var self = this;
        self.formatterleft = function(val){
-            return "<div style='text-align: left'>" + val + "</div>"
+            return "<div style='text-align: left;padding: 0 10px;'>" + val + "</div>"
        }
        self.formatterright = function(val){
-           return "<div style='text-align: right'>" + val + "</div>"
+           return "<div style='text-align: right;padding: 0 10px;'>" + val + "</div>"
        }
        self.formattercenter = function(val){
-           return "<div style='text-align: center'>" + val + "</div>"
+           return "<div style='text-align: center;padding: 0 10px;'>" + val + "</div>"
        }
        //导出至全局变量
        exports.appData = self;