diff --git a/service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkExtServiceImpl.java b/service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkExtServiceImpl.java
index dd0267f8..61dc97fa 100644
--- a/service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkExtServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkExtServiceImpl.java
@@ -28,7 +28,7 @@ import java.util.stream.Stream;
* @Author xiangerlin
* @Date 2024/8/28 14:25
**/
-@Service(value = "dingTalkExtService")
+@Service
public class DingTalkExtServiceImpl implements IDingTalkExtService {
diff --git a/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.java b/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.java
index 94eeb61f..ba467aee 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.java
@@ -6,9 +6,9 @@ public class SysPushMessageEntity extends BaseEntity {
/** 推送方式 “一次”、“定时” */
private String pushMethod;
/** 预警应用编码 */
- private Long warningAppCode;
+ private String warningAppCode;
/** 预警接口编码 */
- private Long warningApiCode;
+ private String warningApiCode;
/** 接收者ID列表*/
private String recipientIdList;
/** 预警应用类型 */
@@ -22,7 +22,7 @@ public class SysPushMessageEntity extends BaseEntity {
/** 返回信息 */
private String returnData;
/** 接收接口编码 */
- private Long receiveApiCode;
+ private String receiveApiCode;
/** 状态(1、待发送2、发送中3、发送成功4、发送失败) */
private String status;
@@ -34,31 +34,22 @@ public class SysPushMessageEntity extends BaseEntity {
this.pushMethod = pushMethod;
}
-
- public Long getWarningAppCode() {
+ public String getWarningAppCode() {
return warningAppCode;
}
- public void setWarningAppCode(Long warningAppCode) {
+ public void setWarningAppCode(String warningAppCode) {
this.warningAppCode = warningAppCode;
}
- public Long getWarningApiCode() {
+ public String getWarningApiCode() {
return warningApiCode;
}
- public void setWarningApiCode(Long warningApiCode) {
+ public void setWarningApiCode(String warningApiCode) {
this.warningApiCode = warningApiCode;
}
- public Long getReceiveApiCode() {
- return receiveApiCode;
- }
-
- public void setReceiveApiCode(Long receiveApiCode) {
- this.receiveApiCode = receiveApiCode;
- }
-
public String getRecipientIdList() {
return recipientIdList;
}
@@ -107,6 +98,14 @@ public class SysPushMessageEntity extends BaseEntity {
this.returnData = returnData;
}
+ public String getReceiveApiCode() {
+ return receiveApiCode;
+ }
+
+ public void setReceiveApiCode(String receiveApiCode) {
+ this.receiveApiCode = receiveApiCode;
+ }
+
public String getStatus() {
return status;
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.xml
index 0916a33a..be1fd3e3 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/pushMessage/entity/SysPushMessageEntity.xml
@@ -4,14 +4,14 @@
-
-
+
+
-
+
diff --git a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java
index ea688246..846c1f9f 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java
@@ -2,12 +2,9 @@ package com.hzya.frame.sysnew.sendMessageLog.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao;
-import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.messageTemplate.dao.ISysMessageTemplateDao;
@@ -52,8 +49,6 @@ public class SysSendMessageLogServiceImpl extends BaseService
-
+
diff --git a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.java b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.java
index fa2181c9..166f8c61 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.java
@@ -15,7 +15,7 @@ public class SysWarningInterfaceEntity extends BaseEntity {
/** api名称 */
private String apiName;
/** api编码 */
- private Long apiCode;
+ private String apiCode;
/** 推送方式(1:推送一次、2:定时) */
private String pushMethod;
/** 状态(0:停用、1:启用) */
@@ -40,11 +40,11 @@ public class SysWarningInterfaceEntity extends BaseEntity {
this.apiName = apiName;
}
- public Long getApiCode() {
+ public String getApiCode() {
return apiCode;
}
- public void setApiCode(Long apiCode) {
+ public void setApiCode(String apiCode) {
this.apiCode = apiCode;
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml
index 663e7cd1..e9bc2d65 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml
@@ -13,7 +13,7 @@
-
+