From d990f83678892ce9f55a617a572ab246db20ed08 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 11:20:44 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java | 1 -
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 20 ++++++++++++++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java | 1 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 7 +++++--
5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
index e783c90..6cbcd25 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
@@ -167,6 +167,7 @@
String url = "https://lcdp.ahyc.com.cn:30443/api/v1/automation/tenant/61b6fb6080e9de2aa1df94d7/hooks/6954aca3cdf86954d2657433fb470ca1aabd108246925eca";
JSONObject object = new JSONObject();
object.put("status",0);
+ object.put("id","testis" );
object.put("username","15345690849" );
object.put("info", "杩欐槸澶囨敞111");
String result = HttpsUtil.postJson(url,JSONObject.toJSONString(object));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 949903c..b334b68 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -220,7 +220,7 @@
void syncDDUserInfo() ;
- void ddPushMemberInfo(String eventType, shade.com.alibaba.fastjson2.JSONObject eventData) ;
+ void ddPushMemberInfo(String eventType, shade.com.alibaba.fastjson2.JSONObject eventData);
void dealJdyMemberInfo(MemberPushData data);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 88528a7..483ffb8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -765,6 +765,26 @@
}
}
+ public static void main(String[] args) {
+ try {
+ JkCabinetGridServiceImpl temp = new JkCabinetGridServiceImpl();
+ FormDataApiClient apiClient = new FormDataApiClient("B4eyPmjtnvnameAKq5lbDLdRZi18VQ3p" ,"https://lcdp.ahyc.com.cn:30443/api/");
+ FormDataCreateParam param =new FormDataCreateParam();
+ WarningEvent warningEvent = new WarningEvent();
+ warningEvent.setTitle("璺ㄨ秺鐢熶骇绾�(娴嬭瘯锛�");
+ warningEvent.setContent("璺ㄨ秺鐢熶骇绾�-鑺滄箹鍖楀洿澧欒繃閬撲笢-鏋紙璺ㄨ秺锛�");
+ param.setData( temp.getJdyChildData(warningEvent,"gaoyf_b"));
+ param.setApp_id("6954aca3cdf8fb470ca1aabd");
+ param.setEntry_id("6954aca6ff1c406a1d7b9afa");
+ param.setIs_start_trigger(false);
+ param.setIs_start_trigger(true);
+ Map<String, Object> response = apiClient.singleDataCreate(param,apiClient.getDefaultVersion());
+ log.error(JSONObject.toJSONString(response));
+ }catch (Exception e){
+
+ }
+
+ }
/**
* 绠�閬撲簯娑堟伅鎺ㄩ�� 瀹氬埗
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 390f9ff..9a0e9e6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -2495,9 +2495,10 @@
public void sendMemberInfoResult(String username, String info, int status){
try {
String url = systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_MEMBER_PUSH_STATUS_URL).getCode();
- log.error("==========鎺ㄩ�佷汉鍛榹}锛氬悓姝ョ粨鏋滃紑濮�=====status={},username={},info={},url={}",username,status,info,url);
+ log.error("==========鎺ㄩ�佷汉鍛榹}锛氬悓姝ョ粨鏋滃紑濮�=====status={},id={},info={},url={}",username,status,info,url);
JSONObject object = new JSONObject();
object.put("status",status);
+// object.put("id",id);
object.put("username",username);
object.put("info",info);
String result = HttpsUtil.postJson(url,JSONObject.toJSONString(object));
@@ -2530,11 +2531,13 @@
}
if(StringUtils.isBlank(data.get_id())
- ||StringUtils.isBlank(data.getUsername())
+ || data.getUser() == null
+ ||StringUtils.isBlank(data.getUser().getUsername())
||StringUtils.isBlank(data.getPhone())
||StringUtils.isBlank(data.getName())){
throw new BusinessException(ResponseStatus.JDY_BAD_REQUEST.getCode(),"浜哄憳淇℃伅涓嶅畬鏁达紒");
}
+ data.setUsername(data.getUser().getUsername());
//鍐呴儴浜哄憳淇℃伅
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
.eq( Member::getErpId,data.get_id() )
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
index da0bdca..c166a4a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
@@ -424,7 +424,6 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)&&memberList.size()>Constants.ZERO){
List<String> ddUserIdList = memberList.stream().map(j->j.getErpId()).collect(Collectors.toList());
//鍙戦�佹帹閫侀拤閽夋秷鎭�
-
Boolean isSuccess = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
String.join(",",ddUserIdList),
ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
--
Gitblit v1.9.3