新增app和跟踪页面,现已经调通
This commit is contained in:
@@ -474,6 +474,30 @@ public class SqlServerApiClient {
|
||||
);
|
||||
}
|
||||
|
||||
public ExecuteSqlResponse queryMatMap() {
|
||||
return executeSql(
|
||||
"oracle",
|
||||
"select AREAID, GROUPID, POS, FULLPLACENAME, CREMATIDTYPE, MATIDTYPE, MATID, SUBPART, UPDMASTER, DISPLAYNAME, L1MAPIDX, UPDTIME from JXPLTCM.ROMTB_MATMAP order by L1MAPIDX",
|
||||
emptyParams()
|
||||
);
|
||||
}
|
||||
|
||||
public ExecuteSqlResponse queryEntryTrace() {
|
||||
return executeSql(
|
||||
"oracle",
|
||||
"select * from JXPLTCM.V_PLTCM_ENTRY_TRACE order by L1MAPIDX",
|
||||
emptyParams()
|
||||
);
|
||||
}
|
||||
|
||||
public ExecuteSqlResponse queryExitTrace() {
|
||||
return executeSql(
|
||||
"oracle",
|
||||
"select * from JXPLTCM.V_PLTCM_EXIT_TRACE order by L1MAPIDX",
|
||||
emptyParams()
|
||||
);
|
||||
}
|
||||
|
||||
private org.springframework.util.MultiValueMap<String, String> convertToQueryParams(Map<String, ?> queryParams) {
|
||||
org.springframework.util.LinkedMultiValueMap<String, String> multiValueMap = new org.springframework.util.LinkedMultiValueMap<>();
|
||||
if (queryParams == null || queryParams.isEmpty()) {
|
||||
|
||||
@@ -126,6 +126,34 @@ public class SqlServerApiBusinessService {
|
||||
return client.queryShapeByMatId(matId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 跟踪数据:ROMTB_MATMAP + V_PLTCM_ENTRY_TRACE + V_PLTCM_EXIT_TRACE 一次返回。
|
||||
*/
|
||||
public TrackDataView getTrackData() {
|
||||
List<Map<String, Object>> matMapRows = asRowList(client.queryMatMap());
|
||||
List<Map<String, Object>> entryRows = asRowList(client.queryEntryTrace());
|
||||
List<Map<String, Object>> exitRows = asRowList(client.queryExitTrace());
|
||||
return new TrackDataView(matMapRows, entryRows, exitRows);
|
||||
}
|
||||
|
||||
public static class TrackDataView {
|
||||
private final List<Map<String, Object>> matMap;
|
||||
private final List<Map<String, Object>> entryTrace;
|
||||
private final List<Map<String, Object>> exitTrace;
|
||||
|
||||
public TrackDataView(List<Map<String, Object>> matMap,
|
||||
List<Map<String, Object>> entryTrace,
|
||||
List<Map<String, Object>> exitTrace) {
|
||||
this.matMap = matMap;
|
||||
this.entryTrace = entryTrace;
|
||||
this.exitTrace = exitTrace;
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getMatMap() { return matMap; }
|
||||
public List<Map<String, Object>> getEntryTrace() { return entryTrace; }
|
||||
public List<Map<String, Object>> getExitTrace() { return exitTrace; }
|
||||
}
|
||||
|
||||
/**
|
||||
* 出口卷实绩列表(分页),来自 PLTCM_PDO_EXCOIL。
|
||||
*/
|
||||
|
||||
@@ -183,6 +183,14 @@ public class SqlServerApiController {
|
||||
return R.ok(businessService.getPresetSetupByCoilId(coilId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 跟踪数据:matMap + entryTrace + exitTrace 一次返回。
|
||||
*/
|
||||
@GetMapping("/track")
|
||||
public R<SqlServerApiBusinessService.TrackDataView> trackData() {
|
||||
return R.ok(businessService.getTrackData());
|
||||
}
|
||||
|
||||
/**
|
||||
* 换辊历史总条数。
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user