From 2ca9993b57bdd090c4345ea6767687e2fbb83014 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 11:00:09 +0800
Subject: [PATCH] 新增任务导出接口
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index d448395..04dd4f0 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -22,10 +22,14 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import me.zhyd.oauth.log.Log;
+import org.joda.time.DateTime;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
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.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.task.entity.Task;
@@ -33,12 +37,14 @@
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.task.wrapper.TaskWrapper;
import org.springblade.modules.taskqd.entity.Taskqd;
+import org.springblade.modules.taskqd.excel.TaskExcel;
import org.springblade.modules.taskqd.service.impl.TaskqdServiceImpl;
import org.springblade.modules.taskqd.vo.TaskqdVO;
import org.springblade.modules.taskqd.wrapper.TaskqdWrapper;
import org.springblade.modules.webscoket.service.IPushMsgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
@@ -81,8 +87,21 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入task")
public R<IPage<TaskqdVO>> list(Taskqd taskqd, Query query) {
- IPage<Taskqd> pages = taskqdService.page(Condition.getPage(query), Condition.getQueryWrapper(taskqd));
+ IPage<Taskqd> pages = taskqdService.page(Condition.getPage(query), Condition.getQueryWrapper(taskqd).orderByDesc("time"));
return R.data(TaskqdWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 自定义分页查询
+ * @param taskqd
+ * @param query
+ * @return
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入task")
+ public R selectTaskQdPage(TaskqdVO taskqd, Query query) {
+ return R.data(taskqdService.selectTaskQdPage(Condition.getPage(query), taskqd));
}
@@ -104,6 +123,14 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入task")
public R update(@Valid @RequestBody Taskqd taskqd) {
+
+ if (taskqd.getStime() == null || taskqd.getStime().equals("")){
+ taskqd.setStime(null);
+ }
+ if (taskqd.getSendtime() == null || taskqd.getSendtime().equals("")){
+ taskqd.setSendtime(null);
+ }
+
return R.status(taskqdService.updateById(taskqd));
}
@@ -414,6 +441,18 @@
}
/**
+ * 查询所有任务轨迹以及人员轨迹
+ * @return
+ */
+ @GetMapping("/queryAllTrar")
+ public R queryAllTrar() {
+ List<Map<String, Object>> allTask = taskqdService.allTask();
+
+
+ return R.data(allTask);
+ }
+
+ /**
* @param nowTime 当前时间
* @param startTime 开始时间
* @param endTime 结束时间
@@ -441,4 +480,29 @@
return false;
}
}
+
+ /**
+ * 根据派出所展示发布数量前十五，根据日周月切换
+ * @param jurisdiction 派出所编号
+ * @param startTime 发布时间
+ * @param period 日(day) 月(week) 年(year)
+ * @return
+ */
+ @GetMapping("/countTaskByJur")
+ @ApiOperation(value = "统计")
+ public R countTaskByJur(String jurisdiction, String startTime,String period ){
+ List<Taskqd> list = taskqdService.countTaskByJur(jurisdiction,startTime,period);
+ return R.data(list);
+ }
+
+ /**
+ * 导出任务数据
+ * @param task
+ * @param response
+ */
+ @GetMapping("export-task")
+ public void exportTask(@ApiIgnore @RequestParam TaskqdVO task, HttpServletResponse response) {
+ List<TaskExcel> list = taskqdService.exportTask(task);
+ ExcelUtil.export(response, "任务数据" + DateUtil.time(), "任务数据表", list, TaskExcel.class);
+ }
}
--
Gitblit v1.9.3