From b112d242575fe96123b1e8dad434f46e6d2bb3d1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 03 Jun 2023 17:57:15 +0800
Subject: [PATCH] 巡查，智能外呼定时任务相关代码抽离修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
index 6ee51bd..03adadb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
@@ -8,6 +8,7 @@
import cn.gistack.sm.patrol.entity.PatrolGroup;
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.service.IPatrolGroupItemService;
+import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
@@ -44,9 +45,8 @@
*/
@ApiOperation(value="巡查指标项目-分页列表查询", notes="巡查指标项目-分页列表查询")
@GetMapping(value = "/list")
- public R queryPageList(PatrolGroupItem patrolGroupItem, Query query) {
-// IPage<PatrolGroupItem> pageList = patrolGroupItemService.selectPatrolConfig(Condition.getPage(query),patrolGroupItem);
- IPage<PatrolGroupItem> pageList = patrolGroupItemService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolGroupItem));
+ public R queryPageList(PatrolGroupItemVO patrolGroupItem, Query query) {
+ IPage<PatrolGroupItemVO> pageList = patrolGroupItemService.selectPatrolConfig(Condition.getPage(query),patrolGroupItem);
return R.data(pageList);
}
@@ -58,8 +58,8 @@
*/
@ApiOperation(value="巡查指标项目-列表查询", notes="巡查指标项目-列表查询")
@GetMapping(value = "/queryList")
- public R queryList(PatrolGroupItem patrolGroupItem) {
- List<PatrolGroupItem> list = patrolGroupItemService.selectPatrolGroupItemList(patrolGroupItem);
+ public R queryList(PatrolGroupItemVO patrolGroupItem) {
+ List<PatrolGroupItemVO> list = patrolGroupItemService.selectPatrolGroupItemList(patrolGroupItem);
return R.data(list);
}
@@ -94,7 +94,7 @@
* @return
*/
@ApiOperation(value="巡查指标项目-通过id删除", notes="巡查指标项目-通过id删除")
- @DeleteMapping(value = "/delete")
+ @PostMapping(value = "/delete")
public R delete(@RequestParam(name="id",required=true) String id) {
return R.data(patrolGroupItemService.removeById(id));
}
@@ -106,7 +106,7 @@
* @return
*/
@ApiOperation(value="巡查指标项目-批量删除", notes="巡查指标项目-批量删除")
- @DeleteMapping(value = "/deleteBatch")
+ @PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
return R.data(patrolGroupItemService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -125,4 +125,5 @@
}
+
}
--
Gitblit v1.9.3