From 3f1ef2fd6b9ded13d3e671619252c595bfb45839 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 23 十二月 2025 17:53:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 18 +++++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java | 1 +
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java
index f743d60..79852d7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java
@@ -12,6 +12,7 @@
private String sendTime;// P String 浜嬩欢浠庢帴鏀惰�咃紙绋嬪簭澶勭悊鍚庯級鍙戝嚭鐨勬椂闂� 鏄� 32 浜嬩欢鍙戦�佹椂闂�
private String ability;// P String 浜嬩欢绫诲埆 鏄� 64 鏍囪瘑鍋滆溅鍦轰簨浠�
private String[] uids;// String[] 鐢ㄦ埛id 鍚� 涓嶉檺
+ private String[] quids;// String[] 鐢ㄦ埛id 鍚� 涓嶉檺
private String[] clients ;//String[] 缁勪欢鏍囪瘑 鍚� 涓嶉檺
private List<EventBaseInfoRequest> events;// P Events[] 浜嬩欢淇℃伅 鏄� 涓嶉檺
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index fa11685..7360b5c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -13,6 +13,7 @@
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventDeviceDataRequest;
import com.doumee.core.haikang.model.param.request.event.base.EventBaseInfoRequest;
+import com.doumee.core.haikang.model.param.request.event.base.EventBaseParamRequest;
import com.doumee.core.haikang.model.param.request.event.base.EventBaseRequest;
import com.doumee.core.haikang.model.param.request.event.parks.*;
import com.doumee.core.haikang.model.param.request.event.visit.*;
@@ -597,6 +598,13 @@
Thread t1=new Thread(new Runnable() {
@Override
public void run() {
+// EventBaseRequest submitParam = new EventBaseRequest();
+// submitParam.setMethod(param.getMethod());
+// submitParam.setParams(new EventBaseParamRequest());
+// submitParam.getParams().setAbility(param.getParams().getAbility());
+// submitParam.getParams().setQuids(param.getParams().getQuids());
+// submitParam.getParams().setSendTime(param.getParams().getSendTime());
+// submitParam.getParams().setEvents(new ArrayList<>());
//瀹氬埗key
param.getParams().setEvents(new ArrayList<>());
int key = Constants.WarningConfig.AF_RYLG_CUSTOM.getKey();
@@ -631,18 +639,26 @@
if(StringUtils.equals(t.getEventId(),request.getEventId())){
continue;
}
+ request.getData().put("url",StringUtils.defaultString(request.getData().getString("url"),"")+","+StringUtils.defaultString(t.getData().getString("url"),""));
request.setSrcIndex(StringUtils.defaultString(request.getSrcIndex(),"")+","+StringUtils.defaultString(t.getSrcIndex(),""));
request.setSrcName(StringUtils.defaultString(request.getSrcName(),"")+","+StringUtils.defaultString(t.getSrcName(),""));
request.getData().getJSONObject("AIOPResultData").put("imageUrl",StringUtils.defaultString( request.getData().getJSONObject("AIOPResultData").getString("imageUrl"),"")
+","+StringUtils.defaultString( t.getData().getJSONObject("AIOPResultData").getString("imageUrl"),""));
}
+ JSONObject img = new JSONObject();
+ img.put("imageUrl", request.getData().getJSONObject("AIOPResultData").getString("imageUrl"));
+ String url = request.getData().getString("url");
+ request.setData(new JSONObject());
+ request.getData().put("AIOPResultData",img);
+ request.getData().put("url",url);
param.getParams().getEvents().add(request);
String thirdpath =systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_THIRD_URL).getCode();
if(StringUtils.isNotBlank(thirdpath)){
+ log.error("========閫氱煡鍏朵粬涓夋柟鍦板潃绂诲矖浜嬩欢宸叉帹閫侊紝鍙傛暟:"+JSONObject.toJSONString(param));
String[] ss = thirdpath.split(";");
for(String s : ss){
String response = HttpsUtil.postJson(s,JSONObject.toJSONString(param));
- log.error("========閫氱煡鍏朵粬涓夋柟鍦板潃绂诲矖浜嬩欢宸叉帹閫侊紝缁撴灉:"+response);
+ log.error("========閫氱煡鍏朵粬涓夋柟鍦板潃绂诲矖浜嬩欢宸叉帹閫侊紝缁撴灉:"+s+"\n"+response);
}
}
}
--
Gitblit v1.9.3