zh

src/main/java/com/zh/project0512/controller/manage/TaskController.java

@@ -3,6 +3,7 @@ package com.zh.project0512.controller.manage;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zh.project0512.annotation.adminTokenValid;
@@ -20,12 +21,14 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -69,6 +72,8 @@ public class TaskController {
     private ITaskTeachRefeService taskTeachRefeService;
     @Autowired
     private ITaskDepartmentService taskDepartmentService;
+    @Autowired
+    private IVideoService videoService;
 
     @Operation(summary = "新增")
     @PostMapping("/add")
@@ -289,11 +294,23 @@ public class TaskController {
         return MybatisPlusUtil.sqlResult(taskService.updateById(task), "修改");
     }
 
-    @Operation(summary = "删除")
+//    @Operation(summary = "删除")
+//    @PostMapping("/del")
+//    @adminTokenValid
+//    public Result del(@Validated @RequestBody DelTaskParam param) {
+//        return MybatisPlusUtil.sqlResult(taskService.removeById(param.getId()), "删除");
+//    }
+
+    @Operation(summary = "终止任务")
     @PostMapping("/del")
     @adminTokenValid
-    public Result del(@Validated @RequestBody DelTaskParam param) {
-        return MybatisPlusUtil.sqlResult(taskService.removeById(param.getId()), "删除");
+    @Transactional
+    public void del(DetTaskParam param) {
+        UpdateWrapper<Task> ew = new UpdateWrapper<>();
+        ew.eq("status",1).eq("id",param.getId())
+            .set("status",2).set("updateAt",LocalDateTime.now());
+        taskService.update(ew);
+        videoService.updStatusByTaskId(param.getId(),LocalDateTime.now());
     }
 
     @Data

src/main/java/com/zh/project0512/mapper/VideoMapper.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -24,10 +25,12 @@ import java.util.Map;
  * @since 2022-05-18
  */
 public interface VideoMapper extends BaseMapper<Video> {
-    @Insert("update video INNER JOIN task on task.id = video.taskId and date_format(task.end, '%Y-%m-%d') = #{now}\n" +
+    @Update("update video INNER JOIN task on task.id = video.taskId and date_format(task.end, '%Y-%m-%d') = #{now}\n" +
         " set video.status = 1 \n" +
         "WHERE video.status = 0")
     void updStatusWhenTaskEnd(String now);
+    @Update("update video INNER JOIN task on task.id = video.taskId and taskId = #{taskId} set video.status = 1 WHERE video.status = 0 ")
+    void updStatusByTaskId(int taskId,LocalDateTime endTime);
     @Select("SELECT t1.*,t2.name as providerName,t3.name as departmentName,t4.title as taskTitle\n" +
         "  from video as t1\n" +
         "LEFT JOIN user as t2 on t2.id = t1.userId\n" +

src/main/java/com/zh/project0512/service/IVideoService.java

@@ -23,6 +23,7 @@ import java.util.Map;
  */
 public interface IVideoService extends IService<Video> {
     void updStatusWhenTaskEnd(String now);
+    void updStatusByTaskId(int taskId,LocalDateTime localDateTime);
     IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper);
     JSONObject record(String openid);
 }

src/main/java/com/zh/project0512/serviceImpl/VideoServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zh
@@ -29,13 +29,20 @@ import java.util.Map;
 public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements IVideoService {
     @Autowired
     private VideoMapper videoMapper;
-    public void updStatusWhenTaskEnd(String now){
+
+    public void updStatusWhenTaskEnd(String now) {
         videoMapper.updStatusWhenTaskEnd(now);
     }
-    public IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper){
+
+    public void updStatusByTaskId(int taskId, LocalDateTime localDateTime){
+        videoMapper.updStatusByTaskId(taskId, localDateTime);
+    }
+
+    public IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper) {
         return videoMapper.pageList(iPage, queryWrapper);
     }
-    public JSONObject record(String openid){
+
+    public JSONObject record(String openid) {
         return videoMapper.record(openid);
     }
 }