Commit 1b68d21b authored by tianyiming's avatar tianyiming

设备列表设备来源增加字段

parent 118f261c
...@@ -138,6 +138,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -138,6 +138,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 设备来源 jg:新设备录入 jg_his:历史数据录入 // 设备来源 jg:新设备录入 jg_his:历史数据录入
public static final String DATA_SOURCE = "DATA_SOURCE"; public static final String DATA_SOURCE = "DATA_SOURCE";
// 设备来源名称 jg:新设备 jg_his:历史数据
public static final String DATA_SOURCE_NAME = "DATA_SOURCE_NAME";
private static final String ATTACHMENT_UPLOAD = "attachmentUpload"; private static final String ATTACHMENT_UPLOAD = "attachmentUpload";
private final List<String> resultError = new ArrayList<>(); private final List<String> resultError = new ArrayList<>();
...@@ -1499,8 +1501,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1499,8 +1501,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
} }
if (!ValidationUtil.isEmpty(dto2.get(DATA_SOURCE))) { if (!ValidationUtil.isEmpty(dto2.get(DATA_SOURCE))) {
String s = dto2.get(DATA_SOURCE).toString(); String s = dto2.get(DATA_SOURCE).toString();
dto2.put(DATA_SOURCE, s);
String equipSource = s.startsWith(EquipSourceEnum.jg.getCode()) ? EquipSourceEnum.jg.getName() : EquipSourceEnum.jg_his.getName(); String equipSource = s.startsWith(EquipSourceEnum.jg.getCode()) ? EquipSourceEnum.jg.getName() : EquipSourceEnum.jg_his.getName();
dto2.put(DATA_SOURCE, equipSource); dto2.put(DATA_SOURCE_NAME, equipSource);
} }
dto2.put("record", dto2.get(SEQUENCE_NBR)); dto2.put("record", dto2.get(SEQUENCE_NBR));
list.add(dto2); list.add(dto2);
......
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