sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
高云鹏 2024-12-27 16:11:38 +08:00
commit cfb432280a
4 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
das/src/main/java/com/das/modules/admin/controller/LoggerController.java Normal file
View File

@ -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<String, String> 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);
}
}
}

8
das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
View File

@ -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());
}
/**

6
ui/dasadmin/src/views/backend/dashboard.vue
View File

@ -38,7 +38,7 @@
<div class="small-value">
<span class="content-number">{{realData.attributeMap.windfarmdayprodenergy}}</span>
<span>万kWh</span>
<span>MWh</span>
</div>
<div class="small-title">日发电量</div>
</div>
@ -48,7 +48,7 @@
<div class="small-value">
<span class="content-number">{{realData.attributeMap.windfarmmonthprodenergy}}</span>
<span>万kWh</span>
<span>MWh</span>
</div>
<div class="small-title">本月发电量</div>
</div>
@ -58,7 +58,7 @@
<div class="small-value">
<span class="content-number">{{realData.attributeMap.windfarmyearprodenergy}}</span>
<span>万kWh</span>
<span>MWh</span>
</div>
<div class="small-title">年发电量</div>
</div>

6
ui/dasadmin/src/views/backend/home/home.vue
View File

@ -21,9 +21,9 @@
<div class="small-base">平均风速:<span>{{ realData.attributeMap.windfarmavgwindspeed}}m/s</span></div>
<div class="small-base">实时有功:<span>{{ realData.attributeMap.windfarmactivepower}}kW</span></div>
<div class="small-base">实时无功:<span>{{ realData.attributeMap.windfarmreactivepower}}kVar</span></div>
<div class="small-base">日发电量:<span>{{ realData.attributeMap.windfarmdayprodenergy}}万kWh</span></div>
<div class="small-base">月发电量:<span>{{ realData.attributeMap.windfarmmonthprodenergy}}万kWh</span></div>
<div style="padding: 0;" class="small-base">年发电量:<span>{{ realData.attributeMap.windfarmyearprodenergy}}万kWh</span></div>
<div class="small-base">日发电量:<span>{{ realData.attributeMap.windfarmdayprodenergy}}MWh</span></div>
<div class="small-base">月发电量:<span>{{ realData.attributeMap.windfarmmonthprodenergy}}MWh</span></div>
<div style="padding: 0;" class="small-base">年发电量:<span>{{ realData.attributeMap.windfarmyearprodenergy}}MWh</span></div>
</div>
<div class="overviewItem" style="border: none;">
<div class="small-base"><i class="powerprod"></i>并网:<span>{{ realData.attributeMap.turbinecountpowerprod}}台</span></div>