jagzwxm/ja_manage.git

			@@ -92,8 +92,8 @@
			}

			@Override
			public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack) {
			return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
			public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, List<Long> areaIds, Integer status, Integer isTrack) {
			return baseMapper.selectFwDeviceList(isAreaSelect, areaId, areaIds, status, isTrack);
			}

			@Override
			@@ -130,8 +130,8 @@
			* @return
			*/
			@Override
			public List<DeviceStatisticsVO> statisticalDeviceType(String regionName, String currentDeptId) {
			return baseMapper.statisticalDeviceType(regionName, currentDeptId);
			public List<DeviceStatisticsVO> statisticalDeviceType(String regionCode, String currentDeptId) {
			return baseMapper.statisticalDeviceType(regionCode, currentDeptId);
			}

			/**
			@@ -167,8 +167,8 @@
			* @return
			*/
			@Override
			public AlarmStatisticsVO statisticalDeviceAtt(String regionName, String currentDeptId) {
			return baseMapper.statisticalDeviceAtt(regionName, currentDeptId);
			public AlarmStatisticsVO statisticalDeviceAtt(String regionCode, String currentDeptId) {
			return baseMapper.statisticalDeviceAtt(regionCode, currentDeptId);
			}

			@Override
			@@ -198,8 +198,8 @@
			}

			@Override
			public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget) {
			return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus, outTarget) > 0;
			public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget, String outTargetCode) {
			return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus, outTarget, outTargetCode) > 0;
			}

			/**
			@@ -218,4 +218,9 @@
			List<FwDeviceVO> deviceList = baseMapper.selectNonDeptAreaDevices(regionName, deptId);
			return deviceList;
			}

			@Override
			public List<DeviceStatisticsVO> getDeviceStatistics(FwDeviceDTO fwDeviceDTO) {
			return baseMapper.getDeviceStatistics(fwDeviceDTO);
			}
			}