导出报警

business-service/src/main/java/com/ozs/entity/MsgAlarm.java

@@ -72,7 +72,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 报警级别
      */
-    @Excel(name = "报警级别")
+//    @Excel(name = "报警级别")
     private Integer alarmLevel;
 
     /**
@@ -89,6 +89,9 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 报警病害类型（1泥石流2异物侵线 3断轨监测）
      */
     private Integer alarmType;
+    @TableField(exist = false)
+    @Excel(name = "报警病害类型")
+    private String alarmTypeStr;
 
     /**
      * 框定范围
@@ -137,7 +140,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 备注
      */
-    @Excel(name = "备注")
+//    @Excel(name = "备注")
     private String remark;
 
     /**

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

@@ -30,9 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -213,39 +211,30 @@ public class MsgAlarmController extends BaseController {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
         List<MsgAlarm> msgAlarmList = msgAlarmService.msgAlarmList(msgAlarmVo);
-        for (MsgAlarm msgAlarm : msgAlarmList) {
-//            String[] split = msgAlarm.getImageUrl().split(";");
-//            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-//            msgAlarm.setImageUrls(objects);
-//            LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-//                cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-//            }
-//            BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-//            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-//            if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
-//                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
-//            }
-//            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-//            msgAlarm.setRailwayName(baseRailwayManagement.getRailwayName());
-//            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-//                msgAlarm.setReleasedByName(user.getNickName());
-//            }
-//            String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
-//            msgAlarm.setAlarmMiles(mils);
-//            String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-//            msgAlarm.setEndMile(end);
-//            String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-//            msgAlarm.setBeginMile(begin);
-//            LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
-//            if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
-//                wrapper.eq(MsgAlarmFrequency::getAlarmId, msgAlarm.getAlarmId());
-//            }
-//            msgAlarm.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
-//            msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
-//            msgAlarm.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
-//            msgAlarm.setAlarmTypeName("泥石流");
+        for (MsgAlarm o : msgAlarmList) {
+            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<>();
+            if (!StringUtils.isEmptySunhh(o.getRailwayCode())) {
+                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
+            }
+            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+            if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
+                o.setRailwayName(baseRailwayManagement.getRailwayName());
+            }
+            if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(o.getReleasedBy());
+                o.setReleasedByName(user.getNickName());
+            }
+            String mils = AppendUtils.stringAppend(o.getAlarmMile());
+            o.setAlarmMiles(mils);
+            o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
+            o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵线" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
+            o.setIsReleaseName(o.getIsRelease() == 1 ? "已解除" : (o.getIsRelease() == 2 ? "未解除" : "未知"));
+            List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
+            data.stream().forEach(sysDictData -> {
+                if (sysDictData.getDictValue().equals(o.getAlarmType().toString())) {
+                    o.setAlarmTypeName(sysDictData.getDictLabel());
+                }
+            });
         }
         ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
         util.exportExcel(response, msgAlarmList, "报警信息管理");