处置结果录入

9 files changed, 386 insertions, 46 deletions

diff --git a/src/main/java/com/realtime/protection/server/v1/controller/TCommandController.java b/src/main/java/com/realtime/protection/server/v1/controller/TCommandController.java
index 5ba670e..58040ad 100644
--- a/src/main/java/com/realtime/protection/server/v1/controller/TCommandController.java
+++ b/src/main/java/com/realtime/protection/server/v1/controller/TCommandController.java
@@ -2,15 +2,14 @@ package com.realtime.protection.server.v1.controller;
 
 
 import com.realtime.protection.configuration.response.ResponseResult;
+import com.realtime.protection.server.v1.entity.TCommandReport;
 import com.realtime.protection.server.v1.entity.TCommandTask;
+import com.realtime.protection.server.v1.service.TCommandReportService;
 import com.realtime.protection.server.v1.service.TCommandService;
-import netscape.javascript.JSObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Objects;
 
 @CrossOrigin(origins = "*")
 @RestController
@@ -20,6 +19,9 @@ public class TCommandController {
     @Autowired
     private TCommandService tCommandService;
 
+    @Autowired
+    private TCommandReportService tCommandReportService;
+
     @GetMapping("/task_list")
     public ResponseResult commandList(@RequestParam(value = "page", defaultValue = "1") Integer pageNum,
                                       @RequestParam(value = "page_size", defaultValue = "20") Integer pageSize,
@@ -94,28 +96,36 @@ public class TCommandController {
     }
 
     /**
-     * 更新或新增处置任务
+     * 新增处置任务
      *
      * @return
      */
-    @GetMapping("/result_update")
-    public ResponseResult resultUpdate(@RequestParam(value = "id") Long id,
-                                       @RequestParam(value = "result") String result) {
-        TCommandTask tCommandTask = new TCommandTask();
-        tCommandTask.setId(id);
-        tCommandTask.setResult(result);
-        Integer i = tCommandService.resultUpdate(tCommandTask);
+    @PostMapping("/result_add")
+    public ResponseResult resultAdd(@RequestBody TCommandReport tCommandReport) {
+        Integer i = tCommandReportService.infoAdd(tCommandReport);
         return ResponseResult.ok().setData("num", i);
     }
 
     /**
-     * 删除处置任务结果
+     * 更新处置任务
      *
      * @return
      */
-    @GetMapping("/result_del")
-    public ResponseResult resultDel(@RequestParam(value = "id") Long id) {
-        Integer i = tCommandService.resultDel(id);
+    @PostMapping("/result_update")
+    public ResponseResult resultUpdate(@RequestBody TCommandReport tCommandReport) {
+        Integer i = tCommandReportService.infoUpdate(tCommandReport);
         return ResponseResult.ok().setData("num", i);
     }
+
+    /**
+     * 更新处置任务
+     *
+     * @return
+     */
+    @GetMapping("/result_query")
+    public ResponseResult resultQuery(@RequestParam(value = "commandId") Long commandId) {
+        TCommandReport tCommandReport = tCommandReportService.queryInfo(commandId);
+        return ResponseResult.ok().setData("info", tCommandReport);
+    }
+
 }
diff --git a/src/main/java/com/realtime/protection/server/v1/entity/TCommandReport.java b/src/main/java/com/realtime/protection/server/v1/entity/TCommandReport.java
new file mode 100644
index 0000000..f0a571b
--- /dev/null
+++ b/src/main/java/com/realtime/protection/server/v1/entity/TCommandReport.java
@@ -0,0 +1,222 @@
+package com.realtime.protection.server.v1.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (TCommandReport)实体类
+ *
+ * @author makejava
+ * @since 2024-09-02 09:23:30
+ */
+public class TCommandReport implements Serializable {
+    private static final long serialVersionUID = -51802057849045839L;
+    /**
+     * 唯一id
+     */
+    private Long id;
+    /**
+     * 指令id  关联
+     */
+    private Long commandId;
+    /**
+     * 关联任务id
+     */
+    private Long taskId;
+    /**
+     * 任务名称
+     */
+    private String taskName;
+    /**
+     * 任务下发人
+     */
+    private String userName;
+    /**
+     * 任务下发部门
+     */
+    private String department;
+    /**
+     * 处置事件类型
+     */
+    private String eventType;
+    /**
+     * 影响的范围
+     */
+    private String incidence;
+    /**
+     * 事件等级
+     * 一般
+     */
+    private String eventLevel;
+    /**
+     * 事件起因
+     */
+    private String eventCause;
+    /**
+     * 事件造成的影响
+     */
+    private String eventImpact;
+    /**
+     * 采取的处置措施
+     */
+    private String disposalMeasures;
+    /**
+     * 处置开始时间
+     */
+    private Date taskStartTime;
+    /**
+     * 处置结束时间，空为一直生效
+     */
+    private Date taskEndTime;
+    /**
+     * 处置结果
+     */
+    private String disposalResults;
+    /**
+     * 整改措施
+     */
+    private String rectificationMeasures;
+    /**
+     * 报告创建时间
+     */
+    private Date createTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCommandId() {
+        return commandId;
+    }
+
+    public void setCommandId(Long commandId) {
+        this.commandId = commandId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    public String getIncidence() {
+        return incidence;
+    }
+
+    public void setIncidence(String incidence) {
+        this.incidence = incidence;
+    }
+
+    public String getEventLevel() {
+        return eventLevel;
+    }
+
+    public void setEventLevel(String eventLevel) {
+        this.eventLevel = eventLevel;
+    }
+
+    public String getEventCause() {
+        return eventCause;
+    }
+
+    public void setEventCause(String eventCause) {
+        this.eventCause = eventCause;
+    }
+
+    public String getEventImpact() {
+        return eventImpact;
+    }
+
+    public void setEventImpact(String eventImpact) {
+        this.eventImpact = eventImpact;
+    }
+
+    public String getDisposalMeasures() {
+        return disposalMeasures;
+    }
+
+    public void setDisposalMeasures(String disposalMeasures) {
+        this.disposalMeasures = disposalMeasures;
+    }
+
+    public Date getTaskStartTime() {
+        return taskStartTime;
+    }
+
+    public void setTaskStartTime(Date taskStartTime) {
+        this.taskStartTime = taskStartTime;
+    }
+
+    public Date getTaskEndTime() {
+        return taskEndTime;
+    }
+
+    public void setTaskEndTime(Date taskEndTime) {
+        this.taskEndTime = taskEndTime;
+    }
+
+    public String getDisposalResults() {
+        return disposalResults;
+    }
+
+    public void setDisposalResults(String disposalResults) {
+        this.disposalResults = disposalResults;
+    }
+
+    public String getRectificationMeasures() {
+        return rectificationMeasures;
+    }
+
+    public void setRectificationMeasures(String rectificationMeasures) {
+        this.rectificationMeasures = rectificationMeasures;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+}
+
diff --git a/src/main/java/com/realtime/protection/server/v1/entity/TCommandTask.java b/src/main/java/com/realtime/protection/server/v1/entity/TCommandTask.java
index 2bea75f..2168b67 100644
--- a/src/main/java/com/realtime/protection/server/v1/entity/TCommandTask.java
+++ b/src/main/java/com/realtime/protection/server/v1/entity/TCommandTask.java
@@ -76,22 +76,10 @@ public class TCommandTask implements Serializable {
 
 
     /**
-     * todo 处置任务ID（暂未使用）
+     * 处置任务ID
      */
     private String taskUuid;
 
-    /**
-     * 处置结果
-     */
-    private String result;
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
 
     public Long getTaskId() {
         return taskId;
diff --git a/src/main/java/com/realtime/protection/server/v1/mapper/TCommandReportMapper.java b/src/main/java/com/realtime/protection/server/v1/mapper/TCommandReportMapper.java
new file mode 100644
index 0000000..e44f219
--- /dev/null
+++ b/src/main/java/com/realtime/protection/server/v1/mapper/TCommandReportMapper.java
@@ -0,0 +1,48 @@
+package com.realtime.protection.server.v1.mapper;
+
+import com.realtime.protection.server.v1.entity.TCommandReport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * (TCommandReport)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-09-02 09:23:28
+ */
+@Mapper
+public interface TCommandReportMapper {
+
+    /**
+     * 通过commandID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    TCommandReport queryByCommandId(Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param tCommandReport 实例对象
+     * @return 影响行数
+     */
+    int insert(TCommandReport tCommandReport);
+
+    /**
+     * 修改数据
+     *
+     * @param tCommandReport 实例对象
+     * @return 影响行数
+     */
+    int update(TCommandReport tCommandReport);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Long id);
+
+}
+
diff --git a/src/main/java/com/realtime/protection/server/v1/mapper/TCommandTaskMapper.java b/src/main/java/com/realtime/protection/server/v1/mapper/TCommandTaskMapper.java
index 8b7176e..09ac379 100644
--- a/src/main/java/com/realtime/protection/server/v1/mapper/TCommandTaskMapper.java
+++ b/src/main/java/com/realtime/protection/server/v1/mapper/TCommandTaskMapper.java
@@ -64,13 +64,6 @@ public interface TCommandTaskMapper {
      */
     int update(TCommandTask tCommandTask);
 
-    /**
-     * 修改数据
-     *
-     * @param id 主键
-     * @return 影响行数
-     */
-    int updateResult(Long id);
 
     /**
      * 通过主键删除数据
diff --git a/src/main/java/com/realtime/protection/server/v1/service/TCommandReportService.java b/src/main/java/com/realtime/protection/server/v1/service/TCommandReportService.java
new file mode 100644
index 0000000..e70bf3e
--- /dev/null
+++ b/src/main/java/com/realtime/protection/server/v1/service/TCommandReportService.java
@@ -0,0 +1,16 @@
+package com.realtime.protection.server.v1.service;
+
+import com.realtime.protection.server.v1.entity.TCommandReport;
+import com.realtime.protection.server.v1.entity.TCommandTask;
+
+import java.util.List;
+
+public interface TCommandReportService {
+
+    Integer infoUpdate(TCommandReport tCommandReport);
+
+    TCommandReport queryInfo(Long id);
+
+    Integer infoAdd(TCommandReport tCommandReport);
+
+}
diff --git a/src/main/java/com/realtime/protection/server/v1/service/TCommandService.java b/src/main/java/com/realtime/protection/server/v1/service/TCommandService.java
index 4d442f3..5167820 100644
--- a/src/main/java/com/realtime/protection/server/v1/service/TCommandService.java
+++ b/src/main/java/com/realtime/protection/server/v1/service/TCommandService.java
@@ -14,7 +14,4 @@ public interface TCommandService {
 
     List<TCommandTask> queryCommandTasks1(TCommandTask tCommandTask, Integer pageNum, Integer pageSize);
 
-    Integer resultUpdate(TCommandTask tCommandTask);
-
-    Integer resultDel(Long id);
 }
diff --git a/src/main/java/com/realtime/protection/server/v1/service/impl/TCommandReportServiceImpl.java b/src/main/java/com/realtime/protection/server/v1/service/impl/TCommandReportServiceImpl.java
new file mode 100644
index 0000000..870b059
--- /dev/null
+++ b/src/main/java/com/realtime/protection/server/v1/service/impl/TCommandReportServiceImpl.java
@@ -0,0 +1,74 @@
+package com.realtime.protection.server.v1.service.impl;
+
+import com.realtime.protection.configuration.entity.task.Task;
+import com.realtime.protection.server.task.TaskMapper;
+import com.realtime.protection.server.v1.entity.TCommandReport;
+import com.realtime.protection.server.v1.entity.TCommandTask;
+import com.realtime.protection.server.v1.mapper.TCommandReportMapper;
+import com.realtime.protection.server.v1.mapper.TCommandTaskMapper;
+import com.realtime.protection.server.v1.service.TCommandReportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Date;
+
+@Slf4j
+@Service
+public class TCommandReportServiceImpl implements TCommandReportService {
+
+    @Autowired
+    private TCommandReportMapper tCommandReportMapper;
+    @Autowired
+    private TCommandTaskMapper tCommandTaskMapper;
+    @Autowired
+    private TaskMapper taskMapper;
+
+    @Override
+    public Integer infoUpdate(TCommandReport tCommandReport) {
+        return tCommandReportMapper.update(tCommandReport);
+    }
+
+    @Override
+    public TCommandReport queryInfo(Long id) {
+        return tCommandReportMapper.queryByCommandId(id);
+    }
+
+    @Override
+    public Integer infoAdd(TCommandReport tCommandReport) {
+        TCommandTask tCommandTask = tCommandTaskMapper.queryById(tCommandReport.getCommandId());
+        Task task = taskMapper.queryTask(tCommandTask.getTaskId());
+        if (task == null) {
+            return 0;
+        }
+        tCommandReport.setTaskId(tCommandTask.getTaskId());
+        tCommandReport.setTaskName(task.getTaskName());
+        tCommandReport.setUserName(task.getTaskCreateUsername());
+        tCommandReport.setDepartment(task.getTaskCreateDepart());
+        tCommandReport.setEventLevel(tCommandTask.getEventLevel());
+        tCommandReport.setEventType(tCommandTask.getEventType());
+        tCommandReport.setIncidence(tCommandTask.getIncidence());
+        if (task.getTaskCreateTime() != null) {
+            ZonedDateTime zonedDateTime = task.getTaskCreateTime().atZone(ZoneId.systemDefault());
+            Instant instant = zonedDateTime.toInstant();
+            Date date = Date.from(instant);
+            tCommandReport.setCreateTime(date);
+        }
+        if (task.getTaskStartTime() != null) {
+            ZonedDateTime zonedDateTime = task.getTaskStartTime().atZone(ZoneId.systemDefault());
+            Instant instant = zonedDateTime.toInstant();
+            Date date = Date.from(instant);
+            tCommandReport.setTaskStartTime(date);
+        }
+        if (task.getTaskEndTime() != null) {
+            ZonedDateTime zonedDateTime = task.getTaskEndTime().atZone(ZoneId.systemDefault());
+            Instant instant = zonedDateTime.toInstant();
+            Date date = Date.from(instant);
+            tCommandReport.setTaskEndTime(date);
+        }
+        return tCommandReportMapper.insert(tCommandReport);
+    }
+}
diff --git a/src/main/java/com/realtime/protection/server/v1/service/impl/TCommandServiceImpl.java b/src/main/java/com/realtime/protection/server/v1/service/impl/TCommandServiceImpl.java
index 878b0d3..a5192fb 100644
--- a/src/main/java/com/realtime/protection/server/v1/service/impl/TCommandServiceImpl.java
+++ b/src/main/java/com/realtime/protection/server/v1/service/impl/TCommandServiceImpl.java
@@ -37,13 +37,5 @@ public class TCommandServiceImpl implements TCommandService {
         return tCommandTaskMapper.queryAllByLimit1(tCommandTask, pageNum, pageSize);
     }
 
-    @Override
-    public Integer resultUpdate(TCommandTask tCommandTask) {
-        return tCommandTaskMapper.update(tCommandTask);
-    }
 
-    @Override
-    public Integer resultDel(Long id) {
-        return tCommandTaskMapper.updateResult(id);
-    }
 }