diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpSdfpssrVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpSdfpssrVo.java index 7c5fcbdc..64fada9b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpSdfpssrVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpSdfpssrVo.java @@ -72,6 +72,9 @@ public class FpSdfpssrVo { @Schema(description = "游向") private Integer direction; + @Schema(description = "游向") + private Integer directionName; + @Schema(description = "监测方式") private Integer mway; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpTableVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpTableVo.java index e336bf1b..b6f4978a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpTableVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpTableVo.java @@ -75,4 +75,10 @@ public class FpTableVo { @Schema(description = "监测方式：1=人工 2=自动(预留)") private Integer mway; + +// @Schema(description = "视频") +// private String vdpth; +// +// @Schema(description = "图片") +// private String picpth; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java index ec4b7376..68e0e443 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java @@ -63,8 +63,8 @@ public class FpRunServiceImpl implements FpRunService { Map paramMap = new HashMap<>(); paramMap.put("stcd", stcd); paramMap.put("yr", yr); - - Map row = microservicDynamicSQLMapper.getOneBySql(buildQgcSecondPlanSql(), paramMap); + String sql = buildQgcSecondPlanSql(); + Map row = microservicDynamicSQLMapper.getOneBySql(sql, paramMap); FpRunPlanVo vo = row == null || row.isEmpty() ? new FpRunPlanVo() : BeanUtil.fillBeanWithMap( @@ -372,49 +372,55 @@ public class FpRunServiceImpl implements FpRunService { " CAST(NULL AS VARCHAR2(255)) AS FIRSTIMGURL, " + " CAST(NULL AS VARCHAR2(255)) AS VIDEOURL, " + " t.FWET AS FWET, " + - " t.FID AS FID, " + - " CASE WHEN t.AI_STCD IS NULL THEN '人工填报' ELSE aiFp.STNM END AS DATASRC, " + + " NULL AS FID, " + + "t.PICPTH AS picpth, " + + "t.VDPTH AS vdpth, " + + " '人工填报' AS DATASRC, " + +// " CASE WHEN t.AI_STCD IS NULL THEN '人工填报' ELSE aiFp.STNM END AS DATASRC, " + " 1 AS MWAY, " + " t.STRDT AS STRDT, " + " t.ENDDT AS ENDDT " + " FROM SD_FPSS_R t " + " LEFT JOIN SD_FPSS_B_H fp ON fp.STCD = t.STCD " + - " LEFT JOIN SD_FPSS_B_H aiFp ON aiFp.STCD = t.AI_STCD " + +// " LEFT JOIN SD_FPSS_B_H aiFp ON aiFp.STCD = t.AI_STCD " + " LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " + " LEFT JOIN SD_FISHDICTORY_RLTN_B relRv ON relRv.FISH_ID = t.FTP AND relRv.RVCD = eng.HBRVCD AND NVL(relRv.IS_DELETED, 0) = 0 " + " LEFT JOIN SD_FISHDICTORY_B fishRv ON fishRv.ID = relRv.ZY_FISH_ID AND NVL(fishRv.IS_DELETED, 0) = 0 AND NVL(fishRv.ENABLE, 1) = 1 " + " LEFT JOIN SD_FISHDICTORY_RLTN_B relZy ON relZy.FISH_ID = t.FTP AND relZy.RVCD = 'ZY' AND NVL(relZy.IS_DELETED, 0) = 0 " + " LEFT JOIN SD_FISHDICTORY_B fishZy ON fishZy.ID = relZy.ZY_FISH_ID AND NVL(fishZy.IS_DELETED, 0) = 0 AND NVL(fishZy.ENABLE, 1) = 1 " + " LEFT JOIN SD_FISHDICTORY_B fishDirect ON fishDirect.ID = t.FTP AND NVL(fishDirect.IS_DELETED, 0) = 0 AND NVL(fishDirect.ENABLE, 1) = 1 " + - " WHERE (t.TASK_STATUS = 'Approved' OR t.TASK_STATUS IS NULL) " + - " AND NVL(t.IS_DELETED, 0) = 0 " + - " UNION ALL " + - " SELECT CAST(NULL AS VARCHAR2(36)) AS STCD, " + - " CAST(NULL AS VARCHAR2(64)) AS STNM, " + - " CAST(NULL AS VARCHAR2(19)) AS TM, " + - " CAST(NULL AS VARCHAR2(255)) AS FTP, " + - " CAST(NULL AS VARCHAR2(200)) AS FISHID, " + - " CAST(NULL AS VARCHAR2(256)) AS FSZ, " + - " CAST(NULL AS VARCHAR2(4)) AS YR, " + - " CAST(NULL AS VARCHAR2(20)) AS FCNT, " + - " CAST(NULL AS VARCHAR2(50)) AS LENGTH, " + - " CAST(NULL AS VARCHAR2(50)) AS WIDTH, " + - " CAST(NULL AS VARCHAR2(50)) AS FISHSPEED, " + - " CAST(NULL AS VARCHAR2(10)) AS DIRECTION, " + - " CAST(NULL AS VARCHAR2(20)) AS DIRECTIONNAME, " + - " CAST(NULL AS NUMBER(18,0)) AS UPFCNT, " + - " CAST(NULL AS NUMBER(18,0)) AS DOWNFCNT, " + - " CAST(NULL AS VARCHAR2(50)) AS TEMPERATURE, " + - " CAST(NULL AS VARCHAR2(50)) AS SPEED, " + - " CAST(NULL AS VARCHAR2(255)) AS FIRSTIMGURL, " + - " CAST(NULL AS VARCHAR2(255)) AS VIDEOURL, " + - " CAST(NULL AS VARCHAR2(50)) AS FWET, " + - " CAST(NULL AS VARCHAR2(1000)) AS FID, " + - " CAST(NULL AS VARCHAR2(64)) AS DATASRC, " + - " 2 AS MWAY, " + - " CAST(NULL AS TIMESTAMP) AS STRDT, " + - " CAST(NULL AS TIMESTAMP) AS ENDDT " + - " FROM DUAL WHERE 1 = 0 " + + " WHERE " + +// "(t.TASK_STATUS = 'Approved' OR t.TASK_STATUS IS NULL) AND "+ + " NVL(t.IS_DELETED, 0) = 0 " + +// " UNION ALL " + +// " SELECT CAST(NULL AS VARCHAR2(36)) AS STCD, " + +// " CAST(NULL AS VARCHAR2(64)) AS STNM, " + +// " CAST(NULL AS VARCHAR2(19)) AS TM, " + +// " CAST(NULL AS VARCHAR2(255)) AS FTP, " + +// " CAST(NULL AS VARCHAR2(200)) AS FISHID, " + +// " CAST(NULL AS VARCHAR2(256)) AS FSZ, " + +// " CAST(NULL AS VARCHAR2(4)) AS YR, " + +// " CAST(NULL AS VARCHAR2(20)) AS FCNT, " + +// " CAST(NULL AS VARCHAR2(50)) AS LENGTH, " + +// " CAST(NULL AS VARCHAR2(50)) AS WIDTH, " + +// " CAST(NULL AS VARCHAR2(50)) AS FISHSPEED, " + +// " CAST(NULL AS VARCHAR2(10)) AS DIRECTION, " + +// " CAST(NULL AS VARCHAR2(20)) AS DIRECTIONNAME, " + +// " CAST(NULL AS NUMBER(18,0)) AS UPFCNT, " + +// " CAST(NULL AS NUMBER(18,0)) AS DOWNFCNT, " + +// " CAST(NULL AS VARCHAR2(50)) AS TEMPERATURE, " + +// " CAST(NULL AS VARCHAR2(50)) AS SPEED, " + +// " CAST(NULL AS VARCHAR2(255)) AS FIRSTIMGURL, " + +// " CAST(NULL AS VARCHAR2(255)) AS VIDEOURL, " + +// " CAST(NULL AS VARCHAR2(50)) AS FWET, " + +// " CAST(NULL AS VARCHAR2(255)) AS picpth, " + +// " CAST(NULL AS VARCHAR2(255)) vdpth FWET, " + +// " CAST(NULL AS VARCHAR2(1000)) AS FID, " + +// " CAST(NULL AS VARCHAR2(64)) AS DATASRC, " + +// " 2 AS MWAY, " + +// " CAST(NULL AS TIMESTAMP) AS STRDT, " + +// " CAST(NULL AS TIMESTAMP) AS ENDDT " + +// " FROM DUAL WHERE 1 = 0 " + ") manualData"; } @@ -439,6 +445,8 @@ public class FpRunServiceImpl implements FpRunService { selectMap.put("videourl", "t.videourl AS videourl"); selectMap.put("fwet", "t.fwet AS fwet"); selectMap.put("fid", "t.fid AS fid"); + selectMap.put("picpth", "t.picpth AS picpth"); + selectMap.put("vdpth", "t.vdpth AS vdpth"); selectMap.put("upFcnt", "t.upFcnt AS upFcnt"); selectMap.put("downFcnt", "t.downFcnt AS downFcnt"); selectMap.put("dataSrc", "t.dataSrc AS dataSrc"); @@ -775,6 +783,7 @@ public class FpRunServiceImpl implements FpRunService { "t.PICPTH AS picpth, " + "t.VDPTH AS vdpth, " + "t.DIRECTION AS direction, " + + "t.DIRECTION AS directionName, " + "1 AS mway, " + "t.STRDT AS strdt, " + "t.ENDDT AS enddt, " + @@ -829,6 +838,7 @@ public class FpRunServiceImpl implements FpRunService { selectMap.put("picpth", "t.picpth AS picpth"); selectMap.put("vdpth", "t.vdpth AS vdpth"); selectMap.put("direction", "t.direction AS direction"); + selectMap.put("directionName", "t.directionName AS directionName"); selectMap.put("mway", "t.mway AS mway"); selectMap.put("strdt", "t.strdt AS strdt"); selectMap.put("enddt", "t.enddt AS enddt");