diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index 3fbb007d..c0b79262 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -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() diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java index 931a1aa4..a659a2a8 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java @@ -456,11 +456,14 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl detailGroup = warnLevelMap.get(warnLevel); List 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); diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/vo/WarnYsVo.java b/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/vo/WarnYsVo.java index 6f9c9c22..92882047 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/vo/WarnYsVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/vo/WarnYsVo.java @@ -16,7 +16,7 @@ public class WarnYsVo { private String ys; /** 等级 */ - private String lvl; + private Integer lvl; /** 告警等级 */ private String warnLevel; diff --git a/backend/src/main/resources/application-dev.yml b/backend/src/main/resources/application-dev.yml index 31f5159d..2053da47 100644 --- a/backend/src/main/resources/application-dev.yml +++ b/backend/src/main/resources/application-dev.yml @@ -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} diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index f7005940..a87887d5 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -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} \ No newline at end of file + delete-url: ${ATTACHMENT_DELETE_URL:http://172.16.31.185:18200/FileDelete} \ No newline at end of file