From 1aad56563c6861e13f3a837eb7ef410723cc2358 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期日, 25 六月 2023 11:00:04 +0800
Subject: [PATCH] 报警点位数量推送增加一层map 增加通用光电报警数量推送
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 348 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 292 insertions(+), 56 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 60dae1c..8bb6f21 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
@@ -1,6 +1,8 @@
package com.ruoyi.alarm.globalAlarm.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.alarm.cameraAlarm.domain.ArdAlarmCamera;
+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.service.IGlobalAlarmService;
@@ -8,21 +10,27 @@
import com.ruoyi.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper;
import com.ruoyi.alarm.tubeAlarm.domain.ArdAlarmTube;
import com.ruoyi.alarm.tubeAlarm.mapper.ArdAlarmTubeMapper;
-import com.ruoyi.alarm.tubeAlarm.service.IArdAlarmTubeService;
import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesMapper;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.UUID;
+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.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -31,7 +39,6 @@
import java.util.*;
import java.util.stream.Collectors;
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/**
* @ClassName: globalAlarmServiceImpl
@@ -48,6 +55,8 @@
@Resource
ArdAlarmTubeMapper ardAlarmTubeMapper;
@Resource
+ ArdAlarmCameraMapper ardAlarmCameraMapper;
+ @Resource
ArdTubesMapper ardTubesMapper;
@Resource
ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
@@ -55,7 +64,21 @@
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");
@@ -73,6 +96,21 @@
.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());
@@ -97,13 +135,21 @@
}
}
+ /**
+ * @鎻忚堪 鎸夋潯浠舵洿鏂版煡鐪嬫椂闂�
+ * @鍙傛暟 [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)) {
+ if (StringUtils.isNotNull(ardAlarmStealelec)) {
String describe = ardAlarmStealelec.getDescribe();
String startTime = fmt.format(ardAlarmStealelec.getStartTime());
int i = ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
@@ -111,80 +157,270 @@
}
case 1014:
ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
- if(StringUtils.isNotNull(ardAlarmTube)) {
+ 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;
+ default:
+ return null;
}
}
+ /**
+ * @鎻忚堪 寮傛澶勭悊鎺ユ敹鐨勬姤璀�
+ * @鍙傛暟 [topic, message]
+ * @杩斿洖鍊� void
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/15 15:46
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
@Override
@Async("alarmExecutor")
public void receiveAlarm(String topic, String message) {
- String uuid = UUID.randomUUID().toString().replace("-", "");
- switch (topic) {
- case "stealelec":
- ArdAlarmStealelec ardAlarmStealelec = JSONObject.parseObject(message, ArdAlarmStealelec.class);
- ardAlarmStealelec.setId(uuid);
- ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmStealelec.getDescribe());
- if(well!=null)
- {
- ardAlarmStealelec.setLongitude(well.getLongitude());
- ardAlarmStealelec.setLatitude(well.getLatitude());
- ardAlarmStealelec.setDeptId(well.getDeptId());
- }
- int insertaas = ardAlarmStealelecMapper.insert(ardAlarmStealelec);
- if(insertaas>0)
- {
- log.info("stealelec鍏ュ簱鎴愬姛锛�" +ardAlarmStealelec);
- }
- break;
- case "tube":
- ArdAlarmTube ardAlarmTube = JSONObject.parseObject(message, ArdAlarmTube.class);
- ardAlarmTube.setId(uuid);
- 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());
+ try {
+ String simpleUUID = IdUtils.simpleUUID();
+ switch (topic) {
+ case "stealelec":
+ //region 澶勭悊鐩楃數鎶ヨ
+ ArdAlarmStealelec ardAlarmStealelec = JSONObject.parseObject(message, ArdAlarmStealelec.class);
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmStealelec.getDescribe());
+ if (well != null) {
+ ardAlarmStealelec.setLongitude(well.getLongitude());
+ ardAlarmStealelec.setLatitude(well.getLatitude());
+ ardAlarmStealelec.setAltitude(well.getAltitude());
}
- }
- int i = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
- if (i > 0) {
- log.info("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
- }
- break;
+ ArdAlarmStealelec existe = ardAlarmStealelecMapper.selectByPrimaryKey(ardAlarmStealelec.getId());
+ if (StringUtils.isNotNull(existe)) {
+ return;
+ }
+ int aas = ardAlarmStealelecMapper.insertArdAlarmStealelec(ardAlarmStealelec);
+ if (aas > 0) {
+ log.info("stealelec鍏ュ簱鎴愬姛锛�" + ardAlarmStealelec);
+ //寮曞褰曞儚
+ 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()});
+ String url = guideCamera(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(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()});
+ String url = guideCamera(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(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()});
+ String url = guideCamera(cmd);
+ //鏇存柊褰曞儚
+ if (StringUtils.isNotEmpty(url)) {
+ ardAlarmCamera.setRecordUrl(url);
+ ardAlarmCameraMapper.updateArdAlarmCamera(ardAlarmCamera);
+ }
+ }
+ //endregion
+ break;
+ }
+ } catch (Exception ex) {
+ log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
}
}
+
+ /**
+ * @鎻忚堪 寮曞鏈�杩戠殑澶у厜鐢垫寚鍚戠洰鏍�
+ * @鍙傛暟 [targetPosition]
+ * @杩斿洖鍊� java.lang.String
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/15 11:55
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ private String guideCamera(CameraCmd cmd) {
+ String url = "";
+ 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 "";
+ }
+ //寮曞鍏夌數
+ cmd.setCameraId(minDistanceCameraId);
+ cmd.setChannelNum(ArdTool.getChannelBydayNightTime(dayNightTime));
+ boolean guideRes = hikClientService.guideTargetPosition(cmd);
+ if (guideRes) {
+ log.debug("寮曞鎴愬姛锛屽皾璇曞綍鍍�");
+ hikClientService.controlLock(cmd);//涓婇攣
+ cmd.setEnable(true);//寮�濮嬪綍鍍�
+ hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
+ GlobalVariable.threadMap.put(minDistanceCameraId, Thread.currentThread().getName());//灏嗙浉鏈篿d涓庡綋鍓嶅鐞嗙嚎绋嬪悕绉扮粦瀹�
+ Thread.sleep(cmd.getExpired() * 1000);//褰曞儚鏃堕暱
+ String thread = GlobalVariable.threadMap.get(minDistanceCameraId);
+ String currentThread = Thread.currentThread().getName();
+ //鍒ゆ柇鐩告満缁戝畾绾跨▼鏄惁鏄綋鍓嶇嚎绋嬶紝濡傛灉鏄紝鍋滄褰曞儚锛屽鏋滀笉鏄紝璇存槑鐩告満琚叾浠栫嚎绋嬫姠鍗狅紝涓嶅仠姝㈠綍鍍�
+ if (thread.equals(currentThread)) {
+ cmd.setEnable(false);//鍋滄褰曞儚
+ cmd.setUploadMinio(true);//涓婁紶minio
+ url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
+ }
+ }
+ } else {
+ log.debug("鏈煡鎵惧埌鏈�杩戝厜鐢�");
+ }
+ } catch (Exception ex) {
+ log.error("寮曞寮傚父:" + ex.getMessage());
+ }
+ return url;
+ }
+
/**
* @鎻忚堪 鏌ヨ鎵�鏈夋姤璀︾殑褰撳墠鏁伴噺
* @鍙傛暟 []
- * @杩斿洖鍊� java.util.Map<java.lang.String,java.lang.Integer>
+ * @杩斿洖鍊� java.util.Map<java.lang.String, java.lang.Integer>
* @鍒涘缓浜� 鍒樿嫃涔�
* @鍒涘缓鏃堕棿 2023/6/13 16:30
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- public Map<String, Integer> selectAlarmLogsCount() {
- Map<String, Integer> countMap=new HashMap<>();
+ public Map<String, Object> selectAlarmLogsCount() {
+ Map<String,Object> map=new HashMap<>();
+ Map<String, Integer> countMap = new HashMap<>();
String refreshTime = configService.selectConfigByKey("refreshTime");
int count1001 = ardAlarmStealelecMapper.selectCountByStartTime(refreshTime);
- countMap.put("1001",count1001);
- int count1014 = ardAlarmTubeMapper.selectCountByStartTime(refreshTime);
- countMap.put("1014 ",count1014);
- return countMap;
+ countMap.put("1001", count1001);
+ int count1002 = ardAlarmCameraMapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1002", count1002);
+ int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1014", count1014);
+ map.put("20000",countMap);
+ return map;
+ }
+
+ @Override
+ public Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("beginTime", beginTime);
+ params.put("endTime", endTime);
+ switch (command) {
+ case 1001:
+ ArdAlarmStealelec aas = new ArdAlarmStealelec();
+ aas.setParams(params);
+ aas.setPageNum(pageNum);
+ aas.setPageSize(pageSize);
+ List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
+ return ardAlarmStealelecs;
+ case 1002:
+ ArdAlarmCamera aac = new ArdAlarmCamera();
+ aac.setParams(params);
+ aac.setPageNum(pageNum);
+ aac.setPageSize(pageSize);
+ List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
+ return ardAlarmCameras;
+ case 1014:
+ ArdAlarmTube aat = new ArdAlarmTube();
+ aat.setParams(params);
+ aat.setPageNum(pageNum);
+ aat.setPageSize(pageSize);
+ List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
+ return ardAlarmTubes;
+ }
+ return null;
+ }
+ public static void main(String[] args) {
+ // 缁欏畾鍧愭爣 A
+ double Ax = 0;
+ double Ay = 0;
+
+ // 缁欏畾瑙掑害锛堜互搴︿负鍗曚綅锛�
+ double angle = 45;
+
+ // 缁欏畾璺濈
+ double distance = 1.414;
+
+ // 灏嗚搴﹁浆鎹负寮у害
+ double radians = Math.toRadians(angle);
+
+ // 璁＄畻 B 鍧愭爣
+ double Bx = Ax + distance * Math.cos(radians);
+ double By = Ay + distance * Math.sin(radians);
+
+ // 杈撳嚭缁撴灉
+ System.out.println("鍧愭爣 B: (" + Bx + ", " + By + ")");
}
}
--
Gitblit v1.9.3