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

fix: 优化bug

Browse Source
This commit is contained in:
tangwei 2026-07-14 10:57:07 +08:00
parent 27076230d9
commit 2cfee388c1
6 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1256,7 +1256,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
"CAST(NULL AS NUMBER) AS ddz, " +
"eng.NRZAR AS nrzar, " +
"eng.BCKLEN AS bcklen, " +
"CAST(NULL AS NUMBER) AS ttcp, " +
"rbh.TTCP AS ttcp, " +
"CAST(NULL AS NUMBER) AS nmzcp, " +
"CAST(NULL AS VARCHAR2(255)) AS fldcpStr, " +
"CAST(NULL AS NUMBER) AS actcp, " +
@ -1323,6 +1323,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
"LEFT JOIN SD_HYCD_DIC hy ON hy.HYCD = eng.HYCD AND NVL(hy.IS_DELETED, 0) = 0 AND NVL(hy.ENABLED, 1) = 1 " +
"LEFT JOIN SD_HYCD_DIC topHy ON topHy.HYCD = eng.TOP_HYCD AND NVL(topHy.IS_DELETED, 0) = 0 AND NVL(topHy.ENABLED, 1) = 1 " +
"LEFT JOIN SD_PWR_B_H pwr ON pwr.STCD = eng.STCD AND NVL(pwr.IS_DELETED, 0) = 0 " +
"LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD = eng.STCD AND NVL(rbh.IS_DELETED, 0) = 0 " +
"LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
"LEFT JOIN ( " +
" SELECT det.SORT, cfg.RVCD, det.STCD " +

3
backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
View File

@ -3374,7 +3374,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
"pbh.YRGE AS yrge, " +
"eng.ENNM AS stnm, " +
"eng.PIODT AS piodt, " +
"CAST(16.39 AS NUMBER) AS ttcp,"+
"rbh.TTCP AS ttcp,"+
"eng.AIODT AS aiodt, " +
"eng.ENNM AS ennm, " +
"eng.BASE_ID AS baseId, " +
@ -3400,6 +3400,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
"NVL(eng.ORDER_INDEX, 999999) AS siteStepSort " +
"FROM SD_ENGINFO_B_H eng " +
"INNER JOIN SD_PWR_B_H pbh ON pbh.STCD= eng.STCD " +
"LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD= eng.STCD " +
"LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
"LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " +
"LEFT JOIN SD_ADDVCD_DIC ad ON ad.ADDVCD = eng.ADDVCD" +

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

@ -3308,6 +3308,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
String countField = row.containsKey("COUNT_STCD") ? "COUNT_STCD" : "COUNT_" + upperField;
String aggregateKey = "COUNT_STCD".equals(countField) ? "count_stcd" : "count_" + groupField;
Object countValue = row.get(countField);
Map<String, Object> item = new LinkedHashMap<>();
if (countValue == null) {
countValue = row.get("count_stcd");
}
@ -3321,7 +3322,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
count = Long.parseLong(String.valueOf(countValue));
}
Map<String, Object> item = new LinkedHashMap<>();
item.put("key", key);
item.put("keyName", null);
item.put("keyExt", new HashMap<>());
@ -3330,7 +3331,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
detail.put(upperField, key);
detail.put(countField, count);
item.put("items", List.of(detail));
item.put("count", 0);
item.put("count", count);
item.put("summary", new Object[0]);
Map<String, Object> aggregates = new LinkedHashMap<>();

16
backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
View File

@ -791,8 +791,20 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
sql.append("AND wt.STTP = #{map.sttpCode} ");
}
if (queryDwDirectly && StrUtil.isNotBlank(sttpCode)) {
paramMap.put("sttpCode", sttpCode);
sql.append("AND dw.STTP = #{map.sttpCode} ");
List<String> sttpCodes = StrUtil.split(sttpCode, ",");
if(sttpCodes.size() > 1){
// 正确拼接，每个值加单引号并用逗号连接
String joined = sttpCodes.stream()
.map(s -> "'" + s.replace("'", "''") + "'") // 转义单引号
.collect(Collectors.joining(","));
sql.append("AND dw.STTP NOT IN (").append(joined).append(") ");
}
if(sttpCodes.size() == 1){
paramMap.put("sttpCode", sttpCode);
sql.append("AND dw.STTP = #{map.sttpCode} ");
}
// paramMap.put("sttpCode", sttpCode);
// sql.append("AND dw.STTP = #{map.sttpCode} ");
}
if (queryDwDirectly && StrUtil.isNotBlank(bldsttCcode)) {

9
backend/src/main/java/com/yfd/platform/qgc_env/wte/entity/vo/WeVmsstbprptVo.java
View File

@ -36,6 +36,15 @@ public class WeVmsstbprptVo {
@Schema(description = "河流编码")
private String rvcd;
@Schema(description = "站址/位置")
private String stlc;
@Schema(description = "地形裁剪范围")
private String box;
@Schema(description = "基地编码")
private String baseName;
@Schema(description = "排序")
private Integer orderIndex;

18
backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
View File

@ -2753,7 +2753,16 @@ public class WeFishServiceImpl implements WeFishService {
"b.NAME AS name, " +
"b.NAME_EN AS nameEn, " +
"b.PROTECTLVL AS protectlvl, " +
"b.PROTECTLVL AS protectlvlName, " +
"CASE b.PROTECTLVL\n" +
" WHEN '1' THEN '国家一级'\n" +
" WHEN '2' THEN '国家二级'\n" +
" WHEN '3' THEN '国家三级'\n" +
" WHEN '4' THEN '省重点'\n" +
" WHEN '5' THEN '市一级'\n" +
" WHEN '6' THEN '市二级'\n" +
" WHEN '7' THEN '无'\n" +
" ELSE b.PROTECTLVL\n" +
"END AS protectlvlName, " +
"b.LOGO AS logo, " +
"b.INTRODUCE AS introduce " +
"FROM MS_SPECANIMALS_B a " +
@ -3286,11 +3295,14 @@ public class WeFishServiceImpl implements WeFishService {
return "SELECT " +
"ai.STCD AS id, " +
"ai.STTP AS sttpCode, " +
"ai.STLC AS stlc, " +
"ai.STCD AS stcd, " +
"ai.STNM AS stnm, " +
"ai.BOX AS box, " +
"ai.RSTCD AS rstcd, " +
"eng.ENNM AS ennm, " +
"ai.BASE_ID AS baseId, " +
"hb.BASENAME AS baseName, " +
"ai.HBRVCD AS hbrvcd, " +
"ai.RVCD AS rvcd, " +
"ai.ORDER_INDEX AS orderIndex, " +
@ -3298,6 +3310,7 @@ public class WeFishServiceImpl implements WeFishService {
"ai.LTTD AS lttd " +
"FROM SD_AIMONITOR_B_H ai " +
"LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = ai.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " +
"LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = ai.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
"WHERE NVL(ai.IS_DELETED, 0) = 0";
}
@ -3350,6 +3363,9 @@ public class WeFishServiceImpl implements WeFishService {
selected.add("t.sttpCode AS sttpCode");
selected.add("t.stnm AS stnm");
selected.add("t.stcd AS stcd");
selected.add("t.stlc AS stlc");
selected.add("t.box AS box");
selected.add("t.baseName AS baseName");
} else {
for (String field : selectFields) {
String column = columns.get(field);