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-31 13:59:43 +08:00
parent aafebe55c1
commit a5fc9d3b37
4 changed files with 274 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java
View File

@ -46,6 +46,13 @@ public class FishPassageController {
return ResponseResult.successData(fpRunService.processQgcFpssrlQueryKendoList(dataSourceRequest)); return ResponseResult.successData(fpRunService.processQgcFpssrlQueryKendoList(dataSourceRequest));
} }
@PostMapping("/query/qgc/GetKendoListCustAI")
@Operation(summary = "全过程过鱼自动(AI设备)与人工监测数据查询")
public ResponseResult getQgcFpssrlAiRQueryKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
return ResponseResult.successData(fpRunService.processQgcFpssrlAiRQueryKendoList(dataSourceRequest));
}
@PostMapping("/fpssTable/qgc/GetKendoListCust") @PostMapping("/fpssTable/qgc/GetKendoListCust")
@Operation(summary = "过鱼设施监测数据查询") @Operation(summary = "过鱼设施监测数据查询")
public ResponseResult getQgcFpssTableKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { public ResponseResult getQgcFpssTableKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {

2
backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpRunService.java
View File

@ -23,6 +23,8 @@ public interface FpRunService {
DataSourceResult<FpFpssrlQueryVo> processQgcFpssrlQueryKendoList(DataSourceRequest dataSourceRequest); DataSourceResult<FpFpssrlQueryVo> processQgcFpssrlQueryKendoList(DataSourceRequest dataSourceRequest);
DataSourceResult<FpFpssrlQueryVo> processQgcFpssrlAiRQueryKendoList(DataSourceRequest dataSourceRequest);
DataSourceResult<FpTableVo> processQgcFpssTableKendoList(DataSourceRequest dataSourceRequest); DataSourceResult<FpTableVo> processQgcFpssTableKendoList(DataSourceRequest dataSourceRequest);
DataSourceResult<FpRunAnalysisTableVo> getAnalysisData(DataSourceRequest dataSourceRequest); DataSourceResult<FpRunAnalysisTableVo> getAnalysisData(DataSourceRequest dataSourceRequest);

264
backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
View File

@ -220,6 +220,15 @@ public class FpRunServiceImpl implements FpRunService {
return queryQgcFpssrlGroupList(dataSourceRequest, loadOptions); return queryQgcFpssrlGroupList(dataSourceRequest, loadOptions);
} }
@Override
public DataSourceResult<FpFpssrlQueryVo> processQgcFpssrlAiRQueryKendoList(DataSourceRequest dataSourceRequest) {
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
if (CollUtil.isEmpty(dataSourceRequest == null ? null : dataSourceRequest.getGroup())) {
return queryQgcFpssrlAiRDetailList(dataSourceRequest, loadOptions);
}
return queryQgcFpssrlAiRGroupList(dataSourceRequest, loadOptions);
}
@Override @Override
public DataSourceResult<FpTableVo> processQgcFpssTableKendoList(DataSourceRequest dataSourceRequest) { public DataSourceResult<FpTableVo> processQgcFpssTableKendoList(DataSourceRequest dataSourceRequest) {
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest(); DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
@ -1211,6 +1220,33 @@ public class FpRunServiceImpl implements FpRunService {
return result; return result;
} }
private DataSourceResult<FpFpssrlQueryVo> queryQgcFpssrlAiRDetailList(DataSourceRequest dataSourceRequest,
DataSourceLoadOptionsBase loadOptions) {
StringBuilder sql = new StringBuilder();
sql.append("SELECT ")
.append(buildQgcFpssrlDetailSelectSql(dataSourceRequest == null ? null : dataSourceRequest.getSelect()))
.append(" FROM (")
.append(buildQgcFpssrlAiRCoreSql())
.append(") t WHERE 1 = 1 ");
Map<String, Object> paramMap = new HashMap<>();
String filterSql = buildQgcFpssrlFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
if (StrUtil.isNotBlank(filterSql)) {
sql.append(" AND ").append(filterSql).append(" ");
}
sql.append(buildQgcFpssrlOrderBySql(dataSourceRequest == null ? null : dataSourceRequest.getSort()));
Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake());
List<FpFpssrlQueryVo> list = microservicDynamicSQLMapper.pageAllListWithResultType(
page, sql.toString(), paramMap, FpFpssrlQueryVo.class
);
DataSourceResult<FpFpssrlQueryVo> result = new DataSourceResult<>();
result.setData(list);
result.setTotal(page != null ? page.getTotal() : list.size());
result.setAggregates(new HashMap<>());
return result;
}
private DataSourceResult<FpFpssrlQueryVo> queryQgcFpssrlGroupList(DataSourceRequest dataSourceRequest, private DataSourceResult<FpFpssrlQueryVo> queryQgcFpssrlGroupList(DataSourceRequest dataSourceRequest,
DataSourceLoadOptionsBase loadOptions) { DataSourceLoadOptionsBase loadOptions) {
List<DataSourceRequest.GroupDescriptor> groups = dataSourceRequest.getGroup(); List<DataSourceRequest.GroupDescriptor> groups = dataSourceRequest.getGroup();
@ -1284,6 +1320,79 @@ public class FpRunServiceImpl implements FpRunService {
return result; return result;
} }
private DataSourceResult<FpFpssrlQueryVo> queryQgcFpssrlAiRGroupList(DataSourceRequest dataSourceRequest,
DataSourceLoadOptionsBase loadOptions) {
List<DataSourceRequest.GroupDescriptor> groups = dataSourceRequest.getGroup();
GroupingInfo[] groupInfos = loadOptions == null ? new GroupingInfo[0] : loadOptions.getGroup();
StringBuilder sql = new StringBuilder("SELECT ");
List<String> selectItems = new ArrayList<>();
for (DataSourceRequest.GroupDescriptor descriptor : groups) {
if (descriptor == null || StrUtil.isBlank(descriptor.getField())) {
continue;
}
String column = mapQgcFpssrlColumn(descriptor.getField());
if (StrUtil.isBlank(column)) {
continue;
}
selectItems.add(column + " AS " + descriptor.getField().toUpperCase());
selectItems.add("COUNT(*) AS COUNT_" + descriptor.getField().toUpperCase());
if (CollUtil.isNotEmpty(descriptor.getAggregates())) {
for (DataSourceRequest.AggregateDescriptor aggregate : descriptor.getAggregates()) {
String aggregateColumn = mapQgcFpssrlColumn(aggregate.getField());
if (StrUtil.isBlank(aggregateColumn) || StrUtil.isBlank(aggregate.getAggregate())) {
continue;
}
String aggregateSql = buildAggregateSql(aggregate.getAggregate(), aggregateColumn, aggregate.getField());
if (StrUtil.isNotBlank(aggregateSql)) {
selectItems.add(aggregateSql);
}
}
}
}
if (selectItems.isEmpty()) {
selectItems.add("t.STCD AS STCD");
selectItems.add("COUNT(*) AS COUNT_STCD");
}
sql.append(String.join(", ", selectItems))
.append(" FROM (")
.append(buildQgcFpssrlCoreSql())
.append(") t WHERE 1 = 1 ");
Map<String, Object> paramMap = new HashMap<>();
String filterSql = buildQgcFpssrlFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
if (StrUtil.isNotBlank(filterSql)) {
sql.append(" AND ").append(filterSql).append(" ");
}
List<String> groupByColumns = new ArrayList<>();
for (DataSourceRequest.GroupDescriptor descriptor : groups) {
if (descriptor == null || StrUtil.isBlank(descriptor.getField())) {
continue;
}
String column = mapQgcFpssrlColumn(descriptor.getField());
if (StrUtil.isNotBlank(column)) {
groupByColumns.add(column);
}
}
if (!groupByColumns.isEmpty()) {
sql.append(" GROUP BY ").append(String.join(", ", groupByColumns)).append(" ");
}
sql.append(buildQgcFpssrlGroupOrderBySql(groups));
List<Map<String, Object>> rows = microservicDynamicSQLMapper.pageAllList(null, sql.toString(), paramMap);
DataSourceResult<FpFpssrlQueryVo> result = new DataSourceResult<>();
if (Boolean.TRUE.equals(dataSourceRequest.getGroupResultFlat())) {
result.setData((List<FpFpssrlQueryVo>) (List<?>) new GroupHelper().faltGroup(rows, Arrays.asList(groupInfos)));
} else {
result.setData((List<FpFpssrlQueryVo>) (List<?>) new GroupHelper().group(rows, Arrays.asList(groupInfos)));
}
result.setTotal(0L);
result.setAggregates(new HashMap<>());
return result;
}
private DataSourceResult<FpSdfpssrVo> queryQgcSdfpssrGroupList(DataSourceRequest dataSourceRequest, private DataSourceResult<FpSdfpssrVo> queryQgcSdfpssrGroupList(DataSourceRequest dataSourceRequest,
DataSourceLoadOptionsBase loadOptions) { DataSourceLoadOptionsBase loadOptions) {
List<DataSourceRequest.GroupDescriptor> groups = dataSourceRequest.getGroup(); List<DataSourceRequest.GroupDescriptor> groups = dataSourceRequest.getGroup();
@ -1566,6 +1675,161 @@ public class FpRunServiceImpl implements FpRunService {
") src"; ") src";
} }
private String buildQgcFpssrlAiRCoreSql() {
return "SELECT " +
"src.ID AS id, " +
"src.STCD AS stcd, " +
"src.STNM AS stnm, " +
"src.BASEID AS baseId, " +
"src.BASENAME AS baseName, " +
"src.RSTCD AS rstcd, " +
"src.ENNM AS ennm, " +
"src.HBRVCD AS hbrvcd, " +
"src.BASESTEPSORT AS baseStepSort, " +
"src.RVCDSTEPSORT AS rvcdStepSort, " +
"src.SITESTEPSORT AS siteStepSort, " +
"src.RSTCDSTEPSORT AS rstcdStepSort, " +
"src.TM AS tm, " +
"src.YR AS yr, " +
"src.FTP AS ftp, " +
"src.FISHID AS fishId, " +
"src.FSZ AS fsz, " +
"src.LENGTH AS length, " +
"src.WIDTH AS width, " +
"src.FISHSPEED AS fishspeed, " +
"src.DIRECTION AS direction, " +
"src.TEMPERATURE AS temperature, " +
"src.SPEED AS speed, " +
"src.CHANNELNO AS channelno, " +
"src.FCNT AS fcnt, " +
"src.FIRSTIMGURL AS firstimgurl, " +
"src.VIDEOURL AS videourl, " +
"src.MWAY AS mway, " +
"src.STRDT AS strdt, " +
"src.ENDDT AS enddt, " +
"src.STCODE AS stCode, " +
"src.STNAME AS stName " +
"FROM ( " +
" SELECT t.ID AS ID, " +
" t.STCD AS STCD, " +
" fp.STNM AS STNM, " +
" eng.BASE_ID AS BASEID, " +
" hb.BASENAME AS BASENAME, " +
" fp.RSTCD AS RSTCD, " +
" eng.ENNM AS ENNM, " +
" eng.HBRVCD AS HBRVCD, " +
" NVL(hb.ORDER_INDEX, 999999) AS BASESTEPSORT, " +
" NVL(hbrv.ORDER_INDEX, 999999) AS RVCDSTEPSORT, " +
" NVL(fp.ORDER_INDEX, 999999) AS SITESTEPSORT, " +
" NVL(eng.ORDER_INDEX, 999999) AS RSTCDSTEPSORT, " +
" t.TM AS TM, " +
" TO_CHAR(t.TM, 'YYYY') AS YR, " +
" COALESCE(fishRv.NAME, relRv.FISH_NAME, fishZy.NAME, relZy.FISH_NAME, fishDirect.NAME, t.FTP) AS FTP, " +
" t.FTP AS FISHID, " +
" t.FSZ AS FSZ, " +
" TO_CHAR(t.LENGTH) AS LENGTH, " +
" TO_CHAR(t.WIDTH) AS WIDTH, " +
" TO_CHAR(t.FISHSPEED) AS FISHSPEED, " +
" TO_CHAR(t.DIRECTION) AS DIRECTION, " +
" TO_CHAR(t.TEMPERATURE) AS TEMPERATURE, " +
" TO_CHAR(t.SPEED) AS SPEED, " +
" t.CHANNELNO AS CHANNELNO, " +
" TO_CHAR(t.FCNT) AS FCNT, " +
" t.FIRSTIMGURL AS FIRSTIMGURL, " +
" t.VIDEOURL AS VIDEOURL, " +
" 2 AS MWAY, " +
" CAST(NULL AS DATE) AS STRDT, " +
" CAST(NULL AS DATE) AS ENDDT, " +
" fp.STTP AS STCODE, " +
" sttp.STTP_NAME AS STNAME " +
" FROM SD_FPSSRL_AI_R t " +
" INNER JOIN V_MS_STBPRP_T fp ON fp.STCD = t.STCD " +
" LEFT JOIN SD_STTP_B sttp ON sttp.STTP_CODE = fp.STTP AND NVL(sttp.IS_DELETED, 0) = 0 AND NVL(sttp.ENABLE, 1) = 1 " +
" LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " +
" 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 " +
" AND NVL(hbrv.IS_DELETED, 0) = 0 " +
" AND NVL(hbrv.ENABLED, 1) = 1 " +
" 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 NVL(t.IS_DELETED, 0) = 0 " +
" UNION ALL " +
" SELECT t.ID AS ID, " +
" t.STCD AS STCD, " +
" fp.STNM AS STNM, " +
" eng.BASE_ID AS BASEID, " +
" hb.BASENAME AS BASENAME, " +
" fp.RSTCD AS RSTCD, " +
" eng.ENNM AS ENNM, " +
" eng.HBRVCD AS HBRVCD, " +
" NVL(hb.ORDER_INDEX, 999999) AS BASESTEPSORT, " +
" NVL(hbrv.ORDER_INDEX, 999999) AS RVCDSTEPSORT, " +
" NVL(fp.ORDER_INDEX, 999999) AS SITESTEPSORT, " +
" NVL(eng.ORDER_INDEX, 999999) AS RSTCDSTEPSORT, " +
" t.STRDT AS TM, " +
" TO_CHAR(t.STRDT, 'YYYY') AS YR, " +
" COALESCE(fishRv.NAME, relRv.FISH_NAME, fishZy.NAME, relZy.FISH_NAME, fishDirect.NAME, t.FTP) AS FTP, " +
" t.FTP AS FISHID, " +
" t.FSZ AS FSZ, " +
" CAST(NULL AS VARCHAR2(50)) AS LENGTH, " +
" CAST(NULL AS VARCHAR2(50)) AS WIDTH, " +
" CAST(NULL AS VARCHAR2(50)) AS FISHSPEED, " +
" TO_CHAR(t.DIRECTION) AS DIRECTION, " +
" CAST(NULL AS VARCHAR2(50)) AS TEMPERATURE, " +
" CAST(NULL AS VARCHAR2(50)) AS SPEED, " +
" CAST(NULL AS VARCHAR2(100)) AS CHANNELNO, " +
" TO_CHAR(t.FCNT) AS FCNT, " +
" t.PICPTH AS FIRSTIMGURL, " +
" t.VDPTH AS VIDEOURL, " +
" 1 AS MWAY, " +
" t.STRDT AS STRDT, " +
" t.ENDDT AS ENDDT, " +
" fp.STTP AS STCODE, " +
" sttp.STTP_NAME AS STNAME " +
" FROM SD_FPSS_R t " +
" INNER JOIN SD_FPSS_B_H fp ON fp.STCD = t.STCD " +
" LEFT JOIN SD_STTP_B sttp ON sttp.STTP_CODE = fp.STTP AND NVL(sttp.IS_DELETED, 0) = 0 AND NVL(sttp.ENABLE, 1) = 1 " +
" LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " +
" 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 " +
" AND NVL(hbrv.IS_DELETED, 0) = 0 " +
" AND NVL(hbrv.ENABLED, 1) = 1 " +
" 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 NVL(t.IS_DELETED, 0) = 0 " +
// " AND (t.TASK_STATUS = 'Approved' OR t.TASK_STATUS IS NULL) " +
") src";
}
private String buildQgcSdfpssrDetailSelectSql(List<String> selectFields) { private String buildQgcSdfpssrDetailSelectSql(List<String> selectFields) {
Map<String, String> selectMap = new LinkedHashMap<>(); Map<String, String> selectMap = new LinkedHashMap<>();
selectMap.put("stcd", "t.stcd AS stcd"); selectMap.put("stcd", "t.stcd AS stcd");

2
backend/src/main/resources/application-prod.yml
View File

@ -197,7 +197,7 @@ logging:
level: level:
root: info root: info
com.yfd.platform: info com.yfd.platform: info
com.yfd.platform.common.MicroservicDynamicSQLMapper: debug com.yfd.platform.common.MicroservicDynamicSQLMapper: info
# ... existing code ... # ... existing code ...
# com.yfd.platform.*.mapper: trace # com.yfd.platform.*.mapper: trace