From 690b5ff07ace78fa1f3f4fa1b0508481cf182919 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 31 七月 2023 11:09:02 +0800
Subject: [PATCH] 修复单兵端 - 下发给我的任务列表分页问题
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index 3fc7278..2208a01 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -1,14 +1,20 @@
package com.ruoyi.app.task.controller;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
+import com.ruoyi.app.task.domain.AppParam;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.pagehelper.JpaPageHelper;
+import com.ruoyi.utils.pagehelper.JpaPageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.catalina.security.SecurityUtil;
@@ -55,9 +61,14 @@
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
- public TableDataInfo userlist(ArdAppTask ardAppTask) {
+ public AjaxResult userlist(ArdAppTask ardAppTask) {
+ Integer pageNum = ardAppTask.getPageNum();
+ Integer pageSize = ardAppTask.getPageSize();
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
- return getDataTable(ardAppTasks);
+ /*鍒嗛〉鏂瑰紡1*/
+ JpaPageHelper.startPage(pageNum,pageSize);
+ JpaPageInfo pageInfo = new JpaPageInfo(ardAppTasks);
+ return AjaxResult.success(pageInfo);
}
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@@ -130,6 +141,7 @@
public AjaxResult editDetail(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
return toAjax(ardAppTaskService.updateArdAppTaskDetail(ardAppTaskDetail));
}
+
@ApiOperation("鍗曞叺绔�-浠诲姟鏌ョ湅")
@PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
@Log(title = "鍗曞叺绔�-浠诲姟鏌ョ湅", businessType = BusinessType.UPDATE)
@@ -137,6 +149,7 @@
public AjaxResult editDetailView(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
return toAjax(ardAppTaskService.updateArdAppTaskDetailView(ardAppTaskDetail));
}
+
/**
* 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
*/
@@ -146,4 +159,20 @@
public AjaxResult getTaskDetailInfo(@PathVariable("id") String id) {
return success(ardAppTaskService.selectArdAppTaskDetailById(id));
}
+
+ @ApiOperation("鍗曞叺绔�-鏂颁换鍔¤疆璇�")
+ @PostMapping(value = "/newTaskPolling")
+ public AjaxResult newTaskPolling(@RequestBody AppParam param) {
+ Map<String, Object> map = new HashMap<>();
+ String userId = param.getUserId();
+ if (StringUtils.isNotNull(param.getUserId())) {
+ ArdAppTask ardAppTask = ardAppTaskService.selectNewArdAppTaskByUserId(userId);
+ map.put("task", ardAppTask);
+ int count = ardAppTaskService.selectUnreadArdAppTaskCount(userId);
+ map.put("count", count);
+ }
+
+ return success(map);
+ }
+
}
--
Gitblit v1.9.3