Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

sql更新

Browse Source
This commit is contained in:
xy
2025-02-26 11:17:01 +08:00
parent 9da41273e5
commit 9a65c1b133
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-common/common-core/src/main/java/com/njcn/common/utils/HarmonicTimesUtil.java
View File

@@ -1,9 +1,5 @@
package com.njcn.common.utils; package com.njcn.common.utils;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.Max; import javax.validation.constraints.Max;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import java.util.ArrayList; import java.util.ArrayList;

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
View File

@@ -31,7 +31,7 @@ import java.util.Map;
path = "/line", path = "/line",
fallbackFactory = LineFeignClientFallbackFactory.class, fallbackFactory = LineFeignClientFallbackFactory.class,
contextId = "line") contextId = "line")
public interface LineFeignClient { public interface LineFeignClient {
/** /**
* 获取终端状态信息 * 获取终端状态信息

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
View File

@@ -158,8 +158,10 @@
gd.name electricPowerCompany, gd.name electricPowerCompany,
b.IP DeviceIP, b.IP DeviceIP,
b.id deviceId, b.id deviceId,
ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal, -- ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal,
ifnull(convert(m.Actual_Value/1024/1024,decimal(7,2)),0) statisValue -- ifnull(convert(m.Actual_Value/1024/1024,decimal(7,2)),0) statisValue
COALESCE(d.flow, (SELECT flow FROM cld_flow_meal WHERE type = 0 AND flag = 1)) + COALESCE(d1.flow, 0) AS flowMeal,
COALESCE(CAST(m.Actual_Value / 1024 / 1024 AS DECIMAL(7, 2)), 0) AS statisValue
FROM pq_line a FROM pq_line a
INNER JOIN pq_line sub ON sub.id = a.pid INNER JOIN pq_line sub ON sub.id = a.pid
INNER JOIN pq_line gd ON gd.id = sub.pid INNER JOIN pq_line gd ON gd.id = sub.pid