diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index dde61ecb..0bb70f56 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -372,7 +372,9 @@ public class FTPUtil { try { if (StrUtil.isBlank(path)) continue; boolean success = ftpClient.deleteFile(path); - if (!success) failList.add(path); + if (success) continue; + failList.add(path); + log.error("FTPUtil.removeFiles()删除文件[{}]失败", path); } catch (Exception e) { failList.add(path); log.error("FTPUtil.removeFiles()删除文件[{}]失败: {}", path, e.getMessage()); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DbItem.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DbItem.java index bdf828f5..b060735e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DbItem.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DbItem.java @@ -8,7 +8,7 @@ import lombok.Getter; public enum DbItem { DBMEMORY("dbMemory"), LOGREMAININGSIZE("logRemainingSize"), - DBSIZE("dblSize"); + DBLSIZE("dblSize"), DBSIZE("dbSize"); private final String value; } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java index 3b1298b2..1f004d52 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java @@ -19,7 +19,6 @@ import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.util.JDBCUtil; import org.jeecg.common.util.NumUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.base.dto.*; import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Item; @@ -33,7 +32,6 @@ import org.jeecg.modules.feignclient.SystemClient; import org.jeecg.modules.mapper.DBRowMapper; import org.jeecg.modules.mapper.SpaceRowMapper; import org.jeecg.modules.mapper.SysDatabaseMapper; -import org.jeecg.modules.service.IAlarmRuleService; import org.jeecg.modules.service.ISysDatabaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -129,8 +127,13 @@ public class SysDatabaseServiceImpl extends ServiceImpl GB item = itemMap.get(DbItem.DBSIZE.getValue()); - if (ObjectUtil.isNotNull(item)) + if (ObjectUtil.isNotNull(item)){ databaseDto.setDbSize(NumUtil.byte2Gb(item.getLastValue(), 2)); + }else { + item = itemMap.get(DbItem.DBLSIZE.getValue()); + if (ObjectUtil.isNotNull(item)) + databaseDto.setDbSize(NumUtil.byte2Gb(item.getLastValue(), 2)); + } } page.setRecords(databaseDtos); return Result.OK(page); diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java index b7e2857c..23f7cdc4 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java @@ -1,4 +1,11 @@ package org.jeecg.modules.controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("") public class AlarmController { + + } diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java index 0aa9822a..97883e0e 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java @@ -1,4 +1,11 @@ package org.jeecg.modules.controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("") public class LoginController { + + } diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java index 785c0eb5..acfee84f 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java @@ -1,4 +1,11 @@ package org.jeecg.modules.controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("") public class WebController { + + } diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java index 9b217606..aa56963f 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java @@ -1,4 +1,11 @@ package org.jeecg.modules.service; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; + +@Component +@FeignClient("armd-system") public interface LoginService { + + } diff --git a/pom.xml b/pom.xml index c9ea61f1..1e8a9549 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ jeecg-module-spectrum-analysis jeecg-module-beta-gamma-analyser jeecg-module-app - +