From f04487fef5ac47380dfa9670156743c9d273966b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 23 Mar 2024 15:54:40 +0800
Subject: [PATCH] 巡查修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 176 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 129 insertions(+), 47 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index cca7670..e64da81 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -1,37 +1,25 @@
package cn.gistack.sm.patrol.controller;
-import cn.gistack.flow.core.entity.BladeFlow;
import cn.gistack.flow.core.feign.IFlowClient;
import cn.gistack.flow.core.vo.BladeFlowVO;
-import cn.gistack.sm.patrol.entity.PatrolReport;
-import cn.gistack.sm.patrol.entity.PatrolTask;
+import cn.gistack.sm.patrol.params.PersonHandleParams;
+import cn.gistack.sm.patrol.dto.PatrolTaskDTO;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
-import cn.gistack.sm.patrol.vo.BladeFlowPage;
-import cn.gistack.sm.patrol.vo.BladeFlowTask;
-import cn.gistack.sm.patrol.vo.PatrolTaskReport;
-import cn.gistack.sm.patrol.vo.PatrolTaskVO;
+import cn.gistack.sm.patrol.vo.*;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
-import org.redisson.executor.TasksService;
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.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
-import javax.sound.midi.Soundbank;
-import java.net.http.HttpRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -164,7 +152,7 @@
@ApiOperation(value = "巡查任务-自定义通过id查询", notes = "巡查任务-自定义通过id查询")
@GetMapping(value = "/getPatrolTaskById")
public R getPatrolTaskById(@RequestParam(name = "id", required = true) String id) {
- PatrolTask PatrolTask = patrolTaskService.getPatrolTaskById(id);
+ PatrolTask PatrolTask = patrolTaskService.customizeGetById(id);
return R.data(PatrolTask);
}
@@ -189,7 +177,7 @@
*/
@PostMapping("start-process")
public R startProcess(@RequestBody PatrolTask patrolTask) {
- return R.status(patrolTaskService.startProcess(patrolTask));
+ return R.data(patrolTaskService.startProcess(patrolTask));
}
/**
@@ -211,6 +199,18 @@
}
/**
+ * 汛期、白蚁、大坝 责任人完成任务
+ */
+ @PostMapping("person-complete-task")
+ @ApiOperation(value = "完成任务", notes = "传入流程信息")
+ public R personCompleteTask(@RequestBody PatrolTaskVO patrolTaskVO) {
+ return R.status(patrolTaskService.personCompleteTask(patrolTaskVO, patrolTaskVO.getCurrentUserId(), patrolTaskVO.getTaskUser()));
+ }
+
+
+
+
+ /**
* 查询待办
*
* @param patrolTask 任务
@@ -218,34 +218,35 @@
@PostMapping("patrol-todo-list")
@ApiOperation(value = "查询待办")
public R patrolTodoList(PatrolTaskVO patrolTask, Query query) {
- BladeFlow bladeFlow2 = new BladeFlow();
- //设置流程类型
- bladeFlow2.setCategory("flow_3");
- R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(), query.getCurrent(), patrolTask.getCurrentUserId(), bladeFlow2);
- IPage<PatrolTask> patrolTaskIPage = new Page<>();
- List<PatrolTask> patrolTaskList = new ArrayList<>();
-
- if (res.isSuccess()) {
- List<Object> data = res.getData().getData();
- data.forEach(obj -> {
- BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
- PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
- if (byId != null) {
- byId.setFlow(bladeFlow);
- patrolTaskList.add(byId);
- }
- });
- }
- //设置数据集
- patrolTaskIPage.setRecords(patrolTaskList);
- //设置当前页
- patrolTaskIPage.setCurrent(res.getData().getCurrent());
- //设置页数
- patrolTaskIPage.setSize(res.getData().getSize());
- //设置总数
- patrolTaskIPage.setTotal(res.getData().getTotal());
-
- return R.data(patrolTaskIPage);
+// BladeFlow bladeFlow2 = new BladeFlow();
+// //设置流程类型
+// bladeFlow2.setCategory("flow_3");
+// R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(), query.getCurrent(), patrolTask.getCurrentUserId(), bladeFlow2);
+// IPage<PatrolTask> patrolTaskIPage = new Page<>();
+// List<PatrolTask> patrolTaskList = new ArrayList<>();
+//
+// if (res.isSuccess()) {
+// List<Object> data = res.getData().getData();
+// data.forEach(obj -> {
+// BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
+// PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
+// if (byId != null) {
+// byId.setFlow(bladeFlow);
+// patrolTaskList.add(byId);
+// }
+// });
+// }
+// //设置数据集
+// patrolTaskIPage.setRecords(patrolTaskList);
+// //设置当前页
+// patrolTaskIPage.setCurrent(res.getData().getCurrent());
+// //设置页数
+// patrolTaskIPage.setSize(res.getData().getSize());
+// //设置总数
+// patrolTaskIPage.setTotal(res.getData().getTotal());
+//
+// return R.data(patrolTaskIPage);
+ return null;
}
/**
@@ -269,8 +270,10 @@
BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
- bladeFlow.setDetail(byId);
- bladeFlowVOList.add(bladeFlow);
+ if (byId != null){
+ bladeFlow.setDetail(byId);
+ bladeFlowVOList.add(bladeFlow);
+ }
});
}
//设置数据集
@@ -315,5 +318,84 @@
return R.data(pageList);
}
+ @GetMapping("getTaskStatusCount")
+ public R getTaskStatusCount(PatrolTaskVO patrolTaskVO){
+// List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
+ List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
+ return R.data(list);
+ }
+
+ @GetMapping("getTaskStatus")
+ public R getTaskStatus(PatrolTaskVO patrolTaskVO){
+ TaskStatus taskStatus = patrolTaskService.getTaskStatus(patrolTaskVO);
+ return R.data(taskStatus);
+ }
+
+ @GetMapping("getTaskStatusCountOptimize")
+ public R getTaskStatusCountOptimize(PatrolTaskVO patrolTaskVO){
+ List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
+ return R.data(list);
+ }
+
+ @GetMapping("getTaskTypeCount")
+ public R getTaskTypeCount(PatrolTaskVO patrolTaskVO){
+ List<TaskStatusCount> list = patrolTaskService.getTaskTypeCount(patrolTaskVO);
+ return R.data(list);
+ }
+
+
+ /**
+ * 下发任务
+ * @param patrolTask
+ * @return
+ */
+ @PostMapping("deliverTask")
+ public R deliverTask(@RequestBody PatrolTask patrolTask){
+ List<PatrolTask> saveList = patrolTaskService.deliverTask(patrolTask);
+ return R.data(saveList);
+ }
+
+ /**
+ * 获取巡查项
+ * @param taskId
+ * @return
+ */
+ @GetMapping("getTaskDTO")
+ public R getTaskDTO(String taskId){
+ PatrolTaskDTO result = patrolTaskService.getTaskDTO(taskId);
+ return R.data(result);
+ }
+
+ /**
+ * 获取我的巡查任务
+ * @param patrolTask
+ * @return
+ */
+ @GetMapping("getMyTask")
+ public R getMyTask(PatrolTaskVO patrolTask,Query query){
+
+ Object result = patrolTaskService.getMyTask(patrolTask,Condition.getPage(query));
+ return R.data(result);
+ }
+
+ /**
+ * 结束任务
+ * @param patrolTaskVO
+ * @return
+ */
+ @PostMapping("finishPatrolTask")
+ public R finishPatrolTask(@RequestBody PatrolTaskVO patrolTaskVO){
+ Boolean result = patrolTaskService.finishPatrolTask(patrolTaskVO);
+ return R.data(result);
+ }
+
+ /**
+ * 处理
+ */
+ @PostMapping("personHandle")
+ public R personHandle(@RequestBody PersonHandleParams personHandleParams){
+ Boolean res = patrolTaskService.personHandle(personHandleParams);
+ return R.data(res);
+ }
}
--
Gitblit v1.9.3