zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化锚点查询

Browse Source
This commit is contained in:
tangwei 2026-07-10 08:53:57 +08:00
parent 3a85ad9cfe
commit b1bdb4cf66
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
View File

@ -2851,9 +2851,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
.append("t.LGTD AS lgtd, ") .append("t.LGTD AS lgtd, ")
.append("t.LTTD AS lttd, ") .append("t.LTTD AS lttd, ")
.append("t.AVQ AS avq, ") .append("t.AVQ AS avq, ")
.append("t.YRGEB AS ttpwr, ") .append("p.TTPWR AS ttpwr, ")
.append("t.FSLTDZ AS normz, ") .append("t.FSLTDZ AS normz, ")
.append("t.YRGEB AS yrge, ") .append("p.YRGE AS yrge, ")
.append("t.BASE_ID AS baseId, ") .append("t.BASE_ID AS baseId, ")
.append("t.JCDT AS jcdt, ") .append("t.JCDT AS jcdt, ")
.append("t.ADDVCD_NAME AS addvcdName, ") .append("t.ADDVCD_NAME AS addvcdName, ")
@ -2882,6 +2882,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
.append(" WHEN t.PRSC IN ('3') THEN 2 ") .append(" WHEN t.PRSC IN ('3') THEN 2 ")
.append(" END AS endInstalledType ") .append(" END AS endInstalledType ")
.append("FROM SD_ENGINFO_B_H t ") .append("FROM SD_ENGINFO_B_H t ")
.append("LEFT JOIN SD_PWR_B_H p ON t.STCD = p.STCD AND NVL(p.IS_DELETED, 0) = 0 ")
.append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = t.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = t.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
.append("LEFT JOIN MS_ALONG_B along ON along.RVCD = t.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ") .append("LEFT JOIN MS_ALONG_B along ON along.RVCD = t.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
.append("LEFT JOIN ( ") .append("LEFT JOIN ( ")

12
backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
View File

@ -4577,6 +4577,15 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
.append("t.ELEV AS dtmel, ") .append("t.ELEV AS dtmel, ")
.append("t.STLC AS stlc, ") .append("t.STLC AS stlc, ")
.append("t.WWQTG AS wwqtg, ") .append("t.WWQTG AS wwqtg, ")
.append("CASE t.WWQTG " +
" WHEN '1' THEN 'Ⅰ' " +
" WHEN '2' THEN 'Ⅱ' " +
" WHEN '3' THEN 'Ⅲ' " +
" WHEN '4' THEN 'Ⅳ' " +
" WHEN '5' THEN 'Ⅴ' " +
" WHEN '6' THEN 'V' " +
" ELSE '未知' " +
"END AS wwqtgName,")
.append("t.DTIN_TYPE AS dtinType, ") .append("t.DTIN_TYPE AS dtinType, ")
.append("t.RSTCD AS rstcd, ") .append("t.RSTCD AS rstcd, ")
.append("t.FHSTCD AS fhstcd, ") .append("t.FHSTCD AS fhstcd, ")
@ -4651,6 +4660,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
if (wqData != null) { if (wqData != null) {
anchorPointVo.setTm(wqData.getTm()); anchorPointVo.setTm(wqData.getTm());
anchorPointVo.setWqGrd(wqData.getWqgrd()); anchorPointVo.setWqGrd(wqData.getWqgrd());
anchorPointVo.setWqGrdName(wqData.getWqgrdName());
anchorPointVo.setSfdb(wqData.getSfdb()); anchorPointVo.setSfdb(wqData.getSfdb());
anchorPointVo.setWtmp(wqData.getWtmp()); anchorPointVo.setWtmp(wqData.getWtmp());
anchorPointVo.setPh(wqData.getPh()); anchorPointVo.setPh(wqData.getPh());
@ -4732,7 +4742,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
.map(s -> "'" + s + "'") .map(s -> "'" + s + "'")
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
String wqDataSql = "SELECT STCD, TM, WQGRD, SFDB, WTMP, PH, DOX, CODMN, CODCR, BOD5, NH3N, TP, TN, CU, ZN, F, SE, ARS, HG, CD, CR6, PB, CN, VLPH, OIL, LAS, S2, FCG, CL, SO4, NO3, THRD, COND, FE, MN, AL, CHLA, CLARITY, TU, CYANO, TOD " + String wqDataSql = "SELECT STCD, TM, WQGRD,CASE WQGRD WHEN '1' THEN 'Ⅰ' WHEN '2' THEN 'Ⅱ' WHEN '3' THEN 'Ⅲ' WHEN '4' THEN 'Ⅳ' WHEN '5' THEN 'Ⅴ' WHEN '6' THEN 'V' ELSE '未知' END AS wqgrdName, SFDB, WTMP, PH, DOX, CODMN, CODCR, BOD5, NH3N, TP, TN, CU, ZN, F, SE, ARS, HG, CD, CR6, PB, CN, VLPH, OIL, LAS, S2, FCG, CL, SO4, NO3, THRD, COND, FE, MN, AL, CHLA, CLARITY, TU, CYANO, TOD " +
"FROM ( " + "FROM ( " +
" SELECT t.*, ROW_NUMBER() OVER (PARTITION BY t.STCD ORDER BY t.TM DESC) AS rn " + " SELECT t.*, ROW_NUMBER() OVER (PARTITION BY t.STCD ORDER BY t.TM DESC) AS rn " +
" FROM SD_WQ_R t " + " FROM SD_WQ_R t " +