Merge remote-tracking branch 'origin/master'

@@ -361,18 +361,27 @@
             </if>
             </if>
         ) f
         ) f
         left join (
         left join (
-            select
-                ROUND(SUM(v.CSL)/10000,2) as clsl,
-                ROUND(AVG(v.CSL)/10000,2) as rjclsl,
+            SELECT
+                ROUND( SUM( v2119.CSL ) / 10000, 2 ) AS clsl,
+                ROUND( AVG( v2119.CSL ) / 10000, 2 ) AS rjclsl,
                 'sl' AS type
                 'sl' AS type
-            from ${dataView2119} v
-            where v.time &gt;= #{startDate} and v.time &lt;= #{endDate}
+            FROM
+            (
+            SELECT
+                SUM( v.CSL ) AS CSL,
+                v.depart_id
+            FROM
+                ${dataView2119} v
+            WHERE
+                v.time &gt;= #{startDate} and v.time &lt;= #{endDate}
                 <if test="departId!=null and departId!=''">
                 <if test="departId!=null and departId!=''">
                     AND v.depart_id in
                     AND v.depart_id in
                     <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
                     <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
                         '${item}'
                         '${item}'
                     </foreach>
                     </foreach>
                 </if>
                 </if>
+            GROUP BY v.depart_id
+            ) v2119
         ) v2 ON f.type = v2.type
         ) v2 ON f.type = v2.type
     </select>
     </select>
     <select id="getDsdhListGroupByDepart" resultType="java.util.HashMap">
     <select id="getDsdhListGroupByDepart" resultType="java.util.HashMap">

@@ -77,6 +77,10 @@ public class NFDataSyncJob implements Job {
 					}else{
 					}else{
 						data.put(itemCode, itemValue);
 						data.put(itemCode, itemValue);
 					}
 					}
+				}else if("nhrb".equals(itemType)){
+					data.put(itemCode, itemValue);
+					data.put("reportId", ReportConstant.view3a24);
+					reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view3a24);
 				}else {
 				}else {
 					log.info("恩菲【"+itemType+"】类型数据未进行数据同步");
 					log.info("恩菲【"+itemType+"】类型数据未进行数据同步");
 				}
 				}

@@ -154,11 +154,11 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/jmeter/**", "anon");
         filterChainDefinitionMap.put("/jmeter/**", "anon");
         filterChainDefinitionMap.put("/jmReport/**", "anon");
         filterChainDefinitionMap.put("/jmReport/**", "anon");
         filterChainDefinitionMap.put("/v1/operate/**", "anon");
         filterChainDefinitionMap.put("/v1/operate/**", "anon");
+        //设备导入
 //        filterChainDefinitionMap.put("/equipment/importExcel", "anon");
 //        filterChainDefinitionMap.put("/equipment/importExcel", "anon");
-//        filterChainDefinitionMap.put("/v1/factoryCenter/getHourWaterData", "anon");
+//        filterChainDefinitionMap.put("/v1/factoryCenter/**", "anon");
 
 
         filterChainDefinitionMap.put("/harbinTechnology/fillReport/**", "anon");
         filterChainDefinitionMap.put("/harbinTechnology/fillReport/**", "anon");
-//        filterChainDefinitionMap.put("/v1/factoryCenter/queryMonitoringData", "anon");
 
 
         // 添加自己的过滤器并且取名为jwt
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
         Map<String, Filter> filterMap = new HashMap<String, Filter>(1);

@@ -75,7 +75,7 @@ public class MybatisInterceptor implements Interceptor {
         add("ajh_supplier_manage");
         add("ajh_supplier_manage");
         add("ajh_meeting_attend");
         add("ajh_meeting_attend");
         add("equipment_sparepart_supplies_allot");
         add("equipment_sparepart_supplies_allot");
-        add("ajh_rectification_info");
+//        add("ajh_rectification_info");
         add("alarm_rule_config_public_templete");//放行报警配置公共模板表
         add("alarm_rule_config_public_templete");//放行报警配置公共模板表
         //算法库相关表过滤权限
         //算法库相关表过滤权限
         add("sys_algorithm_database_info");
         add("sys_algorithm_database_info");