From 40e6b02f26a7c0a1911a69b951c948f582df4032 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 20 六月 2025 13:23:18 +0800
Subject: [PATCH] 准东数据推送优化

---
 src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java |   65 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
index 28d2682..18cbcb7 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -1,5 +1,7 @@
 package com.ruoyi.project.tr.specialCheck.controller;
 
+import com.ruoyi.common.constant.DualControlConstants;
+import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
 import com.ruoyi.doublePrevention.entity.dto.req.PreventRiskControlMeasureDeleteReqDTO;
 import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -8,12 +10,16 @@
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.dc.accidentInformation.domain.AccidentInformation;
+import com.ruoyi.project.enumerate.DcAttachmentTypeEnum;
+import com.ruoyi.project.system.attachment.domain.Attachment;
+import com.ruoyi.project.tr.report.domain.Danger;
 import com.ruoyi.project.tr.riskList.domain.RiskList;
 import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.Test.DealDataTask;
+import com.ruoyi.project.tr.specialCheck.domin.BO.*;
 import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDTO;
+import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDateDTO;
 import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
 import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
 import com.ruoyi.project.tr.specialCheck.service.SpecialCheckTaskService;
@@ -23,6 +29,9 @@
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.sql.Date;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.List;
 
 /**
@@ -81,6 +90,8 @@
     {
         List<RiskList> riskList = riskListService.listHazardSource();
         mmap.put("hazardList", riskList);
+        List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
+        mmap.put("tbBaseCheckTask", listResult);
         return prefix + "/add";
     }
 
@@ -90,9 +101,9 @@
      */
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSpecialTask(TbSpecialCheckTaskLog tbSpecialCheckTaskLog){
+    public AjaxResult addSpecialTask(TbSpecialCheckTaskLogEditBO taskLogEditBO){
 
-        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.addSpecialTask(tbSpecialCheckTaskLog);
+        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.addSpecialTask(taskLogEditBO);
         String code = resultVO.getCode();
         if ("200".equals(code)){
             return toAjax(1);
@@ -104,12 +115,36 @@
     @GetMapping("/edit/{indexId}")
     public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
     {
-        TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);
-        mmap.put("specialCheckTaskLog",specialCheckTaskLogByIndexId);
+        TbSpecialCheckTaskLog specialCheckTaskLog = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);
 
+        TbSpecialCheckTaskLogDateDTO tbSpecialCheckTaskLogDateDTO = BeanCopyUtils.copyBean(specialCheckTaskLog, TbSpecialCheckTaskLogDateDTO.class);
+        Instant instant = specialCheckTaskLog.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
+        tbSpecialCheckTaskLogDateDTO.setCheckDate(Date.from(instant));
+        mmap.put("specialCheckTaskLog",tbSpecialCheckTaskLogDateDTO);
+        List<RiskList> riskList = riskListService.listHazardSource();
+        mmap.put("hazardList", riskList);
         List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
         mmap.put("tbBaseCheckTask", listResult);
         return prefix + "/edit";
+    }
+
+    /**
+     *
+     */
+    @GetMapping("/detail/{indexId}")
+    public String detail(@PathVariable("indexId") Long indexId, ModelMap mmap)
+    {
+        TbSpecialCheckTaskLog specialCheckTaskLog = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);
+
+        TbSpecialCheckTaskLogDateDTO tbSpecialCheckTaskLogDateDTO = BeanCopyUtils.copyBean(specialCheckTaskLog, TbSpecialCheckTaskLogDateDTO.class);
+        Instant instant = specialCheckTaskLog.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
+        tbSpecialCheckTaskLogDateDTO.setCheckDate(Date.from(instant));
+        mmap.put("specialCheckTaskLog",tbSpecialCheckTaskLogDateDTO);
+        List<RiskList> riskList = riskListService.listHazardSource();
+        mmap.put("hazardList", riskList);
+        List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
+        mmap.put("tbBaseCheckTask", listResult);
+        return prefix + "/detail";
     }
 
     /**
@@ -117,9 +152,9 @@
      */
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(TbSpecialCheckTaskLogUpdateBO updateBO)
+    public AjaxResult editSave(TbSpecialCheckTaskLogEditBO taskLogEditBO)
     {
-        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.updateSpecialCheckTaskLog(updateBO);
+        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.updateSpecialCheckTaskLog(taskLogEditBO);
         String code = resultVO.getCode();
         if ("200".equals(code)){
             return toAjax(1);
@@ -141,6 +176,18 @@
         }
     }
 
+
+//
+//    @Autowired
+//    private DealDataTask dealDataTask;
+//
+//    @GetMapping("/dealDataTask")
+//    public AjaxResult dealDataTask()
+//    {
+//        dealDataTask.dealData();
+//        return success();
+//    }
+
 }
 
 

--
Gitblit v1.9.2