From d4e4ea6405756d495806a609e24ae85ebd7345ef Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期二, 17 十二月 2024 09:30:12 +0800
Subject: [PATCH] 代码更新
---
src/main/java/com/yb/service/IntentionService.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/yb/service/IntentionService.java b/src/main/java/com/yb/service/IntentionService.java
index 4bf8092..7634b08 100644
--- a/src/main/java/com/yb/service/IntentionService.java
+++ b/src/main/java/com/yb/service/IntentionService.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.github.houbb.opencc4j.core.impl.ZhConvertBootstrap;
import com.yb.config.XzConfig;
+import com.yb.controller.WebSocketController;
import com.yb.helper.RsaHelper;
import com.yb.util.EntityHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +27,10 @@
@Autowired
private EntityHttpUtil entityHttpUtil;
- public HashMap<String, Object> getFunctionMatch(String orderString, Map<String, String> allParams) throws Exception {
+ @Autowired
+ private WebSocketController webSocketController ;
+
+ public HashMap<String, Object> getFunctionMatch(String orderString, Map<String, String> allParams,String report) throws Exception {
HashMap<String, Object> mapObj = new HashMap<String, Object>();
JSONObject orderObject = JSON.parseObject(orderString);
String name = JSONObject.parseObject(orderObject.getString("args")).getString("place");
@@ -44,7 +48,10 @@
} else if (func.equals(xzConfig.funcName[4])) {
mapObj = getCombatSimulate(orderObject, func);
} else if (func.equals(xzConfig.funcName[5])) {
- mapObj = getBatEnv(orderObject, func, allParams);
+// mapObj = getBatEnv(orderObject, func, allParams);
+ getBatEnv(orderObject, func, allParams,report);
+ }else{
+
}
return mapObj;
@@ -56,22 +63,23 @@
return hashMap;
}
- private HashMap<String, Object> getBatEnv(JSONObject orderObject, String func, Map<String, String> allParams) throws Exception {
+ private void getBatEnv(JSONObject orderObject, String func, Map<String, String> allParams,String report) throws Exception {
HashMap<String, Object> hashMap = new HashMap<String, Object>();
hashMap.put("func", func);
-
+ hashMap.put("session_id", (String)allParams.get("session_id"));
System.out.println("rec history1:" + allParams);
- String val = entityHttpUtil.postAgentMessage(xzConfig.battleReport, allParams);
- JSONObject js = JSONObject.parseObject(val);
- if (js == null) {
+// String val = entityHttpUtil.postAgentMessage(xzConfig.battleReport, allParams);
+// JSONObject js = JSONObject.parseObject(val);
+ if (report ==""|| report == null) {
hashMap.put("msg", "鎶ュ憡鐢熸垚澶辫触");
- return hashMap;
+ webSocketController.sendAllMessage(JSON.toJSONString(hashMap));
+ }else{
+ hashMap.put("msg", report);
+ webSocketController.sendAllMessage(JSON.toJSONString(hashMap));
}
- System.out.println("rec history1:" + val);
- hashMap.put("msg", js.getString("content"));
- return hashMap;
+
}
//鏌ョ湅鏌愪釜鍖哄煙鍐呭悇涓疄浣�/瀵硅薄涔嬮棿鐨勫叧绯�
@@ -84,10 +92,7 @@
String key = "msg";
String msg = (String) poiMap.get(key);
hashMap.put("msg", msg);
- String center = (String) poiMap.get("center");
- if(center != null){
- hashMap.put("data", poiMap);
- }
+ hashMap.put("data", poiMap);
return hashMap;
}
@@ -194,7 +199,7 @@
List<Integer> cNum = new ArrayList<>();
for (int i = 0; i < dataArray.size(); i++) {
JSONObject dataObj = dataArray.getJSONObject(i);
- String fclass1 = dataObj.getString("fclass_1");
+ String fclass1 = dataObj.getString(xzConfig.typeFiled);
String ids = dataObj.getString("seid");
if (cName.contains(fclass1)) {
for (int j = 0; j < cName.size(); j++) {
--
Gitblit v1.9.3