Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_dashboard_back into zhc

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OverviewInfoMapperExt.xml

@@ -27,7 +27,6 @@
 		WHERE
             bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND basic_floor.flag = 0 AND basic_space.flag = 0
         AND basic_monitoring_asset.flag = 0 AND dinfo.flag = 0
-#         AND ah.receive_ts >= #{midnightTimestamp}
 	</select>
 
     <select id="getBuildingInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewVO">

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java

@@ -77,7 +77,7 @@ public class OverviewServiceImpl implements OverviewService {
 			Map<String, Object> paramMap = new HashMap<>();
 			paramMap.put("companyId", companyId);
 			paramMap.put("categoryIdList", Constants.CATEGORY_MAP.get(Constants.CATEGORY_ALARM));
-			paramMap.put("midnightTimestamp", DateUtil.getTodayZeroMillisByOffset(utcOffset));
+//			paramMap.put("midnightTimestamp", DateUtil.getTodayZeroMillisByOffset(utcOffset));
 			List<OverviewInfo> alarmInfoList = overviewInfoMapperExt.getOverviewInfo(paramMap);
 			List<OverviewVO> overviewVOList = convert(alarmInfoList, utcOffset);