Prechádzať zdrojové kódy

转工单 修改报警信息添加工单id和工单状态字段

miaolijing 3 rokov pred
rodič
commit
c16de085d1

+ 13 - 5
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/controller/AlarmRecordController.java

@@ -38,6 +38,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -213,7 +214,7 @@ public class AlarmRecordController {
         String treatState = EnumAlarmTreatState.DONE.getType();
         List<String> recordIds = closeAlarmRecordDTO.getIds();
 
-        return updateAlarmRecordTreatState(treatMode, treatState, recordIds);
+        return updateAlarmRecordTreatState(treatMode, treatState,null,null, recordIds);
     }
 
     /**
@@ -226,8 +227,8 @@ public class AlarmRecordController {
      * @author lixing
      * @version V1.0 2021/9/20 7:25 下午
      */
-    private CommonResult<AlarmRecordIdsItem> updateAlarmRecordTreatState(
-            String treatMode, String treatState, List<String> recordIds) throws Exception {
+    private CommonResult<AlarmRecordIdsItem> updateAlarmRecordTreatState(String treatMode, String treatState,
+            String orderId, String orderState, List<String> recordIds) throws Exception {
         AlarmRecordIdsItem alarmRecordIdsItem = new AlarmRecordIdsItem();
 
         if (CollectionUtils.isEmpty(recordIds)) {
@@ -240,6 +241,12 @@ public class AlarmRecordController {
             updateAlarmRecordDTO.setId(recordId);
             updateAlarmRecordDTO.setTreatMode(Integer.valueOf(treatMode));
             updateAlarmRecordDTO.setTreatState(Integer.valueOf(treatState));
+            if (!StringUtils.isEmpty(orderId)){
+                updateAlarmRecordDTO.setOrderId(orderId);
+            }
+            if (!StringUtils.isEmpty(orderState)){
+                updateAlarmRecordDTO.setOrderState(orderState);
+            }
             updateAlarmRecordDTOList.add(updateAlarmRecordDTO);
             alarmRecordIdsItem.setIds(recordIds);
         }
@@ -259,9 +266,10 @@ public class AlarmRecordController {
         String treatState = EnumAlarmTreatState.HANDLING.getType();
         List<String> recordIds = alarmRecordConvertWorkOrderDTO.getIds();
 
-        return updateAlarmRecordTreatState(treatMode, treatState, recordIds);
+        return updateAlarmRecordTreatState(treatMode, treatState,null,null, recordIds);
     }
 
+
     @ApiOperation(value = "忽略")
     @PostMapping("/ignore")
     public CommonResult<AlarmRecordIdsItem> ignoreAlarmRecord(
@@ -271,7 +279,7 @@ public class AlarmRecordController {
         String treatState = EnumAlarmTreatState.IGNORE.getType();
         List<String> recordIds = ignoreAlarmRecordDTO.getIds();
 
-        return updateAlarmRecordTreatState(treatMode, treatState, recordIds);
+        return updateAlarmRecordTreatState(treatMode, treatState,null,null, recordIds);
     }
 
     @ApiOperation(value = "报警详情")