禅道BUG修改

@@ -713,16 +713,23 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
                     list1 = factoryInfoService.queryFactoryInfos(statisticsParam.getDepartId(),fields,
                             statisticsParam.getStartDate(),statisticsParam.getEndDate(),"1");
                 }
+            }else{
+                list1 = factoryInfoService.queryFactoryInfos(statisticsParam.getDepartId(),fields,
+                        statisticsParam.getStartDate(),statisticsParam.getEndDate(),"1");
             }
             if (!CollectionUtils.isEmpty(list1)) {
                 for (Map<String, Object> map1 : list1) {
                     String time = "";
-                    if("hour".equals(statisticsParam.getStatics())){
-                        time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat);
-                    }else if("day".equals(statisticsParam.getStatics())){
-                        time = map1.get("time").toString();
-                    }else if("month".equals(statisticsParam.getStatics())){
-                        time = map1.get("time").toString();
+                    if(statisticsParam.getStatics()!=null){
+                        if("hour".equals(statisticsParam.getStatics())){
+                            time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat);
+                        }else if("day".equals(statisticsParam.getStatics())){
+                            time = map1.get("time").toString();
+                        }else if("month".equals(statisticsParam.getStatics())){
+                            time = map1.get("time").toString();
+                        }else{
+                            time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat);
+                        }
                     }else{
                         time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat);
                     }
@@ -945,9 +952,15 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
         String dataView2119hb = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, statisticsParam.getDepartId(), startDateHb, endDateHb);
         Map<String, Object> map =  factoryCenterMapper.getDhData(startDate, endDate, statisticsParam.getDepartId(), dataView3a24, dataView2119);
         if(map!=null){
-            zdh = Double.parseDouble(map.get("zdh").toString());
-            rjdh = Double.parseDouble(map.get("rjdh").toString());
-            dsdh = Double.parseDouble(map.get("dsdh").toString());
+            if(map.get("zdh")!=null){
+                zdh = Double.parseDouble(map.get("zdh").toString());
+            }
+            if(map.get("rjdh")!=null){
+                rjdh = Double.parseDouble(map.get("rjdh").toString());
+            }
+            if(map.get("dsdh")!=null){
+                dsdh = Double.parseDouble(map.get("dsdh").toString());
+            }
         }
         resMap.put("zdh", zdh);
         resMap.put("rjdh", rjdh);
@@ -964,7 +977,9 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
             }
             if(maptb.get("dsdh")!=null){
                 dsdhTb = Double.parseDouble(maptb.get("dsdh").toString());
-                dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb));
+                if(dsdhTb > 0.0){
+                    dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb));
+                }
             }
         }
         resMap.put("zdh_tb", zdhTb);
@@ -982,7 +997,9 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
             }
             if(maphb.get("dsdh")!=null){
                 dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
-                dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb));
+                if(dsdhHb > 0.0){
+                    dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb));
+                }
             }
         }
         resMap.put("zdh_hb", zdhHb);

@@ -146,10 +146,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/jmReport/**", "anon");
         filterChainDefinitionMap.put("/v1/operate/**", "anon");
 //        filterChainDefinitionMap.put("/equipment/importExcel", "anon");
+//        filterChainDefinitionMap.put("/v1/factoryCenter/getHourWaterData", "anon");
 
-        //哈工大报表填报数据
-        filterChainDefinitionMap.put("/harbinTechnology/fillReport/**", "anon"); //哈工大报表填报数据
-        //filterChainDefinitionMap.put("/screendata/**", "anon");
+        filterChainDefinitionMap.put("/harbinTechnology/fillReport/**", "anon");
+//        filterChainDefinitionMap.put("/v1/factoryCenter/queryMonitoringData", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<String, Filter>(1);