Merge remote-tracking branch 'origin/master'

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java

@@ -209,7 +209,7 @@ public class ThreadTask {
 		diagnoseFaultReq.setFaultId(req.getFaultId());
 		diagnoseFaultReq.setConfidence(1.0);
 		diagnoseFaultReq.setLifeTime(24*3);//设置有效期3天
-		diagnoseFaultReq.setPriority(-1);
+		diagnoseFaultReq.setPriority(0);
 		diagnoseFaultReq.setTenantId(req.getStation());
 		diagnoseFaultReq.setCreateUser(ObjectUtil.isEmpty(AuthUtil.getUser()) ? "告警推送" : AuthUtil.getUser().getUserName());
 		faultAllReq.setManualData(diagnoseFaultReq);

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java

@@ -588,7 +588,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 
     @Override
     public R updateFaultState(DiagnoseFaultReq diagnoseFaultReq) {
-        diagnoseFaultReq.setPriority(2);
+        diagnoseFaultReq.setPriority(2);//一旦用户进行修改，优先级提为2
 //        /**获取故障对象**/
 //        LambdaQueryWrapper<FdpFaultEntity> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(FdpFaultEntity::getFdpId, diagnoseFaultReq.getFaultId()).last("limit 1");