From 305fe6a8621998e5130d541660c2e3c5f02672d6 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 30 十月 2023 09:27:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 2208a01..b164ead 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
@@ -6,9 +6,12 @@
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
import com.ruoyi.app.task.domain.AppParam;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
+import com.ruoyi.app.task.domain.WellParam;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -43,8 +46,7 @@
public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
- @Autowired
- private ISysUserService sysUserService;
+
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
@@ -61,14 +63,10 @@
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
- public AjaxResult userlist(ArdAppTask ardAppTask) {
- Integer pageNum = ardAppTask.getPageNum();
- Integer pageSize = ardAppTask.getPageSize();
- List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
- /*鍒嗛〉鏂瑰紡1*/
- JpaPageHelper.startPage(pageNum,pageSize);
- JpaPageInfo pageInfo = new JpaPageInfo(ardAppTasks);
- return AjaxResult.success(pageInfo);
+ public TableDataInfo userlist(ArdAppTask ardAppTask) {
+ startPage();
+ List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
+ return getDataTable(list);
}
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@@ -94,9 +92,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));
}
@@ -175,4 +174,10 @@
return success(map);
}
+ @ApiOperation("鎸囨尌绔�-妯＄硦鍒嗛〉鏌ヨ鎵�鏈夊叴瓒ｇ偣")
+ @PostMapping(value = "/likeWell")
+ public AjaxResult likeWell(@RequestBody WellParam wellParam) {
+ return success(ardAppTaskService.likeWell(wellParam));
+ }
+
}
--
Gitblit v1.9.3