From a4e99a6a39284643fdf2b04dbe55212e5954973c Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期一, 20 五月 2024 17:37:25 +0800
Subject: [PATCH] firsh
---
src/main/java/com/skyline/electricity/interceptor/IAMUtils.java | 14 +-
src/main/java/com/skyline/electricity/controller/RemoteController.java | 32 ++++----
src/main/java/com/skyline/electricity/controller/WebSocketServer.java | 20 ++--
src/main/java/com/skyline/electricity/timer/Consumer.java | 10 +-
src/main/java/com/skyline/electricity/timer/SchedulerTask.java | 36 ++++----
src/main/java/com/skyline/electricity/controller/DetectController.java | 48 ++++++------
src/main/java/com/skyline/electricity/utils/TestClass.java | 2
src/main/java/com/skyline/electricity/controller/DeviceController.java | 26 +++---
8 files changed, 95 insertions(+), 93 deletions(-)
diff --git a/src/main/java/com/skyline/electricity/controller/DetectController.java b/src/main/java/com/skyline/electricity/controller/DetectController.java
index 11d2f80..f644865 100644
--- a/src/main/java/com/skyline/electricity/controller/DetectController.java
+++ b/src/main/java/com/skyline/electricity/controller/DetectController.java
@@ -37,18 +37,18 @@
private ConfigInfo configInfo;
GeometryFactory geometryFactory;
WKTReader reader;
-
+
public DetectController() {
this.geometryFactory = new GeometryFactory();
this.reader = new WKTReader(this.geometryFactory);
}
-
+
@RequestMapping(value = { "/getAlarmInfo" }, method = { RequestMethod.POST })
@ApiOperation("瀹炴椂鍒ゆ柇鐢靛瓙鍥存爮鍜屼汉鍛樺畾浣嶇殑浣嶇疆鍏崇郴骞跺瓨鍌ㄩ璀︿俊鎭�")
public void getAlarmInfo() {
this.schedulerTask.getInfo();
}
-
+
@RequestMapping(value = { "/saveFixedFence" }, method = { RequestMethod.POST })
@ApiOperation("淇濆瓨鍥哄畾鐢靛瓙鍥存爮淇℃伅浠ュ強杩斿洖鍥存爮閲嶅彔淇℃伅")
@ResponseBody
@@ -104,7 +104,7 @@
return null;
}
}
-
+
@RequestMapping(value = { "/saveTempFence" }, method = { RequestMethod.POST })
@ApiOperation("淇濆瓨涓存椂鐢靛瓙鍥存爮淇℃伅浠ュ強杩斿洖鍥存爮閲嶅彔淇℃伅")
@ResponseBody
@@ -173,7 +173,7 @@
return null;
}
}
-
+
@RequestMapping(value = { "/getRoute" }, method = { RequestMethod.POST })
@ApiImplicitParam(paramType = "query", name = "username", value = "浜哄憳濮撳悕", required = true, dataType = "String")
@ApiOperation("鑾峰彇浜哄憳娲诲姩杞ㄨ抗")
@@ -182,7 +182,7 @@
final List<String> route = (List<String>)this.detectService.getRoute(username);
return route.toString();
}
-
+
@RequestMapping(value = { "/getWifiInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇Wifi璁惧鍧愭爣")
@ResponseBody
@@ -205,7 +205,7 @@
map.put("data", dtoList);
return map;
}
-
+
@RequestMapping(value = { "/getMonitorInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鎽勫儚澶磋澶囧潗鏍�")
@ResponseBody
@@ -233,7 +233,7 @@
map.put("data", dtoList);
return map;
}
-
+
@RequestMapping(value = { "/getMonitorDeviceInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鎽勫儚澶磋澶囦俊鎭�")
@ResponseBody
@@ -260,7 +260,7 @@
map.put("data", list);
return map;
}
-
+
@RequestMapping(value = { "/getMonitorDeviceInfoById" }, method = { RequestMethod.POST })
@ApiOperation("閫氳繃ID鑾峰彇鎽勫儚澶磋澶囦俊鎭�")
@ResponseBody
@@ -287,7 +287,7 @@
map.put("data", list);
return map;
}
-
+
@RequestMapping(value = { "/getDoorAccessInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇闂ㄧ璁惧鍧愭爣")
@ResponseBody
@@ -297,7 +297,7 @@
map.put("data", list);
return map;
}
-
+
@RequestMapping(value = { "/getEnabledFenceInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鏈夋晥鐨勭數瀛愬洿鏍忎俊鎭�")
@ResponseBody
@@ -307,7 +307,7 @@
map.put("data", list);
return map;
}
-
+
@RequestMapping(value = { "/getFixedFenceInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鍥哄畾鐨勭數瀛愬洿鏍忎俊鎭�")
@ResponseBody
@@ -317,7 +317,7 @@
map.put("data", list);
return map;
}
-
+
@RequestMapping(value = { "/getFenceInfoById" }, method = { RequestMethod.POST })
@ApiImplicitParam(paramType = "query", name = "workId", value = "宸ヤ綔绁↖D", required = true, dataType = "String")
@ApiOperation("鏍规嵁宸ヤ綔绁↖D鑾峰彇鐢靛瓙鍥存爮淇℃伅")
@@ -328,7 +328,7 @@
map.put("data", list);
return map;
}
-
+
@RequestMapping(value = { "/updateFenceInfo" }, method = { RequestMethod.POST })
@ApiImplicitParams({ @ApiImplicitParam(paramType = "query", name = "fname", value = "鐢靛瓙鍥存爮鍚嶇О", required = false, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "workId", value = "宸ヤ綔绁↖D", required = true, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "workLeader", value = "宸ヤ綔绁ㄨ礋璐ｄ汉", required = false, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "starttime", value = "鐢靛瓙鍥存爮鐢熸晥鏃堕棿", required = false, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "disabledtime", value = "鐢靛瓙鍥存爮澶辨晥鏃堕棿", required = false, dataType = "String") })
@ApiOperation("鏇存柊鐢靛瓙鍥存爮淇℃伅")
@@ -371,7 +371,7 @@
result.setMessage("杈撳叆鐨勫洿鏍忕浉鍏充俊鎭湁璇� 鏇存柊澶辫触");
return result;
}
-
+
@RequestMapping(value = { "/deleteFenceById" }, method = { RequestMethod.POST })
@ApiImplicitParam(paramType = "query", name = "workId", value = "宸ヤ綔绁↖D", required = true, dataType = "String")
@ApiOperation("鏍规嵁宸ヤ綔绁↖D鍒犻櫎鐢靛瓙鍥存爮淇℃伅")
@@ -395,7 +395,7 @@
result.setMessage("鍒犻櫎澶辫触");
return result;
}
-
+
@RequestMapping(value = { "/deleteFence" }, method = { RequestMethod.POST })
@ApiOperation("鍒犻櫎鎵�鏈夌數瀛愬洿鏍忎俊鎭�")
@ResponseBody
@@ -411,7 +411,7 @@
result.setMessage("鍒犻櫎澶辫触");
return result;
}
-
+
@RequestMapping(value = { "/getDeviceInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇璁惧鐨勭浉鍏充俊鎭�")
@ResponseBody
@@ -427,7 +427,7 @@
map.put("list", list);
return map;
}
-
+
@RequestMapping(value = { "/getDeviceInfoById" }, method = { RequestMethod.GET })
@ApiOperation("鏍规嵁KKS缂栫爜鑾峰彇璁惧鐨勭浉鍏充俊鎭�")
@ResponseBody
@@ -447,7 +447,7 @@
result.setMessage("杈撳叆鐨勮澶嘔D涓嶅瓨鍦� 鏃犳硶鏌ヨ鐩稿簲鐨勬暟鎹�");
return result;
}
-
+
@RequestMapping(value = { "/selectFencePersonRelByworkid" }, method = { RequestMethod.GET })
@ApiOperation("鏍规嵁workid鑾峰彇鍥存爮鍐呯殑浜哄憳淇℃伅")
@ResponseBody
@@ -472,7 +472,7 @@
}
return result;
}
-
+
@RequestMapping(value = { "/selectFenceAndfixedArea" }, method = { RequestMethod.GET })
@ApiOperation("鑾峰彇鍥存爮鍜屽浐瀹氬尯鍩熷垪琛�")
@ResponseBody
@@ -566,7 +566,7 @@
}
return fencePositionList;
}
-
+
@RequestMapping(value = { "/saveFence_yq" }, method = { RequestMethod.POST })
@ApiOperation("淇濆瓨鍖哄煙淇℃伅")
@ResponseBody
@@ -594,7 +594,7 @@
return null;
}
}
-
+
@RequestMapping(value = { "/saveFix" }, method = { RequestMethod.POST })
@ApiOperation("淇濆瓨鍖哄煙淇℃伅")
@ResponseBody
@@ -608,7 +608,7 @@
catch (Exception e) {
e.printStackTrace();
}
- System.out.println(polygon.toString());
+ //System.out.println(polygon.toString());
final FencePosition fencePosition = new FencePosition();
fencePosition.setFenceposition(polygon.toString());
fencePosition.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()));
@@ -621,7 +621,7 @@
this.detectService.insertPolygon(fencePosition);
return "ok";
}
-
+
static {
DetectController.log = LoggerFactory.getLogger((Class)DetectController.class);
}
diff --git a/src/main/java/com/skyline/electricity/controller/DeviceController.java b/src/main/java/com/skyline/electricity/controller/DeviceController.java
index 794b6e8..cb92449 100644
--- a/src/main/java/com/skyline/electricity/controller/DeviceController.java
+++ b/src/main/java/com/skyline/electricity/controller/DeviceController.java
@@ -34,7 +34,7 @@
OutService outService;
@Autowired
private ConfigInfo configInfo;
-
+
@RequestMapping(value = { "/getCameraEntity" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鎽勫儚澶村疄浣撳垪琛�")
@ResponseBody
@@ -55,7 +55,7 @@
final JSONObject jsonObjectResult = JSONObject.parseObject(body);
return jsonObjectResult.get((Object)"data");
}
-
+
@RequestMapping(value = { "/getCloudplatformInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鎽勫儚澶翠簯鍙版搷浣滀俊鎭�")
@ResponseBody
@@ -76,7 +76,7 @@
final ResponseEntity<String> responseEntity = (ResponseEntity<String>)restTemplate.postForEntity(this.configInfo.getDevice_ip()+ "/restapi/iot/iotinfomgr/service/invoke/cameras/ptzControl?apikey=" + this.configInfo.getApikey(), (Object)httpEntity, (Class)String.class, new Object[0]);
return responseEntity.getBody();
}
-
+
@RequestMapping(value = { "/getPreviewUrls" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鎽勫儚澶磋幏鍙栭瑙堟祦url")
@ResponseBody
@@ -102,7 +102,7 @@
return json;
}
-
+
@RequestMapping(value = { "/getDoorAccessEntity" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇闂ㄧ瀹炰綋鍒楄〃")
@ResponseBody
@@ -123,7 +123,7 @@
final JSONObject jsonObjectResult = JSONObject.parseObject(body);
return jsonObjectResult.get((Object)"data");
}
-
+
@RequestMapping(value = { "/getPlaybackURLs" }, method = { RequestMethod.POST })
@ApiOperation("鎽勫儚澶磋幏鍙栧洖鏀炬祦url")
@ResponseBody
@@ -146,7 +146,7 @@
final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
return json;
}
-
+
@RequestMapping(value = { "/getHistoryDoorAccess" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇鍘嗗彶闂ㄧ淇℃伅")
@ResponseBody
@@ -169,7 +169,7 @@
final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
return json;
}
-
+
@RequestMapping(value = { "/getEquipmentInfo" }, method = { RequestMethod.POST })
@ApiOperation("璁惧淇℃伅鑾峰彇")
@ResponseBody
@@ -182,7 +182,7 @@
final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
return json;
}
-
+
@RequestMapping(value = { "/getReconditionInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇璁惧鐨勬淇巻鍙�")
@ResponseBody
@@ -195,7 +195,7 @@
final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
return json;
}
-
+
@RequestMapping(value = { "/getDeviceKKSInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇璁惧鐨凨KS淇℃伅")
@ResponseBody
@@ -223,7 +223,7 @@
map.put("list", deviceList);
return map;
}
-
+
@RequestMapping(value = { "/getDuty" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇褰撳�煎�奸暱")
@ResponseBody
@@ -233,11 +233,11 @@
final Map<String, Object> map = new HashMap<String, Object>();
final String dzzzresponse = (String)template.getForObject(this.configInfo.getDzzzUrl(), (Class)String.class, new Object[0]);
final JSONObject json = JSONObject.parseObject(dzzzresponse);
- System.out.println(json.getJSONObject("data").getString("id"));
+ //System.out.println(json.getJSONObject("data").getString("id"));
DeviceController.log.warn(dzzzresponse.toString());
return dzzzresponse;
}
-
+
@RequestMapping(value = { "/getOutPeople" }, method = { RequestMethod.GET })
@ApiOperation("鑾峰彇澶栧寘浜哄憳")
@ResponseBody
@@ -246,7 +246,7 @@
DeviceController.log.warn(list.toString());
return list;
}
-
+
static {
DeviceController.log = LoggerFactory.getLogger((Class)DeviceController.class);
}
diff --git a/src/main/java/com/skyline/electricity/controller/RemoteController.java b/src/main/java/com/skyline/electricity/controller/RemoteController.java
index 4159ee0..d49b386 100644
--- a/src/main/java/com/skyline/electricity/controller/RemoteController.java
+++ b/src/main/java/com/skyline/electricity/controller/RemoteController.java
@@ -48,13 +48,13 @@
GeometryFactory geometryFactory;
WKTReader reader;
SimpleDateFormat sdf;
-
+
public RemoteController() {
this.geometryFactory = new GeometryFactory();
this.reader = new WKTReader(this.geometryFactory);
this.sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
}
-
+
@RequestMapping(value = { "/getMultiPersonlocations" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳瀹氫綅鎺ュ彛鑾峰彇瀹氫綅淇℃伅骞跺皢鍏惰瀺鍚�")
@ResponseBody
@@ -231,7 +231,7 @@
map.put("list", newList);
return map;
}
-
+
@RequestMapping(value = { "/getRTCMultiPersonlocations" }, method = { RequestMethod.POST })
@ApiOperation("浠庣紦瀛樿幏鍙栦汉鍛樹俊鎭�")
@ResponseBody
@@ -246,7 +246,7 @@
final Object object = this.getMultiPersonlocations(shopId, modId, modKey, pageNum, pageSize, value);
return object;
}
-
+
@RequestMapping(value = { "/getPersonlocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鍗曚釜浜哄憳瀹氫綅鎺ュ彛鑾峰彇瀹氫綅淇℃伅骞跺皢鍏惰瀺鍚�")
@ResponseBody
@@ -585,7 +585,7 @@
final ResponseEntity<String> responseEntity1 = (ResponseEntity<String>)restTemplate.getForEntity(this.configInfo.getUWB_Historylocation() + "?apikey=" + this.configInfo.getApikey() + "&userId={userId}&shopId={shopId}&startTime={startTime}&endTime={endTime}", (Class)String.class, (Map)params1);
final String body1 = (String)responseEntity1.getBody();
final JSONObject jsonObjectResult1 = JSONObject.parseObject(body1);
- System.out.println(jsonObjectResult1.get((Object)"data"));
+ //System.out.println(jsonObjectResult1.get((Object)"data"));
if (jsonObjectResult1 != null) {
final JSONArray jsonArray1 = (JSONArray)jsonObjectResult1.get((Object)"data");
final List<UWBHistoryInfo> list1 = (List<UWBHistoryInfo>)jsonArray1.toJavaList((Class)UWBHistoryInfo.class);
@@ -717,7 +717,7 @@
final ResponseEntity<String> responseEntity2 = (ResponseEntity<String>)restTemplate.postForEntity(this.configInfo.getGPS_Historylocation()+ "?apikey=" + this.configInfo.getApikey(), (Object)httpEntity, (Class)String.class, new Object[0]);
final String body2 = (String)responseEntity2.getBody();
final JSONObject jsonObjectResult2 = JSONObject.parseObject(body2);
- System.out.println(jsonObjectResult2.get((Object)"data"));
+ //System.out.println(jsonObjectResult2.get((Object)"data"));
final JSONObject object = (JSONObject)jsonObjectResult2.get((Object)"data");
if (object != null) {
final JSONArray jsonArray2 = (JSONArray)object.get((Object)"statisticList");
@@ -865,7 +865,7 @@
}
});
}
-
+
@RequestMapping(value = { "/getMultiHistorylocationByName" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(杈撳叆濮撳悕)")
@ResponseBody
@@ -1153,7 +1153,7 @@
}
return hisInfo;
}
-
+
@RequestMapping(value = { "/oldgetHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鍗曚釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(鏈ˉ鐐�)")
@ResponseBody
@@ -1414,7 +1414,7 @@
hisInfo.add(historyRoute);
return hisInfo;
}
-
+
@RequestMapping(value = { "/getHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鍗曚釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(杈撳叆ID)")
@ResponseBody
@@ -1698,7 +1698,7 @@
hisInfo.add(historyRoute);
return hisInfo;
}
-
+
@RequestMapping(value = { "/getMultiHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(杈撳叆ID)")
@ResponseBody
@@ -1982,7 +1982,7 @@
}
return hisInfo;
}
-
+
@RequestMapping(value = { "/getConfigInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇閰嶇疆淇℃伅")
@ResponseBody
@@ -2009,7 +2009,7 @@
configinfo.put("dzzzUrl", this.configInfo.getDzzzUrl());
return configinfo;
}
-
+
@RequestMapping(value = { "/getAllHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鎵�鏈変汉鍛樺巻鍙茶建杩规帴鍙ｈ幏鍙栫浉鍏充俊鎭苟灏嗗叾铻嶅悎")
@ResponseBody
@@ -2249,7 +2249,7 @@
}
return hisInfo;
}
-
+
@RequestMapping(value = { "/sendMessageToUWB" }, method = { RequestMethod.POST })
@ApiOperation("sendMessageToUWB")
@ResponseBody
@@ -2269,7 +2269,7 @@
final ResponseEntity<String> responseEntity = (ResponseEntity<String>)restTemplate.postForEntity(uwbUrl+ "?apikey=" + this.configInfo.getApikey(), (Object)httpEntity, (Class)String.class, new Object[0]);
return responseEntity.getBody();
}
-
+
@RequestMapping(value = { "/getMultiYQPersonlocations" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳瀹氫綅鎺ュ彛鑾峰彇瀹氫綅淇℃伅")
@ResponseBody
@@ -2429,7 +2429,7 @@
RemoteController.log.info("map" + map.toString());
return map;
}
-
+
private List<FencePositionYQ> getFencePositionYQ() {
final List<FencePositionYQ> yqList = new ArrayList<FencePositionYQ>();
final FencePositionYQ yq11 = new FencePositionYQ();
@@ -2476,7 +2476,7 @@
yqList.add(yq16);
return yqList;
}
-
+
static {
log = LoggerFactory.getLogger((Class)RemoteController.class);
}
diff --git a/src/main/java/com/skyline/electricity/controller/WebSocketServer.java b/src/main/java/com/skyline/electricity/controller/WebSocketServer.java
index 178c1c2..ce00c2c 100644
--- a/src/main/java/com/skyline/electricity/controller/WebSocketServer.java
+++ b/src/main/java/com/skyline/electricity/controller/WebSocketServer.java
@@ -17,12 +17,12 @@
private static Logger log;
private static final AtomicInteger OnlineCount;
private static CopyOnWriteArraySet<Session> SessionSet;
-
+
@PostConstruct
public void init() {
- System.out.println("websocket 鍔犺浇");
+ // System.out.println("websocket 鍔犺浇");
}
-
+
@OnOpen
public void onOpen(final Session session) {
WebSocketServer.SessionSet.add(session);
@@ -30,26 +30,26 @@
WebSocketServer.log.info("鏈夎繛鎺ュ姞鍏ワ紝褰撳墠杩炴帴鏁颁负锛歿}", (Object)cnt);
SendMessage(session, "杩炴帴鎴愬姛");
}
-
+
@OnClose
public void onClose(final Session session) {
WebSocketServer.SessionSet.remove(session);
final int cnt = WebSocketServer.OnlineCount.decrementAndGet();
WebSocketServer.log.info("鏈夎繛鎺ュ叧闂紝褰撳墠杩炴帴鏁颁负锛歿}", (Object)cnt);
}
-
+
@OnMessage
public void onMessage(final String message, final Session session) {
WebSocketServer.log.info("鏉ヨ嚜瀹㈡埛绔殑娑堟伅锛歿}", (Object)message);
SendMessage(session, "鏀跺埌娑堟伅锛屾秷鎭唴瀹癸細" + message);
}
-
+
@OnError
public void onError(final Session session, final Throwable error) {
WebSocketServer.log.error("鍙戠敓閿欒锛歿}锛孲ession ID锛� {}", (Object)error.getMessage(), (Object)session.getId());
error.printStackTrace();
}
-
+
public static void SendMessage(final Session session, final String message) {
try {
session.getBasicRemote().sendText(String.format("%s", message));
@@ -59,7 +59,7 @@
e.printStackTrace();
}
}
-
+
public static void BroadCastInfo(final String message) throws IOException {
for (final Session session : WebSocketServer.SessionSet) {
@@ -68,7 +68,7 @@
}
}
}
-
+
public static void SendMessage(final String message, final String sessionId) throws IOException {
Session session = null;
@@ -85,7 +85,7 @@
WebSocketServer.log.warn("娌℃湁鎵惧埌浣犳寚瀹欼D鐨勪細璇濓細{}", (Object)sessionId);
}
}
-
+
static {
WebSocketServer.log = LoggerFactory.getLogger((Class)WebSocketServer.class);
OnlineCount = new AtomicInteger(0);
diff --git a/src/main/java/com/skyline/electricity/interceptor/IAMUtils.java b/src/main/java/com/skyline/electricity/interceptor/IAMUtils.java
index 15c14bc..35c8c18 100644
--- a/src/main/java/com/skyline/electricity/interceptor/IAMUtils.java
+++ b/src/main/java/com/skyline/electricity/interceptor/IAMUtils.java
@@ -15,7 +15,7 @@
private static final String PREFIX = "bearer ";
@Autowired
private RemoteController remoteController;
-
+
public Object getUserInfoFromIam(final String token) {
final RestTemplate restTemplate = new RestTemplate();
final String url = PropertiesUtil.getProperty("userInfo_url");
@@ -26,7 +26,7 @@
final ResponseEntity<String> responseEntity = (ResponseEntity<String>)restTemplate.exchange(url, HttpMethod.GET, httpEntity, (Class)String.class, new Object[0]);
if (responseEntity.getStatusCode().value() == 200) {
result = (String)responseEntity.getBody();
- System.out.println(result);
+ //System.out.println(result);
}
if ("".equals(result)) {
return null;
@@ -37,7 +37,7 @@
}
return resultJson.getJSONObject("data");
}
-
+
public String getTokenByCode(final String code) {
if (StringUtils.isBlank((CharSequence)code)) {
return null;
@@ -50,14 +50,14 @@
final ResponseEntity<String> responseEntity = (ResponseEntity<String>)restTemplate.getForEntity(url, (Class)String.class, new Object[0]);
if (responseEntity.getStatusCode().value() == 200) {
result = (String)responseEntity.getBody();
- System.out.println(result);
+ //System.out.println(result);
}
if (StringUtils.isBlank((CharSequence)result)) {
return null;
}
final JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.containsKey((Object)"error")) {
- System.out.println(resultJson.toJSONString());
+ //System.out.println(resultJson.toJSONString());
return null;
}
return resultJson.getString("data");
@@ -67,9 +67,9 @@
return null;
}
}
-
+
public String getInfo() {
- System.out.println(PropertiesUtil.getProperty("userInfo_url") + PropertiesUtil.getProperty("token_url"));
+ //System.out.println(PropertiesUtil.getProperty("userInfo_url") + PropertiesUtil.getProperty("token_url"));
return PropertiesUtil.getProperty("userInfo_url") + PropertiesUtil.getProperty("token_url");
}
}
diff --git a/src/main/java/com/skyline/electricity/timer/Consumer.java b/src/main/java/com/skyline/electricity/timer/Consumer.java
index 7028f6a..d6e13ba 100644
--- a/src/main/java/com/skyline/electricity/timer/Consumer.java
+++ b/src/main/java/com/skyline/electricity/timer/Consumer.java
@@ -41,7 +41,7 @@
InformationService informationService ;
@Override
public void onMessage(String message) {
- System.out.println("recv msg: "+message);
+ //System.out.println("recv msg: "+message);
sendAllMessage(message);
}
@@ -64,13 +64,13 @@
*/
public void sendAllMessage(String message) {
- System.out.println("銆恮ebsocket娑堟伅銆戝箍鎾秷鎭�:"+message);
+ //System.out.println("銆恮ebsocket娑堟伅銆戝箍鎾秷鎭�:"+message);
JSONObject jsonObject = JSONObject.parseObject(message);
String personNo = jsonObject.getString("personNo");
SysUser sysUser = infoSynchService.selectUserInfoById(personNo) ;
- System.out.println("銆恥ser]:"+JSONObject.toJSONString(sysUser));
+ //System.out.println("銆恥ser]:"+JSONObject.toJSONString(sysUser));
List<RetInfo> list = new ArrayList<>();
//鏌ヨ鐢ㄦ埛鎵�澶勫洿鏍�
List<FencePosition> fencePositionList = null ;
@@ -79,7 +79,7 @@
}catch (Exception e){
System.out.println(e.getMessage());
}
- System.out.println("銆怓encePosition]:"+JSONObject.toJSONString(fencePositionList));
+ //System.out.println("銆怓encePosition]:"+JSONObject.toJSONString(fencePositionList));
RetInfo alertinfo = new RetInfo();
initAlertInfos(jsonObject, personNo, sysUser, alertinfo);
if( fencePositionList != null && fencePositionList.size() > 0){
@@ -101,7 +101,7 @@
list.add(alertinfo) ;
}
insertInformation(list);
- System.out.println( "list:"+jsonObject.toJSONString(list));
+ // System.out.println( "list:"+jsonObject.toJSONString(list));
// if( list != null && list.size() > 0)
// System.out.println( "websocket status ..["+webSocketController.sendAllMessage(JSONObject.toJSONString(list))+"["+JSONObject.toJSONString(list)+"]" );
}
diff --git a/src/main/java/com/skyline/electricity/timer/SchedulerTask.java b/src/main/java/com/skyline/electricity/timer/SchedulerTask.java
index 4a9cdab..1e83b54 100644
--- a/src/main/java/com/skyline/electricity/timer/SchedulerTask.java
+++ b/src/main/java/com/skyline/electricity/timer/SchedulerTask.java
@@ -76,7 +76,7 @@
private Map<Object, Object> map;
private static final SimpleDateFormat dateFormat;
public Integer mux;
-
+
public SchedulerTask() {
this.cmap = new ConcurrentHashMap();
this.geometryFactory = new GeometryFactory();
@@ -92,8 +92,10 @@
List<RetInfo> rlist = new ArrayList<>();
list.stream().forEach(r->rlist.add(JSONObject.parseObject(r,RetInfo.class))) ;
- if( list != null && list.size() > 0)
- System.out.println( "websocket status ..["+webSocketController.sendAllMessage(JSONObject.toJSONString(rlist))+"["+JSONObject.toJSONString(rlist)+"]" );
+ if( list != null && list.size() > 0){
+ webSocketController.sendAllMessage(JSONObject.toJSONString(rlist));
+ }
+ // System.out.println( "websocket status ..["+JSONObject.toJSONString(rlist)+"]" );
//鎺ㄩ�佹姤璀︿俊鎭�
pushIM(rlist);
}
@@ -116,7 +118,7 @@
rlist.stream().forEach((k) -> {
// if( k.getStatus().equals("ok")) return ;
- System.out.println( "k====="+k.getLongitude()+" "+k.getLatitude()) ;
+ //System.out.println( "k====="+k.getLongitude()+" "+k.getLatitude()) ;
MonitorInfo monitor = informationService.queryMinDistance(k.getLongitude(),k.getLatitude());
if( monitor == null ) return ;
@@ -139,11 +141,11 @@
map.put("startDate",formattedDate);
map.put("warnName", k.getUserName()+"杩涘叆"+k.getFence_name());
String url = configInfo.getWarn_url();
- System.out.println( "post url warning "+url) ;
- System.out.println( "post url warning "+configInfo.getServer_url()) ;
+ //System.out.println( "post url warning "+url) ;
+ //System.out.println( "post url warning "+configInfo.getServer_url()) ;
url = "http://10.69.206.205:8080/a/ew/ewWarning/warning";
ResponseEntity<String> result = template.postForEntity(url, map,String.class);
- System.out.println("銆恥ser info銆�:"+result);
+ //System.out.println("銆恥ser info銆�:"+result);
});
@@ -511,7 +513,7 @@
final JSONObject json = JSONObject.parseObject(dzzzresponse);
SchedulerTask.log.warn(dzzzresponse.toString());
SchedulerTask.log.warn(json.getJSONObject("data").getString("id"));
- System.out.println(json.getJSONObject("data").getString("id"));
+ //System.out.println(json.getJSONObject("data").getString("id"));
if (',' == recipent.charAt(recipent.length() - 1)) {
recipent.append(json.getJSONObject("data").getString("id"));
}
@@ -526,7 +528,7 @@
final ResponseEntity responseEntity = template.postForEntity(imUrl + "/oapi/message/sendworkmsg?tenantId=" + tenantId, (Object)httpEntity, (Class)String.class, new Object[0]);
SchedulerTask.log.warn("鎺ㄩ�佺粨鏋�" + responseEntity.toString());
}
-
+
public void pushCommonMessage(final String userid, final String dzzzUrl, final String imUrl, final String tenantId, final MultiValueMap<String, String> params, final HttpHeaders headers, final RestTemplate template, final Map<String, Object> configMap, final JSONObject message) {
final StringBuilder recipent = new StringBuilder(message.get((Object)"recipient").toString());
if (',' != recipent.charAt(recipent.length() - 1)) {
@@ -547,7 +549,7 @@
final JSONObject json = JSONObject.parseObject(dzzzresponse);
SchedulerTask.log.warn(dzzzresponse.toString());
SchedulerTask.log.warn(json.getJSONObject("data").getString("id"));
- System.out.println(json.getJSONObject("data").getString("id"));
+ //System.out.println(json.getJSONObject("data").getString("id"));
if (',' == recipent.charAt(recipent.length() - 1)) {
recipent.append(json.getJSONObject("data").getString("id"));
}
@@ -562,7 +564,7 @@
final ResponseEntity responseEntity = template.postForEntity(imUrl + "/oapi/message/sendworkmsg?tenantId=" + tenantId, (Object)httpEntity, (Class)String.class, new Object[0]);
SchedulerTask.log.warn("鎺ㄩ�佺粨鏋�" + responseEntity.toString());
}
-
+
// @Scheduled(fixedRate = 5000L)
public void changeFenceStatus() {
final List<FencePosition> fencePositions = (List<FencePosition>)this.detectService.getTempFenceInfo();
@@ -594,7 +596,7 @@
}
}
}
-
+
// @Scheduled(fixedRate = 60000L)
public void setRecipients() {
final List<Recipients> recipients_list = (List<Recipients>)this.infoSynchService.selectRecipients();
@@ -605,7 +607,7 @@
}
}
}
-
+
public void setPermissions() {
final List<Permissions> permissions_list = (List<Permissions>)this.infoSynchService.selectPermissions();
final List<Permissions> permissions = (List<Permissions>)this.infoSynchService.getPermissions();
@@ -615,7 +617,7 @@
}
}
}
-
+
// @Scheduled(fixedRate = 300000L)
public void setWhiteList() {
final List<Fence_User> list = (List<Fence_User>)this.infoSynchService.selectWhiteList();
@@ -631,7 +633,7 @@
}
}
}
-
+
//@Scheduled(fixedRate = 5000L)
public void test() {
SchedulerTask.locationEnable = this.configInfo.getLocationEnable();
@@ -648,10 +650,10 @@
}
}
}
-
+
public static void main(final String[] args) {
}
-
+
static {
SchedulerTask.log = LoggerFactory.getLogger((Class)SchedulerTask.class);
SchedulerTask.personlocationentity = null;
diff --git a/src/main/java/com/skyline/electricity/utils/TestClass.java b/src/main/java/com/skyline/electricity/utils/TestClass.java
index bed0eaf..b08a522 100644
--- a/src/main/java/com/skyline/electricity/utils/TestClass.java
+++ b/src/main/java/com/skyline/electricity/utils/TestClass.java
@@ -8,7 +8,7 @@
final float[] a = { 2.0f, 3.0f, 4.0f };
final float[] b = { 2.0f, 3.0f, 4.0f };
final float[] g = new float[4];
- System.out.println(g.length);
+ //System.out.println(g.length);
final float[][] p = { a, b };
final float[][] c = { a, b };
final float[][][] t = { p, c };
--
Gitblit v1.9.3