From a0af42a6acfc7a0ebbb92bffc1816525e508af70 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 十月 2025 16:54:06 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 286 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 158 insertions(+), 128 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index c4c202f..b2c74b0 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -1,11 +1,15 @@
package com.stylefeng.guns.modular.system.util;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.stylefeng.guns.modular.system.warpper.PushOrderInfoWarpper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -23,10 +27,9 @@
@Component
public class PushUtil {
- Logger logger = LoggerFactory.getLogger("ServiceLog");
- @Autowired
- private RestTemplate internalRestTemplate;
+ @Value("${qyt.socket_uri}")
+ private String socket_uri;
@@ -43,20 +46,23 @@
msg.put("data", new Object());
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -72,22 +78,25 @@
msg.put("msg", "SUCCESS");
msg.put("method", "OFF_WORK");
msg.put("data", new Object());
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -110,22 +119,25 @@
map.put("status", status);
msg.put("data", map);
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -143,22 +155,25 @@
msg.put("msg", "SUCCESS");
msg.put("method", "ORDER_INFO");
msg.put("data", pushOrderInfoWarpper);
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -183,22 +198,25 @@
map.put("countdown", countdown);
msg.put("data", map);
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -222,22 +240,25 @@
map.put("countdown", countdown);
msg.put("data", map);
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -257,22 +278,25 @@
map.put("orderId", orderId);
msg.put("data", map);
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -295,22 +319,25 @@
Map<String, Object> map = new HashMap<>();
msg.put("data", map);
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
@@ -331,22 +358,25 @@
map.put("orderId", orderId);
msg.put("data", map);
-
+
//调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
+ post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
//将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", msg.toJSONString());
- params.add("id", id.toString());
- params.add("type", type.toString());
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://127.0.0.1:3002/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- logger.debug(jsonObject1.getString("msg"));
- System.err.println(jsonObject1.getString("msg"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("msg", msg.toJSONString());
+ params.put("id", id.toString());
+ params.put("type", type.toString());
+ params.put("bussinessType", "daijia");
+ post.form(params);
+ HttpResponse execute = post.execute();
+ if (200 != execute.getStatus()) {
+ System.err.println("推送异常");
+ }else{
+ JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
}
}
}
--
Gitblit v1.7.1