Merge remote-tracking branch 'origin/master'

jiangping

2024-10-12 9aa75d91eb3f854c9d2001b3e3ae1743a51dd476

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java

@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.system.dto.NoticesDTO;
@@ -100,6 +101,7 @@
        return ApiResponse.success("查询成功",approveService.getHomeDataPC(noticesDTO));
    }


    @ApiOperation("任务中心分页")
    @PostMapping("/taskPage")
    public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
@@ -107,6 +109,8 @@
        pageWrap.getModel().setMemberId(loginUserInfo.getMemberId());
        return ApiResponse.success(noticesService.taskCanterPage(pageWrap));
    }



    @ApiOperation("标记已读")
    @GetMapping("/signRead")
@@ -123,4 +127,15 @@
        }
        return ApiResponse.success("操作成功");
    }


    @ApiOperation("PC工作台")
    @GetMapping("/pCWorkPlatformData")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "queryType", value = "查询类型：1=在园人数；2=报表数据；3=待办事项；4=超时预警", required = true),
    })
    public ApiResponse<PCWorkPlatformDataVO> pCWorkPlatformData (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(queryType,getLoginUser(token));
        return ApiResponse.success("查询成功",pcWorkPlatformDataVO);
    }
}