From dee2cf1591b135c9bf75dcaf81a96ee48435b5f9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 17:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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 9b86968..b3a69c0 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,12 +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;
@@ -36,6 +44,7 @@
@Autowired
private IArdAppTaskService ardAppTaskService;
+
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*/
@@ -47,13 +56,16 @@
List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskList(ardAppTask);
return getDataTable(list);
}
+
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
public TableDataInfo userlist(ArdAppTask ardAppTask) {
- List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
- return getDataTable(ardAppTasks);
+ startPage();
+ List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
+ return getDataTable(list);
}
+
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/userDetailById")
@@ -61,6 +73,7 @@
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetailById(ardAppTask);
return AjaxResult.success(ardAppTasks);
}
+
/**
* 瀵煎嚭app浠诲姟绠＄悊鍒楄〃
*/
@@ -76,9 +89,10 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
+ @ApiOperation("鎸囨尌绔�-鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardAppTaskService.selectArdAppTaskById(id));
}
@@ -123,6 +137,15 @@
public AjaxResult editDetail(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
return toAjax(ardAppTaskService.updateArdAppTaskDetail(ardAppTaskDetail));
}
+
+ @ApiOperation("鍗曞叺绔�-浠诲姟鏌ョ湅")
+ @PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
+ @Log(title = "鍗曞叺绔�-浠诲姟鏌ョ湅", businessType = BusinessType.UPDATE)
+ @PutMapping("/detail/view")
+ public AjaxResult editDetailView(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
+ return toAjax(ardAppTaskService.updateArdAppTaskDetailView(ardAppTaskDetail));
+ }
+
/**
* 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
*/
@@ -133,4 +156,19 @@
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