From ef0ed9877417b7efb3a6ec72121bee56720f6939 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 01 七月 2023 17:28:04 +0800
Subject: [PATCH] 优化提交
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 805 +++++++++++++++++++++++++++++---------------------------
1 files changed, 416 insertions(+), 389 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 90cbeb2..b90aa40 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -5,6 +5,8 @@
import com.ruoyi.alarm.cameraAlarm.mapper.ArdAlarmCameraMapper;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
+import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radarAlarm.domain.RadarAlarmData;
@@ -22,30 +24,29 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.constant.CamPriority;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.utils.tools.GisTool;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
-import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
-import com.ruoyi.device.hiksdk.common.GlobalVariable;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.tube.GeoPoint;
import com.ruoyi.utils.tube.TubeTools;
+import lombok.AllArgsConstructor;
+import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.PriorityBlockingQueue;
import java.util.stream.Collectors;
-
/**
+ * @Description: 鍏ㄥ眬鎶ヨ涓氬姟
* @ClassName: globalAlarmServiceImpl
- * @Description:
* @Author: Administrator
* @Date: 2023骞�03鏈�10鏃� 11:03
* @Version: 1.0
@@ -53,392 +54,30 @@
@Service
@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
+ //region 渚濊禆娉ㄥ叆
@Resource
- ArdAlarmRadarMapper ardAlarmRadarMapper;
+ private ArdAlarmRadarMapper ardAlarmRadarMapper;
@Resource
- ArdAlarmStealelecMapper ardAlarmStealelecMapper;
+ private ArdAlarmStealelecMapper ardAlarmStealelecMapper;
@Resource
- ArdAlarmTubeMapper ardAlarmTubeMapper;
+ private ArdAlarmTubeMapper ardAlarmTubeMapper;
@Resource
- ArdAlarmCameraMapper ardAlarmCameraMapper;
+ private ArdAlarmCameraMapper ardAlarmCameraMapper;
@Resource
- ArdTubesMapper ardTubesMapper;
+ private ArdTubesMapper ardTubesMapper;
@Resource
- ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
+ private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
@Resource
- ArdTubesDetailsMapper ardTubesDetailsMapper;
+ private ArdTubesDetailsMapper ardTubesDetailsMapper;
@Resource
private ISysConfigService configService;
@Resource
private ArdCamerasMapper ardCamerasMapper;
@Resource
- private IHikClientService hikClientService;
- @Resource
private RedisCache redisCache;
-
- /**
- * @鎻忚堪 鎸夋潯浠舵煡璇㈡姤璀�
- * @鍙傛暟 [condition]
- * @杩斿洖鍊� java.util.List<com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData>
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/15 15:48
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- @Override
- public List<GlobalAlarmData> selectAlarmLogs(GlobalAlarmCondition condition) {
- String refreshTime = configService.selectConfigByKey("refreshTime");
- switch (condition.getCommand()) {
- case 1001:
- List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectListAllByCommand(refreshTime);
- return ardAlarmStealelecs.stream()
- .map(ardAlarmStealelec -> {
- GlobalAlarmData globalAlarmData = new GlobalAlarmData()
- .setId(ardAlarmStealelec.getId())
- .setName(ardAlarmStealelec.getDescribe())
- .setAlarmTime(ardAlarmStealelec.getStartTime())
- .setLongitude(ardAlarmStealelec.getLongitude())
- .setLatitude(ardAlarmStealelec.getLatitude())
- .setAltitude(ardAlarmStealelec.getAltitude())
- .setCount(ardAlarmStealelec.getCount())
- .setTotal(ardAlarmStealelec.getTotal());
- return globalAlarmData;
- })
- .collect(Collectors.toList());
- case 1002:
- List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
- return ardAlarmCameras.stream()
- .map(ardAlarmCamera -> {
- GlobalAlarmData globalAlarmData = new GlobalAlarmData()
- .setId(ardAlarmCamera.getId())
- .setName(ardAlarmCamera.getCameraName())
- .setAlarmTime(ardAlarmCamera.getAlarmTime())
- .setLongitude(ardAlarmCamera.getLongitude())
- .setLatitude(ardAlarmCamera.getLatitude())
- .setCount(ardAlarmCamera.getCount())
- .setTotal(ardAlarmCamera.getTotal());
- return globalAlarmData;
- })
- .collect(Collectors.toList());
- case 1003:
- List<ArdAlarmRadar> ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "杩愬姩鐩爣妫�娴�");
- return ardAlarmRadars.stream()
- .map(ardAlarmRadar -> {
- GlobalAlarmData globalAlarmData = new GlobalAlarmData()
- .setId(ardAlarmRadar.getId())
- .setName(ardAlarmRadar.getName())
- .setAlarmTime(ardAlarmRadar.getAlarmTime())
- .setLongitude(ardAlarmRadar.getLongitude())
- .setLatitude(ardAlarmRadar.getLatitude())
- .setCount(ardAlarmRadar.getCount())
- .setTotal(ardAlarmRadar.getTotal());
- return globalAlarmData;
- })
- .collect(Collectors.toList());
- case 1004:
- ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "鐑簮妫�娴�");
- return ardAlarmRadars.stream()
- .map(ardAlarmRadar -> {
- GlobalAlarmData globalAlarmData = new GlobalAlarmData()
- .setId(ardAlarmRadar.getId())
- .setName(ardAlarmRadar.getName())
- .setAlarmTime(ardAlarmRadar.getAlarmTime())
- .setLongitude(ardAlarmRadar.getLongitude())
- .setLatitude(ardAlarmRadar.getLatitude())
- .setCount(ardAlarmRadar.getCount())
- .setTotal(ardAlarmRadar.getTotal());
- return globalAlarmData;
- })
- .collect(Collectors.toList());
- case 1014:
- List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
- return ardAlarmTubes.stream()
- .map(ardAlarmTube -> {
- GlobalAlarmData globalAlarmData = new GlobalAlarmData()
- .setId(ardAlarmTube.getId())
- .setName(ardAlarmTube.getTubeName())
- .setAlarmTime(ardAlarmTube.getAlarmTime())
- .setLongitude(ardAlarmTube.getLongitude())
- .setLatitude(ardAlarmTube.getLatitude())
- .setAltitude(ardAlarmTube.getAltitude())
- .setCount(ardAlarmTube.getCount())
- .setTotal(ardAlarmTube.getTotal());
- return globalAlarmData;
- })
- .collect(Collectors.toList());
- default:
- return null;
- }
- }
-
- /**
- * @鎻忚堪 鎸夋潯浠舵洿鏂版煡鐪嬫椂闂�
- * @鍙傛暟 [condition]
- * @杩斿洖鍊� java.lang.Object
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/15 15:48
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- @Override
- public Object updateAlarmViewTime(GlobalAlarmCondition condition) {
- SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- switch (condition.getCommand()) {
- case 1001:
- ArdAlarmStealelec ardAlarmStealelec = ardAlarmStealelecMapper.selectByPrimaryKey(condition.getId());
- if (StringUtils.isNotNull(ardAlarmStealelec)) {
- String describe = ardAlarmStealelec.getDescribe();
- String startTime = fmt.format(ardAlarmStealelec.getStartTime());
- int i = ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
- return ardAlarmStealelec;
- }
- case 1014:
- ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
- if (StringUtils.isNotNull(ardAlarmTube)) {
- String tubeId = ardAlarmTube.getTubeId();
- String alarmTime = fmt.format(ardAlarmTube.getAlarmTime());
- int i = ardAlarmTubeMapper.updateViewTimeByTubeId(tubeId, alarmTime, DateUtils.getTime());
- return ardAlarmTube;
- }
- default:
- return null;
- }
- }
-
- /**
- * @鎻忚堪 寮傛澶勭悊鎺ユ敹鐨勬姤璀�
- * @鍙傛暟 [topic, message]
- * @杩斿洖鍊� void
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/15 15:46
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- @Override
- @Async("alarmExecutor")
- public void receiveAlarm(String topic, String message) {
- try {
- switch (topic) {
- case "stealelec":
- //region 澶勭悊鐩楃數鎶ヨ
- ArdAlarmStealelec ardAlarmStealelec = JSONObject.parseObject(message, ArdAlarmStealelec.class);
-
- ArdAlarmStealelec existe = ardAlarmStealelecMapper.selectByPrimaryKey(ardAlarmStealelec.getId());
- if (StringUtils.isNotNull(existe)) {
- return;
- }
- int aas = ardAlarmStealelecMapper.insertArdAlarmStealelec(ardAlarmStealelec);
- if (aas > 0) {
- log.info("stealelec鍏ュ簱鎴愬姛锛�" + ardAlarmStealelec);
- ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmStealelec.getDescribe());
- if (well != null) {
- ardAlarmStealelec.setLongitude(well.getLongitude());
- ardAlarmStealelec.setLatitude(well.getLatitude());
- ardAlarmStealelec.setAltitude(well.getAltitude());
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("stealelec");
- cmd.setOperator("sys_steal_elec");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{well.getLongitude(), well.getLatitude(), well.getAltitude()});
- boolean res = guideCamera(cmd);
- if (res) {
- String url = alarmToRecord(cmd);
- if (StringUtils.isNotEmpty(url)) {
- //鏇存柊褰曞儚
- ardAlarmStealelec.setRecordUrl(url);
- ardAlarmStealelecMapper.updateArdAlarmStealelec(ardAlarmStealelec);
- }
- }
- }
- }
- //endregion
- break;
- case "tube":
- //region 澶勭悊绠＄嚎娉勯湶鎶ヨ
- ArdAlarmTube ardAlarmTube = JSONObject.parseObject(message, ArdAlarmTube.class);
- ardAlarmTube.setId(IdUtils.simpleUUID());
- ArdTubesDetails atd = new ArdTubesDetails();
- atd.setReelNumber(ardAlarmTube.getTubeId());
- List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(atd);
- if (ardTubesDetails.size() > 0) {
- String tubeId = ardTubesDetails.get(0).getTubeId();
- ArdTubes ardTubes = ardTubesMapper.selectArdTubesById(tubeId);
- ardAlarmTube.setTubeName(ardTubes.getName());
- ardAlarmTube.setColor(ardTubes.getColor());
- ardAlarmTube.setPipeDiameter(ardTubes.getPipeDiameter());
- ardAlarmTube.setTubeType(ardTubes.getType());
- GeoPoint geoPoint = TubeTools.CalculateCoordinates(ardTubesDetails, ardAlarmTube.getPosition());
- if (StringUtils.isNotNull(geoPoint)) {
- ardAlarmTube.setLongitude(geoPoint.getLongitude());
- ardAlarmTube.setLatitude(geoPoint.getLatitude());
- ardAlarmTube.setAltitude(geoPoint.getAltitude());
- }
- }
- int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
- if (aat > 0) {
- log.debug("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("tube");
- cmd.setOperator("sys_tube_leak");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude(), ardAlarmTube.getAltitude()});
- boolean res = guideCamera(cmd);
- if (res) {
- String url = alarmToRecord(cmd);
- if (StringUtils.isNotEmpty(url)) {
- //鏇存柊褰曞儚
- ardAlarmTube.setRecordUrl(url);
- ardAlarmTubeMapper.updateArdAlarmTube(ardAlarmTube);
- }
- }
- }
- //endregion
- break;
- case "camera":
- //region 澶勭悊閫氱敤鍏夌數鎶ヨ
- ArdAlarmCamera ardAlarmCamera = JSONObject.parseObject(message, ArdAlarmCamera.class);
- ardAlarmCamera.setId(IdUtils.simpleUUID());
- int aac = ardAlarmCameraMapper.insertArdAlarmCamera(ardAlarmCamera);
- if (aac > 0) {
- log.debug("camera鍏ュ簱鎴愬姛锛�" + ardAlarmCamera);
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("camera");
- cmd.setOperator("sys_camera");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
- boolean res = guideCamera(cmd);
- if (res) {
- String url = alarmToRecord(cmd);
- if (StringUtils.isNotEmpty(url)) {
- //鏇存柊褰曞儚
- ardAlarmCamera.setRecordUrl(url);
- ardAlarmCameraMapper.updateArdAlarmCamera(ardAlarmCamera);
- }
- }
- }
- //endregion
- break;
- case "radar":
- //region 澶勭悊闆疯揪鎶ヨ
- RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
- List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
- Map<String, Object> readyGuide = new HashMap<>();
- for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
- ardAlarmRadar.setId(IdUtils.simpleUUID());
- ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());
- int aar = ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
- if (aar > 0) {
- log.debug("radar鍏ュ簱鎴愬姛锛�" + ardAlarmRadar);
- }
- readyGuide.put(ardAlarmRadar.getName(), ardAlarmRadar);//姣忎釜鎶ヨ鐐瑰彇鍑轰竴鏉℃姤璀�
- }
- //鑾峰彇姣忎釜鎶ヨ鐐瑰叧鑱旂殑鐩告満
-
- //鍏堟壘鎶ヨ闆疯揪濉斾笂鐨勭浉鏈�
- CameraCmd cmd = new CameraCmd();
- cmd.setCameraId("1");
- cmd.setChannelNum(1);
- boolean b = guideCamera(cmd);
-
- //鍐嶆壘鎶ヨ鐐瑰叧鑱旂殑鐩告満
- cmd.setCameraId("2");
- cmd.setChannelNum(1);
- boolean b1 = guideCamera(cmd);
-
- //endregion
- break;
- }
- } catch (Exception ex) {
- log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
- }
- }
-
- /**
- * @鎻忚堪 寮曞鏈�杩戠殑澶у厜鐢垫寚鍚戠洰鏍�
- * @鍙傛暟 [cmd]
- * @杩斿洖鍊� boolean
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/28 16:34
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- private boolean guideCamera(CameraCmd cmd) {
- try {
- String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
- //鑾峰彇鎵�鏈夊ぇ鍏夌數
- List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
- //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
- Map<String, Double> distanceMap = new HashMap<>();
- Map<String, Integer> guideMap = new HashMap<>();
- for (ArdCameras camera : ardCamerasList) {
- double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
- if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
- distanceMap.put(camera.getId(), distance);
- if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
- camera.setCamAlarmGuideEnable(0);
- }
- guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
- }
- }
- if (distanceMap.size() > 0) {
- log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
- //鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
- String minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
- log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId + "锛屽皾璇曞紩瀵�");
- if (guideMap.get(minDistanceCameraId).equals(0)) {
- log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
- return false;
- }
- //寮曞鍏夌數
- cmd.setCameraId(minDistanceCameraId);
- cmd.setChannelNum(ArdTool.getChannelBydayNightTime(dayNightTime));
- boolean guideRes = hikClientService.guideTargetPosition(cmd);
- return guideRes;
-
- } else {
- log.debug("鏈煡鎵惧埌鏈�杩戝厜鐢�");
- return false;
- }
- } catch (Exception ex) {
- log.error("寮曞寮傚父:" + ex.getMessage());
- return false;
- }
- }
-
- /**
- * @鎻忚堪 鎶ヨ褰曞儚
- * @鍙傛暟 [cmd]
- * @杩斿洖鍊� java.lang.String
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/28 16:33
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- public String alarmToRecord(CameraCmd cmd) {
- String url = "";
- try {
- log.debug("寮曞鎴愬姛锛屽皾璇曞綍鍍�");
- String cameraId = cmd.getCameraId();
- hikClientService.controlLock(cmd);//涓婇攣
- cmd.setEnable(true);//寮�濮嬪綍鍍�
- hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
- GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());//灏嗙浉鏈篿d涓庡綋鍓嶅鐞嗙嚎绋嬪悕绉扮粦瀹�
- Thread.sleep(cmd.getExpired() * 1000);//褰曞儚鏃堕暱
- String thread = GlobalVariable.threadMap.get(cameraId);
- String currentThread = Thread.currentThread().getName();
- //鍒ゆ柇鐩告満缁戝畾绾跨▼鏄惁鏄綋鍓嶇嚎绋嬶紝濡傛灉鏄紝鍋滄褰曞儚锛屽鏋滀笉鏄紝璇存槑鐩告満琚叾浠栫嚎绋嬫姠鍗狅紝涓嶅仠姝㈠綍鍍�
- if (thread.equals(currentThread)) {
- cmd.setEnable(false);//鍋滄褰曞儚
- cmd.setUploadMinio(true);//涓婁紶minio
- url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
- }
- } catch (Exception ex) {
- log.error("褰曞儚寮傚父:" + ex.getMessage());
- }
- return url;
- }
+ @Resource
+ private QueueManager queueManager;
+ //endregion
/**
* @鎻忚堪 鏌ヨ鎵�鏈夋姤璀︾殑褰撳墠鏁伴噺
@@ -468,6 +107,95 @@
}
/**
+ * @鎻忚堪 鎸夋潯浠舵煡璇㈡姤璀�
+ * @鍙傛暟 [condition]
+ * @杩斿洖鍊� java.util.List<com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData>
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/15 15:48
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ @Override
+ public List<GlobalAlarmData> selectAlarmLogs(GlobalAlarmCondition condition) {
+ String refreshTime = configService.selectConfigByKey("refreshTime");
+ switch (condition.getCommand()) {
+ case 1001:
+ List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmStealelecs.stream()
+ .map(ardAlarmStealelec -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmStealelec.getId())
+ .setName(ardAlarmStealelec.getDescribe())
+ .setAlarmTime(ardAlarmStealelec.getStartTime())
+ .setLongitude(ardAlarmStealelec.getLongitude())
+ .setLatitude(ardAlarmStealelec.getLatitude())
+ .setAltitude(ardAlarmStealelec.getAltitude())
+ .setCount(ardAlarmStealelec.getCount())
+ .setTotal(ardAlarmStealelec.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
+ case 1002:
+ List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmCameras.stream()
+ .map(ardAlarmCamera -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmCamera.getId())
+ .setName(ardAlarmCamera.getCameraName())
+ .setAlarmTime(ardAlarmCamera.getAlarmTime())
+ .setLongitude(ardAlarmCamera.getLongitude())
+ .setLatitude(ardAlarmCamera.getLatitude())
+ .setCount(ardAlarmCamera.getCount())
+ .setTotal(ardAlarmCamera.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
+ case 1003:
+ List<ArdAlarmRadar> ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "杩愬姩鐩爣妫�娴�");
+ return ardAlarmRadars.stream()
+ .map(ardAlarmRadar -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmRadar.getId())
+ .setName(ardAlarmRadar.getName())
+ .setAlarmTime(ardAlarmRadar.getAlarmTime())
+ .setLongitude(ardAlarmRadar.getLongitude())
+ .setLatitude(ardAlarmRadar.getLatitude())
+ .setCount(ardAlarmRadar.getCount())
+ .setTotal(ardAlarmRadar.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
+ case 1004:
+ ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "鐑簮妫�娴�");
+ return ardAlarmRadars.stream()
+ .map(ardAlarmRadar -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmRadar.getId())
+ .setName(ardAlarmRadar.getName())
+ .setAlarmTime(ardAlarmRadar.getAlarmTime())
+ .setLongitude(ardAlarmRadar.getLongitude())
+ .setLatitude(ardAlarmRadar.getLatitude())
+ .setCount(ardAlarmRadar.getCount())
+ .setTotal(ardAlarmRadar.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
+ case 1014:
+ List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmTubes.stream()
+ .map(ardAlarmTube -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmTube.getId())
+ .setName(ardAlarmTube.getTubeName())
+ .setAlarmTime(ardAlarmTube.getAlarmTime())
+ .setLongitude(ardAlarmTube.getLongitude())
+ .setLatitude(ardAlarmTube.getLatitude())
+ .setAltitude(ardAlarmTube.getAltitude())
+ .setCount(ardAlarmTube.getCount())
+ .setTotal(ardAlarmTube.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
+ default:
+ return null;
+ }
+ }
+
+ /**
* @鎻忚堪 鍘嗗彶鎶ヨ鏌ヨ
* @鍙傛暟 [command, beginTime, endTime, pageNum, pageSize]
* @杩斿洖鍊� java.lang.Object
@@ -486,40 +214,339 @@
aas.setParams(params);
aas.setPageNum(pageNum);
aas.setPageSize(pageSize);
- List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
- return ardAlarmStealelecs;
+ return ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
case 1002:
ArdAlarmCamera aac = new ArdAlarmCamera();
aac.setParams(params);
aac.setPageNum(pageNum);
aac.setPageSize(pageSize);
- List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
- return ardAlarmCameras;
+ return ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
case 1003:
ArdAlarmRadar aar = new ArdAlarmRadar();
aar.setParams(params);
aar.setPageNum(pageNum);
aar.setPageSize(pageSize);
aar.setAlarmType("杩愬姩鐩爣妫�娴�");
- List<ArdAlarmRadar> ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarList(aar);
- return ardAlarmRadar;
+ return ardAlarmRadarMapper.selectArdAlarmRadarList(aar);
case 1004:
ArdAlarmRadar aarr = new ArdAlarmRadar();
aarr.setParams(params);
aarr.setPageNum(pageNum);
aarr.setPageSize(pageSize);
aarr.setAlarmType("鐑簮妫�娴�");
- List<ArdAlarmRadar> ardAlarmRadarr = ardAlarmRadarMapper.selectArdAlarmRadarList(aarr);
- return ardAlarmRadarr;
+ return ardAlarmRadarMapper.selectArdAlarmRadarList(aarr);
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
aat.setPageNum(pageNum);
aat.setPageSize(pageSize);
- List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
- return ardAlarmTubes;
+ return ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
}
return null;
}
+ /**
+ * @鎻忚堪 鎸夋潯浠舵洿鏂版煡鐪嬫椂闂�
+ * @鍙傛暟 [condition]
+ * @杩斿洖鍊� java.lang.Object
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/15 15:48
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ @Override
+ public Object updateAlarmViewTime(GlobalAlarmCondition condition) {
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ switch (condition.getCommand()) {
+ case 1001:
+ ArdAlarmStealelec ardAlarmStealelec = ardAlarmStealelecMapper.selectByPrimaryKey(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmStealelec)) {
+ String describe = ardAlarmStealelec.getDescribe();
+ String startTime = fmt.format(ardAlarmStealelec.getStartTime());
+ ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
+ return ardAlarmStealelec;
+ }
+ case 1014:
+ ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmTube)) {
+ String tubeId = ardAlarmTube.getTubeId();
+ String alarmTime = fmt.format(ardAlarmTube.getAlarmTime());
+ ardAlarmTubeMapper.updateViewTimeByTubeId(tubeId, alarmTime, DateUtils.getTime());
+ return ardAlarmTube;
+ }
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * @鎻忚堪 寮傛澶勭悊鎺ユ敹鐨勬姤璀�
+ * @鍙傛暟 [topic, message]
+ * @杩斿洖鍊� void
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/15 15:46
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ @Override
+ @Async("alarmExecutor")
+ public void receiveAlarm(String topic, String message) {
+ try {
+ switch (topic) {
+ case "stealelec":
+ //region 澶勭悊鐩楃數鎶ヨ
+ ArdAlarmStealelec ardAlarmStealelec = JSONObject.parseObject(message, ArdAlarmStealelec.class);
+ ArdAlarmStealelec isExiste = ardAlarmStealelecMapper.selectByPrimaryKey(ardAlarmStealelec.getId());
+ if (StringUtils.isNull(isExiste)) {
+ int aas = ardAlarmStealelecMapper.insertArdAlarmStealelec(ardAlarmStealelec);
+ if (aas > 0) {
+ log.info("stealelec鍏ュ簱鎴愬姛锛�" + ardAlarmStealelec);
+ }
+ }
+ //endregion
+ break;
+ case "tube":
+ //region 澶勭悊绠＄嚎娉勯湶鎶ヨ
+ ArdAlarmTube ardAlarmTube = JSONObject.parseObject(message, ArdAlarmTube.class);
+ ardAlarmTube.setId(IdUtils.simpleUUID());
+ ArdTubesDetails atd = new ArdTubesDetails();
+ atd.setReelNumber(ardAlarmTube.getTubeId());
+ List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(atd);
+ if (ardTubesDetails.size() > 0) {
+ String tubeId = ardTubesDetails.get(0).getTubeId();
+ ArdTubes ardTubes = ardTubesMapper.selectArdTubesById(tubeId);
+ ardAlarmTube.setTubeName(ardTubes.getName());
+ ardAlarmTube.setColor(ardTubes.getColor());
+ ardAlarmTube.setPipeDiameter(ardTubes.getPipeDiameter());
+ ardAlarmTube.setTubeType(ardTubes.getType());
+ ardAlarmTube.setCreateTime(new Date());
+ GeoPoint geoPoint = TubeTools.CalculateCoordinates(ardTubesDetails, ardAlarmTube.getPosition());
+ if (StringUtils.isNotNull(geoPoint)) {
+ ardAlarmTube.setLongitude(geoPoint.getLongitude());
+ ardAlarmTube.setLatitude(geoPoint.getLatitude());
+ ardAlarmTube.setAltitude(geoPoint.getAltitude());
+ }
+ }
+ int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
+ if (aat > 0) {
+ log.debug("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
+ Double longitude = ardAlarmTube.getLongitude();
+ Double latitude = ardAlarmTube.getLatitude();
+ if(StringUtils.isNull(longitude)||StringUtils.isNull(latitude))
+ {
+ return;
+ }
+ double[] coordinate=new double[]{longitude,latitude};
+ String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
+ if (StringUtils.isNotEmpty(nearbyCameraId)) {
+ messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak",ardAlarmTube.getCreateTime(), 1,1,coordinate);
+ }
+ }
+ //endregion
+ break;
+ case "camera":
+ //region 澶勭悊閫氱敤鍏夌數鎶ヨ
+ ArdAlarmCamera ardAlarmCamera = JSONObject.parseObject(message, ArdAlarmCamera.class);
+ ardAlarmCamera.setId(IdUtils.simpleUUID());
+
+ int aac = ardAlarmCameraMapper.insertArdAlarmCamera(ardAlarmCamera);
+ if (aac > 0) {
+ log.debug("camera鍏ュ簱鎴愬姛锛�" + ardAlarmCamera);
+ }
+ //endregion
+ break;
+ case "radar":
+ //region 澶勭悊闆疯揪鎶ヨ
+ RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
+ List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
+ for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
+ String uuid = IdUtils.simpleUUID();
+ ardAlarmRadar.setId(uuid);//鎶ヨID
+ ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());//鎶ヨ鏃堕棿
+ String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
+ ardAlarmRadar.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");//鎶ヨ鐐瑰悕绉�
+ ardAlarmRadar.setCreateTime(new Date());//鎺ユ敹鏃堕棿
+ double[] coordinate=new double[]{ardAlarmRadar.getLongitude(),ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
+ String alarmType = "";
+ switch (ardAlarmRadar.getAlarmType()) {
+ case "杩愬姩鐩爣妫�娴�":
+ alarmType = "sys_radar_move";
+ break;
+ case "鐑簮妫�娴�":
+ alarmType = "sys_radar_fire";
+ break;
+ }
+ //鍒ゆ柇褰撳墠鎶ヨ鐐�5鍒嗛挓鍐呮槸鍚﹀凡寮曞
+ ardAlarmRadar.setGuideFlag(1);
+ ArdAlarmRadar AlarmRadar = ardAlarmRadarMapper.getArdAlarmRadarWithGuide(ardAlarmRadar);
+ if (StringUtils.isNull(AlarmRadar)) {
+ //5鍒嗛挓鍐呮湭寮曞鐩存帴鍏ュ簱
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
+ String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
+ if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:"+cameraIdWithTower);
+ //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
+ messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(),1,1,coordinate);
+ }
+ //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+ if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
+ {
+ String cameraId = ardAlarmpointsWell.getCameraId();
+ if(cameraIdWithTower.equals(cameraId))
+ {
+ return;
+ }
+ log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:"+cameraId);
+ //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
+ messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), 1,2,coordinate);
+ }
+ } else {
+ //5鍒嗛挓鍐呮湁寮曞
+ ardAlarmRadar.setGuideFlag(0);
+ int count = ardAlarmRadarMapper.getArdAlarmRadarWithNotGuide(ardAlarmRadar, AlarmRadar.getCreateTime());
+ //鏈紩瀵艰秴杩�3娆★紝鐩存帴鍏ュ簱鍏ラ槦
+ if (count >= 3) {
+ ardAlarmRadar.setGuideFlag(1);
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
+ String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
+ if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:"+cameraIdWithTower);
+ //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
+ messagesEnqueued(cameraIdWithTower, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,1,coordinate);
+ }
+ //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+ if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
+ {
+ String cameraId = ardAlarmpointsWell.getCameraId();
+ if(cameraIdWithTower.equals(cameraId))
+ {
+ return;
+ }
+ log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:"+cameraId);
+ //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
+ messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,2,coordinate);
+ }
+ } else {
+ //鏈紩瀵兼湭瓒呰繃3娆★紝鐩存帴鍏ュ簱
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ }
+ }
+ }
+ //endregion
+ break;
+ }
+ } catch (Exception ex) {
+ log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
+ }
+ }
+
+ /**
+ * 娑堟伅鍏ラ槦
+ *
+ * cameraId 鐩告満ID
+ * alarmId 鎶ヨID
+ * alarmType 鎶ヨ绫诲瀷
+ * num 鎶ヨ娆℃暟
+ * recordSn 褰曞儚瀛樺偍浣嶇疆 1-recordUrl1 2-recordUrl2
+ * targetPosition 鎶ヨ鐐逛綅缃潗鏍�
+ */
+ private void messagesEnqueued(String cameraId, String alarmId, String alarmType,Date receiveTime, Integer num, Integer recordSn,double[] targetPosition) {
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+ GuideTask guideTask = new GuideTask();
+ //鐩告満ID
+ guideTask.setCameraId(cameraId);
+ //鎶ヨ绫诲瀷
+ guideTask.setAlarmType(alarmType);
+ //閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
+ String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
+ Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
+ guideTask.setChanNum(channel);
+ //鎶ヨID
+ guideTask.setAlarmId(alarmId);
+ //鎺ユ敹鏃堕棿
+ guideTask.setReceiveTime(fmt.format(receiveTime));
+ //鎶ヨ浼樺厛绾�(閫氳繃浼樺厛绾у瓧鍏�)
+ Integer priority = CamPriority.priorityMap.get(alarmType);
+ guideTask.setPriority(priority);
+ //鎶ヨ娆℃暟
+ guideTask.setNum(num);
+ //褰曞儚瀛樺偍浣嶇疆
+ guideTask.setRecordSn(recordSn);
+ //鐩爣缁忕含搴�
+ guideTask.setTargetPosition(targetPosition);
+ //娑堟伅鍏ラ槦
+ queueManager.addTaskToQueue(cameraId, guideTask);
+ //鎵撳嵃闃熷垪
+ GuidePriorityQueue.printPriorityQueue();
+ }
+
+ /**
+ * 鑾峰彇闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
+ */
+ private String getNearbyCamera(double[] targetPosition) {
+ String minDistanceCameraId = "";
+ //鑾峰彇鎵�鏈夊ぇ鍏夌數
+ List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
+ //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
+ Map<String, Double> distanceMap = new HashMap<>();
+ Map<String, Integer> guideMap = new HashMap<>();
+ for (ArdCameras camera : ardCamerasList) {
+ double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
+ double distance = GisTool.getDistance(targetPosition, camPosition);
+ if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
+ distanceMap.put(camera.getId(), distance);
+ if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
+ camera.setCamAlarmGuideEnable(0);
+ }
+ guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
+ }
+ }
+ if (distanceMap.size() > 0) {
+ log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
+ //鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
+ minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
+ log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId);
+ if (guideMap.get(minDistanceCameraId).equals(0)) {
+ log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
+ return " ";
+ }
+ }
+ return minDistanceCameraId;
+ }
+
+ public static void main(String[] args) {
+ Comparator<Obj> PriorityDescCom = Comparator.comparingInt(Obj::getPriority).reversed();
+ Comparator<Obj> NumDescCom = Comparator.comparingInt(Obj::getNum).reversed();
+ Comparator<Obj> receiveTimeAscCom = Comparator.comparing(Obj::getAlarmTime);
+ Comparator<Obj> comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(receiveTimeAscCom);
+
+ PriorityBlockingQueue<Obj> priorityQueue = new PriorityBlockingQueue<>(1000,comparator);
+
+ priorityQueue.add(new Obj(999,1,"2023-07-01 16:00:01"));
+ priorityQueue.add(new Obj(999,2,"2023-07-01 16:00:01"));
+ priorityQueue.add(new Obj(999,3,"2023-07-01 16:00:01"));
+
+ List<Obj> elements = new ArrayList<>(priorityQueue);
+ elements.sort(priorityQueue.comparator()); // 浣跨敤闃熷垪鐨勬瘮杈冨櫒杩涜鎺掑簭
+ for (Obj task : elements) {
+ log.info("姝ｅ湪鎺掗槦銆恜riority銆�" + task.getPriority()+"銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
+ }
+ log.info("===================================================================");
+ priorityQueue.add(new Obj(999,5,"2023-07-01 16:00:01"));
+ PriorityBlockingQueue queue = new PriorityBlockingQueue<>(priorityQueue);
+ while (priorityQueue.size() > 0) {
+ Obj task = priorityQueue.poll();
+ log.info("姝ｅ湪鎺掗槦銆恜riority銆�" + task.getPriority()+"銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
+ }
+ }
+ @Data
+ @AllArgsConstructor
+ static class Obj
+ {
+ Integer priority;
+ Integer num;
+ String alarmTime;
+ }
}
--
Gitblit v1.9.3