diff --git a/inspect-base/inspect-base-system/src/main/java/com/inspect/system/base/openDomain/BasedataEqpBookMoMain.java b/inspect-base/inspect-base-system/src/main/java/com/inspect/system/base/openDomain/BasedataEqpBookMoMain.java
index fb5d8c4..b3d3b23 100644
--- a/inspect-base/inspect-base-system/src/main/java/com/inspect/system/base/openDomain/BasedataEqpBookMoMain.java
+++ b/inspect-base/inspect-base-system/src/main/java/com/inspect/system/base/openDomain/BasedataEqpBookMoMain.java
@@ -38,6 +38,9 @@ public class BasedataEqpBookMoMain extends BaseEntity {
name = "设备编码"
)
private String patrolDeviceCode;
+
+ private String upSystemDeviceCode;
+
@Excel(
name = "设备型号"
)
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
index 1eef8d6..806405b 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
@@ -1902,6 +1902,7 @@ public class PatrolResultController extends BaseController {
BeanUtils.copyBeanProp(basedataEqpbookXml, book);
basedataEqpbookXml.setStationCode(stationNo);
basedataEqpbookXml.setStationName(stationName);
+ basedataEqpbookXml.setPatrolDeviceCode(book.getUpSystemDeviceCode());
if (basedataEqpbookXml.getDeviceModel() == null) {
basedataEqpbookXml.setDeviceModel("");
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
index 06abbb9..503a73c 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
@@ -339,6 +339,7 @@
+
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/BasedataEqpBook.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/BasedataEqpBook.java
index e9d0a31..5324c89 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/BasedataEqpBook.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/BasedataEqpBook.java
@@ -45,6 +45,8 @@ public class BasedataEqpBook extends BaseEntity {
name = "设备编码"
)
private String patrolDeviceCode;
+
+ private String upSystemDeviceCode;
@Excel(
name = "设备型号"
)
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java
index 337e773..0547521 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java
@@ -259,7 +259,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
if (null != areaId) {
BaseDataArea baseDataArea = this.baseDataAreaMapper.selectAreaById(areaId);
if (null != baseDataArea) {
- if ("bayunit".equals(baseDataArea.getAreaType())) {
+// if ("bayunit".equals(baseDataArea.getAreaType())) {
bay_id = patrolPoint.getAreaId() + "";
// bay_id = baseDataArea.getUpSystemAreaId();
bay_name = baseDataArea.getAreaName();
@@ -274,10 +274,10 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
area_id = patrolPoint.getAreaId() + "";
area_name = baseDataArea.getAreaName();
}
- } else {
- area_id = patrolPoint.getAreaId() + "";
- area_name = baseDataArea.getAreaName();
- }
+// } else {
+// area_id = patrolPoint.getAreaId() + "";
+// area_name = baseDataArea.getAreaName();
+// }
}
}
@@ -326,7 +326,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
modelItem.setDevice_name(nullToEmpty(device_name));
modelItem.setDevice_type(nullToEmpty(device_type));
modelItem.setMeter_type("");
- modelItem.setAppearance_type("");
+ modelItem.setAppearance_type("9");
modelItem.setSave_type_list("");
modelItem.setRecognition_type_list(hashSet.size() == 0 ? "" : StringUtils.join(hashSet, ","));
modelItem.setPhase(nullToEmpty(phase));
@@ -335,15 +335,18 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
modelItem.setLower_value("");
modelItem.setUpper_value("");
modelItem.setVideo_pos(nullToEmpty(video_pos));
- modelItem.setPoint_type("");
- modelItem.setLabel_attri("");
-
+ modelItem.setPoint_type("1");
+ modelItem.setLabel_attri("1");
+ // 灵州站的设备类型为10000时，省侧规范中不存在10000，设备类型设置为空，相位也为空（）特殊处理一下
+ if ("10000".equals(modelItem.getDevice_type()) || StringUtils.isEmpty(modelItem.getDevice_type())) {
+ modelItem.setDevice_type("21");
+ }
// if(hasChinese(main_device_id) || hasChinese(component_id) || hasChinese(device_id)) {
// continue;
// }
-// if(device_type == null || device_type.equals("10000")){
-// continue;
-// }
+ if (StringUtils.isEmpty(modelItem.getVideo_pos()) || StringUtils.isEmpty(modelItem.getMain_device_id()) || StringUtils.isEmpty(modelItem.getComponent_id())) {
+ continue;
+ }
items.add(modelItem);
}
@@ -486,7 +489,6 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
while (true) {
BasedataPatrolPointPreset preset;
BasedataEqpBook eqpbook;
- BasedataEqpBookChannel eqpbookChannel = null;
String type = "";
JSONObject jsonObject;
String presetCode;
@@ -498,20 +500,12 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
preset = iterator.next();
Long eqpBookId = preset.getEqpBookId();
- Long channelId = preset.getChannelId();
- if (channelId == null) {
- continue;
- }
- eqpbookChannel = this.basedataEqpBookChannelMapper.selectBasedataEqpBookChannelByChannelId(channelId);
- } while (null == eqpbookChannel);
- eqpbook = this.basedataEqpbookMapper.selectBasedataEqpBookByEqpBookId(eqpbookChannel.getEqpBookId());
- if (null == eqpbook) {
- continue;
- }
+ eqpbook = this.basedataEqpbookMapper.selectBasedataEqpBookByEqpBookId(eqpBookId);
+ } while (null == eqpbook);
type = eqpbook.getType();
if ("10".equals(type)) {
jsonObject = new JSONObject();
- jsonObject.put("device_code", eqpbookChannel.getUpSystemDeviceCode());
+ jsonObject.put("device_code", eqpbook.getUpSystemDeviceCode());
presetCode = preset.getPresetCode();
if (null != presetCode && !presetCode.isEmpty()) {
jsonObject.put("device_pos", presetCode);
@@ -524,7 +518,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
if ("1".equals(type) || "2".equals(type) || "3".equals(type)) {
jsonObject = new JSONObject();
- jsonObject.put("robot_code", eqpbookChannel.getUpSystemDeviceCode());
+ jsonObject.put("robot_code", eqpbook.getUpSystemDeviceCode());
presetCode = preset.getPresetCode();
if (null != presetCode && !presetCode.isEmpty()) {
jsonObject.put("robot_pos", presetCode);
@@ -538,7 +532,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
if ("13".equals(type)) {
jsonObject = new JSONObject();
- jsonObject.put("uav_code", eqpbookChannel.getUpSystemDeviceCode());
+ jsonObject.put("uav_code", eqpbook.getUpSystemDeviceCode());
presetCode = preset.getPresetCode();
if (null != presetCode && !presetCode.isEmpty()) {
jsonObject.put("uav_pos", presetCode);
@@ -560,10 +554,25 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
char[] chars = localPhase.toCharArray();
for (int i = 0; i < chars.length; ++i) {
+ char c = chars[i];
+ switch (Character.toUpperCase(c)) {
+ case 'A':
+ c = '1';
+ break;
+ case 'B':
+ c = '2';
+ break;
+ case 'C':
+ c = '3';
+ break;
+ default:
+ // 保持原字符不变
+ break;
+ }
if (i == chars.length - 1) {
- builder.append(chars[i]);
+ builder.append(c);
} else {
- builder.append(chars[i]);
+ builder.append(c);
builder.append(StringUtils.COMMA);
}
}
diff --git a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml
index bb76f6f..ab28bf8 100644
--- a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml
@@ -12,6 +12,7 @@
+
@@ -60,6 +61,7 @@
area_name,
patrol_device_name,
patrol_device_code,
+ up_system_device_code,
device_model,
manufacturer,
use_unit,