feat: 根据条件查询水文流量站基础数据(工程专题询
This commit is contained in:
parent
d9f58678d8
commit
d88f34c549
@ -29,6 +29,12 @@ public class ZqMonitorController {
|
|||||||
return ResponseResult.successData(zqMonitorService.getMsstbprptList(dataSourceRequest));
|
return ResponseResult.successData(zqMonitorService.getMsstbprptList(dataSourceRequest));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/msstbprpt/eng/GetKendoList")
|
||||||
|
@Operation(summary = "根据条件查询水文流量站基础数据(工程专题)")
|
||||||
|
public ResponseResult getEngMsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||||
|
return ResponseResult.successData(zqMonitorService.getEngMsstbprptList(dataSourceRequest));
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/river/GetKendoListCust")
|
@PostMapping("/river/GetKendoListCust")
|
||||||
@Operation(summary = "查询流量站实时数据")
|
@Operation(summary = "查询流量站实时数据")
|
||||||
public ResponseResult getRiverKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
public ResponseResult getRiverKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||||
|
|||||||
@ -30,6 +30,9 @@ public class ZqBaseInfoVo {
|
|||||||
@Schema(description = "纬度")
|
@Schema(description = "纬度")
|
||||||
private Double lttd;
|
private Double lttd;
|
||||||
|
|
||||||
|
@Schema(description = "水温设备类型")
|
||||||
|
private Integer wtDeviceType;
|
||||||
|
|
||||||
@Schema(description = "海拔")
|
@Schema(description = "海拔")
|
||||||
private Double elev;
|
private Double elev;
|
||||||
|
|
||||||
|
|||||||
@ -9,6 +9,8 @@ public interface ZqMonitorService {
|
|||||||
|
|
||||||
DataSourceResult getMsstbprptList(DataSourceRequest dataSourceRequest);
|
DataSourceResult getMsstbprptList(DataSourceRequest dataSourceRequest);
|
||||||
|
|
||||||
|
DataSourceResult getEngMsstbprptList(DataSourceRequest dataSourceRequest);
|
||||||
|
|
||||||
DataSourceResult<ZqRiverDataVo> getRiverKendoListCust(DataSourceRequest dataSourceRequest);
|
DataSourceResult<ZqRiverDataVo> getRiverKendoListCust(DataSourceRequest dataSourceRequest);
|
||||||
|
|
||||||
ZqBaseInfoVo getStcdInfo(String stcd);
|
ZqBaseInfoVo getStcdInfo(String stcd);
|
||||||
|
|||||||
@ -33,6 +33,17 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DataSourceResult getMsstbprptList(DataSourceRequest dataSourceRequest) {
|
public DataSourceResult getMsstbprptList(DataSourceRequest dataSourceRequest) {
|
||||||
|
return getMsstbprptListInternal(dataSourceRequest, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DataSourceResult getEngMsstbprptList(DataSourceRequest dataSourceRequest) {
|
||||||
|
DataSourceRequest request = dataSourceRequest == null ? new DataSourceRequest() : dataSourceRequest;
|
||||||
|
request.setSelect(Arrays.asList("stcd", "stnm", "wtDeviceType", "dtinType", "mway"));
|
||||||
|
return getMsstbprptListInternal(request, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private DataSourceResult getMsstbprptListInternal(DataSourceRequest dataSourceRequest, boolean onlyZq) {
|
||||||
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
|
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
|
||||||
if (CollUtil.isEmpty(dataSourceRequest == null ? null : dataSourceRequest.getGroup())) {
|
if (CollUtil.isEmpty(dataSourceRequest == null ? null : dataSourceRequest.getGroup())) {
|
||||||
StringBuilder sql = new StringBuilder();
|
StringBuilder sql = new StringBuilder();
|
||||||
@ -48,6 +59,9 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
|
|||||||
.append("LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD ")
|
.append("LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD ")
|
||||||
.append("LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD ")
|
.append("LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD ")
|
||||||
.append("WHERE NVL(t.IS_DELETED, 0) = 0 ");
|
.append("WHERE NVL(t.IS_DELETED, 0) = 0 ");
|
||||||
|
if (onlyZq) {
|
||||||
|
sql.append("AND t.STTP = 'ZQ' ");
|
||||||
|
}
|
||||||
|
|
||||||
Map<String, Object> paramMap = new HashMap<>();
|
Map<String, Object> paramMap = new HashMap<>();
|
||||||
String filterSql = buildMsstbprptFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
|
String filterSql = buildMsstbprptFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
|
||||||
@ -89,6 +103,9 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
|
|||||||
.append("FROM SD_RIVER_B_H t ")
|
.append("FROM SD_RIVER_B_H t ")
|
||||||
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
|
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
|
||||||
.append("WHERE NVL(t.IS_DELETED, 0) = 0 ");
|
.append("WHERE NVL(t.IS_DELETED, 0) = 0 ");
|
||||||
|
if (onlyZq) {
|
||||||
|
sql.append("AND t.STTP = 'ZQ' ");
|
||||||
|
}
|
||||||
|
|
||||||
Map<String, Object> paramMap = new HashMap<>();
|
Map<String, Object> paramMap = new HashMap<>();
|
||||||
String filterSql = buildMsstbprptFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
|
String filterSql = buildMsstbprptFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
|
||||||
@ -778,6 +795,7 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
|
|||||||
}
|
}
|
||||||
return switch (field) {
|
return switch (field) {
|
||||||
case "isDeleted" -> "NVL(t.IS_DELETED, 0)";
|
case "isDeleted" -> "NVL(t.IS_DELETED, 0)";
|
||||||
|
case "sttpFullPath" -> null;
|
||||||
case "sttpCode" -> "t.STTP";
|
case "sttpCode" -> "t.STTP";
|
||||||
case "mway" -> "t.MWAY";
|
case "mway" -> "t.MWAY";
|
||||||
case "dtinType" -> "t.DTIN_TYPE";
|
case "dtinType" -> "t.DTIN_TYPE";
|
||||||
@ -800,6 +818,7 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
|
|||||||
selectMap.put("sttpCode", "t.STTP AS sttpCode");
|
selectMap.put("sttpCode", "t.STTP AS sttpCode");
|
||||||
selectMap.put("lgtd", "t.LGTD AS lgtd");
|
selectMap.put("lgtd", "t.LGTD AS lgtd");
|
||||||
selectMap.put("lttd", "t.LTTD AS lttd");
|
selectMap.put("lttd", "t.LTTD AS lttd");
|
||||||
|
selectMap.put("wtDeviceType", "CAST(NULL AS NUMBER(10,0)) AS wtDeviceType");
|
||||||
selectMap.put("elev", "t.ELEV AS elev");
|
selectMap.put("elev", "t.ELEV AS elev");
|
||||||
selectMap.put("stlc", "t.STLC AS stlc");
|
selectMap.put("stlc", "t.STLC AS stlc");
|
||||||
selectMap.put("jcdt", "t.JCDT AS jcdt");
|
selectMap.put("jcdt", "t.JCDT AS jcdt");
|
||||||
@ -921,6 +940,7 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
|
|||||||
case "sttp", "sttpCode" -> "t.STTP";
|
case "sttp", "sttpCode" -> "t.STTP";
|
||||||
case "lgtd" -> "t.LGTD";
|
case "lgtd" -> "t.LGTD";
|
||||||
case "lttd" -> "t.LTTD";
|
case "lttd" -> "t.LTTD";
|
||||||
|
case "wtDeviceType" -> "CAST(NULL AS NUMBER(10,0))";
|
||||||
case "elev" -> "t.ELEV";
|
case "elev" -> "t.ELEV";
|
||||||
case "stlc" -> "t.STLC";
|
case "stlc" -> "t.STLC";
|
||||||
case "jcdt" -> "t.JCDT";
|
case "jcdt" -> "t.JCDT";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user