From c2600591e819743757f8668d0c684da1e24cb7d4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 08 三月 2024 18:21:22 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
index 90b5856..92ea7e4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
@@ -16,11 +16,14 @@
import com.ruoyi.project.domain.vo.DingTalkReqVo;
import com.ruoyi.project.service.DingTalkService;
import com.taobao.api.ApiException;
+import lombok.Data;
import lombok.extern.log4j.Log4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -41,6 +44,9 @@
@Value("${dingAppSecret}")
private String dingAppSecret;
+
+ @Value("${agentId}")
+ private Long agentId;
@Override
public Boolean sendNotification(DingTalkReqVo dingTalkReqVo) {
@@ -99,18 +105,27 @@
DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2");
OapiMessageCorpconversationAsyncsendV2Request request = new OapiMessageCorpconversationAsyncsendV2Request();
request.setUseridList(urid);
- request.setAgentId(1779052814L);
+ request.setAgentId(agentId);
request.setToAllUser(false);
//鍙戦�佸唴瀹瑰鐞�
- List<ConcurrentHashMap<String, String>> contents = dingTalkReqVo.getContents();
+ List<ConcurrentHashMap<String, Object>> contents = dingTalkReqVo.getContents();
ArrayList<OapiMessageCorpconversationAsyncsendV2Request.Form> objects = new ArrayList<>();
for (int i = 0; i < contents.size(); i++) {
- ConcurrentHashMap<String, String> map = contents.get(i);
- for (Map.Entry<String, String> entry : map.entrySet()) {
+ ConcurrentHashMap<String, Object> map = contents.get(i);
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
OapiMessageCorpconversationAsyncsendV2Request.Form formSeverityDesc = new OapiMessageCorpconversationAsyncsendV2Request.Form();
formSeverityDesc.setKey(entry.getKey());
- formSeverityDesc.setValue(entry.getValue());
+ if (entry.getKey().contains("瀹℃壒鏃堕棿")) {
+ Date date = (Date) entry.getValue();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ String format = simpleDateFormat.format(date);
+ formSeverityDesc.setValue(format);
+ } else {
+ if (entry.getValue() != null) {
+ formSeverityDesc.setValue(entry.getValue().toString());
+ }
+ }
objects.add(formSeverityDesc);
}
}
@@ -134,7 +149,7 @@
try {
response = client.execute(request, accessToken);
} catch (ApiException e) {
- e.printStackTrace();
+ e.getErrMsg();
}
// log.info("娑堟伅浠诲姟ID"+response.getTaskId());
--
Gitblit v1.9.3