ThbTech/SmartSubstationPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化逻辑

Browse Source
This commit is contained in:
weitang 2025-05-20 11:05:57 +08:00
parent 19a3df435e
commit 9ecebaac7d
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
View File

@ -153,7 +153,7 @@ public class AlgorithmDeviceServiceImpl extends ServiceImpl<AlgorithmDeviceMappe
for (LocalDateTime slot : minuteSlots) { for (LocalDateTime slot : minuteSlots) {
xAxisData.add(slot.format(formatter)); xAxisData.add(slot.format(formatter));
String value = minuteDataMap.getOrDefault(slot, "0"); String value = minuteDataMap.getOrDefault(slot, "0");
if (!NumberUtil.isDouble(value)) { if (!NumberUtil.isNumber(value)) {
value = "0"; value = "0";
} }
seriesData.add(NumberUtil.parseDouble(value)); seriesData.add(NumberUtil.parseDouble(value));

2
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
View File

@ -83,7 +83,7 @@ public class DeviceWorkDataController {
for (LocalDateTime slot : minuteSlots) { for (LocalDateTime slot : minuteSlots) {
xAxisData.add(slot.format(formatter)); xAxisData.add(slot.format(formatter));
String value = minuteDataMap.getOrDefault(slot, "0"); String value = minuteDataMap.getOrDefault(slot, "0");
if (!NumberUtil.isDouble(value)) { if (!NumberUtil.isNumber(value)) {
value="0"; value="0";
} }
seriesData.add(NumberUtil.parseDouble(value)); seriesData.add(NumberUtil.parseDouble(value));

9
riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java
View File

@ -1,11 +1,12 @@
package com.yfd.platform.utils; package com.yfd.platform.utils;
import cn.hutool.core.util.NumberUtil;
public class TestFileDir { public class TestFileDir {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
double resultvalue = 50; if (NumberUtil.isNumber("23")) {
double baseValue = 100; System.out.println("是数字");
double abs = Math.abs((resultvalue - baseValue) / baseValue * 100); }
System.out.println(abs);
} }
} }

22
riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
View File

@ -44,17 +44,21 @@
</select> </select>
<select id="getDeviceWorkData" resultType="java.util.Map"> <select id="getDeviceWorkData" resultType="java.util.Map">
SELECT SELECT
ds.signal_id, ds.signal_id,
ds.signal_code itemcode, ds.signal_code itemcode,
ds.signal_name dictname, ds.signal_name dictname,
COALESCE ( ds.yc_value, '无' ) AS value, COALESCE ( ds.yc_value, '无' ) AS value,
ds.signal_unit unit ds.signal_unit unit
FROM FROM
fk_device_signal ds fk_device_signal ds
INNER JOIN iis_substation_component sc ON ds.main_component_id = sc.component_id INNER JOIN iis_substation_component sc ON ds.main_component_id = sc.component_id
INNER JOIN iis_substation ss ON ss.station_code = sc.station_code
WHERE WHERE
sc.component_name = '微气象设备部件' sc.component_name = '微气象设备部件'
ORDER BY orderno <if test="stationId != null and stationId != ''">
AND ss.station_id=#{stationId}
</if>
ORDER BY orderno
</select> </select>
<select id="getHistoricalCurveList" resultType="com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData"> <select id="getHistoricalCurveList" resultType="com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData">
SELECT SELECT