统计页面病害属性展示和导出更改内容

business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticDto.java

@@ -74,9 +74,14 @@ public class AlarmStatisticDto {
     /**
      * 报警病害属性（可以给出泥石流的框定范围）
      */
-    @Excel(name = "报警病害属性")
     private String alarmAttr;
 
+    /**
+     * 报警病害属性（可以给出泥石流的框定范围）字符串
+     */
+    @Excel(name = "报警病害属性")
+    private String alarmAttrString;
+
     /**
      * 报警图片地址
      */

business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticVo.java

@@ -131,4 +131,9 @@ public class AlarmStatisticVo {
      * 报警是否解除 1已解除2未解除
      */
     private String isLockName;
+
+    /**
+     * 报警病害属性（可以给出泥石流的框定范围）字符串
+     */
+    private String alarmAttrString;
 }

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -496,6 +496,13 @@ public class MsgAlarmController extends BaseController {
                 if (!ObjectUtils.isEmpty(l.getIsLock())) {
                     l.setIsLockName(l.getIsLock() == 1 ? "已解除" : "未解除");
                 }
+                if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
+                    String[] split1 = l.getAlarmAttr().split(",");
+                    String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+                            "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+                            "大小" + split1[4] + "×" + split1[5];
+                    l.setAlarmAttrString(stringBuilder);
+                }
             });
         }
         IPage page = msgAlarmService.listToPage(list, pageNum, pageSize);
@@ -623,6 +630,13 @@ public class MsgAlarmController extends BaseController {
                     if (!ObjectUtils.isEmpty(l.getIsLock())) {
                         l.setIsLockName(l.getIsLock() == 1 ? "已解除" : "未解除");
                     }
+                    if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
+                        String[] split1 = l.getAlarmAttr().split(",");
+                        String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+                                "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+                                "大小" + split1[4] + "×" + split1[5];
+                        l.setAlarmAttrString(stringBuilder);
+                    }
                 });
             }