Pārlūkot izejas kodu

修改:1.23号演示修改需求

chenhongyan1989 3 mēneši atpakaļ
vecāks
revīzija
a703b5e3f2

+ 1 - 1
energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -312,7 +312,7 @@ public class AnalysisServiceImpl implements AnalysisService {
                 addPriorityRecord(analysisDto.getDataBatchNum(), taskId);
                 //保存请求参数
                 addDataRelationRecord(analysisDto,taskId);
-                //更新任务状态为排队中
+                //更新任务状态为排队中(只更新分析完成与未分析状态)
                 analysisResultMapper.updateAnalysisState(analysisDto.getDataBatchNum());
             }else{
                 //调用算法逻辑(排队逻辑)

+ 1 - 1
energy-manage-service/src/main/java/com/energy/manage/service/task/AnalysisTask.java

@@ -58,7 +58,7 @@ public class AnalysisTask {
             }
             //调用分析
             analysisService.callAnalysis(getAnalysisDto(priorityRecordsPo));
-            //更新任务优先级状态
+            //更新任务优先级状态为已执行
             priorityRecordsMapper.updateExecuteStatus(priorityRecordsPo.getTaskId(), AnalysisConstants.ON_CALL);
         }catch (Exception e){
             log.error("触发自动分析定时任务异常",e);

+ 2 - 1
energy-manage-service/src/main/resources/mybatis/analysis/AnalysisResultMapper.xml

@@ -161,7 +161,8 @@
     <update id="updateAnalysisState" parameterType="java.lang.String">
         update analysis_result
         set analysis_state = 10
-        where batch_code = #{batchCode,jdbcType=VARCHAR}
+        where analysis_state = -1 or analysis_state = 30
+        and batch_code = #{batchCode,jdbcType=VARCHAR}
     </update>
 
     <update id="updateByBatchCode" parameterType="com.energy.manage.service.domain.dto.analysis.AnalysisDto">