From 06a17c236d4cb9b8da75fce43af938cb7ea510bf Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 15 十二月 2025 09:50:12 +0800
Subject: [PATCH] feat: 优化企业微信判断，优化gps分断处理
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 78 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 2f76290..e70255f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -10,6 +10,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
@@ -25,6 +29,8 @@
public class RyTask
{
private static final Logger log = LoggerFactory.getLogger(RyTask.class);
+
+
// 娣诲姞鐘舵�佹槧灏勫瓧鍏�
private static final Map<String, String> ORDER_STATUS_MAP = new HashMap<String, String>() {{
@@ -63,6 +69,9 @@
@Autowired
private ITbCallbackLogService tbCallbackLogService;
+ @Autowired
+ private ITbVehicleOrderService tbVehicleOrderService;
+
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{
System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
@@ -94,14 +103,14 @@
for (AOrderStatus orderStatus : orderStatusList) {
int count = tbOrdersService.checkServiceOrdIDExists(orderStatus.getServiceOrdID());
if (count > 0) {
- log.info("鏈嶅姟璁㈠崟ID瀛樺湪锛�" + orderStatus.getServiceOrdID());
+// log.info("鏈嶅姟璁㈠崟ID瀛樺湪锛�" + orderStatus.getServiceOrdID());
TbOrders tbOrders = tbOrdersService.selectTbOrdersByServiceOrdID(orderStatus.getServiceOrdID());
//鑾峰彇杞︾墝鍙�
- String carLicense = "";
+ String carLicense = "-";
StringBuilder driverNames = new StringBuilder();
StringBuilder driverMobiles = new StringBuilder();
try{
@@ -132,6 +141,38 @@
}
}
}
+
+ //濡傛灉杞︾墝鍙蜂笉涓虹┖
+ if(carLicense!=null && carLicense.length()>0){
+// log.info("鏇存柊璁㈠崟-杞︾墝鍙峰叧鑱旇〃锛屻��" + tbOrders.getOrderID() + "銆戣溅鐗屽彿锛�" + carLicense);
+
+ //鏌ヨ鏄惁瀛樺湪鍏宠仈璁板綍
+ TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(tbOrders.getOrderID());
+ if(tbVehicleOrder==null){
+ //涓嶅瓨鍦ㄥ叧鑱旇褰�
+ //鍒涘缓鍏宠仈璁板綍
+ tbVehicleOrder = new TbVehicleOrder();
+ tbVehicleOrder.setOrderId(tbOrders.getOrderID());
+ tbVehicleOrder.setServiceOrdId(tbOrders.getServiceOrdID());
+ tbVehicleOrder.setVehicle(carLicense);
+ tbVehicleOrder.setStatus("0");
+ tbVehicleOrderService.insertTbVehicleOrder(tbVehicleOrder);
+ }
+ else{
+ //瀛樺湪鍏宠仈璁板綍
+ //鏇存柊鍏宠仈璁板綍
+ if(orderStatus.getMsg().contains("宸茶繑鍥�"))
+ {
+ tbVehicleOrder.setStatus("1");
+ tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder);
+ }
+ else if(orderStatus.getMsg().contains("鍙栨秷"))
+ {
+ tbVehicleOrder.setStatus("2");
+ tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder);
+ }
+ }
+ }
}
}
catch (Exception e)
@@ -142,11 +183,19 @@
SysClientApp clientApp = sysClientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
if(clientApp==null){
log.error("鍥炶皟鍦板潃涓嶅瓨鍦�");
- return;
+ orderStatusService.updateAOrderStatusFlag(orderStatus.getId());
+ continue;
}
String callbackUrl = clientApp.getCallbackUrl();
try {
+
+ String carLicenseStr = "-";
+ if(carLicense!=null && carLicense.length()>0){
+ carLicenseStr = carLicense;
+ }
+
+
// 鏋勫缓璇锋眰鍙傛暟
Map<String, String> map = new HashMap<>();
map.put("orderID", tbOrders.getOrderID().toString());
@@ -158,10 +207,29 @@
.findFirst()
.orElse("0"));
map.put("orderRemark", orderStatus.getMsg());
- map.put("plateNo",carLicense);
+ map.put("plateNo",carLicenseStr);
map.put("driverMobile",driverMobiles.toString());
map.put("driverName", driverNames.toString());
- map.put("appId", tbOrders.getAppId());
+
+ //鏍煎紡鍖栨洿鏂版椂闂�
+ try {
+
+ // 2. 瀹氫箟鐩爣鏍煎紡锛�24灏忔椂鍒� "HH"锛�
+ DateTimeFormatter targetFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String formattedTime = orderStatus.getUpdateTime().format(targetFormat);
+ map.put("updateTime", formattedTime);
+ }
+ catch (Exception ex)
+ {
+ log.error("鏃堕棿鏍煎紡杞寲鍑洪敊");
+ }
+
+
+
+
+ log.info("銆愮洃娴嬨�慬" + tbOrders.getOrderID() + "]杞︾墝鍙凤細" + carLicenseStr);
+ //鎵撳嵃map
+ log.info("銆愮洃娴嬨�慬" + tbOrders.getOrderID() + "]鍥炶皟璇锋眰鍙傛暟锛�" + map);
// 绗竴娆″皾璇�
String response = sendCallback(callbackUrl, map);
--
Gitblit v1.9.1