数据条目增加删除和详情接口

src/main/java/com/bootdo/datas/controller/DataEntryController.java

@@ -5,15 +5,19 @@ import com.bootdo.common.annotation.Log;
 import com.bootdo.common.utils.PageUtils;
 import com.bootdo.common.utils.Query;
 import com.bootdo.common.utils.R;
+import com.bootdo.datas.dto.ExamineLogDTO;
 import com.bootdo.datas.dto.GyDataImportDTO;
+import com.bootdo.datas.service.ExamineLogService;
 import com.bootdo.datas.service.GyDataService;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -27,6 +31,8 @@ public class DataEntryController {
 
     @Autowired
     private GyDataService gyDataService;
+    @Autowired
+    private ExamineLogService examineLogService;
 
     @GetMapping()
     @Log("访问数据条目")
@@ -69,8 +75,19 @@ public class DataEntryController {
     @GetMapping("/edit/{id}")
     @RequiresPermissions("datas:data:edit")
     String edit(@PathVariable("id") Long id, Model model) {
+        log.info("edit id:{}", id);
         GyDataImportDTO data = gyDataService.get(id);
+        Map<String, Object> reqParamMap = Maps.newHashMap();
+        reqParamMap.put("dataType", "DI_OPER");
+        reqParamMap.put("uniqueKey", id);
+        log.info("日志查询开始");
+        List<ExamineLogDTO> examineLogList = examineLogService.list(reqParamMap);
+        log.info("日志查询结束"+examineLogList.size());
         model.addAttribute("data", data);
+        if (!CollectionUtils.isEmpty(examineLogList)) {
+            log.info("examineLog-----"+examineLogList);
+            model.addAttribute("examineLog", examineLogList);
+        }
         return "datas/data/edit";
     }
 }