Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

3 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java

@@ -2,6 +2,8 @@

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.service.business.VisitsService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
@@ -30,6 +32,9 @@
    @Autowired
    private BoardService boardService;

    @Autowired
    private VisitsService visitsService;

    @LoginNoRequired
    @ApiOperation("中心数据")
    @GetMapping("/centerData")
@@ -39,11 +44,16 @@
    }


    /**
     *
     * @param type 0/null  = 当天；1=当月；2=当年
     * @return
     */
    @LoginNoRequired
    @ApiOperation("报警信息")
    @GetMapping("/alarmData")
    public ApiResponse<AlarmDataVO> alarmDataSumByCate() {
        AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate();
    public ApiResponse<AlarmDataVO> alarmDataSumByCate(Integer type) {
        AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate(type);
        return ApiResponse.success(alarmDataVO);
    }
    @LoginNoRequired
@@ -88,6 +98,13 @@
        return ApiResponse.success(list);
    }

    @LoginNoRequired
    @ApiOperation("实时在场人员分布")
    @GetMapping("/inParkUser")
    public ApiResponse<PCWorkPlatformDataVO> inParkUser() {
        PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(Constants.ONE,null);
        return ApiResponse.success(pcWorkPlatformDataVO);
    }


}