From b176ddd3a9acdd1eef2e7eb9c0cef5fa620334b4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 12 Jul 2023 16:03:53 +0800
Subject: [PATCH] 巡查逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java | 122 +++++++---------------------------------
1 files changed, 22 insertions(+), 100 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
index dd39240..80ec17f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -1,18 +1,10 @@
package cn.gistack.sm.reportFlood.controller;
import cn.gistack.flow.core.feign.IFlowClient;
-import cn.gistack.flow.core.vo.BladeFlowVO;
-import cn.gistack.sm.patrol.entity.PatrolConfig;
-import cn.gistack.sm.patrol.entity.PatrolTask;
-import cn.gistack.sm.patrol.service.IPatrolConfigService;
-import cn.gistack.sm.patrol.vo.BladeFlowPage;
-import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.reportFlood.entity.ReportFloodRecord;
import cn.gistack.sm.reportFlood.service.IReportFloodRecordService;
import cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO;
-import com.alibaba.fastjson.JSON;
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 lombok.AllArgsConstructor;
@@ -21,6 +13,7 @@
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.StringUtil;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -45,8 +38,17 @@
*/
@ApiOperation(value = "报汛记录-分页列表查询", notes = "报汛记录-分页列表查询")
@GetMapping(value = "/list")
- public R<IPage<ReportFloodRecord>> queryPageList(ReportFloodRecord reportFloodRecord, Query query) {
- IPage<ReportFloodRecord> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
+ public R<IPage<ReportFloodRecordVO>> queryPageList(ReportFloodRecordVO reportFloodRecord, Query query) {
+
+ String code = reportFloodRecord.getAdCode();
+ if (StringUtil.isNoneBlank(code)){
+ if (code.substring(0,4).indexOf("00") > -1) {
+ reportFloodRecord.setAdCode(code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ reportFloodRecord.setAdCode(code.substring(0,4));
+ }
+ }
+ IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
return R.data(pageList);
}
@@ -81,7 +83,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(reportFloodRecordService.removeById(id));
}
@@ -93,7 +95,7 @@
* @return
*/
@ApiOperation(value = "报汛记录-批量删除", notes = "报汛记录-批量删除")
- @DeleteMapping(value = "/deleteBatch")
+ @PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
return R.data(this.reportFloodRecordService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -107,101 +109,21 @@
@ApiOperation(value = "报汛记录-通过id查询", notes = "报汛记录-通过id查询")
@GetMapping(value = "/queryById")
public R queryById(@RequestParam(name = "id", required = true) String id) {
- ReportFloodRecord reportFloodRecord = reportFloodRecordService.getById(id);
+ ReportFloodRecordVO reportFloodRecord = reportFloodRecordService.getDetailVO(id);
return R.data(reportFloodRecord);
}
- /**====================工作流==========================**/
/**
- * 新增或修改
+ * 根据水库id返回最新审核通过的报汛记录
*
- * @param reportFloodRecord
+ * @param reservoirId
* @return
*/
- @ApiOperation(value = "报汛记录-新增或修改", notes = "报汛记录-新增或修改")
- @PostMapping(value = "/start-process")
- public R startProcess(@RequestBody ReportFloodRecordVO reportFloodRecord) {
- return R.status(reportFloodRecordService.startProcess(reportFloodRecord));
- }
-
- /**
- * 完成任务
- *
- * @param reportFloodRecord
- * @return
- */
- @ApiOperation(value = "报汛记录-新增或修改", notes = "报汛记录-新增或修改")
- @PostMapping(value = "/complete-task")
- public R startProcess(@RequestBody ReportFloodRecordVO reportFloodRecord, String taskUser, String currentUser) {
- return R.status(reportFloodRecordService.completeTask(reportFloodRecord, taskUser, currentUser));
- }
-
- /**
- * 查询待办
- */
- @PostMapping("reportFlood-todo-list")
- @ApiOperation(value = "查询待办")
- public R reportFloodToDoList(ReportFloodRecordVO reportFloodRecordVO, Query query) {
- BladeFlowVO bladeFlow2 = new BladeFlowVO();
- //设置流程类型
- bladeFlow2.setCategory("flow_4");
- //获取待办
- R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(), query.getCurrent(), reportFloodRecordVO.getCurrentUserId(), bladeFlow2);
- IPage<BladeFlowVO> bladeFlowVOIPage = new Page<>();
- List<BladeFlowVO> bladeFlowVOList = new ArrayList<>();
-
- if (res.isSuccess()) {
- List<Object> data = res.getData().getData();
- data.forEach(obj -> {
- BladeFlowVO<ReportFloodRecord> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
- ReportFloodRecordVO byId = reportFloodRecordService.customizeGetDetail(bladeFlow.getBusinessId());
- bladeFlow.setDetail(byId);
- bladeFlowVOList.add(bladeFlow);
- });
- }
- //设置数据集
- bladeFlowVOIPage.setRecords(bladeFlowVOList);
- //设置当前页
- bladeFlowVOIPage.setCurrent(res.getData().getCurrent());
- //设置页数
- bladeFlowVOIPage.setSize(res.getData().getSize());
- //设置总数
- bladeFlowVOIPage.setTotal(res.getData().getTotal());
- return R.data(bladeFlowVOIPage);
- }
-
- /**
- * 查询已办
- */
- @PostMapping("reportFlood-done-list")
- @ApiOperation(value = "查询待办")
- public R reportFloodDoneList(ReportFloodRecordVO reportFloodRecordVO, Query query) {
- BladeFlowVO bladeFlow2 = new BladeFlowVO();
- //设置流程类型
- bladeFlow2.setCategory("flow_4");
- //获取待办
- R<BladeFlowPage> res = flowClient.getDoneBladeFlowList(query.getSize(), query.getCurrent(), reportFloodRecordVO.getCurrentUserId(), bladeFlow2);
- IPage<BladeFlowVO> bladeFlowVOIPage = new Page<>();
- List<BladeFlowVO> bladeFlowVOList = new ArrayList<>();
-
- if (res.isSuccess()) {
- List<Object> data = res.getData().getData();
- data.forEach(obj -> {
- BladeFlowVO<ReportFloodRecord> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
- ReportFloodRecordVO byId = reportFloodRecordService.customizeGetDetail(bladeFlow.getBusinessId());
- bladeFlow.setDetail(byId);
- bladeFlowVOList.add(bladeFlow);
- });
- }
- //设置数据集
- bladeFlowVOIPage.setRecords(bladeFlowVOList);
- //设置当前页
- bladeFlowVOIPage.setCurrent(res.getData().getCurrent());
- //设置页数
- bladeFlowVOIPage.setSize(res.getData().getSize());
- //设置总数
- bladeFlowVOIPage.setTotal(res.getData().getTotal());
- return R.data(bladeFlowVOIPage);
+ @ApiOperation(value = "报汛记录-根据水库id返回最新审核通过的报汛记录", notes = "报汛记录-根据水库id返回最新审核通过的报汛记录")
+ @GetMapping(value = "/getLatestRecord")
+ public R getLatestRecord(String reservoirId) {
+ ReportFloodRecord reportFloodRecord = reportFloodRecordService.getLatestRecord(reservoirId);
+ return R.data(reportFloodRecord);
}
}
--
Gitblit v1.9.3