1

README.md

@@ -86,4 +86,18 @@ fd_fusion_xj-init.sql
     4.新增cameraType  入参下拉框为  /fusion/cameraType/allList GET 
 二. 设置场景分享,见接口文档
     http://120.25.146.52:3090/project/193/interface/api/10963
+三.
+    1. 照片卷
+        caseImgTag/info 接口返回修改为数组
+        caseImgTag/saveOrUpdate  新增入参id,有则修改，无则新增
+    
+    2. 提取清单
+        caseInquest/info 接口返回修改为数组
+        caseInquest/saveOrUpdate  新增入参id,有则修改，无则新增
+        caseInquest/downDocx  入参从caseId修改为id     
+       
+    3. 火调勘验笔录
+        caseExtractDetail/info 接口返回修改为数组
+        caseExtractDetail/saveOrUpdate  新增入参id,有则修改，无则新增
+        caseExtractDetail/downDocx  入参从caseId修改为id
 ~~~~

src/main/java/com/fdkankan/fusion/controller/CaseExtractDetailController.java

@@ -29,10 +29,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
+ * 勘验笔录
  * @author 
  * @since 2024-07-05
  */
@@ -56,13 +53,13 @@ public class CaseExtractDetailController {
     }
 
     @GetMapping("/downDocx")
