Commit d0b253eb authored by 李秀明's avatar 李秀明

fix(消防视图): 换流站区域下面点击设备未打开设备信息卡且接口报错

【web端】站端3711:全景监控>消防视图>换流站区域下面点击设备未打开设备信息卡且接口报错 Closes http://113.142.68.105:5080/zentao/task-view-21172.html
parent a5438d12
...@@ -151,4 +151,9 @@ public class PointTreeVo { ...@@ -151,4 +151,9 @@ public class PointTreeVo {
private String code; private String code;
//建筑类型 //建筑类型
private String groupType; private String groupType;
/**
* 画布id
*/
private String bizOrgCode;
} }
...@@ -53,6 +53,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -53,6 +53,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
/** /**
...@@ -256,10 +257,13 @@ public class EquipmentDetailController extends AbstractBaseController { ...@@ -256,10 +257,13 @@ public class EquipmentDetailController extends AbstractBaseController {
} }
FireFightingSystemEntity fightingSystemEntity = new FireFightingSystemEntity(); FireFightingSystemEntity fightingSystemEntity = new FireFightingSystemEntity();
if(!ObjectUtils.isEmpty(equipmentSpecific.getSystemId())){ if(!ObjectUtils.isEmpty(equipmentSpecific.getSystemId())){
fightingSystemEntity = fireFightingSystemService.getOneById(Long.valueOf(equipmentSpecific.getSystemId())); String ids = equipmentSpecific.getSystemId();
equipmentSpecific.setSystemId(fightingSystemEntity.getName()); String[] idArray = ids.split(",");
AtomicReference<String> name = new AtomicReference<>("");
fireFightingSystemService.listByIds(Arrays.asList(idArray)).forEach(x -> name.set(name.get() + x.getName() + ","));
fightingSystemEntity.setName(name.get().substring(0, name.get().length() - 1));
} else { } else {
equipmentSpecific.setSystemId(""); equipmentSpecific.setSystemName("");
} }
equipmentSpecific.setSystemId(fightingSystemEntity.getName()); equipmentSpecific.setSystemId(fightingSystemEntity.getName());
equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode()); equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment