lyhzzz hace 2 meses
padre
commit
bbfb43af01

+ 2 - 1
src/main/java/com/fdkankan/fusion/controller/CaseTabulationController.java

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.controller;
 
 
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.entity.CaseFiles;
 import com.fdkankan.fusion.entity.CaseTabulation;
 import com.fdkankan.fusion.service.ICaseTabulationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,7 @@ public class CaseTabulationController {
 
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate (@RequestBody CaseTabulation caseTabulation){
-        caseTabulationService.saveOrUpdate(caseTabulation);
+        caseTabulationService.addOrUpdate(caseTabulation);
         return ResultData.ok(caseTabulation);
     }
 

+ 7 - 0
src/main/java/com/fdkankan/fusion/entity/CaseFiles.java

@@ -9,6 +9,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+import scala.Int;
 
 /**
  * <p>
@@ -88,5 +89,11 @@ public class CaseFiles implements Serializable {
     @TableField("content")
     private String content;
 
+    @TableField("overview_id")
+    private Integer overviewId;
+
+    @TableField("tabulation_id")
+    private Integer tabulationId;
+
 
 }

+ 8 - 0
src/main/java/com/fdkankan/fusion/entity/CaseTabulation.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+import scala.Int;
 
 /**
  * <p>
@@ -79,4 +80,11 @@ public class CaseTabulation implements Serializable {
 
     @TableField("width")
     private Integer width;
+
+    /**
+     * 封面图
+     */
+    @TableField("list_cover")
+    private String listCover;
+
 }

+ 4 - 0
src/main/java/com/fdkankan/fusion/service/ICaseFilesService.java

@@ -25,4 +25,8 @@ public interface ICaseFilesService extends IService<CaseFiles> {
     CaseFiles addByInquest(CaseInquestCriminal caseInquestCriminal);
 
     List<CaseFiles> getByCaseIdAndTypeId(Integer caseId, Integer filesTypeId);
+
+    CaseFiles getByTabulation(Integer tabulationId);
+
+    CaseFiles getByOverviewId(Integer overviewId);
 }

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/ICaseTabulationService.java

@@ -18,4 +18,6 @@ public interface ICaseTabulationService extends IService<CaseTabulation> {
     List<CaseTabulation> getByCaseId(String caseId);
 
     List<CaseTabulation> getByOverviewId(String overviewId);
+
+    void addOrUpdate(CaseTabulation caseTabulation);
 }

+ 22 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseFilesServiceImpl.java

@@ -98,4 +98,26 @@ public class CaseFilesServiceImpl extends ServiceImpl<ICaseFilesMapper, CaseFile
         List<CaseFiles> list = this.list(wrapper);
         return list;
     }
+
+    @Override
+    public CaseFiles getByTabulation(Integer tabulationId) {
+        LambdaQueryWrapper<CaseFiles> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseFiles::getTabulationId,tabulationId);
+        List<CaseFiles> list = this.list(wrapper);
+        if(list != null && !list.isEmpty()){
+            return list.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public CaseFiles getByOverviewId(Integer overviewId) {
+        LambdaQueryWrapper<CaseFiles> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseFiles::getOverviewId,overviewId);
+        List<CaseFiles> list = this.list(wrapper);
+        if(list != null && !list.isEmpty()){
+            return list.get(0);
+        }
+        return null;
+    }
 }

+ 59 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseTabulationServiceImpl.java

@@ -1,10 +1,16 @@
 package com.fdkankan.fusion.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.entity.CaseFiles;
+import com.fdkankan.fusion.entity.CaseOverview;
 import com.fdkankan.fusion.entity.CaseTabulation;
 import com.fdkankan.fusion.mapper.ICaseTabulationMapper;
+import com.fdkankan.fusion.service.ICaseFilesService;
+import com.fdkankan.fusion.service.ICaseOverviewService;
 import com.fdkankan.fusion.service.ICaseTabulationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,6 +26,11 @@ import java.util.List;
 @Service
 public class CaseTabulationServiceImpl extends ServiceImpl<ICaseTabulationMapper, CaseTabulation> implements ICaseTabulationService {
 
+    @Autowired
+    ICaseFilesService caseFilesService;
+    @Autowired
+    ICaseOverviewService caseOverviewService;
+
     @Override
     public List<CaseTabulation> getByCaseId(String caseId) {
         LambdaQueryWrapper<CaseTabulation> wrapper = new LambdaQueryWrapper<>();
@@ -35,4 +46,52 @@ public class CaseTabulationServiceImpl extends ServiceImpl<ICaseTabulationMapper
         wrapper.orderByDesc(CaseTabulation::getId);
         return this.list(wrapper);
     }
+
+    @Override
+    public void addOrUpdate(CaseTabulation caseTabulation) {
+
+        this.saveOrUpdate(caseTabulation);
+
+        if(StringUtils.isNotBlank(caseTabulation.getListCover()) || caseTabulation.getOverviewId() != null){
+            CaseFiles caseFiles  = new CaseFiles();
+            if(caseTabulation.getId()!=null){
+                CaseTabulation db = this.getById(caseTabulation.getId());
+                if(caseTabulation.getOverviewId() == null){
+                    caseTabulation.setOverviewId(db.getOverviewId());
+                }
+                CaseFiles dbCaseFile = caseFilesService.getByTabulation(caseTabulation.getId());
+                if(dbCaseFile != null){
+                    caseFiles.setFilesId(dbCaseFile.getFilesId());
+                }
+            }
+            if(caseTabulation.getOverviewId()!=null){
+                CaseFiles dbCaseFile = caseFilesService.getByOverviewId(caseTabulation.getOverviewId());
+                if(dbCaseFile != null){
+                    caseFiles.setFilesId(dbCaseFile.getFilesId());
+                }
+            }
+            caseFiles.setCaseId(caseTabulation.getCaseId());
+            caseFiles.setFilesUrl(caseTabulation.getListCover());
+            if(StringUtils.isBlank(caseTabulation.getListCover())){
+                CaseOverview caseOverview = caseOverviewService.getById(caseTabulation.getOverviewId());
+                caseFiles.setFilesUrl(caseOverview.getListCover());
+            }
+
+            if(caseTabulation.getOverviewId() != null){         //平面图
+                caseFiles.setFilesTypeId(41);
+                caseFiles.setFilesTitle("平面图");
+                caseFiles.setOverviewId(caseTabulation.getOverviewId() );
+            }else {
+                caseFiles.setFilesTypeId(42);
+                caseFiles.setFilesTitle("方位图");
+                caseFiles.setTabulationId(caseTabulation.getId() );
+
+            }
+            caseFilesService.saveOrUpdate(caseFiles);
+        }
+
+
+
+
+    }
 }