diff --git a/das/src/main/java/com/das/modules/admin/controller/LoggerController.java b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java new file mode 100644 index 00000000..cf41ce9a --- /dev/null +++ b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java @@ -0,0 +1,52 @@ +package com.das.modules.admin.controller; + +import com.das.common.result.R; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.config.Configurator; +import org.apache.logging.log4j.core.config.LoggerConfig; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/api/logger/") +public class LoggerController { + private static final Logger logger = LogManager.getLogger(LoggerController.class); + + /** + * 查询当前日志级别 + * + * @return 当前所有日志级别 + */ + @GetMapping("/list") + public R> listLogLevels() { + LoggerContext context = (LoggerContext) LogManager.getContext(false); + return R.success(context.getConfiguration().getLoggers().values().stream() + .collect(Collectors.toMap( + LoggerConfig::getName, + loggerConfig -> loggerConfig.getLevel().toString() + ))); + } + + /** + * 更新日志级别 + * + * @param loggerName 日志名称 + * @param level 日志级别 (TRACE, DEBUG, INFO, WARN, ERROR, FATAL) + * @return 更新结果 + */ + @PostMapping("/update") + public R updateLogLevel(String loggerName, String level) { + try { + Configurator.setLevel(loggerName, org.apache.logging.log4j.Level.valueOf(level.toUpperCase())); + logger.info("Updated logger [{}] to level [{}]", loggerName, level); + return R.success( String.format("Logger [%s] updated to level [%s]", loggerName, level)); + } catch (IllegalArgumentException e) { + logger.error("Invalid log level [{}]", level, e); + return R.fail(String.format("Invalid log level [%s]. Valid levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL.", level)); + } + } +} \ No newline at end of file diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java index 70f06a89..2ae3ceee 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java @@ -173,13 +173,7 @@ public class SysEnumServiceImpl implements SysEnumService { */ @Override public void deleteEnumValues(SysEnumValuesDto sysEnumValuesDto) { - SysEnumValues sysEnumValues = new SysEnumValues(); - BeanCopyUtils.copy(sysEnumValuesDto,sysEnumValues); - SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); - sysEnumValues.setUpdatedBy(sysUserVo.getAccount()); - sysEnumValues.setUpdatedTime(new Date()); - sysEnumValues.setIsActive(0); - sysEnumValuesMapper.updateById(sysEnumValues); + sysEnumValuesMapper.deleteById(sysEnumValuesDto.getId()); } /** diff --git a/ui/dasadmin/src/api/backend/index.ts b/ui/dasadmin/src/api/backend/index.ts index e3233464..c6f9ff58 100644 --- a/ui/dasadmin/src/api/backend/index.ts +++ b/ui/dasadmin/src/api/backend/index.ts @@ -301,14 +301,15 @@ export function delOtherParamsReq(params: any) { export function uploadOtherParamsFileReq(formData: FormData, V: string) { const token = encrypt_aes(adminInfo.token, V) return createAxios({ - url: '/api/equipment//file/upload', + url: '/api/equipment/file/upload', method: 'POST', data: formData, headers: { 'Content-Type': 'multipart/form-data', V, token, - } + }, + timeout: 1000 * 60 * 2, }, { customEncrypt: true }) } diff --git a/ui/dasadmin/src/components/upload/index.vue b/ui/dasadmin/src/components/upload/index.vue new file mode 100644 index 00000000..14bd1f79 --- /dev/null +++ b/ui/dasadmin/src/components/upload/index.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue index 92d6bb12..537503be 100644 --- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue @@ -43,7 +43,7 @@ 测点选择 数据导出 -
+
@@ -643,7 +667,7 @@