This commit is contained in:
parent
38bd349887
commit
d403b27c5f
|
@ -287,8 +287,8 @@ public class MonitorController {
|
|||
"&start=" + start +
|
||||
"&end=" + end +
|
||||
"&step=" + step;
|
||||
|
||||
ResponseEntity<HashMap> entity = restTemplate.getForEntity(url, HashMap.class, query);
|
||||
|
||||
HashMap body = entity.getBody();
|
||||
HashMap data = (HashMap) body.get("data");
|
||||
if (data != null) {
|
||||
|
|
|
@ -2874,7 +2874,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
sb.append(" AND apply.\"resourceName\" LIKE '%" + params.get("resourceName").toString() + "%'");
|
||||
}
|
||||
sb.append(" ORDER BY apply.\"createDate\" DESC");
|
||||
List<Map<String, Object>> list = null;
|
||||
List<Map<String, Object>> list = new ArrayList<>();
|
||||
try {
|
||||
list = lcJdbcTemplate.queryForList(sb.toString());
|
||||
} catch (DataAccessException e) {
|
||||
|
|
Loading…
Reference in New Issue