From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java b/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java
index 711c550..e77e3ef 100644
--- a/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java
+++ b/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java
@@ -1,5 +1,7 @@
package org.springblade.modules.patrol.controller;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -10,6 +12,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.modules.patrol.entity.PatrolGroup;
import org.springblade.modules.patrol.service.IPatrolGroupService;
+import org.springblade.modules.patrol.vo.PatrolGroupVO;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -39,6 +42,20 @@
return R.data(pageList);
}
+
+ /**
+ * 检查内容组 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入patrolGroup")
+ public R<IPage<PatrolGroupVO>> page(PatrolGroupVO patrolGroup, Query query) {
+ IPage<PatrolGroupVO> pages = patrolGroupService.selectPatrolGroupPage(Condition.getPage(query), patrolGroup);
+ return R.data(pages);
+ }
+
+
+
/**
* 添加
*
@@ -50,6 +67,20 @@
public R add(@RequestBody PatrolGroup patrolGroup) {
return R.data(patrolGroupService.save(patrolGroup));
}
+
+
+ /**
+ * 添加
+ *
+ * @param patrolGroup
+ * @return
+ */
+ @ApiOperation(value = "巡查指标组-添加", notes = "巡查指标组-添加")
+ @PostMapping(value = "/addTwo")
+ public R addTwo(@RequestBody PatrolGroupVO patrolGroup) {
+ return R.data(patrolGroupService.addTwo(patrolGroup));
+ }
+
/**
* 编辑
@@ -84,7 +115,7 @@
@ApiOperation(value = "巡查指标组-批量删除", notes = "巡查指标组-批量删除")
@PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- return R.data(patrolGroupService.removeByIds(Arrays.asList(ids.split(","))));
+ return R.data(patrolGroupService.removePatrolGroupByIds(Arrays.asList(ids.split(","))));
}
/**
@@ -130,8 +161,8 @@
*/
@ApiOperation(value = "查询巡查项树数据", notes = "查询巡查项树数据")
@GetMapping(value = "/getPatrolGroupTree")
- public R getPatrolGroupTree() {
- return R.data(patrolGroupService.getPatrolGroupTree());
+ public R getPatrolGroupTree(@RequestParam(value = "type",required = false)String type,@RequestParam(value = "childType",required = false)String childType) {
+ return R.data(patrolGroupService.getPatrolGroupTree(type,childType));
}
/**
--
Gitblit v1.9.3