From 658c0c5cf6eb1365ac7de1bad291a87ead9f2ad8 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Mon, 2 Sep 2024 11:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2+=E5=B7=A1=E6=A3=80=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/InspectTaskController.java | 14 +++++++++++++- .../controller/InspectTaskDetailController.java | 7 +++++-- .../xyt/mapper/InspectTaskDetailMapper.java | 4 ++-- .../project/xyt/mapper/InspectTaskMapper.java | 2 +- .../xyt/service/InspectTaskDetailService.java | 16 ++++++++++++++++ .../project/xyt/service/InspectTaskService.java | 9 +++++++++ 6 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/InspectTaskController.java b/src/main/java/com/gunshi/project/xyt/controller/InspectTaskController.java index ef554b6..efa4af0 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/InspectTaskController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/InspectTaskController.java @@ -3,6 +3,7 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.InspectTaskPageSo; +import com.gunshi.project.xyt.entity.vo.InspectTaskDetailVo; import com.gunshi.project.xyt.model.InspectTask; import com.gunshi.project.xyt.service.InspectTaskService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 描述: 巡检任务 * author: xusan @@ -22,7 +25,7 @@ import org.springframework.web.bind.annotation.*; @Tag(name = "巡检任务") @RestController @RequestMapping(value="/inspect/task") -public class InspectTaskController { +public class InspectTaskController extends AbstractCommonFileController{ @Autowired private InspectTaskService service; @@ -58,6 +61,15 @@ public class InspectTaskController { return R.ok(service.startInspect(id)); } + @Operation(summary = "结束巡查") + @PostMapping("/finish") + public R finish(@RequestBody @Validated List list) { + return R.ok(service.finish(list)); + } + @Override + public String getGroupId() { + return "inspectTask"; + } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/InspectTaskDetailController.java b/src/main/java/com/gunshi/project/xyt/controller/InspectTaskDetailController.java index 4264152..b2bd7a3 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/InspectTaskDetailController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/InspectTaskDetailController.java @@ -23,12 +23,11 @@ import java.util.List; @Tag(name = "巡查信息") @RestController @RequestMapping(value="/inspect/detail") -public class InspectTaskDetailController { +public class InspectTaskDetailController{ @Autowired private InspectTaskDetailService service; - @Operation(summary = "编辑详情") @GetMapping("/getByTaskId") public R> getByTaskId(@Schema(name = "taskId",description = "任务id") @RequestParam(name = "taskId") Long taskId) { @@ -46,4 +45,8 @@ public class InspectTaskDetailController { public R> page(@RequestBody @Validated InspectProblemPageSo page) { return R.ok(service.pageQuery(page)); } + + + + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java index c06bc18..4d73b55 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java @@ -38,10 +38,10 @@ public interface InspectTaskDetailMapper extends BaseMapper { left join public.inspect_task t4 on t1.task_id =t4.id - t1.inspect_user_id = #{obj.inspectUserId} + t4.inspect_user_id = #{obj.inspectUserId} - t1.is_handle = #{obj.isHandle} + and t1.is_handle = #{obj.isHandle} and t4.finish_time =]]> #{obj.dateTimeRangeSo.start} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskMapper.java index 79ebf3f..ecf996d 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskMapper.java @@ -25,7 +25,7 @@ public interface InspectTaskMapper extends BaseMapper { t.create_user_id = #{obj.createUserId} - t.status = #{obj.status} + and t.status = #{obj.status} and t.task_type = #{obj.taskType} diff --git a/src/main/java/com/gunshi/project/xyt/service/InspectTaskDetailService.java b/src/main/java/com/gunshi/project/xyt/service/InspectTaskDetailService.java index 2dd29ad..cd8f704 100644 --- a/src/main/java/com/gunshi/project/xyt/service/InspectTaskDetailService.java +++ b/src/main/java/com/gunshi/project/xyt/service/InspectTaskDetailService.java @@ -10,6 +10,7 @@ import com.gunshi.project.xyt.entity.vo.InspectTaskDetailVo; import com.gunshi.project.xyt.mapper.InspectTaskDetailMapper; import com.gunshi.project.xyt.model.InspectTaskDetail; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -119,6 +120,21 @@ public class InspectTaskDetailService extends ServiceImpl list) { + List res = new ArrayList<>(); + for(InspectTaskDetailVo vo : list){ + InspectTaskDetail detail = new InspectTaskDetail(); + BeanUtils.copyProperties(vo,detail); + res.add(detail); + fileService.save(vo.getInspectPics(),vo.getId().toString(),getGroupId(),getPicType()); + fileService.save(vo.getInspectVideos(),vo.getId().toString(),getGroupId(),getVideoType()); + fileService.save(vo.getHandlePics(),vo.getId().toString(),getGroupId(),getHandlePicType()); + fileService.save(vo.getHandleVideos(),vo.getId().toString(),getGroupId(),getHandleVideoType()); + } + //更新任务巡检信息表 + this.updateBatchById(res); + } } diff --git a/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java b/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java index f48b689..f5e095e 100644 --- a/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java +++ b/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gunshi.project.xyt.entity.so.InspectTaskPageSo; +import com.gunshi.project.xyt.entity.vo.InspectTaskDetailVo; import com.gunshi.project.xyt.mapper.InspectTaskMapper; import com.gunshi.project.xyt.model.InspectTask; import lombok.extern.slf4j.Slf4j; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -69,6 +71,13 @@ public class InspectTaskService extends ServiceImpl list) { + inspectTaskDetailService.finish(list); + InspectTask task = this.getById(list.get(0).getTaskId()); + task.setFinishTime(new Date()); + task.setStatus(2); + return this.updateById(task); + } }