瀏覽代碼

系统监控500bug修复

demon 8 年之前
父節點
當前提交
1b924a5a87

+ 3 - 4
src/main/java/com/yihu/hos/monitor/controller/ServerMonitorController.java

@ -28,8 +28,6 @@ public class ServerMonitorController {
    private ServerMonitorService monitorService;
    //跳转到列表页
    @RequestMapping("/initial")
    public String initial(Model model) {
@ -51,7 +49,8 @@ public class ServerMonitorController {
            @ApiParam(name = "endTime", value = "结束时间", required = true)
            @RequestParam(value = "endTime") String endTime) {
        HttpSession session = request.getSession();
            return monitorService.getMonitorList(session,host,type, beginTime, endTime);
        Result result = monitorService.getMonitorList(session, host, type, beginTime, endTime);
        return result;
    }
@ -67,7 +66,7 @@ public class ServerMonitorController {
            @ApiParam(name = "date", value = "时间点", required = true)
            @RequestParam(value = "date") String date) {
        HttpSession session = request.getSession();
        return monitorService.getMonitorDetail(session,host,type, date);
        return monitorService.getMonitorDetail(session, host, type, date);
    }
    @RequestMapping(value = "/hosts", method = RequestMethod.GET)

+ 2 - 2
src/main/java/com/yihu/hos/monitor/service/ServerMonitorService.java

@ -49,12 +49,12 @@ public class ServerMonitorService {
                        new BasicDBObject().append("create_time",
                                new BasicDBObject().append(QueryOperators.LT, DateUtil.toTimestamp(endTime)))});
        JSONArray result = new JSONArray();
        List<DBObject> result = new ArrayList<>();
        DBCursor cursor = envCollection.find(queryObject);
        while(cursor.hasNext()) {
            DBObject dbObject = cursor.next();
            dbObject.removeField("_id");
            result.put(dbObject);
            result.add(dbObject);
        }
        ActionResult actionResult = new ActionResult();

+ 0 - 1
src/main/webapp/WEB-INF/ehr/jsp/common/index.jsp

@ -45,7 +45,6 @@
        </div>
    </div>
    <div position="left" class="m-index-left">
        <div class="m-index-menu-top" id="btnIndexHome">系统首页</div>
        <div position="center">
            <ul id="ulTree"></ul>
        </div>