From 01dd9c8e4c755a7272205425b0d81316fa3b503c Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 28 七月 2023 17:31:29 +0800
Subject: [PATCH] 三一车辆追踪优化提交
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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..087e993 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,17 @@
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.spring.SpringUtils;
+import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.catalina.security.SecurityUtil;
@@ -35,6 +40,8 @@
public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
@@ -47,6 +54,7 @@
List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskList(ardAppTask);
return getDataTable(list);
}
+
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
@@ -54,6 +62,7 @@
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
return getDataTable(ardAppTasks);
}
+
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/userDetailById")
@@ -61,6 +70,7 @@
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetailById(ardAppTask);
return AjaxResult.success(ardAppTasks);
}
+
/**
* 瀵煎嚭app浠诲姟绠＄悊鍒楄〃
*/
@@ -123,6 +133,13 @@
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 +150,14 @@
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();
+ ArdAppTask ardAppTask= ardAppTaskService.selectNewArdAppTaskByUserId(userId);
+ map.put("task",ardAppTask);
+ return success(map);
+ }
}
--
Gitblit v1.9.3