1. 修复 bug

src/main/java/com/supervision/police/mapper/ModelAtomicResultMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.supervision.police.domain.ModelAtomicResult;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 原子指标结果表(ModelAtomicResult)表数据库访问层
  *
@@ -17,5 +19,7 @@ public interface ModelAtomicResultMapper extends BaseMapper<ModelAtomicResult> {
                                                 @Param("indexId") String indexId,
                                                 @Param("atomicId") String atomicId);
 
+
+    List<ModelAtomicResult> queryByCaseIdForUpdate(@Param("caseId") String caseId);
 }
 

src/main/java/com/supervision/police/service/ModelAtomicResultService.java

@@ -2,9 +2,10 @@ package com.supervision.police.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.supervision.police.domain.ModelAtomicResult;
-import com.supervision.police.dto.EvidentIndexResultDTO;
 
 import java.util.List;
 
 public interface ModelAtomicResultService extends IService<ModelAtomicResult> {
+
+    List<ModelAtomicResult> queryByCaseIdForUpdate(String caseId);
 }

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

@@ -7,7 +7,14 @@ import com.supervision.police.service.ModelAtomicResultService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Slf4j
 @Service
 public class ModelAtomicResultServiceImpl extends ServiceImpl<ModelAtomicResultMapper, ModelAtomicResult> implements ModelAtomicResultService {
+
+    @Override
+    public List<ModelAtomicResult> queryByCaseIdForUpdate(String caseId) {
+        return super.getBaseMapper().queryByCaseIdForUpdate(caseId);
+    }
 }

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

@@ -531,31 +531,6 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
 
                 atomic.setParentIndexName(record.getIndexName());
             }
-            // ===================================↑新方法=====================================
-            // ===================================↓老方法=====================================
-
-//            if (StringUtils.isEmpty(record.getJudgeLogic())) {
-//                continue;
-//            }
-//            // 是否是新的结果
-//            record.setNewFlagValue();
-//
-//            List<String> atomicIds = JudgeLogicUtil.pickAtomicIndexIds(record.getJudgeLogic());
-//            List<AtomicIndexDTO> atomics = modelCaseMapper.getAtomicDetail(caseId, record.getIndexId(), atomicIds);
-//            for (AtomicIndexDTO atomic : atomics) {
-//                // 获取原子指标的判断规则
-//                // 配置的指标的逻辑
-//                Map<String, String> indexJundgeLogicMap = parseLogicMap(record.getJudgeLogic());
-//                // 需要和原子指标的规则判断是否一致(解决出罪和入罪冲突的问题)
-//                String relationalSymbol = indexJundgeLogicMap.get(atomic.getAtomicIndexId());
-//
-//                atomic.judgeWithIndexResult(relationalSymbol);
-//                atomic.setSegmentation(nodeRecordSpliteMap);
-//                atomic.setRecordIfSegmentationAbsent("无");
-//                List<ModelAtomicResult> filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(record.getIndexId(), v.getIndexId())).toList();
-//                List<EvidentIndexResultDTO> evidentResult = getEvidentResult(filterAtomicResultList, caseEvidenceList, rootDirectory);
-//                atomic.setEvidentResultList(evidentResult);
-//            }
 
             record.setChildren(atomics);
             record.setRecordValue();

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

@@ -159,7 +159,7 @@ public class ModelServiceImpl implements ModelService {
 
         // 将原先的值进行赋值,设置到pre_result
         modelIndexResultMapper.updatePreResult(analyseCaseDTO.getCaseId());
-        List<ModelAtomicResult> modelAtomicResultList = modelAtomicResultService.lambdaQuery().eq(ModelAtomicResult::getCaseId, caseId).list();
+        List<ModelAtomicResult> modelAtomicResultList = modelAtomicResultService.queryByCaseIdForUpdate(caseId);
         log.info("开始计算指标结果");
         // 遍历指标集合，处理每个指标的判断逻辑，得出结果
         modelIndices.forEach(modelIndex -> {

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

@@ -22,13 +22,13 @@ public class TaskInfoReqVO {
     /**
      * 创建时间排序 默认降序
      */
-    private String createTimeSorted = "desc";
+    private String createTimeSorted = "asc";
 
 
     /**
      * 取消时间排序 默认降序
      */
-    private String cancelTimeSorted = "desc";
+    private String cancelTimeSorted = "asc";
 
     /**
      * 校验排序值，防止sql注入

src/main/resources/application-test.yml

@@ -80,7 +80,7 @@ xxl:
     admin:
       username: admin
       password: 123456
-      addresses: http://192.168.10.138:8080/xxl-job-admin
+      addresses: http://localhost:8080/xxl-job-admin
     accessToken: default_token
     executor:
       address:

src/main/resources/mapper/ModelAtomicResultMapper.xml

@@ -18,4 +18,10 @@
             </if>
         </where>
     </select>
+    <select id="queryByCaseIdForUpdate" resultType="com.supervision.police.domain.ModelAtomicResult">
+        select *
+        from model_atomic_result
+        where case_id = #{caseId}
+            for update;
+    </select>
 </mapper>

src/main/resources/mapper/TaskRecordMapper.xml

@@ -51,6 +51,7 @@
                 and t.status = #{taskInfo.taskStatus}
             </if>
         </where>
-        order by c.create_time ${taskInfo.createTimeSorted} ,t.create_time ${taskInfo.cancelTimeSorted}
+        order by FIELD(t.status, '1','0','2','4','3','5'), t.create_time ${taskInfo.createTimeSorted} ,t.cancel_time ${taskInfo.cancelTimeSorted}
     </select>
+    <!--状态字段默认排序规则 处理中 >> 待处理 >> 取消中 >> 处理成功 >>已取消 >> 处理失败-->
 </mapper>