1.设备故障状态合并到设备状态中，设备状态接口修改 2.警情处理完成后修改设备状态为正常，修改警情处理接口

Administrator

2021-05-06 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java

@@ -37,6 +37,7 @@
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.equipment.feign.DeptFeignApi;
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.operation.entity.Operation;
import org.springblade.jfpt.operation.service.IOperationService;
@@ -75,6 +76,8 @@
   private ParcelService parcelService;

   private final DeptFeignApi deptFeignApi;

   private IEquipmentService iEquipmentService;

   /**
    * 详情
@@ -477,6 +480,11 @@
      alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr());
      alarmService.updatePoliceStatus(operation.getRid(),"0");
      operationService.save(operation);
      //如果警情处理完成，则修改设备状态为正常
      if (null!=operation.getJtype() && operation.getJtype().equals("2")){
         String state ="处理完成";
         iEquipmentService.updateExstate(state,null,operation.getDeviceNumber());
      }
      return R.success("修改成功");
   }