1. 修复新增案件知识图谱保存不进去问题

src/main/java/com/supervision/police/domain/TaskCaseRecord.java

@@ -1,5 +1,6 @@
 package com.supervision.police.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +8,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * @TableName task_case_record
@@ -59,7 +60,8 @@ public class TaskCaseRecord implements Serializable {
     /**
      * 创建时间
      */
-    private Date createTime;
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
 
     /**
      * 更新人ID
@@ -69,7 +71,8 @@ public class TaskCaseRecord implements Serializable {
     /**
      * 更新时间
      */
-    private Date updateTime;
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
 
     @Serial
     @TableField(exist = false)

src/main/java/com/supervision/police/domain/TaskRecord.java

@@ -1,11 +1,13 @@
 package com.supervision.police.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -69,7 +71,8 @@ public class TaskRecord implements Serializable {
     /**
      * 创建时间
      */
-    private Date createTime;
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
 
     /**
      * 更新人ID
@@ -79,7 +82,8 @@ public class TaskRecord implements Serializable {
     /**
      * 更新时间
      */
-    private Date updateTime;
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/supervision/police/service/impl/MroServiceImpl.java

@@ -41,7 +41,7 @@ public class MroServiceImpl implements MroService {
                 .like(StrUtil.isNotEmpty(caseProcessReqVO.getCaseName()), ModelCase::getCaseName, caseProcessReqVO.getCaseName())
                 .in(CollUtil.isNotEmpty(caseProcessReqVO.getIdentifyResult()), ModelCase::getIdentifyResult, caseProcessReqVO.getIdentifyResult())
                 .in(CollUtil.isNotEmpty(caseProcessReqVO.getAnalysisStatus()), ModelCase::getCaseAnalysisStatus, caseProcessReqVO.getAnalysisStatus())
-                .orderBy(true, StrUtil.equalsIgnoreCase(caseProcessReqVO.getSort(), "asc"), ModelCase::getCaseAnalysisSuccessTime)
+                .orderBy(true, StrUtil.equalsIgnoreCase(caseProcessReqVO.getSort(), "desc"), ModelCase::getCaseAnalysisSuccessTime)
                 .page(Page.of(page, size));
 
        final Set<String> processCaseIds = new HashSet<>();

src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java

@@ -186,6 +186,7 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
 
     @Override
     public IPage<TaskInfoDTO> queryTaskList(TaskInfoReqVO taskInfo, Integer page, Integer size) {
+        taskInfo.checkSorted();
         return super.getBaseMapper().queryTaskList(taskInfo, Page.of(page, size));
     }
 

src/main/java/com/supervision/police/service/impl/TripleInfoServiceImpl.java

@@ -33,9 +33,6 @@ public class TripleInfoServiceImpl extends ServiceImpl<TripleInfoMapper, TripleI
                     .eq(TripleInfo::getEndNodeType, tripleInfo.getEndNodeType())
                     .eq(TripleInfo::getRecordSplitId, tripleInfo.getRecordSplitId()).one();
             if (null != one) {
-                tripleInfo.setId(one.getId());
-                super.updateById(tripleInfo);
-            } else {
                 super.save(tripleInfo);
             }
         }

src/main/java/com/supervision/police/vo/TaskInfoReqVO.java

@@ -1,7 +1,10 @@
 package com.supervision.police.vo;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Data
 public class TaskInfoReqVO {
 
@@ -26,4 +29,18 @@ public class TaskInfoReqVO {
      * 取消时间排序 默认降序
      */
     private String cancelTimeSorted = "desc";
+
+    /**
+     * 校验排序值，防止sql注入
+     */
+    public void checkSorted(){
+        if (!StrUtil.equalsAnyIgnoreCase(createTimeSorted, "desc", "asc")){
+            log.warn("checkSorted:createTimeSorted参数校验失败，输入值:{},已重置为默认值:{}", createTimeSorted,"desc");
+            this.cancelTimeSorted = "desc";
+        }
+        if (!StrUtil.equalsAnyIgnoreCase(cancelTimeSorted, "desc", "asc")){
+            log.warn("checkSorted:cancelTimeSorted参数校验失败，输入值:{},已重置为默认值:{}", cancelTimeSorted,"desc");
+            this.cancelTimeSorted = "desc";
+        }
+    }
 }

src/main/resources/mapper/TaskRecordMapper.xml

@@ -40,13 +40,13 @@
                  left join model_case c on t.case_id = c.id
                  left join case_person p on t.create_user_id = p.id
         <where>
-            <if test="caseName != null and caseName != ''">
+            <if test="taskInfo.caseName != null and taskInfo.caseName != ''">
                 and c.case_name like concat('%',#{taskInfo.caseName},'%')
             </if>
-            <if test="taskStatus != null and taskStatus != ''">
+            <if test="taskInfo.taskStatus != null and taskInfo.taskStatus != ''">
                 and t.status = #{taskInfo.taskStatus}
             </if>
         </where>
-        order by c.create_time #{taskInfo.createTimeSorted} ,t.create_time #{taskInfo.cancelTimeSorted}
+        order by c.create_time ${taskInfo.createTimeSorted} ,t.create_time ${taskInfo.cancelTimeSorted}
     </select>
 </mapper>