Gaokun Wang 8 сар өмнө
parent
commit
d75087b7f2

+ 1 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFalseAlarmService.java

@@ -47,7 +47,7 @@ public interface IFalseAlarmService extends IBaseService<FalseAlarm> {
      * @param falseAlarmBo 虚警抑制Bo
      * @return 结果:true 操作成功,false 操作失败
      */
-    boolean insert(FalseAlarmBo falseAlarmBo);
+    FalseAlarm insert(FalseAlarmBo falseAlarmBo);
 
     /**
      * 新增虚警抑制,前台提供主键值,一般用于导入的场合

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AlgorithmService.java

@@ -9,6 +9,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.FalseAlarm;
 import org.eco.als.domain.Warning;
 import org.eco.als.domain.bo.*;
 import org.eco.als.domain.vo.ModelHttpVo;
@@ -166,7 +167,7 @@ public class AlgorithmService implements IAlgorithmService {
             .status("0")
             .columnData(Arrays.toString(algorithmBo.getColumnData()))
             .build();
-        falseAlarmService.insert(falseAlarmBo);
+        FalseAlarm falseAlarm = falseAlarmService.insert(falseAlarmBo);
 
         // 警告列表
         List<Warning> warnings = warningService.listByIds(Arrays.asList(algorithmBo.getWarningIds()));
@@ -181,6 +182,7 @@ public class AlgorithmService implements IAlgorithmService {
         ModelHttpVo httpVo = sendHttp(modelVo, map);
         if (httpVo != null && httpVo.getStatus() == 200) {
             falseAlarmBo.setStatus("1");
+            falseAlarmBo.setId(falseAlarm.getId());
             falseAlarmService.update(falseAlarmBo);
             FalseAlarmResultBo falseAlarmResultBo = FalseAlarmResultBo.builder()
                 .falseAlarmId(falseAlarmBo.getId())

+ 3 - 2
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FalseAlarmServiceImpl.java

@@ -106,10 +106,11 @@ public class FalseAlarmServiceImpl extends BaseServiceImpl<FalseAlarmMapper, Fal
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insert(FalseAlarmBo falseAlarmBo) {
+    public FalseAlarm insert(FalseAlarmBo falseAlarmBo) {
         FalseAlarm falseAlarm = MapstructUtils.convert(falseAlarmBo, FalseAlarm.class);
 
-        return this.save(falseAlarm);//使用全局配置的雪花算法主键生成器生成ID值
+        this.save(falseAlarm);//使用全局配置的雪花算法主键生成器生成ID值
+        return this.save(falseAlarm) ? falseAlarm : null;
     }
 
     /**