Browse Source

灵州站上级系统修改

master
wangguangyuan 3 months ago
parent
commit
9e9fb7f545
2 changed files with 12 additions and 3 deletions
  1. +11
    -2
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
  2. +1
    -1
      inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolTaskXML.java

+ 11
- 2
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java View File

@ -1778,24 +1778,27 @@ public class PatrolResultController extends BaseController {
String stationName = stationMap.get("station_name"); String stationName = stationMap.get("station_name");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
PatrolTaskFtp patrolTaskFtp = patrolTaskFtpService.selectPatrolTaskFtpByLineId(3L); PatrolTaskFtp patrolTaskFtp = patrolTaskFtpService.selectPatrolTaskFtpByLineId(3L);
List<String> algId = new ArrayList<>();
List<String> algId = new ArrayList<>(); //设备类型巡视主机 20机器人 123摄像机及硬盘录像机 1011无人机及无人机巢 13声纹 14
String filename; String filename;
String modelXml = null; String modelXml = null;
String contype = "";
String contype = ""; // 1:设备模型2任务文件3检修区域配置文件
String type = basedataEqpBook.getType(); String type = basedataEqpBook.getType();
String str; String str;
switch (type) { switch (type) {
// 巡视主机及分析主机模型
case "1": case "1":
algId.add("20"); algId.add("20");
contype = "1"; contype = "1";
break; break;
case "2": case "2":
// 机器人模型
algId.add("1"); algId.add("1");
algId.add("2"); algId.add("2");
algId.add("3"); algId.add("3");
contype = "1"; contype = "1";
break; break;
case "3": case "3":
// 摄像机及硬盘录像机模型
algId.add("10"); algId.add("10");
algId.add("11"); algId.add("11");
contype = "1"; contype = "1";
@ -1803,28 +1806,34 @@ public class PatrolResultController extends BaseController {
default: default:
String path; String path;
switch (type) { switch (type) {
// 点位模型
case "4": case "4":
logger.info("--------getEqpBookListInfo 2 type:4!!!!!!"); logger.info("--------getEqpBookListInfo 2 type:4!!!!!!");
path = baseDataClient.superSystemSynPatrolPointModel(); path = baseDataClient.superSystemSynPatrolPointModel();
str = "{\"device_file_path\":\"" + path + "\"}"; str = "{\"device_file_path\":\"" + path + "\"}";
return str; return str;
case "5": case "5":
// 无人机及无人机巢模型
algId.add("13"); algId.add("13");
contype = "1"; contype = "1";
break; break;
case "6": case "6":
// 声纹模型
algId.add("14"); algId.add("14");
contype = "1"; contype = "1";
break; break;
case "7": case "7":
// 任务文件
algId.add("-1"); algId.add("-1");
contype = "2"; contype = "2";
break; break;
case "8": case "8":
// 检修区域配置文件
algId.add("-1"); algId.add("-1");
contype = "3"; contype = "3";
break; break;
case "9": case "9":
// 地图文件
path = baseDataClient.setSendServiceForMap(); path = baseDataClient.setSendServiceForMap();
str = "{\"map_file_path\":\"" + path + "\"}"; str = "{\"map_file_path\":\"" + path + "\"}";
return str; return str;


+ 1
- 1
inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolTaskXML.java View File

@ -208,7 +208,7 @@ public class PatrolTaskXML implements Serializable {
name = "编制人" name = "编制人"
) )
@XmlAttribute( @XmlAttribute(
name = "cerator"
name = "creator"
) )
private String creator; private String creator;
@XmlAttribute( @XmlAttribute(


Loading…
Cancel
Save