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/task/controller/TaskCampusReportingEventController.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java
index c603806..ff06ea4 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java
@@ -16,25 +16,25 @@
  */
 package org.springblade.modules.task.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 io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.task.dto.TaskCampusReportingEventDTO;
 import org.springblade.modules.task.entity.TaskCampusReportingEventEntity;
+import org.springblade.modules.task.service.ITaskCampusReportingEventService;
 import org.springblade.modules.task.vo.TaskCampusReportingEventVO;
 import org.springblade.modules.task.wrapper.TaskCampusReportingEventWrapper;
-import org.springblade.modules.task.service.ITaskCampusReportingEventService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 校园安全检查任务表 控制器
@@ -46,7 +46,7 @@
 @AllArgsConstructor
 @RequestMapping("blade-taskCampusReportingEvent/taskCampusReportingEvent")
 @Api(value = "校园安全检查任务表", tags = "校园安全检查任务表接口")
-public class TaskCampusReportingEventController extends BladeController {
+public class TaskCampusReportingEventController{
 
 	private final ITaskCampusReportingEventService taskCampusReportingEventService;
 
@@ -56,9 +56,9 @@
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入taskCampusReportingEvent")
-	public R<TaskCampusReportingEventVO> detail(TaskCampusReportingEventEntity taskCampusReportingEvent) {
+	public R<TaskCampusReportingEventEntity> detail(TaskCampusReportingEventEntity taskCampusReportingEvent) {
 		TaskCampusReportingEventEntity detail = taskCampusReportingEventService.getOne(Condition.getQueryWrapper(taskCampusReportingEvent));
-		return R.data(TaskCampusReportingEventWrapper.build().entityVO(detail));
+		return R.data(detail);
 	}
 	/**
 	 * 校园安全检查任务表 分页
@@ -88,8 +88,8 @@
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入taskCampusReportingEvent")
-	public R save(@Valid @RequestBody TaskCampusReportingEventEntity taskCampusReportingEvent) {
-		return R.status(taskCampusReportingEventService.save(taskCampusReportingEvent));
+	public R save(@Valid @RequestBody TaskCampusReportingEventDTO taskCampusReportingEvent) {
+		return R.status(taskCampusReportingEventService.saveCampusReporting(taskCampusReportingEvent));
 	}
 
 	/**
@@ -98,8 +98,8 @@
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入taskCampusReportingEvent")
-	public R update(@Valid @RequestBody TaskCampusReportingEventEntity taskCampusReportingEvent) {
-		return R.status(taskCampusReportingEventService.updateById(taskCampusReportingEvent));
+	public R update(@Valid @RequestBody TaskCampusReportingEventDTO taskCampusReportingEvent) throws Exception {
+		return R.status(taskCampusReportingEventService.updateCampusReporting(taskCampusReportingEvent));
 	}
 
 	/**
@@ -119,7 +119,7 @@
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(taskCampusReportingEventService.deleteLogic(Func.toLongList(ids)));
+		return R.status(taskCampusReportingEventService.removeBatchByIds(Func.toLongList(ids)));
 	}
 
 

--
Gitblit v1.9.3