From 7f13f3c0e756864d0117ba949661c7eab4208181 Mon Sep 17 00:00:00 2001 From: zhouhy Date: Thu, 14 Sep 2023 15:25:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.1.3=20=E7=9B=91=E6=8E=A7=E5=8D=95?= =?UTF-8?q?=E5=85=83Controller=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HwMonitorPlatformController.java | 20 +++++++++----- .../service/IHwMonitorUnitService.java | 7 ++++- .../impl/HwMonitorUnitServiceImpl.java | 26 +++++++++++++------ .../mapper/business/HwMonitorUnitMapper.xml | 2 +- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java index 2b53ea4..e170d66 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java @@ -44,6 +44,7 @@ public class HwMonitorPlatformController extends BaseController { private IHwElectronicFenceService hwElectronicFenceService; + /** * 树状获取监控单元列表 * @param hwMonitorUnits 监控单元对象 @@ -51,7 +52,7 @@ public class HwMonitorPlatformController extends BaseController { * @throws * */ @GetMapping("/treeList") - public TableDataInfo treeList(List hwMonitorUnits){ + public TableDataInfo treeList(@RequestBody List hwMonitorUnits){ List list = hwMonitorUnitService.selectTreeList(hwMonitorUnits); return getDataTable(list); @@ -113,6 +114,7 @@ public class HwMonitorPlatformController extends BaseController { } /** * 查询区域数量站场景区总数百分比 + * 1-左上 * */ @GetMapping("/monitorPercentage") public TableDataInfo monitorPercentage(){ @@ -181,11 +183,11 @@ public class HwMonitorPlatformController extends BaseController { * */ @PostMapping("/selectMonitorUnitSub") //ok - public HwMonitorUnit selectMonitorUnitSub(Long monitorUnitId){ + public AjaxResult selectMonitorUnitSub(Long monitorUnitId){ HwMonitorUnit hwMonitorUnits = hwMonitorUnitService.selectHwMonitorUnitByMonitorUnitId(monitorUnitId); - return hwMonitorUnits; + return AjaxResult.success(monitorUnitId); } /** * 2. 设备实时在运数量曲线图 @@ -194,9 +196,10 @@ public class HwMonitorPlatformController extends BaseController { * @param sceneId 场景id * */ @PostMapping("/getDeviceOperations") - public int[] selectTdengine(String beginTime,String endTime,Long sceneId){ - int ints[] = hwMonitorUnitService.selectTdengine(beginTime,endTime,sceneId); - return ints; + public R> selectTdengine(String beginTime,String endTime,Long sceneId){ + + Map objectIntegerMap = hwMonitorUnitService.selectTdengine(beginTime, endTime, sceneId); + return R.ok(objectIntegerMap); } /** * 设备汇总 @@ -222,4 +225,9 @@ public class HwMonitorPlatformController extends BaseController { hwScenes.get(0).setDefaultFlag("1");} return getDataTable(hwScenes); } + /** + * 报警列表 + * 无alarminfo表 + * */ + } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorUnitService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorUnitService.java index 65f7299..5c6fdd4 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorUnitService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorUnitService.java @@ -38,6 +38,11 @@ public interface IHwMonitorUnitService * */ public List selectLimitSubMonitorUnit(); + /** + * 报警信息列表 + * */ + + /** @@ -72,7 +77,7 @@ public interface IHwMonitorUnitService * 通过tdengine获取设备运行情况 * * @return*/ - public int[] selectTdengine(String beginTime, String endTime, Long sceneId); + public Map selectTdengine(String beginTime, String endTime, Long sceneId); /** * 设备汇总 * diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java index 253394b..c7c5784 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java @@ -211,11 +211,12 @@ public class HwMonitorUnitServiceImpl implements IHwMonitorUnitService @Override // 加一个begintime参数，endtime参数 stream时间戳 从开始时间0点开始，结束时间23.59.59结束 - public int[] selectTdengine(String beginTime, String endTime, Long sceneId) { + public Map selectTdengine(String beginTime, String endTime, Long sceneId) { DeviceStatus queryDeviceStatus = new DeviceStatus(); Map params = queryDeviceStatus.getParams(); DateTimeFormatter ofPattern = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.CHINA); + System.out.println(ofPattern); LocalDate parse = LocalDate.parse(beginTime, ofPattern); long begintime = parse.atStartOfDay().toInstant(ZoneOffset.of("+8")).toEpochMilli(); @@ -232,18 +233,27 @@ public class HwMonitorUnitServiceImpl implements IHwMonitorUnitService int sum = 0; int values[] = new int[10]; + Map valuesMap = new HashMap<>(); //todo 使用id(以解决) //map key时间戳，value List 对象 + R r = remoteTdEgineService.getOnlineDevicesGroupByDay(queryDeviceStatus); + Map> deviceStatusMap = (Map>) r.getData(); List list = (List) remoteTdEgineService.getOnlineDevicesGroupByDay(queryDeviceStatus); - for (int i = 0; i < list.size(); i++) { - if (list.get(i).getDeviceType()==1) { - values[i]=hwMonitorUnitMapper.selectReleatedDeviceIdNums(list.get(i).getDeviceId()); - } - else { - values[i] = hwDeviceMapper.selectSumDeviceFlagNot0(); + Set longs = deviceStatusMap.keySet(); + for (Object key:longs){ + List deviceStatuses = deviceStatusMap.get(key); + for (int i=0;i From cef22f82877bdfedcfbdfdb7b899e612a23bc140 Mon Sep 17 00:00:00 2001 From: zhouhy Date: Thu, 14 Sep 2023 16:13:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.1.3=20=E7=9B=91=E6=8E=A7=E5=8D=95?= =?UTF-8?q?=E5=85=83Controller=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HwMonitorPlatformController.java | 4 +++- .../service/impl/HwMonitorUnitServiceImpl.java | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java index e170d66..e825b7f 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java @@ -52,7 +52,9 @@ public class HwMonitorPlatformController extends BaseController { * @throws * */ @GetMapping("/treeList") - public TableDataInfo treeList(@RequestBody List hwMonitorUnits){ + public TableDataInfo treeList(){ + HwMonitorUnit hwMonitorUnit = new HwMonitorUnit(); + List hwMonitorUnits = hwMonitorUnitService.selectHwMonitorUnitList(hwMonitorUnit); List list = hwMonitorUnitService.selectTreeList(hwMonitorUnits); return getDataTable(list); diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java index c7c5784..be57e45 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java @@ -280,14 +280,18 @@ public class HwMonitorUnitServiceImpl implements IHwMonitorUnitService public List selectTreeList(List hwMonitorUnits) { List returnList = new ArrayList<>(); List tempList = hwMonitorUnits.stream().map(HwMonitorUnit::getMonitorUnitId).collect(Collectors.toList()); - + List treeList = new ArrayList<>(); for (HwMonitorUnit hwMonitorUnit:hwMonitorUnits){ if (!tempList.contains(hwMonitorUnit.getParentId())) recursionFn(hwMonitorUnits,hwMonitorUnit); returnList.add(hwMonitorUnit); } - - return returnList; + for (int i = 0; i < returnList.size(); i++){ + if (returnList.get(i).getParentId()==null){ + treeList.add(returnList.get(i)); + } + } + return treeList; } private void recursionFn(List list, HwMonitorUnit t) {