From 9b208eb3947358169df8f46472a246eb6ea8ca32 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 十二月 2023 17:08:09 +0800
Subject: [PATCH] 工作通知
---
ycl-platform/src/main/resources/application-online.yml | 7 +------
ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java | 7 ++++++-
ycl-platform/src/main/java/com/ycl/timer/SendDingMsg.java | 6 +++---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 1 +
ycl-platform/src/main/java/com/ycl/service/auth/impl/AuthService.java | 1 +
ycl-platform/src/main/java/com/ycl/entity/message/DingMessage.java | 6 +++---
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index 3197f28..9bc9146 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -103,6 +103,7 @@
private String openid;
@ApiModelProperty(value = "閽夐拤璐︽埛id")
+ @TableField("account_id")
private Long accountId;
@ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
diff --git a/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java b/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
index 471af60..e36d906 100644
--- a/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
+++ b/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
@@ -62,7 +62,6 @@
// 鍒ゆ柇ding 淇℃伅鏄惁瀛樺湪
boolean hasDing = redisTemplate.hasKey("ding");
if (hasDing) {
- log.info("redis姝ｅ父鏈夋秷鎭�");
String dingStr = redisTemplate.opsForValue().get("ding");
JSONObject dingObj = JSONObject.parseObject(dingStr);
String getToken = dingObj.getString("token");
@@ -86,6 +85,12 @@
DingUserInfo dingUserInfo = BeanUtil.toBean(resObj, DingUserInfo.class);
String accId = DingEncodeUtil.getMD5(resObj.getString("employeeCode").getBytes());
dingUserInfo.setUserId(Long.parseLong(accId));
+ String employeeCode = resObj.getString("employeeCode");
+ JSONArray users = getAccountId(Arrays.asList(employeeCode));
+ JSONObject jsonObject = users.getJSONObject(0);
+ String accountId = jsonObject.getString("accountId");
+ dingUserInfo.setAccountId(Long.parseLong(accountId));
+
return dingUserInfo;
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/DingMessage.java b/ycl-platform/src/main/java/com/ycl/entity/message/DingMessage.java
index e4fad7b..e691b78 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/DingMessage.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/DingMessage.java
@@ -68,7 +68,7 @@
/**
* 鍙戦�佹椂闂�
*/
- @TableField("body")
+ @TableField("send_time")
@ApiModelProperty(value = "鍙戦�佹椂闂�")
private Date sendTime;
@@ -76,8 +76,8 @@
/**
* 鏄惁鎵弿锛�0鏈壂鎻�-1宸叉壂鎻�
*/
- @TableField("status")
+ @TableField("if_scan")
@ApiModelProperty(value = "鏄惁鎵弿锛�0鏈壂鎻�-1宸叉壂鎻�")
- private Short if_scan;
+ private Short ifScan;
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/auth/impl/AuthService.java b/ycl-platform/src/main/java/com/ycl/service/auth/impl/AuthService.java
index c2ff7d1..01c7d63 100644
--- a/ycl-platform/src/main/java/com/ycl/service/auth/impl/AuthService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/auth/impl/AuthService.java
@@ -58,6 +58,7 @@
userParam.setOpenid(openid); //openid
userParam.setIsDy(Byte.parseByte("0"));
userParam.setMobile("");
+ userParam.setAccountId(dingUserInfo.getAccountId());
String encodePassword = passwordEncoder.encode("123456");
userParam.setPassword(encodePassword); //瀵嗙爜
userParam.setStatus(1); //鐘舵��
diff --git a/ycl-platform/src/main/java/com/ycl/timer/SendDingMsg.java b/ycl-platform/src/main/java/com/ycl/timer/SendDingMsg.java
index 157b992..ede2249 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/SendDingMsg.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/SendDingMsg.java
@@ -51,12 +51,12 @@
String baseCaseCode = dingMessage.getBaseCaseCode();
Long accountId = dingMessage.getAccountId();
Long messageId = dingMessage.getId();
- String text = "# 閬傛槍浜戞墽娉曪細鏈夊緟澶勭悊鐨勪换鍔� \n " +
- "路鎮ㄦ湁1鏉″緟澶勭悊浜嬩欢銆備簨浠剁紪鍙�: \n " +
+ String text = "閬傛槍浜戞墽娉曪細鏈夊緟澶勭悊鐨勪换鍔n" +
+ "路鎮ㄦ湁1鏉″緟澶勭悊浜嬩欢銆備簨浠剁紪鍙�:\n" +
baseCaseCode;
String title = "鎮ㄦ湁涓�鏉″伐浣滈�氱煡";
try {
- dingMessage.setIf_scan(SCAN_FINISH);
+ dingMessage.setIfScan(SCAN_FINISH);
dingMessage.setSendTime(new Date());
dingCommon.sendDingMsgStr(accountId + "", text);
log.info("鍙戦�佷竴鏉″伐浣滈�氱煡锛屾秷鎭痠d{}", messageId);
diff --git a/ycl-platform/src/main/resources/application-online.yml b/ycl-platform/src/main/resources/application-online.yml
index 644466e..983c90c 100644
--- a/ycl-platform/src/main/resources/application-online.yml
+++ b/ycl-platform/src/main/resources/application-online.yml
@@ -74,12 +74,6 @@
passWord: a12345677
ip: 10.10.10.10
-DH:
- web_url: http://172.28.194.185:8281
- port: 8281
- userName: zfgy
- passWord: zfj12345
-
aliyun:
oss:
endpoint: http://oss-cn-zjls-lszwy-d01-a.ops.zjlscloud.com
@@ -92,6 +86,7 @@
port: 8281
userName: zfgy
passWord: zfj12345
+
#涓撴湁閽夐拤鍙傛暟
zzding :
app-key : sczhzfpt-81R3ErbU00G4VoXaEBruq
--
Gitblit v1.8.0