diff --git a/backend/src/main/java/com/yfd/platform/config/MyMetaObjectHandler.java b/backend/src/main/java/com/yfd/platform/config/MyMetaObjectHandler.java index 63de20da..71ec29a3 100644 --- a/backend/src/main/java/com/yfd/platform/config/MyMetaObjectHandler.java +++ b/backend/src/main/java/com/yfd/platform/config/MyMetaObjectHandler.java @@ -23,7 +23,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { Date now = new Date(); - + // 创建时间 this.strictInsertFill(metaObject, "createdAt", Date.class, now); @@ -31,7 +31,8 @@ public class MyMetaObjectHandler implements MetaObjectHandler { this.strictInsertFill(metaObject, "updatedAt", Date.class, now); // 更新时间 this.strictInsertFill(metaObject, "modifyTime", Date.class, now); - + // 更新时间 + this.strictInsertFill(metaObject, "recordTime", Date.class, now); try { String userId = SecurityUtils.getUserId(); // 创建人 diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java index b6da77f2..d9b6f10a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java @@ -437,7 +437,7 @@ public class WeFishServiceImpl implements WeFishService { "SUM(CASE WHEN we.DCPC = #{map.dcpc2} THEN NVL(fish.FCNT, 0) ELSE 0 END) AS fcnt2 " + "FROM SD_WE_R we " + "INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID AND NVL(fish.IS_DELETED, 0) = 0 " + - "INNER JOIN SD_WE_B_H section ON section.STCD = we.STCD AND NVL(section.USFL, 0) = 1 " + + "INNER JOIN SD_WE_B_H sec ON sec.STCD = we.STCD AND NVL(sec.USFL, 0) = 1 " + "INNER JOIN SD_FISHDICTORY_B dict ON dict.ID = fish.FTP AND NVL(dict.IS_DELETED, 0) = 0 " + "WHERE NVL(we.IS_DELETED, 0) = 0 " + "AND NVL(we.STATUS, 1) = 1 " + @@ -514,49 +514,49 @@ public class WeFishServiceImpl implements WeFishService { .append("CASE WHEN fishAgg.yr = #{map.endYear} THEN fishAgg.fcnt END AS endFtpCnt, ") .append("CASE WHEN fishAgg.yr = #{map.endYear} THEN totalAgg.fcnt END AS endCnt ") .append("FROM (") - .append("SELECT fish.FTP AS ftp, section.HBRVCD AS hbrvcd, SUM(NVL(fish.FCNT, 0)) AS fcnt, TO_CHAR(we.TM, 'YYYY') AS yr ") + .append("SELECT fish.FTP AS ftp, sec.HBRVCD AS hbrvcd, SUM(NVL(fish.FCNT, 0)) AS fcnt, TO_CHAR(we.TM, 'YYYY') AS yr ") .append("FROM SD_WE_R we ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("INNER JOIN SD_WE_B_H section ON section.STCD = we.STCD ") + .append("INNER JOIN SD_WE_B_H sec ON sec.STCD = we.STCD ") .append("INNER JOIN V_SD_FISHDICTORY_B dictFilter ON dictFilter.FISH_ID = fish.FTP ") - .append(" AND (section.HBRVCD = dictFilter.RVCD OR dictFilter.RVCD = 'ZY') ") + .append(" AND (sec.HBRVCD = dictFilter.RVCD OR dictFilter.RVCD = 'ZY') ") .append("WHERE NVL(we.STATUS, 1) = 1 ") .append("AND NVL(we.IS_DELETED, 0) = 0 ") .append("AND TO_CHAR(we.TM, 'YYYY') IN (#{map.startYear}, #{map.endYear}) "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("fishPageBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.fishPageBaseId} "); + sql.append("AND sec.BASE_ID = #{map.fishPageBaseId} "); } if (StrUtil.isNotBlank(hbrvcd)) { paramMap.put("fishPageHbrvcd", hbrvcd); - sql.append("AND section.HBRVCD = #{map.fishPageHbrvcd} "); + sql.append("AND sec.HBRVCD = #{map.fishPageHbrvcd} "); } if (StrUtil.isNotBlank(rstcd)) { paramMap.put("fishPageRstcd", rstcd); - sql.append("AND section.RSTCD = #{map.fishPageRstcd} "); + sql.append("AND sec.RSTCD = #{map.fishPageRstcd} "); } - sql.append("GROUP BY fish.FTP, section.HBRVCD, TO_CHAR(we.TM, 'YYYY') ") + sql.append("GROUP BY fish.FTP, sec.HBRVCD, TO_CHAR(we.TM, 'YYYY') ") .append(") fishAgg ") .append("LEFT JOIN (") .append("SELECT SUM(NVL(fish.FCNT, 0)) AS fcnt, TO_CHAR(we.TM, 'YYYY') AS yr ") .append("FROM SD_WE_R we ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("INNER JOIN SD_WE_B_H section ON section.STCD = we.STCD ") + .append("INNER JOIN SD_WE_B_H sec ON sec.STCD = we.STCD ") .append("INNER JOIN V_SD_FISHDICTORY_B dictFilter ON dictFilter.FISH_ID = fish.FTP ") - .append(" AND (section.HBRVCD = dictFilter.RVCD OR dictFilter.RVCD = 'ZY') ") + .append(" AND (sec.HBRVCD = dictFilter.RVCD OR dictFilter.RVCD = 'ZY') ") .append("WHERE NVL(we.STATUS, 1) = 1 ") .append("AND NVL(we.IS_DELETED, 0) = 0 ") .append("AND TO_CHAR(we.TM, 'YYYY') IN (#{map.startYear}, #{map.endYear}) "); if (StrUtil.isNotBlank(baseId)) { - sql.append("AND section.BASE_ID = #{map.fishPageBaseId} "); + sql.append("AND sec.BASE_ID = #{map.fishPageBaseId} "); } if (StrUtil.isNotBlank(hbrvcd)) { - sql.append("AND section.HBRVCD = #{map.fishPageHbrvcd} "); + sql.append("AND sec.HBRVCD = #{map.fishPageHbrvcd} "); } if (StrUtil.isNotBlank(rstcd)) { - sql.append("AND section.RSTCD = #{map.fishPageRstcd} "); + sql.append("AND sec.RSTCD = #{map.fishPageRstcd} "); } sql.append("GROUP BY TO_CHAR(we.TM, 'YYYY') ") .append(") totalAgg ON totalAgg.yr = fishAgg.yr ") @@ -1087,33 +1087,33 @@ public class WeFishServiceImpl implements WeFishService { Map paramMap = new HashMap<>(); StringBuilder sql = new StringBuilder(); sql.append("SELECT ") - .append("section.STCD AS stcd, ") - .append("section.STNM AS stnm, ") - .append("section.LGTD AS lgtd, ") - .append("section.LTTD AS lttd, ") - .append("section.ELEV AS dtmel, ") - .append("section.RSTCD AS rstcds, ") + .append("sec.STCD AS stcd, ") + .append("sec.STNM AS stnm, ") + .append("sec.LGTD AS lgtd, ") + .append("sec.LTTD AS lttd, ") + .append("sec.ELEV AS dtmel, ") + .append("sec.RSTCD AS rstcds, ") .append("eng.ENNM AS ennm, ") .append("TO_CHAR(latest.TM, 'yyyy-mm-dd hh24:mi:ss') AS tm, ") .append("'WE' AS anchoPointState, ") .append("'WE' AS sttpMap, ") .append("'WE' AS sttp, ") .append("'WE' AS sttpCode, ") - .append("section.STNM AS titleName, ") - .append("section.RVCD AS rvcd, ") - .append("section.ADDVCD AS addvcd, ") - .append("section.BASE_ID AS baseId, ") - .append("section.RSTCD AS rstcd, ") + .append("sec.STNM AS titleName, ") + .append("sec.RVCD AS rvcd, ") + .append("sec.ADDVCD AS addvcd, ") + .append("sec.BASE_ID AS baseId, ") + .append("sec.RSTCD AS rstcd, ") .append("siteSort.SORT AS siteStepSort ") - .append("FROM SD_WE_B_H section ") - .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") + .append("FROM SD_WE_B_H sec ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = sec.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN ( ") .append(" SELECT STCD, MAX(TM) AS TM ") .append(" FROM SD_WE_R ") .append(" WHERE NVL(IS_DELETED, 0) = 0 AND STATUS = 1 ") .append(" GROUP BY STCD ") - .append(") latest ON latest.STCD = section.STCD ") - .append("LEFT JOIN MS_ALONG_B along ON along.BASEID = section.BASE_ID ") + .append(") latest ON latest.STCD = sec.STCD ") + .append("LEFT JOIN MS_ALONG_B along ON along.BASEID = sec.BASE_ID ") .append(" AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ") .append("LEFT JOIN ( ") .append(" SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ") @@ -1122,8 +1122,8 @@ public class WeFishServiceImpl implements WeFishService { .append(" WHERE NVL(det.IS_DELETED, 0) = 0 ") .append(" AND NVL(cfg.IS_DELETED, 0) = 0 ") .append(" AND cfg.CODE = 'common' ") - .append(") siteSort ON siteSort.BASEID = section.BASE_ID AND siteSort.STCD = section.STCD ") - .append("WHERE NVL(section.USFL, 1) = 1 "); + .append(") siteSort ON siteSort.BASEID = sec.BASE_ID AND siteSort.STCD = sec.STCD ") + .append("WHERE NVL(sec.USFL, 1) = 1 "); String filterSql = buildWePointFilterCondition(dataSourceRequest.getFilter(), paramMap, new int[]{0}); if (StrUtil.isNotBlank(filterSql)) { @@ -1186,8 +1186,8 @@ public class WeFishServiceImpl implements WeFishService { .append("FROM SD_WE_R we ") .append("INNER JOIN SD_WEFISH_R fish ON fish.WER_ID = we.ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("INNER JOIN SD_WE_B_H section ON section.STCD = we.STCD ") - .append(" AND NVL(section.USFL, 1) = 1 ") + .append("INNER JOIN SD_WE_B_H sec ON sec.STCD = we.STCD ") + .append(" AND NVL(sec.USFL, 1) = 1 ") .append("INNER JOIN ( ") .append(" SELECT STCD, MAX(TM) AS TM ") .append(" FROM SD_WE_R ") @@ -1201,7 +1201,7 @@ public class WeFishServiceImpl implements WeFishService { .append(" WHERE NVL(rel.IS_DELETED, 0) = 0 ") .append(" AND NVL(dic.IS_DELETED, 0) = 0 ") .append(" AND (rel.FISH_ID <> rel.ZY_FISH_ID OR rel.RVCD = 'ZY') ") - .append(") dict ON fish.FTP = dict.FISH_ID AND (section.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") + .append(") dict ON fish.FTP = dict.FISH_ID AND (sec.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") .append("WHERE fish.FCNT IS NOT NULL ") .append("AND NVL(we.IS_DELETED, 0) = 0 ") .append("AND NVL(we.STATUS, 1) = 1 "); @@ -1925,16 +1925,16 @@ public class WeFishServiceImpl implements WeFishService { StringBuilder sql = new StringBuilder(); sql.append("SELECT t.BASE_ID AS hbrvcd, t.YR AS yr ") .append("FROM (") - .append("SELECT section.HBRVCD, section.RSTCD, section.BASE_ID, TO_CHAR(we.TM, 'yyyy') AS yr ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("SELECT sec.HBRVCD, sec.RSTCD, sec.BASE_ID, TO_CHAR(we.TM, 'yyyy') AS yr ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") .append(" AND NVL(we.STATUS, 1) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") .append("LEFT JOIN V_SD_FISHDICTORY_B dict ON fish.FTP = dict.FISH_ID ") - .append(" AND (section.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") - .append("WHERE NVL(section.USFL, 0) = 1 ") + .append(" AND (sec.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") + .append("WHERE NVL(sec.USFL, 0) = 1 ") .append("AND CASE ") .append("WHEN dict.SPEC_ORIGIN = 2 THEN 1 ") .append("WHEN dict.SPEC_ORIGIN = 1 AND NVL(dict.PTYPE, -1) <> 6 THEN 2 ") @@ -1943,11 +1943,11 @@ public class WeFishServiceImpl implements WeFishService { if (StrUtil.isNotBlank(baseId)) { paramMap.put("weYearBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.weYearBaseId} "); + sql.append("AND sec.BASE_ID = #{map.weYearBaseId} "); } if (StrUtil.isNotBlank(hbrvcd)) { paramMap.put("weYearHbrvcd", hbrvcd); - sql.append("AND section.HBRVCD = #{map.weYearHbrvcd} "); + sql.append("AND sec.HBRVCD = #{map.weYearHbrvcd} "); } if (StrUtil.isNotBlank(yr)) { paramMap.put("weYearYr", yr); @@ -1965,11 +1965,11 @@ public class WeFishServiceImpl implements WeFishService { placeholders.add("#{map." + key + "}"); } if (CollUtil.isNotEmpty(placeholders)) { - sql.append("AND section.RSTCD IN (").append(String.join(", ", placeholders)).append(") "); + sql.append("AND sec.RSTCD IN (").append(String.join(", ", placeholders)).append(") "); } } - sql.append("GROUP BY section.BASE_ID, section.HBRVCD, section.RSTCD, TO_CHAR(we.TM, 'yyyy')") + sql.append("GROUP BY sec.BASE_ID, sec.HBRVCD, sec.RSTCD, TO_CHAR(we.TM, 'yyyy')") .append(") t ") .append("INNER JOIN (") .append("SELECT det.STCD, det.SORT, cfg.RVCD ") @@ -1993,7 +1993,7 @@ public class WeFishServiceImpl implements WeFishService { StringBuilder sql = new StringBuilder(); sql.append("SELECT t.STCD AS stcd, t.STNM AS stnm, t.NUM AS num, t.TY AS ty, t2.SORT AS sort ") .append("FROM (") - .append("SELECT section.RSTCD AS STCD, ") + .append("SELECT sec.RSTCD AS STCD, ") .append("eng.ENNM AS STNM, ") .append("COUNT(DISTINCT fish.FTP) AS NUM, ") .append("CASE ") @@ -2001,26 +2001,26 @@ public class WeFishServiceImpl implements WeFishService { .append("WHEN dict.SPEC_ORIGIN = 1 AND NVL(dict.PTYPE, -1) <> 6 THEN '2' ") .append("WHEN dict.SPEC_ORIGIN = 1 AND dict.PTYPE = 6 THEN '3' ") .append("END AS TY ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") // .append(" AND NVL(we.STATUS, 1) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = sec.RSTCD ") .append(" AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN V_SD_FISHDICTORY_B dict ON fish.FTP = dict.FISH_ID ") - .append(" AND (section.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") + .append(" AND (sec.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") .append("WHERE 1 = 1 "); -// .append("WHERE NVL(section.USFL, 0) = 1 "); +// .append("WHERE NVL(sec.USFL, 0) = 1 "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("weFishStatBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.weFishStatBaseId} "); + sql.append("AND sec.BASE_ID = #{map.weFishStatBaseId} "); } if (StrUtil.isNotBlank(hbrvcd)) { paramMap.put("weFishStatHbrvcd", hbrvcd); - sql.append("AND section.HBRVCD = #{map.weFishStatHbrvcd} "); + sql.append("AND sec.HBRVCD = #{map.weFishStatHbrvcd} "); } if (StrUtil.isNotBlank(yr)) { paramMap.put("weFishStatYr", yr); @@ -2038,7 +2038,7 @@ public class WeFishServiceImpl implements WeFishService { placeholders.add("#{map." + key + "}"); } if (CollUtil.isNotEmpty(placeholders)) { - sql.append("AND section.RSTCD IN (").append(String.join(", ", placeholders)).append(") "); + sql.append("AND sec.RSTCD IN (").append(String.join(", ", placeholders)).append(") "); } } @@ -2047,7 +2047,7 @@ public class WeFishServiceImpl implements WeFishService { .append("WHEN dict.SPEC_ORIGIN = 1 AND NVL(dict.PTYPE, -1) <> 6 THEN 2 ") .append("WHEN dict.SPEC_ORIGIN = 1 AND dict.PTYPE = 6 THEN 3 ") .append("END IS NOT NULL ") - .append("GROUP BY section.RSTCD, eng.ENNM, CASE ") + .append("GROUP BY sec.RSTCD, eng.ENNM, CASE ") .append("WHEN dict.SPEC_ORIGIN = 2 THEN '1' ") .append("WHEN dict.SPEC_ORIGIN = 1 AND NVL(dict.PTYPE, -1) <> 6 THEN '2' ") .append("WHEN dict.SPEC_ORIGIN = 1 AND dict.PTYPE = 6 THEN '3' ") @@ -2074,7 +2074,7 @@ public class WeFishServiceImpl implements WeFishService { StringBuilder sql = new StringBuilder(); sql.append("SELECT t.STCD AS stcd, t.STNM AS stnm, t.NUM AS num, t.TY AS ty, t2.SORT AS sort ") .append("FROM (") - .append("SELECT section.RSTCD AS STCD, ") + .append("SELECT sec.RSTCD AS STCD, ") .append("eng.ENNM AS STNM, ") .append("COUNT(DISTINCT fish.FTP) AS NUM, ") .append("CASE ") @@ -2083,29 +2083,29 @@ public class WeFishServiceImpl implements WeFishService { .append("WHEN dict.SPEC_ORIGIN = 1 AND dict.PTYPE = 6 THEN '3' ") .append("END AS TY, ") .append("TO_CHAR(we.TM, 'yyyy') AS YR ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") .append(" AND NVL(we.STATUS, 1) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = sec.RSTCD ") .append(" AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_FISHDICTORY_B dict ON fish.FTP = dict.ID ") .append(" AND NVL(dict.IS_DELETED, 0) = 0 ") - .append("WHERE NVL(section.USFL, 0) = 1 "); + .append("WHERE NVL(sec.USFL, 0) = 1 "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("weFishStatBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.weFishStatBaseId} "); + sql.append("AND sec.BASE_ID = #{map.weFishStatBaseId} "); } if (StrUtil.isNotBlank(hbrvcd)) { paramMap.put("weFishStatHbrvcd", hbrvcd); - sql.append("AND section.HBRVCD = #{map.weFishStatHbrvcd} "); + sql.append("AND sec.HBRVCD = #{map.weFishStatHbrvcd} "); } - sql.append("AND section.RSTCD IS NOT NULL ") + sql.append("AND sec.RSTCD IS NOT NULL ") .append("AND dict.SPEC_ORIGIN IS NOT NULL ") - .append("GROUP BY section.RSTCD, eng.ENNM, ") + .append("GROUP BY sec.RSTCD, eng.ENNM, ") .append("CASE ") .append("WHEN dict.SPEC_ORIGIN = 2 THEN '1' ") .append("WHEN dict.SPEC_ORIGIN = 1 AND NVL(dict.PTYPE, -1) <> 6 THEN '2' ") @@ -2189,36 +2189,36 @@ public class WeFishServiceImpl implements WeFishService { Map paramMap) { StringBuilder sql = new StringBuilder(); sql.append("SELECT ") - .append("section.RSTCD AS rstcd, ") + .append("sec.RSTCD AS rstcd, ") .append("eng.ENNM AS rstcdName, ") - .append("TO_CHAR(WM_CONCAT(DISTINCT section.STCD)) AS stcd, ") - .append("TO_CHAR(WM_CONCAT(DISTINCT section.STNM)) AS stnm, ") + .append("TO_CHAR(WM_CONCAT(DISTINCT sec.STCD)) AS stcd, ") + .append("TO_CHAR(WM_CONCAT(DISTINCT sec.STNM)) AS stnm, ") .append("TO_CHAR(WM_CONCAT(DISTINCT dict.ZY_FISH_ID)) AS id ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") .append(" AND NVL(we.STATUS, 1) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("LEFT JOIN SD_ENGINFO_B_H eng ON section.RSTCD = eng.STCD ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON sec.RSTCD = eng.STCD ") .append(" AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN V_SD_FISHDICTORY_B dict ON fish.FTP = dict.FISH_ID ") - .append(" AND (section.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") - .append("WHERE NVL(section.USFL, 0) = 1 ") - .append("AND section.RSTCD IS NOT NULL ") + .append(" AND (sec.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") + .append("WHERE NVL(sec.USFL, 0) = 1 ") + .append("AND sec.RSTCD IS NOT NULL ") .append("AND dict.ZY_FISH_ID IS NOT NULL "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("qgcWeFishDetailBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.qgcWeFishDetailBaseId} "); + sql.append("AND sec.BASE_ID = #{map.qgcWeFishDetailBaseId} "); } if (StrUtil.isNotBlank(rstcd)) { paramMap.put("qgcWeFishDetailRstcd", rstcd); - sql.append("AND section.RSTCD = #{map.qgcWeFishDetailRstcd} "); + sql.append("AND sec.RSTCD = #{map.qgcWeFishDetailRstcd} "); } if (StrUtil.isNotBlank(rvcd)) { paramMap.put("qgcWeFishDetailRvcd", rvcd); - sql.append("AND section.HBRVCD = #{map.qgcWeFishDetailRvcd} "); + sql.append("AND sec.HBRVCD = #{map.qgcWeFishDetailRvcd} "); } if (StrUtil.isNotBlank(yr)) { paramMap.put("qgcWeFishDetailYr", yr); @@ -2233,7 +2233,7 @@ public class WeFishServiceImpl implements WeFishService { .append("END = #{map.qgcWeFishDetailTy} "); } - sql.append("GROUP BY section.RSTCD, eng.ENNM ") + sql.append("GROUP BY sec.RSTCD, eng.ENNM ") .append("ORDER BY eng.ENNM ASC NULLS LAST"); return sql.toString(); } @@ -2246,36 +2246,36 @@ public class WeFishServiceImpl implements WeFishService { Map paramMap) { StringBuilder sql = new StringBuilder(); sql.append("SELECT ") - .append("section.RSTCD AS rstcd, ") + .append("sec.RSTCD AS rstcd, ") .append("eng.ENNM AS rstcdName, ") - .append("TO_CHAR(WM_CONCAT(DISTINCT section.STCD)) AS stcd, ") - .append("TO_CHAR(WM_CONCAT(DISTINCT section.STNM)) AS stnm, ") + .append("TO_CHAR(WM_CONCAT(DISTINCT sec.STCD)) AS stcd, ") + .append("TO_CHAR(WM_CONCAT(DISTINCT sec.STNM)) AS stnm, ") .append("TO_CHAR(WM_CONCAT(DISTINCT dict.NAME)) AS name ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") .append(" AND NVL(we.STATUS, 1) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("LEFT JOIN SD_ENGINFO_B_H eng ON section.RSTCD = eng.STCD ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON sec.RSTCD = eng.STCD ") .append(" AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_FISHDICTORY_B dict ON fish.FTP = dict.ID ") .append(" AND NVL(dict.IS_DELETED, 0) = 0 ") - .append("WHERE NVL(section.USFL, 0) = 1 ") - .append("AND section.RSTCD IS NOT NULL ") + .append("WHERE NVL(sec.USFL, 0) = 1 ") + .append("AND sec.RSTCD IS NOT NULL ") .append("AND dict.NAME IS NOT NULL "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("weFishDetailBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.weFishDetailBaseId} "); + sql.append("AND sec.BASE_ID = #{map.weFishDetailBaseId} "); } if (StrUtil.isNotBlank(rstcd)) { paramMap.put("weFishDetailRstcd", rstcd); - sql.append("AND section.RSTCD = #{map.weFishDetailRstcd} "); + sql.append("AND sec.RSTCD = #{map.weFishDetailRstcd} "); } if (StrUtil.isNotBlank(rvcd)) { paramMap.put("weFishDetailRvcd", rvcd); - sql.append("AND section.HBRVCD = #{map.weFishDetailRvcd} "); + sql.append("AND sec.HBRVCD = #{map.weFishDetailRvcd} "); } if (StrUtil.isNotBlank(yr)) { paramMap.put("weFishDetailYr", yr); @@ -2290,7 +2290,7 @@ public class WeFishServiceImpl implements WeFishService { .append("END = #{map.weFishDetailTy} "); } - sql.append("GROUP BY section.RSTCD, eng.ENNM ") + sql.append("GROUP BY sec.RSTCD, eng.ENNM ") .append("ORDER BY eng.ENNM ASC NULLS LAST"); return sql.toString(); } @@ -2303,36 +2303,36 @@ public class WeFishServiceImpl implements WeFishService { Map paramMap) { StringBuilder sql = new StringBuilder(); sql.append("SELECT ") - .append("section.RSTCD AS rstcd, ") + .append("sec.RSTCD AS rstcd, ") .append("eng.ENNM AS rstcdName, ") - .append("section.STCD AS stcd, ") - .append("section.STNM AS stnm, ") + .append("sec.STCD AS stcd, ") + .append("sec.STNM AS stnm, ") .append("dict.ZY_FISH_ID AS id ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") .append(" AND NVL(we.STATUS, 1) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("LEFT JOIN SD_ENGINFO_B_H eng ON section.RSTCD = eng.STCD ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON sec.RSTCD = eng.STCD ") .append(" AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN V_SD_FISHDICTORY_B dict ON fish.FTP = dict.FISH_ID ") - .append(" AND (section.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") - .append("WHERE NVL(section.USFL, 0) = 1 ") - .append("AND section.RSTCD IS NOT NULL ") + .append(" AND (sec.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") + .append("WHERE NVL(sec.USFL, 0) = 1 ") + .append("AND sec.RSTCD IS NOT NULL ") .append("AND dict.ZY_FISH_ID IS NOT NULL "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("hbbQgcWeFishDetailBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.hbbQgcWeFishDetailBaseId} "); + sql.append("AND sec.BASE_ID = #{map.hbbQgcWeFishDetailBaseId} "); } if (StrUtil.isNotBlank(rstcd)) { paramMap.put("hbbQgcWeFishDetailRstcd", rstcd); - sql.append("AND section.RSTCD = #{map.hbbQgcWeFishDetailRstcd} "); + sql.append("AND sec.RSTCD = #{map.hbbQgcWeFishDetailRstcd} "); } if (StrUtil.isNotBlank(rvcd)) { paramMap.put("hbbQgcWeFishDetailRvcd", rvcd); - sql.append("AND section.HBRVCD = #{map.hbbQgcWeFishDetailRvcd} "); + sql.append("AND sec.HBRVCD = #{map.hbbQgcWeFishDetailRvcd} "); } if (StrUtil.isNotBlank(yr)) { paramMap.put("hbbQgcWeFishDetailYr", yr); @@ -2347,8 +2347,8 @@ public class WeFishServiceImpl implements WeFishService { .append("END = #{map.hbbQgcWeFishDetailTy} "); } - sql.append("GROUP BY section.RSTCD, eng.ENNM, section.STCD, section.STNM,dict.ZY_FISH_ID ") - .append("ORDER BY eng.ENNM ASC NULLS LAST, section.STNM ASC NULLS LAST"); + sql.append("GROUP BY sec.RSTCD, eng.ENNM, sec.STCD, sec.STNM,dict.ZY_FISH_ID ") + .append("ORDER BY eng.ENNM ASC NULLS LAST, sec.STNM ASC NULLS LAST"); return sql.toString(); } @@ -2364,27 +2364,27 @@ public class WeFishServiceImpl implements WeFishService { .append("WHEN dict.SPEC_ORIGIN = 1 AND NVL(dict.PTYPE, -1) <> 6 THEN '2' ") .append("WHEN dict.SPEC_ORIGIN = 1 AND dict.PTYPE = 6 THEN '3' ") .append("END AS ty ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") .append(" AND NVL(we.STATUS, 1) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_FISHDICTORY_B dict ON fish.FTP = dict.ID ") .append(" AND NVL(dict.IS_DELETED, 0) = 0 ") - .append("WHERE NVL(section.USFL, 0) = 1 "); + .append("WHERE NVL(sec.USFL, 0) = 1 "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("weFishStatTabBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.weFishStatTabBaseId} "); + sql.append("AND sec.BASE_ID = #{map.weFishStatTabBaseId} "); } if (StrUtil.isNotBlank(rvcd)) { paramMap.put("weFishStatTabRvcd", rvcd); - sql.append("AND section.HBRVCD = #{map.weFishStatTabRvcd} "); + sql.append("AND sec.HBRVCD = #{map.weFishStatTabRvcd} "); } if (StrUtil.isNotBlank(rstcd)) { paramMap.put("weFishStatTabRstcd", rstcd); - sql.append("AND section.RSTCD = #{map.weFishStatTabRstcd} "); + sql.append("AND sec.RSTCD = #{map.weFishStatTabRstcd} "); } if (StrUtil.isNotBlank(yr)) { paramMap.put("weFishStatTabYr", yr); @@ -2547,7 +2547,7 @@ public class WeFishServiceImpl implements WeFishService { "eng.RVCD_NAME AS rvcdName, " + "eng.HBRVCD AS hbrvcd, " + "eng.HBRVCD_NAME AS hbrvcdName, " + - "section.RSTCD AS rstcd, " + + "sec.RSTCD AS rstcd, " + "eng.ENNM AS ennm, " + "eng.BASE_ID AS baseId, " + "eng.BASE_NAME AS baseName, " + @@ -2557,9 +2557,9 @@ public class WeFishServiceImpl implements WeFishService { "FROM SD_WE_R we " + "INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID " + " AND NVL(fish.IS_DELETED, 0) = 0 " + - "INNER JOIN SD_WE_B_H section ON we.STCD = section.STCD " + - " AND NVL(section.USFL, 0) = 1 " + - "INNER JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD " + + "INNER JOIN SD_WE_B_H sec ON we.STCD = sec.STCD " + + " AND NVL(sec.USFL, 0) = 1 " + + "INNER JOIN SD_ENGINFO_B_H eng ON eng.STCD = sec.RSTCD " + " AND NVL(eng.IS_DELETED, 0) = 0 " + "INNER JOIN V_SD_FISHDICTORY_B dict ON dict.FISH_ID = fish.FTP " + " AND (eng.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') " + @@ -2580,11 +2580,11 @@ public class WeFishServiceImpl implements WeFishService { end = parseDateTimeSafely(endTime); } StringBuilder sql = new StringBuilder(); - sql.append("SELECT agg.ftp AS ftp, section.STCD AS stcd, section.RSTCD AS rstcds, ") - .append("section.STNM AS stnm, eng.ENNM AS ennm, ") - .append("section.LGTD AS lgtd, section.LTTD AS lttd, ") + sql.append("SELECT agg.ftp AS ftp, sec.STCD AS stcd, sec.RSTCD AS rstcds, ") + .append("sec.STNM AS stnm, eng.ENNM AS ennm, ") + .append("sec.LGTD AS lgtd, sec.LTTD AS lttd, ") .append("'ylfb' AS sttp, 'ylfb' AS sttpMap, ") - .append("section.RVCD AS rvcd, section.ADDVCD AS addvcd, section.BASE_ID AS baseId, ") + .append("sec.RVCD AS rvcd, sec.ADDVCD AS addvcd, sec.BASE_ID AS baseId, ") .append("'WE' AS sttpCode, 'ylfb' AS anchoPointState, '鱼类分布' AS titleName, ") .append("eng.ELEV AS dtmel ") .append("FROM (") @@ -2592,12 +2592,12 @@ public class WeFishServiceImpl implements WeFishService { .append("FROM (") .append("SELECT dict.ZY_FISH_ID AS ID, we.STCD AS stcd ") .append("FROM SD_WE_R we ") - .append("INNER JOIN SD_WE_B_H section ON we.STCD = section.STCD ") - .append(" AND NVL(section.USFL, 0) = 1 ") + .append("INNER JOIN SD_WE_B_H sec ON we.STCD = sec.STCD ") + .append(" AND NVL(sec.USFL, 0) = 1 ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") .append("INNER JOIN V_SD_FISHDICTORY_B dict ON dict.FISH_ID = fish.FTP ") - .append(" AND (section.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") + .append(" AND (sec.HBRVCD = dict.RVCD OR dict.RVCD = 'ZY') ") .append("WHERE NVL(we.IS_DELETED, 0) = 0 ") .append("AND NVL(we.STATUS, 1) = 1 "); @@ -2625,12 +2625,12 @@ public class WeFishServiceImpl implements WeFishService { sql.append("AND we.STCD IN (") .append("SELECT a.STCD ") .append("FROM SD_WE_R a ") - .append("INNER JOIN SD_WE_B_H section2 ON a.STCD = section2.STCD ") - .append(" AND NVL(section2.USFL, 0) = 1 ") + .append("INNER JOIN SD_WE_B_H sec2 ON a.STCD = sec2.STCD ") + .append(" AND NVL(sec2.USFL, 0) = 1 ") .append("INNER JOIN SD_WEFISH_R b ON a.ID = b.WER_ID ") .append(" AND NVL(b.IS_DELETED, 0) = 0 ") .append("INNER JOIN V_SD_FISHDICTORY_B c ON c.FISH_ID = b.FTP ") - .append(" AND (section2.HBRVCD = c.RVCD OR c.RVCD = 'ZY') ") + .append(" AND (sec2.HBRVCD = c.RVCD OR c.RVCD = 'ZY') ") .append("WHERE NVL(a.IS_DELETED, 0) = 0 ") .append("AND NVL(a.STATUS, 1) = 1 "); if (start != null && end != null) { @@ -2644,16 +2644,16 @@ public class WeFishServiceImpl implements WeFishService { sql.append("GROUP BY we.STCD, dict.ZY_FISH_ID") .append(") t GROUP BY t.stcd") .append(") agg ") - .append("INNER JOIN SD_WE_B_H section ON agg.stcd = section.STCD ") - .append(" AND NVL(section.USFL, 0) = 1 ") - .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD ") + .append("INNER JOIN SD_WE_B_H sec ON agg.stcd = sec.STCD ") + .append(" AND NVL(sec.USFL, 0) = 1 ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = sec.RSTCD ") .append(" AND NVL(eng.IS_DELETED, 0) = 0 ") .append("WHERE 1 = 1 "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("weFishPointBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.weFishPointBaseId} "); + sql.append("AND sec.BASE_ID = #{map.weFishPointBaseId} "); } - sql.append("ORDER BY section.STCD ASC"); + sql.append("ORDER BY sec.STCD ASC"); return sql.toString(); } @@ -2669,14 +2669,14 @@ public class WeFishServiceImpl implements WeFishService { } return switch (field) { - case "stcd" -> "section.STCD"; - case "lgtd" -> "section.LGTD"; - case "stnm", "titleName" -> "section.STNM"; + case "stcd" -> "sec.STCD"; + case "lgtd" -> "sec.LGTD"; + case "stnm", "titleName" -> "sec.STNM"; case "ennm" -> "eng.ENNM"; - case "rvcd" -> "section.RVCD"; - case "addvcd" -> "section.ADDVCD"; - case "baseId" -> "section.BASE_ID"; - case "rstcd", "rstcds" -> "section.RSTCD"; + case "rvcd" -> "sec.RVCD"; + case "addvcd" -> "sec.ADDVCD"; + case "baseId" -> "sec.BASE_ID"; + case "rstcd", "rstcds" -> "sec.RSTCD"; case "tm" -> "latest.TM"; default -> null; }; @@ -2709,13 +2709,13 @@ public class WeFishServiceImpl implements WeFishService { return null; } return switch (field) { - case "stcd" -> "section.STCD"; - case "stnm", "titleName" -> "section.STNM"; + case "stcd" -> "sec.STCD"; + case "stnm", "titleName" -> "sec.STNM"; case "ennm" -> "eng.ENNM"; case "tm" -> "latest.TM"; - case "rvcd" -> "section.RVCD"; - case "addvcd" -> "section.ADDVCD"; - case "baseId" -> "section.BASE_ID"; + case "rvcd" -> "sec.RVCD"; + case "addvcd" -> "sec.ADDVCD"; + case "baseId" -> "sec.BASE_ID"; case "siteStepSort" -> "siteSort.SORT"; default -> null; }; @@ -3949,21 +3949,21 @@ public class WeFishServiceImpl implements WeFishService { .append("COUNT(DISTINCT we.STCD) AS stcdCount, ") .append("COUNT(DISTINCT fish.FTP) AS ftpCount, ") .append("NVL(SUM(NVL(fish.FCNT, 0)), 0) AS fcntSum ") - .append("FROM SD_WE_B_H section ") - .append("INNER JOIN SD_WE_R we ON section.STCD = we.STCD ") + .append("FROM SD_WE_B_H sec ") + .append("INNER JOIN SD_WE_R we ON sec.STCD = we.STCD ") .append(" AND NVL(we.IS_DELETED, 0) = 0 ") .append(" AND NVL(we.STATUS, 1) = 1 ") .append("LEFT JOIN SD_WEFISH_R fish ON fish.WER_ID = we.ID ") .append(" AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("WHERE NVL(section.USFL, 0) = 1 "); + .append("WHERE NVL(sec.USFL, 0) = 1 "); if (StrUtil.isNotBlank(baseId)) { paramMap.put("weStaticsBaseId", baseId); - sql.append("AND section.BASE_ID = #{map.weStaticsBaseId} "); + sql.append("AND sec.BASE_ID = #{map.weStaticsBaseId} "); } if (StrUtil.isNotBlank(hbrvcd)) { paramMap.put("weStaticsHbrvcd", hbrvcd); - sql.append("AND section.HBRVCD = #{map.weStaticsHbrvcd} "); + sql.append("AND sec.HBRVCD = #{map.weStaticsHbrvcd} "); } if (StrUtil.isNotBlank(yr)) { paramMap.put("weStaticsYr", yr); @@ -3981,7 +3981,7 @@ public class WeFishServiceImpl implements WeFishService { placeholders.add("#{map." + key + "}"); } if (CollUtil.isNotEmpty(placeholders)) { - sql.append("AND section.RSTCD IN (").append(String.join(", ", placeholders)).append(") "); + sql.append("AND sec.RSTCD IN (").append(String.join(", ", placeholders)).append(") "); } } return sql.toString(); @@ -4001,8 +4001,8 @@ public class WeFishServiceImpl implements WeFishService { private String buildWeFishTDetailSql() { return "SELECT " + - "section.STCD AS stcd, " + - "section.STNM AS stnm, " + + "sec.STCD AS stcd, " + + "sec.STNM AS stnm, " + "eng.BASE_ID AS baseId, " + "eng.BASE_NAME AS baseName, " + "eng.RVCD AS rvcd, " + @@ -4044,9 +4044,9 @@ public class WeFishServiceImpl implements WeFishService { "FROM SD_WE_R we " + "INNER JOIN SD_WEFISH_R fish ON fish.WER_ID = we.ID " + " AND NVL(fish.IS_DELETED, 0) = 0 " + - "INNER JOIN SD_WE_B_H section ON section.STCD = we.STCD " + - " AND NVL(section.USFL, 0) = 1 " + - "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD " + + "INNER JOIN SD_WE_B_H sec ON sec.STCD = we.STCD " + + " AND NVL(sec.USFL, 0) = 1 " + + "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = sec.RSTCD " + " AND NVL(eng.IS_DELETED, 0) = 0 " + "LEFT JOIN SD_FISHDICTORY_B dict ON dict.ID = fish.FTP " + " AND NVL(dict.IS_DELETED, 0) = 0 " + @@ -4056,8 +4056,8 @@ public class WeFishServiceImpl implements WeFishService { private String buildWeFishQgcDetailSql() { return "SELECT " + - "section.STCD AS stcd, " + - "section.STNM AS stnm, " + + "sec.STCD AS stcd, " + + "sec.STNM AS stnm, " + "eng.BASE_ID AS baseId, " + "eng.BASE_NAME AS baseName, " + "eng.RVCD AS rvcd, " + @@ -4099,9 +4099,9 @@ public class WeFishServiceImpl implements WeFishService { "FROM SD_WE_R we " + "INNER JOIN SD_WEFISH_R fish ON fish.WER_ID = we.ID " + " AND NVL(fish.IS_DELETED, 0) = 0 " + - "INNER JOIN SD_WE_B_H section ON section.STCD = we.STCD " + -// " AND NVL(section.USFL, 0) = 1 " + - "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD " + + "INNER JOIN SD_WE_B_H sec ON sec.STCD = we.STCD " + +// " AND NVL(sec.USFL, 0) = 1 " + + "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = sec.RSTCD " + " AND NVL(eng.IS_DELETED, 0) = 0 " + "LEFT JOIN SD_FISHDICTORY_B dict ON dict.ID = fish.FTP " + // " AND (dict.RVCD = 'ZY' OR dict.RVCD = eng.HBRVCD) " + diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index 24473695..1c569fca 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -11,8 +11,10 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: master: - driverClassName: oracle.jdbc.OracleDriver - url: "${DB_MASTER_URL:jdbc:oracle:thin:@172.16.31.190:1521/SDLYZ}" +# driverClassName: oracle.jdbc.OracleDriver +# url: "${DB_MASTER_URL:jdbc:oracle:thin:@172.16.31.190:1521/SDLYZ}" + driverClassName: dm.jdbc.driver.DmDriver + url: "${DB_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}" username: "${DB_MASTER_USERNAME:QGC_REFA}" password: "${DB_MASTER_PASSWORD:Y4M4K1oCkL8U}" initial-size: 5 @@ -41,8 +43,10 @@ spring: max-pool-prepared-statement-per-connection-size: 100 connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 slave: - driverClassName: oracle.jdbc.OracleDriver - url: "${DB_SLAVE_URL:jdbc:oracle:thin:@172.16.31.190:1521/SDLYZ}" + driverClassName: dm.jdbc.driver.DmDriver + url: "${DB_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}" +# driverClassName: oracle.jdbc.OracleDriver +# url: "${DB_SLAVE_URL:jdbc:oracle:thin:@172.16.31.190:1521/SDLYZ}" username: "${DB_SLAVE_USERNAME:QGC_REFA}" password: "${DB_SLAVE_PASSWORD:Y4M4K1oCkL8U}" initial-size: 5