添加忽略行驶表字段终端名称

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

@@ -10,9 +10,11 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.ozs.entity.vo.TerminalIgnoreVo;
+import com.ozs.service.BaseVehicleTerminalService;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -41,6 +44,8 @@ public class TerminalIgnoreAlarmController extends BaseController {
     private TerminalIgnoreAlarmService terminalIgnoreAlarmService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Autowired
+    private BaseVehicleTerminalService baseVehicleTerminalService;
 
     /**
      * 查询终端忽略报警信息列表
@@ -58,6 +63,18 @@ public class TerminalIgnoreAlarmController extends BaseController {
         }
         wrapper.orderByDesc("ignore_time");
         IPage<TerminalIgnoreAlarm> page = terminalIgnoreAlarmService.page(new Page<>(terminalIgnoreVo.getPageNum(), terminalIgnoreVo.getPageSize()), wrapper);
+        List<BaseVehicleTerminal> terminal = baseVehicleTerminalService.list();
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
+            List<TerminalIgnoreAlarm> dto = page.getRecords().stream().map(o -> {
+            for(BaseVehicleTerminal ter:terminal){
+                if(ter.getTerminalCode().equals(o.getTerminalCode())){
+                    o.setTerminalName(ter.getTerminalName());
+                }
+            }
+            return o;
+        }).collect(Collectors.toList());
+            page.setRecords(dto);
+        }
         return AjaxResult.success(page);
     }