禅道BUG修改

张雷
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
--- a/sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
查看文件 @81c652f
+++ b/sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
查看文件 @81c652f
@@ -713,10 +713,14 @@ 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(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())){
@@ -726,6 +730,9 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
                        }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);
+                    }
                    xlist.add(time);
                    String jscod;
                    if (!StringUtils.isEmpty(jscod = fieldsMap.get("JSCOD"))) {
@@ -945,10 +952,16 @@ 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){
+            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);
        resMap.put("dsdh", dsdh);
@@ -964,9 +977,11 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
            }
            if(maptb.get("dsdh")!=null){
                dsdhTb = Double.parseDouble(maptb.get("dsdh").toString());
+                if(dsdhTb > 0.0){
                    dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb));
                }
            }
+        }
        resMap.put("zdh_tb", zdhTb);
        resMap.put("rjdh_tb", rjdhTb);
        resMap.put("dsdh_tb", dsdhTb);
@@ -982,9 +997,11 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
            }
            if(maphb.get("dsdh")!=null){
                dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
+                if(dsdhHb > 0.0){
                    dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb));
                }
            }
+        }
        resMap.put("zdh_hb", zdhHb);
        resMap.put("rjdh_hb", rjdhHb);
        resMap.put("dsdh_hb", dsdhHb);
--- a/sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
查看文件 @81c652f
+++ b/sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
查看文件 @81c652f
@@ -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("/harbinTechnology/fillReport/**", "anon"); //哈工大报表填报数据
+//        filterChainDefinitionMap.put("/v1/factoryCenter/queryMonitoringData", "anon");
-        //filterChainDefinitionMap.put("/screendata/**", "anon");
        // 添加自己的过滤器并且取名为jwt
        Map<String, Filter> filterMap = new HashMap<String, Filter>(1);