From c8faa15c88cff7b5d75afcb6469c5b1b7e1a670f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 18 八月 2022 17:31:59 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java | 112 ++++++++++++++++++++-------
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java | 24 ++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 10 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 18 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 48 ++++++++++++
5 files changed, 171 insertions(+), 41 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index b1e0c81..54ff463 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -154,9 +154,9 @@
@AnonymousAccess
@PostMapping("/poleReset/{poleId}")
public ResponseVO<Object> poleReset(@PathVariable Long poleId) {
-// if (!permissionConfig.check(MenuEnum.POLE_REAL_RESET.getCode())) {
-// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
-// }
+ if (!permissionConfig.check(MenuEnum.POLE_REAL_RESET.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(poleService.poleReset(poleId));
}
@@ -271,9 +271,9 @@
@AnonymousAccess
@PostMapping("/listStatusByDeviceCode")
public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList) {
-// if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
-// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
-// }
+ if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
for (String s : deviceCodeList) {
if (s == null) {
return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
@@ -297,9 +297,9 @@
@AnonymousAccess
@PostMapping("/isRegisterByCode")
public ResponseVO<Object> getStatusByCode() {
-// if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
+/*// if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
-// }
+// }*/
ArrayList<String> deviceCodeList = new ArrayList<>();
deviceCodeList.add("baseDevice01");
deviceCodeList.add("baseDevice02");
@@ -353,7 +353,7 @@
/**
- * 鏌ユ壘鑷繁鎷ユ湁鐨勭伅鏉�
+ * 鏌ユ壘鎷ユ湁鐨勭伅鏉�
*/
@PostMapping("/getOwnerPole/{cilentId}")
public ResponseVO<Object> getOwnerPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
index 8703cb6..458b83c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -22,6 +22,7 @@
import java.util.Comparator;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Author liuhaonan
@@ -209,42 +210,93 @@
*/
public BigDecimal getchargeDecimalByC3id(Long c3Id) {
List<C3mChargingCharge> list = list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3Id));
- //鑾峰彇褰撳墠鏃堕棿
- LocalTime localTime = LocalTime.now();
- //閬嶅巻璐圭巼闆嗗悎 鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄨ垂鐜囨椂闂存鍐�
- LocalTime startTime;
- LocalTime endTime;
- //榛樿璐圭巼
- Double charge = 8.8;
- if (list.size() > 1) {
- //璐圭巼鏉℃暟澶т簬1鏃讹紝閬嶅巻璐圭巼闆嗗悎 鑾峰彇褰撳墠鏃堕棿娈电殑璐圭巼
- for (int i = 0; i < list.size(); i++) {
- //鑾峰彇璐圭巼鏃堕棿娈� 杞寲涓篖ocalTime
- startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
- endTime = LocalTime.of(list.get(i + 1).getHour(), list.get(i + 1).getMin());
- if (i == list.size()) {
- startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
- endTime = LocalTime.of(list.get(0).getHour(), list.get(0).getMin());
+
+ //鍙湁涓�鏉¤垂鐜囨椂锛岀洿鎺ヨ繑鍥�
+ if (list.size() == 1) {
+ return BigDecimal.valueOf(list.get(0).getCharge());
+ } else {//璐圭巼澶т簬涓�鏉℃椂鍊欙紝璁＄畻璐圭巼
+
+ //鎺掑簭璐圭巼(鏍规嵁鏃堕棿鎺掑簭)
+ List<C3mChargingCharge> collect =
+ list.stream().sorted(Comparator.comparing(C3mChargingCharge::getHour).thenComparing(C3mChargingCharge::getMin)).collect(Collectors.toList());
+ System.out.println("----- " + collect);
+
+ //鑾峰彇褰撳墠鏃堕棿
+// LocalTime localTime = LocalTime.now();
+ LocalTime localTime = LocalTime.of(0, 0);
+ System.out.println(localTime);
+
+ C3mChargingCharge temp1 = collect.get(collect.size() - 1);
+ if (localTime.isAfter(LocalTime.of(temp1.getHour(), temp1.getMin()))) {
+ return BigDecimal.valueOf(temp1.getCharge());
+ }
+
+ C3mChargingCharge temp2= collect.get(0);
+ if (localTime.isBefore(LocalTime.of(temp2.getHour(), temp2.getMin()))) {
+ return BigDecimal.valueOf(temp1.getCharge());
+ }
+
+
+ for (int i = 0; i < collect.size(); i++) {
+ int x = i;
+ int y = i + 1;
+ if (y == collect.size()) {
+ y = 0;
}
- //鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄨ垂鐜囨椂闂存鍐�
- if (localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
- //鑾峰彇璐圭巼
- charge = list.get(i).getCharge();
+ LocalTime startTime = LocalTime.of(collect.get(x).getHour(), collect.get(x).getMin());
+ LocalTime endTime = LocalTime.of(collect.get(y).getHour(), collect.get(y).getMin());
+
+ //褰撳墠鏃堕棿绛変簬璐圭巼鏃堕棿娈电殑寮�濮嬫椂闂�
+ if (localTime.equals(startTime)) {
+ return BigDecimal.valueOf(collect.get(x).getCharge());
}
+ //褰撳墠鏃堕棿鍦ㄨ垂鐜囨椂闂存鍐�
+ if (localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
+ return BigDecimal.valueOf(collect.get(x).getCharge());
+ }
}
- } else if (list.size() == 1) {
- //鍙湁涓�鏉¤垂鐜囨椂锛岀洿鎺ヨ幏鍙栬垂鐜�
- charge = list.get(0).getCharge();
- } else {
- //鍏朵粬璐圭巼鏃讹紝鑾峰彇榛樿璐圭巼
- charge = 8.8;
}
- //charge杞寲涓築igDecimal
- //double鐩存帴浣跨敤 new BigDecimal()鏃朵細鍑虹幇绮惧害闂锛屾墍浠ラ渶瑕佷娇鐢˙igDecimal.valueOf()鏂规硶 骞惰缃簿搴︿负2浣嶅皬鏁�
- BigDecimal chargeDecimal = BigDecimal.valueOf(charge).setScale(2, BigDecimal.ROUND_HALF_UP);
- return chargeDecimal;
+//
+// //鑾峰彇褰撳墠鏃堕棿
+// LocalTime localTime = LocalTime.now();
+// //閬嶅巻璐圭巼闆嗗悎 鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄨ垂鐜囨椂闂存鍐�
+// LocalTime startTime;
+// LocalTime endTime;
+// //榛樿璐圭巼
+// Double charge = 8.8;
+// if (list.size() > 1) {
+// //璐圭巼鏉℃暟澶т簬1鏃讹紝閬嶅巻璐圭巼闆嗗悎 鑾峰彇褰撳墠鏃堕棿娈电殑璐圭巼
+// for (int i = 0; i < list.size(); i++) {
+// //鑾峰彇璐圭巼鏃堕棿娈� 杞寲涓篖ocalTime
+// startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
+// endTime = LocalTime.of(list.get(i + 1).getHour(), list.get(i + 1).getMin());
+// if (i == list.size()) {
+// startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
+// endTime = LocalTime.of(list.get(0).getHour(), list.get(0).getMin());
+// }
+// //鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄨ垂鐜囨椂闂存鍐�
+// if (localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
+// //鑾峰彇璐圭巼
+// charge = list.get(i).getCharge();
+// }
+//
+// }
+// } else if (list.size() == 1) {
+// //鍙湁涓�鏉¤垂鐜囨椂锛岀洿鎺ヨ幏鍙栬垂鐜�
+// charge = list.get(0).getCharge();
+// } else {
+// //鍏朵粬璐圭巼鏃讹紝鑾峰彇榛樿璐圭巼
+// charge = 8.8;
+// }
+//
+// //charge杞寲涓築igDecimal
+// //double鐩存帴浣跨敤 new BigDecimal()鏃朵細鍑虹幇绮惧害闂锛屾墍浠ラ渶瑕佷娇鐢˙igDecimal.valueOf()鏂规硶 骞惰缃簿搴︿负2浣嶅皬鏁�
+// BigDecimal chargeDecimal = BigDecimal.valueOf(charge).setScale(2, BigDecimal.ROUND_HALF_UP);
+//
+// return chargeDecimal;
+ return BigDecimal.valueOf(99);
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
index 1fe87b3..3ff5338 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
@@ -95,7 +95,7 @@
* @param keyword 鍏抽敭璇�
* @param deviceCode 璁惧鐮�
*/
- public CommonPage listReportData(int pageNo, int pageSize, String keyword, String deviceCode,Integer order,Integer seq) {
+ public CommonPage listReportData(int pageNo, int pageSize, String keyword, String deviceCode, Integer order, Integer seq) {
List<LightReportDataBo> lightReportDataBos = new ArrayList<>(pageSize);
//鎺掑簭瀛楁
@@ -124,7 +124,7 @@
}
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize, keyword, deviceCode,orderBy);
+ CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize, keyword, deviceCode, orderBy);
List<String> macList = stringCommonPage.getList();
if (CollUtil.isEmpty(macList)) {
return new CommonPage();
@@ -243,6 +243,12 @@
}
PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize());
List<LightReportData> list = list(Wrappers.lambdaQuery(LightReportData.class).eq(LightReportData::getDeviceCode, macCode));
+ list.forEach(
+ lightReportData -> {
+ lightReportData.setCreateTime(lightReportData.getCreateTime1().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ lightReportData.setUpdateTime(lightReportData.getUpdateTime1().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ );
return list;
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
index c7e54af..a4e905d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -284,6 +284,54 @@
return map;
}
+
+ // 鎵归噺鎴睆
+ public Map<String, String> getScreenShotUrl(List<String> playerIds) {
+ Map<String, String> map = new HashMap();
+
+ playerIds.forEach(
+ playId->{
+ try {
+ redisUtils.delete(VnnoxConstant.REDIS_SCREEN_SHOT + playId);
+ } catch (Exception e) {
+
+ }
+ }
+ );
+
+ VnnoxResult vnnoxResult = vnnoxAPIUtil.screenShot(playerIds);
+
+ if (null == vnnoxResult) {
+ map.put("code", "500");
+ map.put("msg", "璁惧宸蹭笅绾�");
+ return map;
+ }
+
+ if (vnnoxResult.getSuccess().size() == 0) {
+ map.put("code", "500");
+ map.put("msg", "鑾峰彇缂╃暐鍥惧け璐�!");
+ return map;
+ }
+ String url = null;
+ Integer checkCount = 0;
+ while (checkCount < 10) {
+ url = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + playerIds.get(0));
+ if (null != url) {
+ break;
+ }
+ try {
+ Thread.sleep(2000);
+ checkCount = checkCount + 1;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ map.put("url", url);
+ map.put("code", "200");
+ return map;
+ }
+
+
// //閲嶅惎
// public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
// return vnnoxAPIUtil.reboot(
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
index d9a01d9..37e99bb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
@@ -205,6 +205,30 @@
return response.getData();
}
+
+
+
+ /**
+ * 鎵归噺灞忓箷鎴浘
+ *
+ * @param players
+ * @return
+ */
+ public VnnoxResult screenShot(List<String> players) {
+ VnnoxBaseRequest request = new VnnoxBaseRequest();
+ request.setPlayerIds(players);
+ request.setNoticeUrl(VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
+
+ String result = VnnoxRequestUtil.PostWithHeader(
+ VnnoxUrl.getUrl(VnnoxUrl.SCREEN_SHOT),
+ request.toJson(),
+ new CommonHeader(CommonHeader.JSON, true)
+ );
+ VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
+
+ return response.getData();
+ }
+
/**
* 璁惧閲嶅惎
*
--
Gitblit v1.9.3