From 52a3bda95de2e73e5958644f57b2a3d32168a4a1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 22 八月 2022 16:04:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 8 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 2
sandu-common/src/main/java/com/sandu/common/util/IpUtil.java | 15 +++++++
dao/src/main/java/com/sandu/ximon/dao/enums/OrderStatus.java | 3 +
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 12 ++----
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 43 +++++++++++++--------
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 11 +++--
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 15 +++++++
10 files changed, 79 insertions(+), 34 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/OrderStatus.java b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderStatus.java
index e09f0eb..ad77d72 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/OrderStatus.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderStatus.java
@@ -22,7 +22,8 @@
// 宸插畬鎴�
COMPLETE(4),
- ;
+ //宸插彇娑�
+ CANCEL(-1);;
private Integer status;
diff --git a/sandu-common/src/main/java/com/sandu/common/util/IpUtil.java b/sandu-common/src/main/java/com/sandu/common/util/IpUtil.java
index 8a273a4..a165918 100644
--- a/sandu-common/src/main/java/com/sandu/common/util/IpUtil.java
+++ b/sandu-common/src/main/java/com/sandu/common/util/IpUtil.java
@@ -14,4 +14,19 @@
HttpServletRequest request = RequestHolder.getHttpServletRequest();
return ServletUtil.getClientIP(request);
}
+
+ public static String getIpAddr(HttpServletRequest request) {
+ String ip = request.getHeader("x-forwarded-for");
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getRemoteAddr();
+ }
+ return ip;
+ }
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
index 28da159..ac8ba31 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -20,6 +20,7 @@
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.SortedMap;
@@ -61,7 +62,7 @@
*/
@AnonymousAccess
@PostMapping("/advancePay")
- public ResponseVO<Object> advancePayOrder(@RequestBody PayParam param) throws WxErrorException {
+ public ResponseVO<Object> advancePayOrder(HttpServletRequest request, @RequestBody PayParam param) throws WxErrorException {
if (param.getOpenId().isEmpty()) {
throw new BusinessException("寰俊code涓嶈兘涓虹┖");
}
@@ -83,15 +84,10 @@
//鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, "wxpay"
, totalAmount, param.getSubscribeChargingCapacity(), param.getOpenId());
- if (null == c3mOrderEntity) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｈ浣跨敤!");
- }
- param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
- param.setTotalAmount(c3mOrderEntity.getTotalAmount());
- String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
+ String s = WxFastPayService.parseWxAmount(c3mOrderEntity.getTotalAmount().toString());
//鐢熸垚寰俊棰勪粯璁㈠崟
- SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay(request,"鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", c3mOrderEntity.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
return ResponseUtil.success(result);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
index 6caa79f..0c9c0fe 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
@@ -76,6 +76,21 @@
}
+
+ /**
+ * 娓呴櫎浠诲姟
+ * @param
+ * @return
+ */
+ @PostMapping("/clear")
+ public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean result = lightTaskService.clearLightTask(poleIds);
+ return ResponseUtil.success(result);
+ }
+
@GetMapping("/{taskId}")
public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java
index cb6c882..46045e0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java
@@ -18,7 +18,7 @@
private String c3Mac;
//鐏潌ID
private Long poleId;
- //鍏呯數妗╂々鐘舵��
+ //鍏呯數妗╂々鐘舵�� 1.绌洪棽 2.鍏呯數涓� 3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭 4.鍏呯數缁撴潫锛岀瓑寰呮湇鍔″櫒纭 5.鏈夋晠闅� 6.涓庡厖鐢垫々瀵规帴涓�
private Integer statusBit;
//鐢靛帇
private String gridVoltage;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java
index a25bc62..85ac312 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java
@@ -68,7 +68,7 @@
private String sec;
// 鍏呯數妗╁彛
private String chargingPort;
- // 鍏呯數妗╁彛鐘舵�佷綅
+ // 鍏呯數妗╁彛鐘舵�佷綅 1.绌洪棽 2.鍏呯數涓� 3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭 4.鍏呯數缁撴潫锛岀瓑寰呮湇鍔″櫒纭 5.鏈夋晠闅� 6.涓庡厖鐢垫々瀵规帴涓�
private String statusBit;
// 璁惧娓╁害 0.1鈩�
private String deviceTemperature;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
index 698ae8e..c5fd3c4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
@@ -28,6 +28,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletRequest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -204,7 +205,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public SortedMap<Object, Object> miniAppPay(String body, String orderId, int totalFee, Long poleId, String wxCode) throws WxErrorException {
+ public SortedMap<Object, Object> miniAppPay(HttpServletRequest request, String body, String orderId, int totalFee, Long poleId, String wxCode) throws WxErrorException {
WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
//璁剧疆寰俊鏀粯鍙傛暟
@@ -228,7 +229,7 @@
wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
- wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
+ wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getIpAddr(request));
wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
System.out.println("-----------" + wxPayUnifiedOrderRequest);
@@ -240,13 +241,13 @@
SortedMap<Object, Object> parameters = new TreeMap<>();
parameters.put("appid", wxPayUnifiedOrderResult.getAppid());
- parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
+// parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
parameters.put("partnerid", wxConfig.getMchId()); // 鍟嗘埛id
// parameters.put("out_trade_no", orderId);//鍟嗘埛璁㈠崟鍙�
parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
- parameters.put("package", "Sign=WXPay");
- parameters.put("timestamp", time);
+// parameters.put("package", "Sign=WXPay");
+// parameters.put("timestamp", time);
String sign = createSign(wxConfig.getPrivateKey(), parameters);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index 4d4b7fe..cfe7b89 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -317,7 +317,7 @@
chargingDto.setC3Id(one.getC3Id());
//C3Mac
chargingDto.setC3Mac(one.getC3Mac());
- //鍦ㄧ嚎鐘舵��
+ //鍦ㄧ嚎鐘舵�� 1.绌洪棽 2.鍏呯數涓� 3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭 4.鍏呯數缁撴潫锛岀瓑寰呮湇鍔″櫒纭 5.鏈夋晠闅� 6.涓庡厖鐢垫々瀵规帴涓�
chargingDto.setStatusBit(Integer.valueOf(beatDataPackage.getStatusBit()));
//鐢靛帇
chargingDto.setGridVoltage(beatDataPackage.getGridVoltage());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index afe5064..79c16f1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -140,27 +140,26 @@
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
Integer subscribeChargingCapacity, String wxCode) {
-
- // 鍒ゆ柇璇ュ厖鐢垫々鏄惁瀛樺湪姝ｅ湪杩涜涓殑璁㈠崟
- String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
- if (null != chargingJson) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
- }
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
- if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
+ //鍏呯數妗╂鍦ㄥ厖鐢典腑
+ if (c3mOrder != null && c3mOrder.getChargingStates() == 0) {
+ throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
}
+
+ //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
if (c3mOrder != null) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
+ c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
+ updateById(c3mOrder);
}
+
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
- return null;
+ throw new BusinessException("鍏呯數妗╃伅鏉嗕俊鎭笉瀛樺湪!");
}
- // 鐢熸垚璁㈠崟锛屽苟鍔犺浇鍒皉edis缂撳瓨锛岃缃秴鏃舵椂闂翠负5鍒嗛挓
+ // 鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = new C3mOrderVO().generateOrder(
streetlightId,
pole.getDeviceCode(),
@@ -169,7 +168,6 @@
totalAmount,
subscribeChargingCapacity
);
- boolean b = true;
c3mOrderEntity.setOrderId(snowflake.nextId());
c3mOrderEntity.setC3Mac(c3m.getC3Name());
c3mOrderEntity.setPoleId(streetlightId);
@@ -180,10 +178,15 @@
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
- if (b) {
- this.save(c3mOrderEntity);
+ //
+ c3mOrderEntity.setC3Name("鍒涘缓璁㈠崟");
+
+
+ if (save(c3mOrderEntity)) {
+ return c3mOrderEntity;
+ } else {
+ throw new BusinessException("鍒涘缓璁㈠崟澶辫触,璇烽噸鏂版壂鐮�!");
}
- return b ? c3mOrderEntity : null;
}
/**
@@ -194,6 +197,8 @@
String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
C3mOrder userOrder = getByOrderSn(orderSn);
+ userOrder.setC3Name("鍥炶皟鎴愬姛");
+ updateById(userOrder);
if (userOrder == null) {
return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
}
@@ -309,8 +314,12 @@
public void deleteOrderListByCreateTime() {
// 鑾峰彇褰撳墠鏃堕棿鎴�
Long time = System.currentTimeMillis();
+
+ //褰撳墠鏃堕棿鍑忓幓10鍒嗛挓
+ Long timeMinus10 = time - 600000;
+
//鍒犻櫎瓒呰繃10鍒嗛挓鏈粯娆剧殑璁㈠崟
- remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
+ remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
}
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index d954fdb..b4bdff6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -902,4 +902,12 @@
}
}
+
+ public boolean clearLightTask(List<Long> poleIds) {
+ Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", "FFFF");
+ ffff.get("success").forEach(lightTaskPoleRelation -> {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, lightTaskPoleRelation.getTaskId()));
+ });
+ return true;
+ }
}
--
Gitblit v1.9.3