lyhzzz 1 rok temu
rodzic
commit
4c236f9ffe

+ 2 - 1
src/main/java/com/fdkankan/fusion/common/ResultCode.java

@@ -66,7 +66,8 @@ public enum ResultCode {
     SS_SCENE_DOWN_ERROR(7020,"深时点云场景下载失败"),
     FILE_NOT_EXIST(7021,"文件不存在,或已被刪除"),
 
-    CAMERA_SPACE_ERROR(7022, "相机容量不足")
+    CAMERA_SPACE_ERROR(7022, "相机容量不足"),
+    INQUEST_ERROR(7023, "该案件已有勘验笔录")
 
 
     ;

+ 37 - 0
src/main/java/com/fdkankan/fusion/controller/CaseInquestController.java

@@ -0,0 +1,37 @@
+package com.fdkankan.fusion.controller;
+
+
+import com.dtflys.forest.annotation.Post;
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.entity.CaseInquest;
+import com.fdkankan.fusion.service.ICaseInquestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-04
+ */
+@RestController
+@RequestMapping("/caseInquest")
+public class CaseInquestController {
+
+    @Autowired
+    ICaseInquestService caseInquestService;
+
+    @GetMapping("/info")
+    public ResultData info(@RequestParam(required = false) Integer caseId){
+        return ResultData.ok(caseInquestService.getByCaseId(caseId));
+    }
+
+    @PostMapping("/saveOrUpdate")
+    public ResultData saveOrUpdate(@RequestBody CaseInquest caseInquest){
+        caseInquestService.saveByParam(caseInquest);
+        return ResultData.ok();
+    }
+}
+

+ 147 - 0
src/main/java/com/fdkankan/fusion/entity/CaseInquest.java

@@ -0,0 +1,147 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-04
+ */
+@Getter
+@Setter
+@TableName("t_case_inquest")
+public class CaseInquest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("case_id")
+    private Integer caseId;
+
+    /**
+     * 勘验次数
+     */
+    @TableField("count")
+    private Integer count;
+
+    /**
+     * 勘验开始时间
+     */
+    @TableField("start_time")
+    private Date startTime;
+
+    /**
+     * 勘验结束时间
+     */
+    @TableField("end_time")
+    private Date endTime;
+
+    /**
+     * 勘验地点
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 勘验人员信息
+     */
+    @TableField("user_info")
+    private String userInfo;
+
+    /**
+     * 勘验气象条件
+     */
+    @TableField("weather")
+    private String weather;
+
+    /**
+     * 勘验情况
+     */
+    @TableField("situation")
+    private String situation;
+
+    /**
+     * 环境勘验
+     */
+    @TableField("environment")
+    private String environment;
+
+    /**
+     * 初步勘验
+     */
+    @TableField("first_inquest")
+    private String firstInquest;
+
+    /**
+     * 细项勘验
+     */
+    @TableField("careful_inquest")
+    private String carefulInquest;
+
+    /**
+     * 专项勘验
+     */
+    @TableField("special_inquest")
+    private String specialInquest;
+
+    /**
+     * 提取物品描述
+     */
+    @TableField("item_description")
+    private String itemDescription;
+
+    /**
+     * 现场拍照制图描述
+     */
+    @TableField("img_description")
+    private String imgDescription;
+
+    /**
+     * 负责人
+     */
+    @TableField("leader")
+    private String leader;
+
+    /**
+     * 记录人
+     */
+    @TableField("recorder")
+    private String recorder;
+
+    /**
+     * 勘验人
+     */
+    @TableField("Inspector")
+    private String inspector;
+
+    /**
+     * 证人信息数组
+     */
+    @TableField("witness_info")
+    private String witnessInfo;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 1 - 1
src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "t_system_setting"
+               "t_case_inquest"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 18 - 0
src/main/java/com/fdkankan/fusion/mapper/ICaseInquestMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.fusion.mapper;
+
+import com.fdkankan.fusion.entity.CaseInquest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-04
+ */
+@Mapper
+public interface ICaseInquestMapper extends BaseMapper<CaseInquest> {
+
+}

+ 19 - 0
src/main/java/com/fdkankan/fusion/service/ICaseInquestService.java

@@ -0,0 +1,19 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.CaseInquest;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-04
+ */
+public interface ICaseInquestService extends IService<CaseInquest> {
+
+    CaseInquest getByCaseId(Integer caseId);
+
+    void saveByParam(CaseInquest caseInquest);
+}

+ 46 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseInquestServiceImpl.java

@@ -0,0 +1,46 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.entity.CaseInquest;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.mapper.ICaseInquestMapper;
+import com.fdkankan.fusion.service.ICaseInquestService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-04
+ */
+@Service
+public class CaseInquestServiceImpl extends ServiceImpl<ICaseInquestMapper, CaseInquest> implements ICaseInquestService {
+
+
+    @Override
+    public CaseInquest getByCaseId(Integer caseId) {
+        LambdaQueryWrapper<CaseInquest> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseInquest::getCaseId,caseId);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public void saveByParam(CaseInquest caseInquest) {
+        if(caseInquest.getCaseId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        if(caseInquest.getId() == null){
+            CaseInquest dbCaseInquest = this.getByCaseId(caseInquest.getCaseId());
+            if(dbCaseInquest != null){
+                throw new BusinessException(ResultCode.INQUEST_ERROR);
+            }
+        }
+
+        this.saveOrUpdate(caseInquest);
+
+    }
+}

+ 8 - 1
src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -1,5 +1,7 @@
 package com.fdkankan.fusion.service.impl;
 
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -70,7 +72,12 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
             wrapper.eq(TmProject::getIsTeached,1);
             deptIds = tmDepartmentService.getByZdDeptIds();
         }else {
-            deptIds = tmDepartmentService.getDeptIds();
+            String share = SaHolder.getRequest().getHeader("share");
+            if(StringUtils.isNotBlank(share) && "1".equals(share)){ //分享请求头
+                deptIds = tmDepartmentService.list().stream().map(TmDepartment::getId).collect(Collectors.toList());
+            }else {
+                deptIds = tmDepartmentService.getDeptIds();
+            }
         }
         if(deptIds.size() <=0){
             throw new BusinessException(ResultCode.NOT_DEPT);

+ 5 - 0
src/main/resources/mapper/fusion/CaseInquestMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.fusion.mapper.ICaseInquestMapper">
+
+</mapper>