From 042ab498ee53e8f3c7cecf52f733e8c1c162dfb5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 03 三月 2025 10:39:47 +0800
Subject: [PATCH] 修改模型3的bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
index 69a226d..bbf43c0 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
@@ -8,10 +8,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.TaskDetailMapper;
-import com.stylefeng.guns.modular.system.model.PatrolTask;
-import com.stylefeng.guns.modular.system.model.TaskDetail;
-import com.stylefeng.guns.modular.system.model.TaskDetailVehicles;
-import com.stylefeng.guns.modular.system.model.TaskDetailVehiclesChannel;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.model.enums.VideoChannelEnum;
import com.stylefeng.guns.modular.system.model.vo.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -64,6 +61,9 @@
@Autowired
private IUserService userService;
+ @Autowired
+ private IIconService iconService;
+
@@ -86,11 +86,12 @@
*/
@Override
public void delTaskDetail(List<String> ids) {
- this.baseMapper.deleteBatchIds(ids);
List<TaskDetail> taskDetails = this.selectBatchIds(ids);
for (TaskDetail taskDetail : taskDetails) {
JobKey jobKey = new JobKey(taskDetail.getId().toString());
quartzUtil.deleteQuartzTask(jobKey);
+ taskDetail.setDelFlag(1);
+ this.updateById(taskDetail);
}
}
@@ -229,10 +230,22 @@
collect.add(-1);
}
List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus());
+ List<Icon> icons = iconService.selectList(null);
for (PictureDetails pictureDetail : pictureDetails) {
String videoChannel = pictureDetail.getVideoChannel();
String name = VideoChannelEnum.getName(Integer.valueOf(videoChannel));
pictureDetail.setVideoChannel(name);
+ //异常
+ if(pictureDetail.getStatus() == 5){
+ pictureDetail.setImageUrl(icons.stream().filter(s->s.getType() == 2).findFirst().get().getUrl());
+ }else if(ToolUtil.isEmpty(pictureDetail.getImageUrl())){
+ //没有图片返回
+ pictureDetail.setImageUrl(icons.stream().filter(s->s.getType() == 3).findFirst().get().getUrl());
+ }
+ //离线
+ if(pictureDetail.getStatus() == 4){
+ pictureDetail.setImageUrl(icons.stream().filter(s->s.getType() == 1).findFirst().get().getUrl());
+ }
}
return pictureDetails;
}
@@ -310,7 +323,7 @@
hssfCell.setCellStyle(style);
hssfCell.setCellValue(titles.get(l));
}
-
+ List<Icon> icons = iconService.selectList(null);
HSSFPatriarch patriarch = hssfSheet.createDrawingPatriarch();
for (int i = 0; i < mapList.size(); i++) {
hssfRow = hssfSheet.createRow(i + 2);
@@ -354,6 +367,17 @@
Integer status1 = Integer.valueOf(map.get("status").toString());
//执行状态（1=待执行，2=进行中，3=成功，4=失败）
hssfCell4.setCellValue(1 == status1 ? "待执行" : 2 == status1 ? "进行中" : 3 == status1 ? "成功" : "失败");
+ //异常
+ if(status1 == 5){
+ map.put("imageUrl", icons.stream().filter(s->s.getType() == 2).findFirst().get().getUrl());
+ }else if(ToolUtil.isEmpty(map.get("imageUrl"))){
+ //没有图片返回
+ map.put("imageUrl", icons.stream().filter(s->s.getType() == 3).findFirst().get().getUrl());
+ }
+ //离线
+ if(status1 == 4){
+ map.put("imageUrl", icons.stream().filter(s->s.getType() == 1).findFirst().get().getUrl());
+ }
}
//车牌号
HSSFCell hssfCell5 = hssfRow.createCell(5);
--
Gitblit v1.7.1