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 | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
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 950794c..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
@@ -6,8 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
-import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
-import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
@@ -15,11 +13,10 @@
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.*;
-import com.doumee.core.haikang.model.param.respose.AuthResultPageDetailResponse;
-import com.doumee.core.haikang.model.param.respose.AuthResultPageResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
@@ -33,20 +30,20 @@
import com.doumee.service.business.impl.JkCabinetGridServiceImpl;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
import com.doumee.service.business.third.TmsService;
-import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.request.TmsOrderInfoRequest;
import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.*;
import java.util.Date;
import java.util.stream.Collectors;
@@ -541,10 +538,21 @@
);
}
if(Constants.equalsInteger(warningRule.getMemberNotice(),Constants.ONE)){
- // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
- // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
- // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
+// Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+// StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
+// dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
// warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+ List<String> ddUserIdList = memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ddUserIdList)){
+ for (String ddUserId:ddUserIdList) {
+ impl.getJDYData(warningEvent,ddUserId,
+ systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.API_KEY).getCode(),
+ systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.APPID).getCode(),
+ systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.ENTRY_ID).getCode()
+
+ );
+ }
+ }
}
impl.sendDeviceNotice(warningRule);
warningPushMapper.insert(warningPush);
@@ -576,6 +584,10 @@
return null;
}
+
+
+
+
/**
* 閫氱煡鐢典俊鎺ュ彛锛堢宀椾簨浠讹級
* @param list
@@ -586,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();
@@ -620,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