fix: 优化逻辑
This commit is contained in:
parent
cc3d280dda
commit
2ba302ae86
@ -61,6 +61,8 @@ public class SecurityConfig {
|
||||
.requestMatchers("/tempFile/**").permitAll()
|
||||
.requestMatchers("/system/user/auditUser").permitAll()
|
||||
.requestMatchers("/register/accessToken").permitAll()
|
||||
.requestMatchers("/sys/psbmodulelbb/**").permitAll()
|
||||
|
||||
// .requestMatchers("/eng/**").permitAll()
|
||||
// .requestMatchers("/eq/**").permitAll()
|
||||
// .requestMatchers("/env/**").permitAll()
|
||||
|
||||
@ -456,11 +456,14 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
|
||||
MsWarnRuleDetailVo detailVo = new MsWarnRuleDetailVo();
|
||||
List<MsWarnRuleDetailB> detailGroup = warnLevelMap.get(warnLevel);
|
||||
List<WarnYsVo> ysVoList = new ArrayList<>();
|
||||
MsWarnRuleDetailB first = detailGroup.get(0);
|
||||
org.springframework.beans.BeanUtils.copyProperties(first, detailVo);
|
||||
MsWarnRuleDetailB first = detailGroup.getFirst();
|
||||
detailVo.setLvl(first.getLvl().toString());
|
||||
detailVo.setWarnLevel(first.getWarnLevel());
|
||||
// detailVo.setLvlName(first.n);
|
||||
// BeanUtils.copyProperties(first, detailVo);
|
||||
for (MsWarnRuleDetailB db : detailGroup) {
|
||||
WarnYsVo ysVo = new WarnYsVo();
|
||||
org.springframework.beans.BeanUtils.copyProperties(db, ysVo);
|
||||
BeanUtils.copyProperties(db, ysVo);
|
||||
ysVoList.add(ysVo);
|
||||
}
|
||||
detailVo.setYsList(ysVoList);
|
||||
|
||||
@ -16,7 +16,7 @@ public class WarnYsVo {
|
||||
private String ys;
|
||||
|
||||
/** 等级 */
|
||||
private String lvl;
|
||||
private Integer lvl;
|
||||
|
||||
/** 告警等级 */
|
||||
private String warnLevel;
|
||||
|
||||
@ -129,4 +129,4 @@ attachment:
|
||||
token: ${ATTACHMENT_TOKEN:qgcBkod25ngBa4wu8BtfCPYsJ7lQGVDoexH}
|
||||
upload-url: ${ATTACHMENT_UPLOAD_URL:http://172.16.31.185:18200/upload}
|
||||
video-url: ${ATTACHMENT_VIDEO_URL:http://172.16.31.185:18200/upload}
|
||||
delete-url: ${ATTACHMENT_DELETE_URL:http://172.16.31.185:18200/delete}
|
||||
delete-url: ${ATTACHMENT_DELETE_URL:http://172.16.31.185:18200/FileDelete}
|
||||
|
||||
@ -285,4 +285,4 @@ attachment:
|
||||
token: ${ATTACHMENT_TOKEN:qgcBkod25ngBa4wu8BtfCPYsJ7lQGVDoexH}
|
||||
upload-url: ${ATTACHMENT_UPLOAD_URL:http://172.16.31.185:18200/upload}
|
||||
video-url: ${ATTACHMENT_VIDEO_URL:http://172.16.31.185:18200/upload}
|
||||
delete-url: ${ATTACHMENT_DELETE_URL:http://172.16.31.185:18200/delete}
|
||||
delete-url: ${ATTACHMENT_DELETE_URL:http://172.16.31.185:18200/FileDelete}
|
||||
Loading…
Reference in New Issue
Block a user