From 992a5d818cb01ae0ffb3b4bd6511da52c3b1f879 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 09 五月 2024 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index a1ccc37..9fe8e77 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -47,9 +47,6 @@
private IOrderTaxiService orderTaxiService;
@Autowired
- private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
- @Autowired
private IOrderPrivateCarService orderPrivateCarService;
@Autowired
@@ -424,12 +421,12 @@
* @param id
* @param type
*/
- public void pushOffline(Integer id, Integer type){
+ public void pushOffline(Integer id, Integer type, Object object){
JSONObject msg = new JSONObject();
msg.put("code", 200);
msg.put("msg", "SUCCESS");
msg.put("method", "OFFLINE");
- msg.put("data", new Object());
+ msg.put("data", object);
//调用推送
HttpHeaders headers = new HttpHeaders();
@@ -495,8 +492,9 @@
* @param orderId
* @param orderType
* @param money
+ * @param status 1=申请，2=同意，3=拒绝
*/
- public void pushPayDifference(Integer type, Integer uid, Integer orderId, Integer orderType, Double money){
+ public void pushPayDifference(Integer type, Integer uid, Integer orderId, Integer orderType, Double money, Integer status){
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", 200);
jsonObject.put("msg", "SUCCESS");
@@ -505,6 +503,7 @@
map.put("orderId", orderId);
map.put("orderType", orderType);
map.put("money", money);
+ map.put("status", status);
jsonObject.put("data", map);
//调用推送
@@ -575,4 +574,41 @@
System.err.println(jsonObject1.getString("msg"));
}
}
+
+
+ /**
+ * 司机超时推送
+ * @param type
+ * @param uid
+ * @param orderId
+ * @param orderType
+ * @param describe
+ */
+ public void pushOrderTimeOut(Integer type, Integer uid, Integer orderId, Integer orderType, String describe){
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("code", 200);
+ jsonObject.put("msg", "SUCCESS");
+ jsonObject.put("method", "ORDER_TIME_OUT");
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderId", orderId);
+ map.put("orderType", orderType);
+ map.put("describe", describe);
+ jsonObject.put("data", map);
+
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ //将请求头部和参数合成一个请求
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ params.add("msg", jsonObject.toJSONString());
+ params.add("id", String.valueOf(uid));
+ params.add("type", String.valueOf(type));
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+ String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
+ }
}
--
Gitblit v1.7.1