From 60688f1573eadd0c76dea6b94e684bf363bd99ab Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 03 九月 2025 12:08:33 +0800
Subject: [PATCH] 修改手动推送订单
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java | 4 -
/dev/null | 47 -----------
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 10 +-
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 11 +-
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java | 16 ++--
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java | 144 +++++++++++++++++++-----------------
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java | 6
8 files changed, 99 insertions(+), 141 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 5421d94..e0e8174 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -157,6 +157,7 @@
}else {
siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
}
+ TVip vip = null;
if(Objects.nonNull(appUser)){
// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
@@ -166,12 +167,13 @@
TAppUserVipDetail data1 = appUserVipDetail.getData();
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
- TVip vip = JSON.parseObject(vipJson, TVip.class);
- if(Objects.nonNull(vip) && vip.getType() == 2){
- siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
- }
+ vip = JSON.parseObject(vipJson, TVip.class);
}
}
+
+ if(Objects.nonNull(vip) && vip.getType() == 2){
+ siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
+ }
}
}
siteInfoVO.setChargingGunId(chargingGun.getId());
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
index 99f11b7..756d1f3 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
@@ -99,55 +99,53 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
TAppUser appUser = appUserClient.getUserById(userId).getData();
+ TVip vip = null;
if(Objects.nonNull(appUser)){
// 查询会员信息
-// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
-
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
getAppUserVipDetail.setAppUserId(userId);
getAppUserVipDetail.setVipId(appUser.getVipId());
R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
TAppUserVipDetail data1 = appUserVipDetail.getData();
- TVip vip = null;
+
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
vip = JSON.parseObject(vipJson, TVip.class);
}
-
- TAccountingStrategyDetailVO accountingStrategyDetailVO;
- TAccountingStrategyDetailVO accountingStrategyDetailNext;
- // 获取当前时间段的计费策略明细
- accountingStrategyDetailVO = list.stream().filter(detail -> DateUtils.string2LocalTime(detail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
- && DateUtils.string2LocalTime(detail.getEndTime() + ("23:59:59".equals(detail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0)
- .findFirst().orElseThrow(() -> new ServiceException("当前时间段未查询到计费策略明细"));
- // 获取后一次的计费策略明细
- accountingStrategyDetailVO.setEndTime("23:59:59".equals(accountingStrategyDetailVO.getEndTime())? "00:00":accountingStrategyDetailVO.getEndTime());
- accountingStrategyDetailNext = list.stream().filter(detail -> detail.getStartTime().compareTo(accountingStrategyDetailVO.getEndTime()) == 0)
- .findFirst().orElseThrow(() -> new ServiceException("未查询到下一时间段的计费策略明细"));
- if(Objects.nonNull(vip)) {
- if (vip.getType() == 2) {
- accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(vip.getDiscount())));
- accountingStrategyDetailVO.setDiscount(vip.getDiscount().divide(new BigDecimal(10)));
- accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(vip.getDiscount())));
- } else {
- if(Objects.isNull(accountingStrategy.getDiscount())){
- accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(new BigDecimal(1))));
- accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(new BigDecimal(1))));
- }else {
- accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(accountingStrategy.getDiscount())));
- accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(accountingStrategy.getDiscount())));
- }
- }
- }else {
- accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge()));
- accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge()));
- }
- list = new ArrayList<>();
- list.add(accountingStrategyDetailVO);
- list.add(accountingStrategyDetailNext);
- return list;
}
- return new ArrayList<>();
+
+ TAccountingStrategyDetailVO accountingStrategyDetailVO;
+ TAccountingStrategyDetailVO accountingStrategyDetailNext;
+ // 获取当前时间段的计费策略明细
+ accountingStrategyDetailVO = list.stream().filter(detail -> DateUtils.string2LocalTime(detail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
+ && DateUtils.string2LocalTime(detail.getEndTime() + ("23:59:59".equals(detail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0)
+ .findFirst().orElseThrow(() -> new ServiceException("当前时间段未查询到计费策略明细"));
+ // 获取后一次的计费策略明细
+ accountingStrategyDetailVO.setEndTime("23:59:59".equals(accountingStrategyDetailVO.getEndTime())? "00:00":accountingStrategyDetailVO.getEndTime());
+ accountingStrategyDetailNext = list.stream().filter(detail -> detail.getStartTime().compareTo(accountingStrategyDetailVO.getEndTime()) == 0)
+ .findFirst().orElseThrow(() -> new ServiceException("未查询到下一时间段的计费策略明细"));
+ if(Objects.nonNull(vip)) {
+ if (vip.getType() == 2) {
+ accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(vip.getDiscount())));
+ accountingStrategyDetailVO.setDiscount(vip.getDiscount().divide(new BigDecimal(10)));
+ accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(vip.getDiscount())));
+ } else {
+ if(Objects.isNull(accountingStrategy.getDiscount())){
+ accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(new BigDecimal(1))));
+ accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(new BigDecimal(1))));
+ }else {
+ accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(accountingStrategy.getDiscount())));
+ accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(accountingStrategy.getDiscount())));
+ }
+ }
+ }else {
+ accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge()));
+ accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge()));
+ }
+ list = new ArrayList<>();
+ list.add(accountingStrategyDetailVO);
+ list.add(accountingStrategyDetailNext);
+ return list;
}
@Override
@@ -246,40 +244,50 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
TAppUser appUser = appUserClient.getUserById(userId).getData();
+ TVip vip = null;
if(Objects.nonNull(appUser)){
// 查询会员信息
- TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- TAccountingStrategyDetailVO accountingStrategyDetailVO;
- TAccountingStrategyDetailVO accountingStrategyDetailNext;
- // 获取当前时间段的计费策略明细
- accountingStrategyDetailVO = list.stream().filter(detail -> DateUtils.string2LocalTime(detail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
- && DateUtils.string2LocalTime(detail.getEndTime() + ("23:59:59".equals(detail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0)
- .findFirst().orElseThrow(() -> new ServiceException("当前时间段未查询到计费策略明细"));
- // 获取后一次的计费策略明细
- accountingStrategyDetailVO.setEndTime("23:59:59".equals(accountingStrategyDetailVO.getEndTime())? "00:00":accountingStrategyDetailVO.getEndTime());
- accountingStrategyDetailNext = list.stream().filter(detail -> detail.getStartTime().compareTo(accountingStrategyDetailVO.getEndTime()) == 0)
- .findFirst().orElseThrow(() -> new ServiceException("未查询到下一时间段的计费策略明细"));
- if(Objects.nonNull(vip)) {
- if (vip.getType() == 2) {
- accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(vip.getDiscount())));
- accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(vip.getDiscount())));
- } else {
- BigDecimal discount = accountingStrategy.getDiscount();
- if(Objects.isNull(discount)){
- discount = BigDecimal.ONE;
- }
- accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(discount)));
- accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(discount)));
- }
- }else {
- accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge()));
- accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge()));
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ TAppUserVipDetail data1 = appUserVipDetail.getData();
+
+ if(Objects.nonNull(data1)){
+ String vipJson = data1.getVipJson();
+ vip = JSON.parseObject(vipJson, TVip.class);
}
- list = new ArrayList<>();
- list.add(accountingStrategyDetailVO);
- list.add(accountingStrategyDetailNext);
- return list;
}
- return new ArrayList<>();
+
+ TAccountingStrategyDetailVO accountingStrategyDetailVO;
+ TAccountingStrategyDetailVO accountingStrategyDetailNext;
+ // 获取当前时间段的计费策略明细
+ accountingStrategyDetailVO = list.stream().filter(detail -> DateUtils.string2LocalTime(detail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
+ && DateUtils.string2LocalTime(detail.getEndTime() + ("23:59:59".equals(detail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0)
+ .findFirst().orElseThrow(() -> new ServiceException("当前时间段未查询到计费策略明细"));
+ // 获取后一次的计费策略明细
+ accountingStrategyDetailVO.setEndTime("23:59:59".equals(accountingStrategyDetailVO.getEndTime())? "00:00":accountingStrategyDetailVO.getEndTime());
+ accountingStrategyDetailNext = list.stream().filter(detail -> detail.getStartTime().compareTo(accountingStrategyDetailVO.getEndTime()) == 0)
+ .findFirst().orElseThrow(() -> new ServiceException("未查询到下一时间段的计费策略明细"));
+ if(Objects.nonNull(vip)) {
+ if (vip.getType() == 2) {
+ accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(vip.getDiscount())));
+ accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(vip.getDiscount())));
+ } else {
+ BigDecimal discount = accountingStrategy.getDiscount();
+ if(Objects.isNull(discount)){
+ discount = BigDecimal.ONE;
+ }
+ accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge().multiply(discount)));
+ accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge().multiply(discount)));
+ }
+ }else {
+ accountingStrategyDetailVO.setTotalPrice(accountingStrategyDetailVO.getElectrovalence().add(accountingStrategyDetailVO.getServiceCharge()));
+ accountingStrategyDetailNext.setTotalPrice(accountingStrategyDetailNext.getElectrovalence().add(accountingStrategyDetailNext.getServiceCharge()));
+ }
+ list = new ArrayList<>();
+ list.add(accountingStrategyDetailVO);
+ list.add(accountingStrategyDetailNext);
+ return list;
}
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java
index 34414fd..667ae3c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java
@@ -236,7 +236,7 @@
*/
@PostMapping("/qrCodeDelivery")
public String qrCodeDelivery(@RequestBody QrCodeDelivery qrCodeDelivery){
- log.info("二维码下发：{}", JSON.toJSONString(qrCodeDelivery));
+// log.info("二维码下发：{}", JSON.toJSONString(qrCodeDelivery));
return iotMessageProduce.sendMessage(qrCodeDelivery.getCharging_pile_code(), ServiceIdMenu.QR_CODE_DELIVERY.getKey(),messageUtil.qrCodeDelivery(qrCodeDelivery));
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java
index 657165a..1901063 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java
@@ -72,10 +72,6 @@
e.printStackTrace();
} catch (ServiceResponseException e) {
e.printStackTrace();
- log.info(String.valueOf(e.getHttpStatusCode()));
- log.info(e.getRequestId());
- log.info(e.getErrorCode());
- log.info(e.getErrorMsg());
}
return null;
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
index 3e4077b..970238f 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
@@ -66,7 +66,7 @@
*/
@PostMapping(value = "/message")
public AjaxResult<String> message(@RequestBody JSONObject jsonObject) throws IOException {
- log.info("接收到消息中转：{}",jsonObject);
+ log.info("接收到消息中转：{}",jsonObject.toJSONString());
JSONObject body = jsonObject.getJSONObject("notify_data").getJSONObject("body");
JSONObject content = null;
try {
@@ -77,7 +77,7 @@
if(!"}".equals(substring)){
content1 = content1.substring(0, content1.length() - 1) + "}";
}
- log.info("content1:"+content1);
+// log.info("content1:"+content1);
content = JSON.parseObject(content1);
}
JSONObject header = jsonObject.getJSONObject("notify_data").getJSONObject("header");
@@ -85,7 +85,7 @@
String nodeId = header.getString("node_id"); // 设备编号
String productId = header.getString("product_id"); // 产品id
String service_id = content.getString("service_id");
- log.info("服务id:{}",service_id);
+// log.info("服务id:{}",service_id);
ChargingMessage chargingMessage = new ChargingMessage();
chargingMessage.setServiceId(service_id);
// 设备消息下发
@@ -103,7 +103,7 @@
onlineReply.setCharging_pile_code(onlineMessage.getCharging_pile_code());
onlineReply.setOnline_result(0);
result = iotMessageProduce.sendMessage(onlineReply.getCharging_pile_code(), ServiceIdMenu.ONLINE_REPLY.getKey(), messageUtil.onlineReply(onlineReply));
- log.info("充电桩登录认证-返回结果：{}",result);
+// log.info("充电桩登录认证-返回结果：{}",result);
// 响应硬件 对时设置应答
TimingSettingReply timingSettingReplyOnline = new TimingSettingReply();
timingSettingReplyOnline.setCharging_pile_code(onlineMessage.getCharging_pile_code());
@@ -117,7 +117,7 @@
PingMessage pingMessage = JSON.parseObject(content.toJSONString(),PingMessage.class);
//存储缓存中，5分钟有效
- redisTemplate.opsForValue().set("ping:" + pingMessage.getCharging_pile_code() + pingMessage.getCharging_gun_code(), pingMessage, 5, TimeUnit.MINUTES);
+// redisTemplate.opsForValue().set("ping:" + pingMessage.getCharging_pile_code() + pingMessage.getCharging_gun_code(), pingMessage, 5, TimeUnit.MINUTES);
// 响应硬件
Pong pong = new Pong();
@@ -218,7 +218,6 @@
case SendTagConstant.UPLOAD_REAL_TIME_MONITORING_DATA:
long UPLOAD_REAL_TIME_MONITORING_DATA = System.currentTimeMillis();
- log.info("充电实时数据上传");
UploadRealTimeMonitoringDataMessage uploadRealTimeMonitoringDataMessage = JSON.parseObject(content.toJSONString(),UploadRealTimeMonitoringDataMessage.class);
chargingMessage.setUploadRealTimeMonitoringDataMessage(uploadRealTimeMonitoringDataMessage);
chargingMessageUtil.handleMessage(chargingMessage);
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java
index d45ab54..2743b00 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java
@@ -40,7 +40,7 @@
*/
@PostMapping("/sendMessage")
public String sendMessage(String code, String name, JSONObject message){
- log.info("消息下发至设备：code={}，name={}，message={}", code, name, message);
+// log.info("消息下发至设备：code={}，name={}，message={}", code, name, message);
CreateMessageRequest request = new CreateMessageRequest();
request.withDeviceId(code);
DeviceMessageRequest body = new DeviceMessageRequest();
@@ -50,11 +50,11 @@
request.withBody(body);
try {
CreateMessageResponse response = iotBuilder.buildIot().createMessage(request);
- log.info("消息下发至设备结果：{}", JSON.toJSONString(response));
+// log.info("消息下发至设备结果：{}", JSON.toJSONString(response));
return JSON.toJSONString(response);
} catch (Exception e) {
e.printStackTrace();
- log.error("消息下发至设备异常：code---{}，msg---{}", code, e.getMessage());
+// log.error("消息下发至设备异常：code---{}，msg---{}", code, e.getMessage());
return e.getMessage();
}
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
index 85b01c5..427c1cc 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
@@ -70,7 +70,7 @@
* @return
*/
public JSONObject onlineReply(OnlineReply onlineReply){
- log.info("登录认证应答:{}", onlineReply);
+// log.info("登录认证应答:{}", onlineReply);
onlineReplyService.create(onlineReply);
return getMessageJsonString(onlineReply, ServiceIdMenu.ONLINE_REPLY.getValue());
}
@@ -81,10 +81,10 @@
* @return
*/
public JSONObject pong(Pong pong){
- log.info("心跳包应答:{}", pong);
+// log.info("心跳包应答:{}", pong);
// pongService.create(pong);
//存储缓存中，5分钟有效
- redisTemplate.opsForValue().set("pong:" + pong.getCharging_pile_code() + pong.getCharging_gun_code(), pong, 5, TimeUnit.MINUTES);
+// redisTemplate.opsForValue().set("pong:" + pong.getCharging_pile_code() + pong.getCharging_gun_code(), pong, 5, TimeUnit.MINUTES);
return getMessageJsonString(pong, ServiceIdMenu.PONG.getValue());
}
@@ -94,7 +94,7 @@
* @return
*/
public JSONObject billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){
- log.info("计费模型验证请求应答:{}", billingModeVerifyReply);
+// log.info("计费模型验证请求应答:{}", billingModeVerifyReply);
// billingModeVerifyReplyService.create(billingModeVerifyReply);
return getMessageJsonString(billingModeVerifyReply, ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getValue());
}
@@ -105,7 +105,7 @@
* @return
*/
public JSONObject acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){
- log.info("计费模型验证请求应答:{}", acquisitionBillingModeReply);
+// log.info("计费模型验证请求应答:{}", acquisitionBillingModeReply);
acquisitionBillingModeReplyService.create(acquisitionBillingModeReply);
return getMessageJsonString(acquisitionBillingModeReply, ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getValue());
}
@@ -116,7 +116,7 @@
* @return
*/
public JSONObject readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){
- log.info("读取实时监测数据:{}", readRealTimeMonitoringData);
+// log.info("读取实时监测数据:{}", readRealTimeMonitoringData);
readRealTimeMonitoringDataService.create(readRealTimeMonitoringData);
return getMessageJsonString(readRealTimeMonitoringData, ServiceIdMenu.READ_REAL_TIME_MONITORING_DATA.getValue());
}
@@ -236,7 +236,7 @@
* @return
*/
public JSONObject timingSettingReply(TimingSettingReply timingSettingReply){
- log.info("对时设置应答:{}", timingSettingReply);
+// log.info("对时设置应答:{}", timingSettingReply);
// timingSettingReplyService.create(timingSettingReply);
return getMessageJsonString(timingSettingReply, ServiceIdMenu.TIMING_SETTING_REPLY.getValue());
}
@@ -298,7 +298,7 @@
public JSONObject getMessageJsonString(Object object, String serviceId){
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(object));
jsonObject.put("service_id", serviceId);
- log.info("发送数据service_id：{},发送内容：{}",serviceId,jsonObject);
+// log.info("发送数据service_id：{},发送内容：{}",serviceId,jsonObject);
return jsonObject;
}
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/RedisLock.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/RedisLock.java
deleted file mode 100644
index b6b72a4..0000000
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/RedisLock.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ruoyi.order.util;
-
-import org.springframework.data.redis.core.RedisTemplate;
-
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author zhibing.pu
- * @Date 2024/9/26 18:43
- */
-public class RedisLock {
- private RedisTemplate<String, String> redisTemplate;
- private String lockKey;
- private int expireTime; // 锁的超时时间
- private int timeout; // 获取锁的超时时间
-
-
- public RedisLock(RedisTemplate<String, String> redisTemplate, String lockKey, int expireTime, int timeout) {
- this.redisTemplate = redisTemplate;
- this.lockKey = lockKey;
- this.expireTime = expireTime;
- this.timeout = timeout;
- }
-
- public boolean lock() {
- String identifier = UUID.randomUUID().toString();
- long end = System.currentTimeMillis() + timeout;
- while (System.currentTimeMillis() < end) {
- if (redisTemplate.opsForValue().setIfAbsent(lockKey, identifier, expireTime, TimeUnit.SECONDS)) {
- return true;
- }
- // 可以使用延时来减少CPU占用
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- }
- return false;
- }
-
- public boolean unlock() {
- redisTemplate.delete(lockKey);
- return true;
- }
-}
--
Gitblit v1.7.1