1

README.md

@@ -49,4 +49,17 @@
 3.添加多数据源配置
 4.下载记录日志记录
 5.所属架构数据过滤
+~~~~
+
+
+###**v1.7.0-bc**
+~~~~
+1.标题        //案件名称
+2.笔录人  绘图人  照相人 //登录人
+3.制作时间     //当前时间
+4.现场勘验单位  指派/报告单位 //部门名称
+5.勘验时间       //第一个场景的拍摄时间
+6.现场地点   //案件地理位置
+7.现场勘验情况   //讯飞ai图片说明
+8.单位 //单位
 ~~~~

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

@@ -2,17 +2,13 @@ package com.fdkankan.fusion.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.entity.TmProject;
-import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CaseEntity;
 import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.response.CaseVo;
-import com.fdkankan.fusion.service.ICaseNumService;
 import com.fdkankan.fusion.service.ICaseService;
 import com.fdkankan.fusion.service.ITmProjectService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,7 +40,7 @@ public class CaseController extends BaseController{
     }
 
     @PostMapping("/addOrUpdate")
-    public ResultData addOrUpdate(@RequestBody CaseParam param){
+    public ResultData addOrUpdate(@RequestBody CaseEntity param){
         caseService.addOrUpdate(param,getUserName());
         return ResultData.ok();
     }

src/main/java/com/fdkankan/fusion/entity/CaseEntity.java

@@ -1,9 +1,12 @@
 package com.fdkankan.fusion.entity;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,7 +20,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("t_case")
+@TableName(value = "t_case",autoResultMap = true)
 public class CaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -87,6 +90,12 @@ public class CaseEntity implements Serializable {
      */
     @TableField("case_region")
     private String caseRegion;
+    /**
+     * 案发区域
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray caseRegionCode;
+
 
     /**
      * 案发地址

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

@@ -4,7 +4,6 @@ import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.entity.CaseEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.fusion.request.CaseParam;
-import com.fdkankan.fusion.response.HotVo;
 import com.fdkankan.fusion.response.SceneVo;
 
 import java.util.List;
@@ -22,7 +21,7 @@ public interface ICaseService extends IService<CaseEntity> {
 
     PageInfo pageList(CaseParam param,String token);
 
-    void addOrUpdate(CaseParam param, String token);
+    void addOrUpdate(CaseEntity param, String token);
 
     void addScene(CaseParam param);
 

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

@@ -35,9 +35,36 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
 
     @Override
     public CaseInquestCriminal getByCaseId(Integer caseId) {
+
         LambdaQueryWrapper<CaseInquestCriminal> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseInquestCriminal::getCaseId,caseId);
-        return this.getOne(wrapper);
+        CaseInquestCriminal caseInquestCriminal = this.getOne(wrapper);
+        /**
+         * 1.标题                     //案件名称
+         * 2.笔录人  绘图人  照相人   //登录人
+         * 3.制作时间                //当前时间
+         * 4.现场勘验单位  指派/报告单位 //部门名称
+         * 5.勘验时间       //第一个场景的拍摄时间
+         * 6.现场地点       //案件地理位置
+         * 7.现场勘验情况   //讯飞ai图片说明
+         * 8.单位             //部门名称
+         */
+        if(caseInquestCriminal == null){
+//            caseInquestCriminal = new CaseInquestCriminal();
+//            caseInquestCriminal.setCaseId(caseId);
+//            caseInquestCriminal.setDeptName();
+//            caseInquestCriminal.setTitle();
+//            caseInquestCriminal.setSendDept();
+//            caseInquestCriminal.setRecorder();
+//            caseInquestCriminal.setPainter();
+//            caseInquestCriminal.setPhotographer();
+//            caseInquestCriminal.setMakeTime();
+//            caseInquestCriminal.setReportDept();
+//            caseInquestCriminal.setInquestTime();
+//            caseInquestCriminal.setAddress();
+//            this.save(caseInquestCriminal);
+        }
+        return caseInquestCriminal;
     }
 
     @Override

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

@@ -1,6 +1,5 @@
 package com.fdkankan.fusion.service.impl;
 
-import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.ResultCode;
@@ -10,7 +9,6 @@ import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.mapper.ICaseMapper;
 import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.request.ScenePram;
-import com.fdkankan.fusion.response.HotVo;
 import com.fdkankan.fusion.response.SceneVo;
 import com.fdkankan.fusion.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,7 +17,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -215,24 +212,16 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
     }
 
     @Override
-    public void addOrUpdate(CaseParam param, String userName) {
+    public void addOrUpdate(CaseEntity param, String userName) {
         if(StringUtils.isEmpty(param.getCaseTitle())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        CaseEntity caseEntity ;
         if(param.getCaseId() == null){
-            caseEntity = new CaseEntity();
             TmUser tmUser = tmUserService.getByUserName(userName);
-            caseEntity.setDeptId(tmUser.getDeptId());
-            caseEntity.setUserName(userName);
-        }else {
-            caseEntity = this.getById(param.getCaseId());
+            param.setDeptId(tmUser.getDeptId());
+            param.setUserName(userName);
         }
-        caseEntity.setCaseTitle(param.getCaseTitle());
-        caseEntity.setLatAndLong(param.getLatAndLong());
-        caseEntity.setMapUrl(param.getMapUrl());
-        caseEntity.setUpdateTime(null);
-        this.saveOrUpdate(caseEntity);
+        this.saveOrUpdate(param);
     }
 
     @Override