From 5b84583b833ce8acb2cd50aa4606bc4007ac7aca Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 27 Dec 2024 15:38:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/LoggerController.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 das/src/main/java/com/das/modules/admin/controller/LoggerController.java 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..32edcfa6 --- /dev/null +++ b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java @@ -0,0 +1,51 @@ +package com.das.modules.admin.controller; + +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 Map listLogLevels() { + LoggerContext context = (LoggerContext) LogManager.getContext(false); + return 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 String 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 String.format("Logger [%s] updated to level [%s]", loggerName, level); + } catch (IllegalArgumentException e) { + logger.error("Invalid log level [{}]", level, e); + return String.format("Invalid log level [%s]. Valid levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL.", level); + } + } +} \ No newline at end of file From 7d51b0fc7ac33237fefcc43a44a561170e70f9b7 Mon Sep 17 00:00:00 2001 From: yu Date: Fri, 27 Dec 2024 15:44:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=20=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E5=88=A0=E9=99=A4=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/SysEnumServiceImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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()); } /** From 63fe0253794b015934e0972435d1630ea183c171 Mon Sep 17 00:00:00 2001 From: fengrong Date: Fri, 27 Dec 2024 16:04:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/dashboard.vue | 6 +++--- ui/dasadmin/src/views/backend/home/home.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue index d7c38d14..0e830ae8 100644 --- a/ui/dasadmin/src/views/backend/dashboard.vue +++ b/ui/dasadmin/src/views/backend/dashboard.vue @@ -38,7 +38,7 @@
{{realData.attributeMap.windfarmdayprodenergy}} - 万kWh + MWh
日发电量
@@ -48,7 +48,7 @@
{{realData.attributeMap.windfarmmonthprodenergy}} - 万kWh + MWh
本月发电量
@@ -58,7 +58,7 @@
{{realData.attributeMap.windfarmyearprodenergy}} - 万kWh + MWh
年发电量
diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue index af88c841..61ab69de 100644 --- a/ui/dasadmin/src/views/backend/home/home.vue +++ b/ui/dasadmin/src/views/backend/home/home.vue @@ -21,9 +21,9 @@
平均风速:{{ realData.attributeMap.windfarmavgwindspeed}}m/s
实时有功:{{ realData.attributeMap.windfarmactivepower}}kW
实时无功:{{ realData.attributeMap.windfarmreactivepower}}kVar
-
日发电量:{{ realData.attributeMap.windfarmdayprodenergy}}万kWh
-
月发电量:{{ realData.attributeMap.windfarmmonthprodenergy}}万kWh
-
年发电量:{{ realData.attributeMap.windfarmyearprodenergy}}万kWh
+
日发电量:{{ realData.attributeMap.windfarmdayprodenergy}}MWh
+
月发电量:{{ realData.attributeMap.windfarmmonthprodenergy}}MWh
+
年发电量:{{ realData.attributeMap.windfarmyearprodenergy}}MWh
并网:{{ realData.attributeMap.turbinecountpowerprod}}台