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 b260249..69f7ba2 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 @@ -1778,24 +1778,27 @@ public class PatrolResultController extends BaseController { String stationName = stationMap.get("station_name"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); PatrolTaskFtp patrolTaskFtp = patrolTaskFtpService.selectPatrolTaskFtpByLineId(3L); - List algId = new ArrayList<>(); + List algId = new ArrayList<>(); //设备类型,巡视主机 20,机器人 1,2,3,摄像机及硬盘录像机 10,11,无人机及无人机巢 13,声纹 14 String filename; String modelXml = null; - String contype = ""; + String contype = ""; // 1:设备模型,2:任务文件,3:检修区域配置文件 String type = basedataEqpBook.getType(); String str; switch (type) { + // 巡视主机及分析主机模型 case "1": algId.add("20"); contype = "1"; break; case "2": + // 机器人模型 algId.add("1"); algId.add("2"); algId.add("3"); contype = "1"; break; case "3": + // 摄像机及硬盘录像机模型 algId.add("10"); algId.add("11"); contype = "1"; @@ -1803,28 +1806,34 @@ public class PatrolResultController extends BaseController { default: String path; switch (type) { + // 点位模型 case "4": logger.info("--------getEqpBookListInfo 2 type:4!!!!!!"); path = baseDataClient.superSystemSynPatrolPointModel(); str = "{\"device_file_path\":\"" + path + "\"}"; return str; case "5": + // 无人机及无人机巢模型 algId.add("13"); contype = "1"; break; case "6": + // 声纹模型 algId.add("14"); contype = "1"; break; case "7": + // 任务文件 algId.add("-1"); contype = "2"; break; case "8": + // 检修区域配置文件 algId.add("-1"); contype = "3"; break; case "9": + // 地图文件 path = baseDataClient.setSendServiceForMap(); str = "{\"map_file_path\":\"" + path + "\"}"; return str; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolTaskXML.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolTaskXML.java index 29eb7a8..27cf428 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolTaskXML.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolTaskXML.java @@ -208,7 +208,7 @@ public class PatrolTaskXML implements Serializable { name = "编制人" ) @XmlAttribute( - name = "cerator" + name = "creator" ) private String creator; @XmlAttribute(