From 22aba721f5498d42156885d0e9e596c41f426d71 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 二月 2025 16:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 4 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 18 +++-----
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java | 6 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 12 +++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/UploadPdfDTO.java | 21 ++++++++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 8 ++--
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java | 4 ++
7 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java
index 14c12e1..b616ffc 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java
@@ -153,7 +153,11 @@
* @param chargeGun 桩编号
* @return
*/
+
public static String faultMsg(String phone,String site,String chargeGun){
+ // 去除特殊字符 比如.-/{(等等
+ site = site.replaceAll("[\\p{P}+~$`^=|<>～｀＄＾＋＝｜＜＞￥×]", "");
+
SubmitTempletReq submitReq = new SubmitTempletReq();
if(site.length()<=10){
String[] paramss = {site,chargeGun};
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
index 5cc6b28..13943f1 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -118,7 +118,11 @@
public static void main(String[] args) {
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- String encode = passwordEncoder.encode("49a15811ea47e8e9c6d8f3ef4d7bbc54");
+ String encode = passwordEncoder.encode("0173940ec8314d1671c2ba365d28fcc1");
System.err.println(encode);
+// String s = encryptPassword("0173940ec8314d1671c2ba365d28fcc1");
+// System.err.println(s);
+// boolean b = matchesPassword("0173940ec8314d1671c2ba365d28fcc1", "$2a$10$5ViClN9ACi9jM7W9wLqmJ.kgpYhT7da7sWvBDI5j2fXKNrBakUdQS");
+// System.err.println(b);
}
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 56cd613..3e69ba0 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -1324,8 +1324,16 @@
return R.ok(result3);
}
}
-
-
+
+
+ public static void main(String[] args) {
+// String reqStr1 = MsgUtil.codeMsg("19983174515", "123456");
+// String result1 = HttpUtils.post(MsgConstants.SEND_URL, reqStr1);
+
+ String reqStr3 = MsgUtil.faultMsg("18398968484", "长河服务区充电站（遂", "123");
+ String result3 = HttpUtils.post(MsgConstants.SEND_URL, reqStr3);
+ System.err.println(result3);
+ }
@PostMapping(value = "/user/logOut")
@ApiOperation(value = "退出登录", tags = {"小程序-个人中心"})
public AjaxResult logOut(){
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 595b2b0..c122e98 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
@@ -417,7 +417,7 @@
@ApiOperation(value = "测试",tags = {"硬件接口"})
@GetMapping(value = "/test")
- public R test() {
+ public R test(String code) {
String orderNum = "2024092646526785213546";
String deviceId = "3401231001200202";
Long orderId = 2024065544L;
@@ -425,7 +425,7 @@
PlatformStartCharging platformStartCharging = new PlatformStartCharging();
platformStartCharging.setTransaction_serial_number(orderNum);
platformStartCharging.setCharging_pile_code(deviceId);
- platformStartCharging.setCharging_gun_code("02");
+ platformStartCharging.setCharging_gun_code(code);
platformStartCharging.setCard_number(orderId.toString());
platformStartCharging.setAccount_balance(money);
String message = iotMessageProduce.sendMessage(platformStartCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_START_CHARGING.getKey(), messageUtil.platformStartCharging(platformStartCharging));
@@ -435,10 +435,10 @@
@ApiOperation(value = "测试",tags = {"硬件接口"})
@GetMapping(value = "/stop")
- public R test1() {
+ public R test1(String code) {
PlatformStopCharging platformStopCharging = new PlatformStopCharging();
platformStopCharging.setCharging_pile_code("3401231001200202");
- platformStopCharging.setCharging_gun_code("02");
+ platformStopCharging.setCharging_gun_code(code);
String message = iotMessageProduce.sendMessage(platformStopCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_STOP_CHARGING.getKey(),messageUtil.platformStopCharging(platformStopCharging));
return R.ok(message);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
index bfef7f3..c376527 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -15,10 +15,7 @@
import com.ruoyi.order.api.model.TOrderInvoice;
import com.ruoyi.order.api.query.TOrderInvoiceQuery;
import com.ruoyi.order.api.vo.TOrderInvoiceVO;
-import com.ruoyi.order.dto.AddOrderInvoice;
-import com.ruoyi.order.dto.GetOrderInvoiceList;
-import com.ruoyi.order.dto.MyOrderInvoiceInfo;
-import com.ruoyi.order.dto.OrderInvoiceList;
+import com.ruoyi.order.dto.*;
import com.ruoyi.order.export.OrderInvoiceExport;
import com.ruoyi.order.service.TOrderInvoiceService;
import io.swagger.annotations.Api;
@@ -76,16 +73,15 @@
public AjaxResult<PageInfo<TOrderInvoiceVO>> pageList(@RequestBody TOrderInvoiceQuery query){
return AjaxResult.success(orderInvoiceService.pageList(query));
}
-
+
@RequiresPermissions(value = {"/invoiceManagement/accept_hear_case"}, logical = Logical.OR)
- @GetMapping("/uploadPdf")
+ @PostMapping("/uploadPdf")
@ApiOperation(value = "上传发票", tags = {"管理后台-发票管理"})
- public AjaxResult<String> uploadPdf(@RequestParam("id") Long id,
- @RequestParam("invoiceUrl") String invoiceUrl){
- TOrderInvoice orderInvoice = orderInvoiceService.getById(id);
- orderInvoice.setInvoiceUrl(invoiceUrl);
+ public AjaxResult<String> uploadPdf(@RequestBody UploadPdfDTO dto){
+ TOrderInvoice orderInvoice = orderInvoiceService.getById(dto.getId());
+ orderInvoice.setInvoiceUrl(dto.getInvoiceUrl());
orderInvoice.setStatus(3);
orderInvoiceService.updateById(orderInvoice);
// 发送邮箱
@@ -145,7 +141,7 @@
// 组装附件
MimeBodyPart filePart = new MimeBodyPart();
- String imageUrl = invoiceUrl;
+ String imageUrl = dto.getInvoiceUrl();
try {
// 下载数据
URL url = new URL(imageUrl);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/UploadPdfDTO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/UploadPdfDTO.java
new file mode 100644
index 0000000..a737fdc
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/UploadPdfDTO.java
@@ -0,0 +1,21 @@
+package com.ruoyi.order.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/20 13:54
+ */
+@Data
+@ApiModel(value = "上传发票")
+public class UploadPdfDTO {
+ @ApiModelProperty("发票id")
+ public Long id;
+ @ApiModelProperty("文件路径")
+ private String invoiceUrl;
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 44bace0..f4352b6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1100,7 +1100,7 @@
if(1 == doubleIntegration){
num1 *= 2;
}
-
+
}
GetInviteUser query = new GetInviteUser();
@@ -2177,7 +2177,7 @@
discountAmount = discountAmount.setScale(4, RoundingMode.HALF_EVEN);
payAmount = payAmount.subtract(discountAmount);
periodServicePrice_total = periodServicePrice_total.subtract(discountAmount);
-
+
TChargingOrder order = new TChargingOrder();
order.setId(chargingOrder.getId());
order.setAppUserId(chargingOrder.getAppUserId());
--
Gitblit v1.7.1