xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 调整excel内容

Browse Source
dev
huangfeng 1 year ago
parent 101165c42d
commit ae927b3cc1
3 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/CmdController.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class CmdController extends BaseController {
list.add(new ActionModel(1, "yw_cmd_android_reboot", "重启设备"));
list.add(new ActionModel(2, "yw_cmd_mcu_reboot", "MCU单片机重启"));
list.add(new ActionModel(3, "i1_cmd_set_i1_server_ip_port", "设置I1服务器"));
list.add(new ActionModel(4, "i1_cmd_set_xy_yw_ip_port", "设置运维服务器"));
// list.add(new ActionModel(4, "i1_cmd_set_xy_yw_ip_port", "设置运维服务器"));
list.add(new ActionModel(5, "i1_cmd_set_i1_heart_beat_time", "设置心跳周期"));
list.add(new ActionModel(6, "yw_cmd_upload_i1_zip_log", "上传日志"));
list.add(new ActionModel(7, "upgrade", "升级"));

69
xymanager_common/src/main/java/com/shxy/xymanager_common/excel/TerminalExcel.java
Unescape Escape View File

@ -12,19 +12,19 @@ import java.util.HashMap;
@Data
public class TerminalExcel {
@ColumnWidth(16)
@ColumnWidth(20)
@ExcelProperty(value = "出厂ID")
private String oid;
@ColumnWidth(16)
@ColumnWidth(20)
@ExcelProperty(value = "装置编号")
private String cmdid;
@ColumnWidth(16)
@ColumnWidth(10)
@ExcelProperty(value = "状态")
private String onlinestatus;
@ColumnWidth(16)
@ColumnWidth(20)
@ExcelProperty(value = "最后心跳时间")
private Date lastReportTime;
@ColumnWidth(16)
@ColumnWidth(10)
@ExcelProperty(value = "传图")
private String pic;
@ColumnWidth(16)
@ -72,7 +72,7 @@ public class TerminalExcel {
@ColumnWidth(16)
@ExcelProperty(value = "SIM卡2")
private String simcard2;
@ColumnWidth(16)
@ColumnWidth(24)
@ExcelProperty(value = "CMA服务器")
private String cma;
@ColumnWidth(16)
@ -111,33 +111,38 @@ public class TerminalExcel {
item.setProtocolName(term.getProtocolName());
MntnStatus status = term.getMntnStatus();
item.setLastReportTime(new Date(status.getRawReportTime() * 1000));
item.setLastIP(status.getLastIp());
item.setComment(status.getComment());
if (status != null) {
item.setLastReportTime(new Date(status.getRawReportTime() * 1000));
item.setLastIP(status.getLastIp());
item.setComment(status.getComment());
HashMap<String, Object> map = status.getReportMap();
item.setPic((String) map.get("pic"));
item.setBattery((String) map.get("battery"));
item.setNumberOfHb((String) map.get("numberOfHb"));
item.setHeartbeatDuration((String) map.get("heartbeatDuration"));
item.setRecv((String) map.get("recv"));
item.setPhotoTimes((String) map.get("photoTimes"));
item.setSuccess((String) map.get("success"));
item.setFailure((String) map.get("failure"));
item.setSignature1((String) map.get("signature1"));
item.setSignature2((String) map.get("signature2"));
item.setNetworkError((String) map.get("networkError"));
item.setRebootTimes((String) map.get("rebootTimes"));
item.setI1RebootTimes((String) map.get("i1RebootTimes"));
item.setSimcard1((String) map.get("simcard1"));
item.setSimcard2((String) map.get("simcard2"));
item.setCma((String) map.get("cma"));
item.setFreeROM((String) map.get("freeROM"));
item.setI1Version((String) map.get("i1Version"));
item.setMaintainVersion((String) map.get("maintainVersion"));
item.setCameraService((String) map.get("cameraService"));
item.setAiVersion((String) map.get("aiVersion"));
item.setMcu((String) map.get("mcu"));
HashMap<String, Object> map = status.getReportMap();
if (map != null) {
item.setOid(String.valueOf(map.get("oid")));
item.setPic(String.valueOf(map.get("pic")));
item.setBattery(String.valueOf(map.get("battery")));
item.setNumberOfHb(String.valueOf(map.get("numberOfHb")));
item.setHeartbeatDuration(String.valueOf(map.get("heartbeatDuration")));
item.setRecv(String.valueOf(map.get("recv")));
item.setPhotoTimes(String.valueOf(map.get("photoTimes")));
item.setSuccess(String.valueOf(map.get("success")));
item.setFailure(String.valueOf(map.get("failure")));
item.setSignature1(String.valueOf(map.get("signature1")));
item.setSignature2(String.valueOf(map.get("signature2")));
item.setNetworkError(String.valueOf(map.get("networkError")));
item.setRebootTimes(String.valueOf(map.get("rebootTimes")));
item.setI1RebootTimes(String.valueOf(map.get("i1RebootTimes")));
item.setSimcard1(String.valueOf(map.get("simcard1")));
item.setSimcard2(String.valueOf(map.get("simcard2")));
item.setCma(String.valueOf(map.get("cma")));
item.setFreeROM(String.valueOf(map.get("freeROM")));
item.setI1Version(String.valueOf(map.get("i1Version")));
item.setMaintainVersion(String.valueOf(map.get("maintainVersion")));
item.setCameraService(String.valueOf(map.get("cameraService")));
item.setAiVersion(String.valueOf(map.get("aiVersion")));
item.setMcu(String.valueOf(map.get("mcu")));
}
}
return item;
}
}

2
xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java
Unescape Escape View File

@ -58,7 +58,7 @@ public class RawReportUtil {
} else if (str.startsWith("卡2:")) {
map.put("simcard2", str.replaceFirst("卡2:", ""));
} else if (str.startsWith("mcu:")) {
map.put("mcu", str.replaceFirst("mcu", ""));
map.put("mcu", str.replaceFirst("mcu:", ""));
} else if (str.startsWith("ai:")) {
map.put("aiVersion", str.replaceFirst("ai:", ""));
} else if (str.startsWith("cam:")) {

Write Preview
Loading…
Cancel
Save