From d7920e744ec362493795faf9cb5c92c101522d57 Mon Sep 17 00:00:00 2001 From: xy <748613699@qq.com> Date: Wed, 15 May 2024 11:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/web/utils/FloatUtils.java | 2 +- .../com/njcn/harmonic/utils/FloatUtils.java | 2 +- .../mapper/mapping/RStatDataPltDMapper.xml | 1 + .../mapper/mapping/RStatDataVDMapper.xml | 7 ++- .../service/impl/GridServiceImpl.java | 2 +- .../system/service/impl/ThemeServiceImpl.java | 44 +++++++++---------- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/FloatUtils.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/FloatUtils.java index 36170605a..440337f30 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/FloatUtils.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/FloatUtils.java @@ -15,7 +15,7 @@ public class FloatUtils { * @param data Float参数 */ public static float get2Float(Float data) { - if (data == null) { + if (data == null || data.isNaN() || data.isInfinite()) { return 0f; } int scale = 2;//设置位数 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/FloatUtils.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/FloatUtils.java index d7710d1f7..bb6ae7ab6 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/FloatUtils.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/FloatUtils.java @@ -15,7 +15,7 @@ public class FloatUtils { * @param data Float参数 */ public static float get2Float(Float data) { - if (data == null) { + if (data == null || data.isNaN() || data.isInfinite()) { return 0f; } int scale = 2;//设置位数 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml index 7f7d4bf88..cd108b187 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml @@ -17,6 +17,7 @@ #{item} + and quality_flag = 0 group by `time`,line_id diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml index bcbaf95ab..53a18db64 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml @@ -14,10 +14,11 @@ `time` between #{startTime} and #{endTime} and phasic_type = 'T' and value_type = 'MAX' - AND line_id IN + and line_id IN #{item} + and quality_flag = 0 group by `time`,line_id @@ -26,7 +27,7 @@ select `time` time, line_id lineId, - avg(vl_dev) vlDev + avg(vu_dev) vuDev from r_stat_data_v_d where @@ -37,6 +38,7 @@ #{item} + and quality_flag = 0 group by `time`,line_id @@ -56,6 +58,7 @@ #{item} + and quality_flag = 0 group by `time`,line_id diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java index f5dbe27bd..a93b6cfde 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java @@ -317,7 +317,7 @@ public class GridServiceImpl implements IGridService { vo1.setSd(targetSd(d,avg)); } if (CollUtil.isNotEmpty(list2)) { - List d = list2.stream().map(o->o.getVlDev().doubleValue()).collect(Collectors.toList()); + List d = list2.stream().map(o->o.getVuDev().doubleValue()).collect(Collectors.toList()); double avg = d.stream().collect(Collectors.averagingDouble(x->x)); vo2.setAvg(PubUtils.doubleRound(2,avg)); vo2.setSd(targetSd(d,avg)); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ThemeServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ThemeServiceImpl.java index fd7ed121d..b8b9ba10b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ThemeServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ThemeServiceImpl.java @@ -54,17 +54,17 @@ public class ThemeServiceImpl extends ServiceImpl implements theme.setFaviconUrl(generateBase64(themeParam.getFaviconFile())); //v3参数 theme.setMainAnimation(themeParam.getMainAnimation()); - theme.setElementUiPrimary(String.join("", themeParam.getElementUiPrimary())); - theme.setTableHeaderBackground(String.join("", themeParam.getTableHeaderBackground())); - theme.setTableHeaderColor(String.join("", themeParam.getTableHeaderColor())); - theme.setTableCurrent(String.join("", themeParam.getTableCurrent())); - theme.setMenuBackground(String.join("", themeParam.getMenuBackground())); - theme.setMenuColor(String.join("", themeParam.getMenuColor())); - theme.setMenuActiveBackground(String.join("", themeParam.getMenuActiveBackground())); - theme.setMenuActiveColor(String.join("", themeParam.getMenuActiveColor())); - theme.setMenuTopBarBackground(String.join("", themeParam.getMenuTopBarBackground())); - theme.setHeaderBarTabColor(String.join("", themeParam.getHeaderBarTabColor())); - theme.setHeaderBarBackground(String.join("", themeParam.getHeaderBarBackground())); + theme.setElementUiPrimary(String.join(",", themeParam.getElementUiPrimary())); + theme.setTableHeaderBackground(String.join(",", themeParam.getTableHeaderBackground())); + theme.setTableHeaderColor(String.join(",", themeParam.getTableHeaderColor())); + theme.setTableCurrent(String.join(",", themeParam.getTableCurrent())); + theme.setMenuBackground(String.join(",", themeParam.getMenuBackground())); + theme.setMenuColor(String.join(",", themeParam.getMenuColor())); + theme.setMenuActiveBackground(String.join(",", themeParam.getMenuActiveBackground())); + theme.setMenuActiveColor(String.join(",", themeParam.getMenuActiveColor())); + theme.setMenuTopBarBackground(String.join(",", themeParam.getMenuTopBarBackground())); + theme.setHeaderBarTabColor(String.join(",", themeParam.getHeaderBarTabColor())); + theme.setHeaderBarBackground(String.join(",", themeParam.getHeaderBarBackground())); theme.setLogoPath(fileStorageUtil.uploadMultipart(themeParam.getLogoFile(), OssPath.THEME)); theme.setFaviconPath(fileStorageUtil.uploadMultipart(themeParam.getFaviconFile(), OssPath.THEME)); return this.save(theme); @@ -79,17 +79,17 @@ public class ThemeServiceImpl extends ServiceImpl implements BeanUtil.copyProperties(themeParam, theme); //v3参数 theme.setMainAnimation(themeParam.getMainAnimation()); - theme.setElementUiPrimary(String.join("", themeParam.getElementUiPrimary())); - theme.setTableHeaderBackground(String.join("", themeParam.getTableHeaderBackground())); - theme.setTableHeaderColor(String.join("", themeParam.getTableHeaderColor())); - theme.setTableCurrent(String.join("", themeParam.getTableCurrent())); - theme.setMenuBackground(String.join("", themeParam.getMenuBackground())); - theme.setMenuColor(String.join("", themeParam.getMenuColor())); - theme.setMenuActiveBackground(String.join("", themeParam.getMenuActiveBackground())); - theme.setMenuActiveColor(String.join("", themeParam.getMenuActiveColor())); - theme.setMenuTopBarBackground(String.join("", themeParam.getMenuTopBarBackground())); - theme.setHeaderBarTabColor(String.join("", themeParam.getHeaderBarTabColor())); - theme.setHeaderBarBackground(String.join("", themeParam.getHeaderBarBackground())); + theme.setElementUiPrimary(String.join(",", themeParam.getElementUiPrimary())); + theme.setTableHeaderBackground(String.join(",", themeParam.getTableHeaderBackground())); + theme.setTableHeaderColor(String.join(",", themeParam.getTableHeaderColor())); + theme.setTableCurrent(String.join(",", themeParam.getTableCurrent())); + theme.setMenuBackground(String.join(",", themeParam.getMenuBackground())); + theme.setMenuColor(String.join(",", themeParam.getMenuColor())); + theme.setMenuActiveBackground(String.join(",", themeParam.getMenuActiveBackground())); + theme.setMenuActiveColor(String.join(",", themeParam.getMenuActiveColor())); + theme.setMenuTopBarBackground(String.join(",", themeParam.getMenuTopBarBackground())); + theme.setHeaderBarTabColor(String.join(",", themeParam.getHeaderBarTabColor())); + theme.setHeaderBarBackground(String.join(",", themeParam.getHeaderBarBackground())); theme.setLogoPath(fileStorageUtil.uploadMultipart(themeParam.getLogoFile(), OssPath.THEME)); theme.setFaviconPath(fileStorageUtil.uploadMultipart(themeParam.getFaviconFile(), OssPath.THEME)); return this.updateById(theme);