diff --git a/src/main/java/com/xydl/cac/controller/NSensorController.java b/src/main/java/com/xydl/cac/controller/NSensorController.java index 2ddb0fb..bc02a06 100644 --- a/src/main/java/com/xydl/cac/controller/NSensorController.java +++ b/src/main/java/com/xydl/cac/controller/NSensorController.java @@ -64,7 +64,7 @@ public class NSensorController extends BasicController { @ApiOperation("查询全部") public Response> listAll(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid, @ApiParam("类型") @RequestParam(value = "typeId", required = false) Integer typeId) throws Exception { - List result = service.listAll(zsbid , typeId); + List result = service.listAll(zsbid, typeId); return Response.success(result); } @@ -191,7 +191,7 @@ public class NSensorController extends BasicController { public void exportLatest(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid, HttpServletResponse response) throws Exception { response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); - List result = service.listAll(zsbid , null); + List result = service.listAll(zsbid, null); Map> map = new HashMap<>(); for (NSensor nSensor : result) { diff --git a/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java index 7eef80f..d2e2aaf 100644 --- a/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java @@ -134,6 +134,9 @@ public class ReportServiceImpl implements ReportService { head.add("主设备名称"); heads.add(head); head = new ArrayList<>(); + head.add("装置名称"); + heads.add(head); + head = new ArrayList<>(); head.add("时间"); heads.add(head); for (ModevTypePoint point : nSensors.get(0).getTypePoints()) { @@ -147,9 +150,10 @@ public class ReportServiceImpl implements ReportService { for (NSensor nSensor : nSensors) { List line = new ArrayList<>(); line.add(nSensor.getZsbName()); + line.add(nSensor.getName()); HashMap lastData = nSensor.getLastData(); if (null != lastData) { - String acquisitionTime = nSensor.getLastData().get("acquisitionTime"); + String acquisitionTime = lastData.get("acquisitionTime"); line.add(acquisitionTime); for (ModevTypePoint typePoint : nSensor.getTypePoints()) { line.add(lastData.get(typePoint.getField()));