-    public void downDocx(@RequestParam(required = false) Integer caseId,
+    public void downDocx(@RequestParam(required = false) Integer id,
                          HttpServletResponse res, HttpServletRequest req) throws IOException {
 
-        if(caseId == null){
+        if(id == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        CaseExtractDetail caseExtractDetail = caseExtractDetailService.getByCaseId(caseId);
+        CaseExtractDetail caseExtractDetail = caseExtractDetailService.getById(id);
         if(caseExtractDetail == null){
             throw new BusinessException(ResultCode.INQUEST_ERROR2);
         }

src/main/java/com/fdkankan/fusion/controller/CaseImgTagController.java

@@ -10,12 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2024-07-12
+ * 照片卷
  */
 @RestController
 @RequestMapping("/caseImgTag")

src/main/java/com/fdkankan/fusion/controller/CaseInquestController.java

@@ -27,9 +27,7 @@ import java.nio.file.Paths;
 import static java.nio.file.Files.newOutputStream;
 
 /**
- * <p>
- *  前端控制器
- * </p>
+ * 提取清单
  *
  * @author 
  * @since 2024-07-04
@@ -53,13 +51,13 @@ public class CaseInquestController {
     }
 
     @GetMapping("/downDocx")
-    public void downDocx(@RequestParam(required = false) Integer caseId,
+    public void downDocx(@RequestParam(required = false) Integer id,
                          HttpServletResponse res, HttpServletRequest req) throws IOException {
 
-        if(caseId == null){
+        if(id == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        CaseInquest caseInquest = caseInquestService.getByCaseId(caseId);
+        CaseInquest caseInquest = caseInquestService.getById(id);
         if(caseInquest == null){
             throw new BusinessException(ResultCode.INQUEST_ERROR2);
         }

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -357,17 +357,22 @@ public class CaseDownService {
             }
             jsonObject.put(basePath+fusionGuidePath+guide.getFusionGuideId(), ResultData.ok(listByGuideId));
         }
-        CaseInquest caseInquest1 = caseInquestService.getByCaseId(caseId);
+        List<CaseInquest> caseInquest1 = caseInquestService.getByCaseId(caseId);
         if(caseInquest1 != null){
-            XWPFTemplate inquestTemp = caseInquestService.getWordByTemplate(caseInquest1);
-            downWordByTemplate(caseId,inquestTemp,"caseInquest.doc");
+            for (CaseInquest inquest : caseInquest1) {
+                XWPFTemplate inquestTemp = caseInquestService.getWordByTemplate(inquest);
+                downWordByTemplate(caseId,inquestTemp,"caseInquest"+inquest.getId()+".doc");
+            }
+
         }
         jsonObject.put(basePath+caseInquest+caseId, ResultData.ok(caseInquest1));
 
-        CaseExtractDetail caseExtractDetail1 = caseExtractDetailService.getByCaseId(caseId);
+        List<CaseExtractDetail> caseExtractDetail1 = caseExtractDetailService.getByCaseId(caseId);
         if(caseExtractDetail1 != null){
-            XWPFTemplate detailTemp = caseExtractDetailService.getWordByTemplate(caseExtractDetail1);
-            downWordByTemplate(caseId,detailTemp,"caseExtractDetail.doc");
+            for (CaseExtractDetail extractDetail : caseExtractDetail1) {
+                XWPFTemplate detailTemp = caseExtractDetailService.getWordByTemplate(extractDetail);
+                downWordByTemplate(caseId,detailTemp,"caseExtractDetail"+extractDetail.getId()+".doc");
+            }
         }
         jsonObject.put(basePath+caseExtractDetail+caseId, ResultData.ok(caseExtractDetail1));
 

src/main/java/com/fdkankan/fusion/service/ICaseExtractDetailService.java

@@ -4,6 +4,8 @@ import com.deepoove.poi.XWPFTemplate;
 import com.fdkankan.fusion.entity.CaseExtractDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -14,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICaseExtractDetailService extends IService<CaseExtractDetail> {
 
-    CaseExtractDetail getByCaseId(Integer caseId);
+    List<CaseExtractDetail> getByCaseId(Integer caseId);
 
     void saveByParam(CaseExtractDetail caseExtractDetail);
 

src/main/java/com/fdkankan/fusion/service/ICaseImgTagService.java

@@ -3,6 +3,8 @@ package com.fdkankan.fusion.service;
 import com.fdkankan.fusion.entity.CaseImgTag;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICaseImgTagService extends IService<CaseImgTag> {
 
-    CaseImgTag getByCaseId(Integer caseId);
+    List<CaseImgTag> getByCaseId(Integer caseId);
 
     void saveByParam(CaseImgTag caseImgTag);
 }

src/main/java/com/fdkankan/fusion/service/ICaseInquestService.java

@@ -4,6 +4,8 @@ import com.deepoove.poi.XWPFTemplate;
 import com.fdkankan.fusion.entity.CaseInquest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -14,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICaseInquestService extends IService<CaseInquest> {
 
-    CaseInquest getByCaseId(Integer caseId);
+    List<CaseInquest> getByCaseId(Integer caseId);
 
     void saveByParam(CaseInquest caseInquest);
 

src/main/java/com/fdkankan/fusion/service/impl/CaseExtractDetailServiceImpl.java

@@ -16,12 +16,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.io.InputStream;
+import java.util.List;
 
 /**
- * <p>
- *  服务实现类
- * </p>
- *
+ *勘验笔录
  * @author 
  * @since 2024-07-05
  */
@@ -29,10 +27,10 @@ import java.io.InputStream;
 public class CaseExtractDetailServiceImpl extends ServiceImpl<ICaseExtractDetailMapper, CaseExtractDetail> implements ICaseExtractDetailService {
 
     @Override
-    public CaseExtractDetail getByCaseId(Integer caseId) {
+    public List<CaseExtractDetail> getByCaseId(Integer caseId) {
         LambdaQueryWrapper<CaseExtractDetail> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseExtractDetail::getCaseId,caseId);
-        return this.getOne(wrapper);
+        return this.list(wrapper);
     }
 
     @Override
@@ -40,10 +38,6 @@ public class CaseExtractDetailServiceImpl extends ServiceImpl<ICaseExtractDetail
         if(caseExtractDetail.getCaseId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        CaseExtractDetail dbCaseExtractDetail = this.getByCaseId(caseExtractDetail.getCaseId());
-        if(dbCaseExtractDetail != null){
-            caseExtractDetail.setId(dbCaseExtractDetail.getId());
-        }
         this.saveOrUpdate(caseExtractDetail);
     }
 

src/main/java/com/fdkankan/fusion/service/impl/CaseImgTagServiceImpl.java

@@ -10,6 +10,8 @@ import com.fdkankan.fusion.service.ICaseImgTagService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -22,10 +24,10 @@ import org.springframework.stereotype.Service;
 public class CaseImgTagServiceImpl extends ServiceImpl<ICaseImgTagMapper, CaseImgTag> implements ICaseImgTagService {
 
     @Override
-    public CaseImgTag getByCaseId(Integer caseId) {
+    public List<CaseImgTag> getByCaseId(Integer caseId) {
         LambdaQueryWrapper<CaseImgTag> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseImgTag::getCaseId,caseId);
-        return this.getOne(wrapper);
+        return this.list(wrapper);
     }
 
     @Override
@@ -33,10 +35,6 @@ public class CaseImgTagServiceImpl extends ServiceImpl<ICaseImgTagMapper, CaseIm
         if(caseImgTag.getCaseId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        CaseImgTag dbCaseImgTag = this.getByCaseId(caseImgTag.getCaseId());
-        if(dbCaseImgTag != null){
-            caseImgTag.setId(dbCaseImgTag.getId());
-        }
         this.saveOrUpdate(caseImgTag);
     }
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseInquestServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.io.InputStream;
+import java.util.List;
 
 /**
  * <p>
@@ -32,10 +33,10 @@ public class CaseInquestServiceImpl extends ServiceImpl<ICaseInquestMapper, Case
 
 
     @Override
-    public CaseInquest getByCaseId(Integer caseId) {
+    public List<CaseInquest> getByCaseId(Integer caseId) {
         LambdaQueryWrapper<CaseInquest> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseInquest::getCaseId,caseId);
-        return this.getOne(wrapper);
+        return this.list(wrapper);
     }
 
     @Override
@@ -43,10 +44,6 @@ public class CaseInquestServiceImpl extends ServiceImpl<ICaseInquestMapper, Case
         if(caseInquest.getCaseId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        CaseInquest dbCaseInquest = this.getByCaseId(caseInquest.getCaseId());
-        if(dbCaseInquest != null){
-            caseInquest.setId(dbCaseInquest.getId());
-        }
         this.saveOrUpdate(caseInquest);
 
     }

src/main/java/com/fdkankan/fusion/service/impl/CopyCaseService.java

@@ -160,13 +160,15 @@ public class CopyCaseService {
      * 复制案件提取清单
      */
     private void cpCaseExtractDetail(Integer oldCaseId,Integer newCaseId){
-        CaseExtractDetail caseExtractDetail = caseExtractDetailService.getByCaseId(oldCaseId);
+        List<CaseExtractDetail> caseExtractDetail = caseExtractDetailService.getByCaseId(oldCaseId);
         if(caseExtractDetail== null){
            return;
         }
-        caseExtractDetail.setId(null);
-        caseExtractDetail.setCaseId(newCaseId);
-        caseExtractDetailService.save(caseExtractDetail);
+        for (CaseExtractDetail extractDetail : caseExtractDetail) {
+            extractDetail.setId(null);
+            extractDetail.setCaseId(newCaseId);
+            caseExtractDetailService.save(extractDetail);
+        }
     }
 
     /**
@@ -236,13 +238,15 @@ public class CopyCaseService {
      * 复制案件勘验笔录
      */
     private void cpCaseInquest(Integer oldCaseId, Integer newCaseId) {
-        CaseInquest entity = caseInquestService.getByCaseId(oldCaseId);
+        List<CaseInquest> entity = caseInquestService.getByCaseId(oldCaseId);
         if(entity == null ){
             return;
         }
-        entity.setId(null);
-        entity.setCaseId(newCaseId);
-        caseInquestService.save(entity);
+        for (CaseInquest caseInquest : entity) {
+            caseInquest.setId(null);
+            caseInquest.setCaseId(newCaseId);
+            caseInquestService.save(caseInquest);
+        }
     }
 
     /**
@@ -263,13 +267,15 @@ public class CopyCaseService {
      * 复制案件图片标注
      */
     private void cpImgTag(Integer oldCaseId, Integer newCaseId) {
-        CaseImgTag entity = caseImgTagService.getByCaseId(oldCaseId);
+        List<CaseImgTag> entity = caseImgTagService.getByCaseId(oldCaseId);
         if(entity == null ){
             return;
         }
-        entity.setId(null);
-        entity.setCaseId(newCaseId);
-        caseImgTagService.save(entity);
+        for (CaseImgTag caseImgTag : entity) {
+            caseImgTag.setId(null);
+            caseImgTag.setCaseId(newCaseId);
+            caseImgTagService.save(caseImgTag);
+        }
     }