~liusuyi/ruoyi-api.git

			@@ -43,6 +43,7 @@
			import com.ruoyi.device.external.domain.ArdEquipExternal;
			import com.ruoyi.device.external.mapper.ArdEquipExternalMapper;
			import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
			import com.ruoyi.utils.excel.EasyExcelUtil;
			import com.ruoyi.utils.gis.GisUtil;
			import com.ruoyi.utils.tools.ArdTool;
			import com.ruoyi.common.utils.uuid.IdUtils;
			@@ -782,7 +783,7 @@
			* @修改人和其它信息
			*/
			@Override
			public Object selectAlarmList(String name,Integer command, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
			public Object selectAlarmList(String name, Integer command, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
			Map<String, Object> params = new HashMap<>();
			params.put("beginTime", beginTime);
			params.put("endTime", endTime);
			@@ -1090,8 +1091,9 @@
			Map<String, Object> map = new HashMap<>();
			map.put("80000", alarmpointName);
			WebSocketUtils.sendMessageAll(map);
			String filePath = ARDConfig.getDownloadPath() + "noExistWell.txt";
			writeStringToFile(alarmpointName, filePath);
			String fileName = ARDConfig.getDownloadPath() + "noExistWell.xlsx";
			String msg = alarmpointName + "(" + radarAlarmData.getRadarName() + ")";
			EasyExcelUtil.writeAppend(fileName, msg);
			continue;
			}

			@@ -1156,11 +1158,12 @@
			//外联防区名称就是兴趣点，查兴趣点坐标
			String defenseName = ardAlarmExternal.getDefenseName();
			ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);

			if (StringUtils.isNotNull(well)) {
			ardAlarmExternal.setLongitude(well.getLongitude());
			ardAlarmExternal.setLatitude(well.getLatitude());
			if (well == null) {
			return;
			}

			ardAlarmExternal.setLongitude(well.getLongitude());
			ardAlarmExternal.setLatitude(well.getLatitude());
			int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
			if (aae > 0) {
			log.debug("external入库成功：" + ardAlarmExternal);
			@@ -1285,8 +1288,7 @@
			GuideTask guideTask = new GuideTask();
			guideTask.setCameraId(cameraId);//相机ID
			guideTask.setIsGuidePTZ(guideDataDto.getIsGuidePTZ());
			if(guideTask.getIsGuidePTZ())
			{
			if (guideTask.getIsGuidePTZ()) {
			guideTask.setTargetPTZ(guideDataDto.getGuidePTZ());
			}
			String alarmType = guideDataDto.getAlarmType();