This is an automated email from the ASF dual-hosted git repository.
wangtao29 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new 0f608005 fix: fix the type parameter of the hera App (#591)
0f608005 is described below
commit 0f608005cb07a9fef0951c5f22aa5a1c7ee7a362
Author: Xue <[email protected]>
AuthorDate: Wed Jun 25 14:51:37 2025 +0800
fix: fix the type parameter of the hera App (#591)
- fix the type parameter of the hera App
---
.../java/org/apache/ozhera/app/api/response/AppBaseInfo.java | 1 +
.../org/apache/ozhera/app/api/service/HeraAppService.java | 2 +-
.../apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java | 2 +-
.../apache/ozhera/app/service/impl/HeraAppServiceImpl.java | 12 +++++++++---
.../src/main/resources/mapper/HeraAppBaseInfoMapper.xml | 9 +++++++++
.../apache/ozhera/log/manager/service/HeraAppService.java | 2 +-
.../ozhera/log/manager/service/impl/HeraAppServiceImpl.java | 4 ++--
.../ozhera/log/manager/service/impl/LogTailServiceImpl.java | 2 +-
8 files changed, 25 insertions(+), 9 deletions(-)
diff --git
a/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java
b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java
index 916b1583..10154b2a 100644
---
a/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java
+++
b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java
@@ -34,6 +34,7 @@ import java.util.List;
public class AppBaseInfo implements Serializable {
private Integer id;
private String bindId;
+ private Integer bindType;
private String appName;
private String appCname;
private Integer platformType;
diff --git
a/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java
b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java
index bfbe27b3..0622f57f 100644
---
a/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java
+++
b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java
@@ -72,7 +72,7 @@ public interface HeraAppService {
Long countRole(HeraAppRoleModel roleModel);
- List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName, Integer
limit);
+ List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName, Integer
limit, Integer type);
/**
* query user have permission project
diff --git
a/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java
b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java
index 43fed1f9..b77ae39f 100644
---
a/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java
+++
b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java
@@ -40,7 +40,7 @@ public interface HeraAppBaseInfoMapper extends
BaseMapper<HeraAppBaseInfo> {
List<AppBaseInfo> queryAppInfo(@Param("appName") String appName,
@Param("platformType") Integer platformType, @Param("type") Integer type);
- List<AppBaseInfo> queryLatestAppInfo(@Param("limit") Integer limit);
+ List<AppBaseInfo> queryLatestAppInfo(@Param("limit") Integer limit,
@Param("platformType") Integer platformType, @Param("type") Integer type);
List<AppBaseInfo> queryByIds(List<Long> ids);
diff --git
a/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java
b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java
index 094b07da..73c0eb5b 100644
---
a/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java
+++
b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java
@@ -106,12 +106,18 @@ public class HeraAppServiceImpl implements HeraAppService
{
}
@Override
- public List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName,
Integer limit) {
+ public List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName,
Integer limit, Integer type) {
List<AppBaseInfo> appBaseInfos;
+ Integer platformType = null;
+ Integer appType = null;
if (appName != null && !appName.isEmpty()) {
- appBaseInfos = heraAppBaseInfoMapper.queryAppInfo(appName, null,
null);
+ if (Objects.nonNull(type)) {
+ appType = appTypeServiceExtension.getAppTypeLog(type);
+ platformType = appTypeServiceExtension.getAppPlatForm(type);
+ }
+ appBaseInfos = heraAppBaseInfoMapper.queryAppInfo(appName,
platformType, appType);
}else{
- appBaseInfos = heraAppBaseInfoMapper.queryLatestAppInfo(limit);
+ appBaseInfos = heraAppBaseInfoMapper.queryLatestAppInfo(limit,
platformType, appType);
}
if (CollectionUtils.isNotEmpty(appBaseInfos)) {
appBaseInfos = appBaseInfos.parallelStream().map(appBaseInfo -> {
diff --git
a/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
b/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
index 786dd5f7..821fb605 100644
--- a/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
+++ b/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
@@ -669,6 +669,15 @@
he.node_ips AS nodeIPs
FROM hera_app_base_info hb
LEFT JOIN hera_app_excess_info he ON hb.id = he.app_base_id
+ <where>
+ `status` = 0
+ <if test="platformType != null">
+ AND hb.platform_type = #{platformType}
+ </if>
+ <if test="type != null">
+ AND hb.app_type = #{type}
+ </if>
+ </where>
ORDER BY
hb.update_time DESC
LIMIT #{limit}
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/HeraAppService.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/HeraAppService.java
index 3323066a..acae2812 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/HeraAppService.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/HeraAppService.java
@@ -61,5 +61,5 @@ public interface HeraAppService {
Long getAppCount();
- List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName, Integer
limit);
+ List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName, Integer
limit, Integer type);
}
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/HeraAppServiceImpl.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/HeraAppServiceImpl.java
index afb1ae5f..d203dd3f 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/HeraAppServiceImpl.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/HeraAppServiceImpl.java
@@ -63,8 +63,8 @@ public class HeraAppServiceImpl implements HeraAppService {
}
@Override
- public List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName,
Integer limit) {
- return heraAppService.querySpecifiedAppInfoWithLog(appName, limit);
+ public List<AppBaseInfo> querySpecifiedAppInfoWithLog(String appName,
Integer limit, Integer type) {
+ return heraAppService.querySpecifiedAppInfoWithLog(appName, limit,
type);
}
@Override
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
index a597683b..ccae672d 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
@@ -541,7 +541,7 @@ public class LogTailServiceImpl extends BaseService
implements LogTailService {
private List<MapDTO> queryAppInfo(String appName, Integer type) {
int limit = 100;
- List<AppBaseInfo> apps =
heraAppService.querySpecifiedAppInfoWithLog(appName, limit);
+ List<AppBaseInfo> apps =
heraAppService.querySpecifiedAppInfoWithLog(appName, limit, type);
List<MapDTO> mapDTOList = Lists.newArrayList();
if (CollectionUtils.isNotEmpty(apps)) {
mapDTOList = apps.stream().map(response -> {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
