Merge remote-tracking branch 'origin/master'

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,9 @@ public class HwMonitorPlatformController extends BaseController {
      * @throws
      * */
     @GetMapping("/treeList")
-    public TableDataInfo treeList(List<HwMonitorUnit> hwMonitorUnits){
+    public TableDataInfo treeList(){
+        HwMonitorUnit hwMonitorUnit = new HwMonitorUnit();
+        List<HwMonitorUnit> hwMonitorUnits = hwMonitorUnitService.selectHwMonitorUnitList(hwMonitorUnit);
         List<HwMonitorUnit> list = hwMonitorUnitService.selectTreeList(hwMonitorUnits);
         return getDataTable(list);
 
@@ -113,6 +116,7 @@ public class HwMonitorPlatformController extends BaseController {
     }
     /**
      * 查询区域数量站场景区总数百分比
+     * 1-左上
      * */
     @GetMapping("/monitorPercentage")
     public TableDataInfo monitorPercentage(){
@@ -181,11 +185,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 +198,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<Map<Object, Integer>> selectTdengine(String beginTime,String endTime,Long sceneId){
+
+        Map<Object, Integer> objectIntegerMap = hwMonitorUnitService.selectTdengine(beginTime, endTime, sceneId);
+        return  R.ok(objectIntegerMap);
     }
     /**
      * 设备汇总
@@ -222,4 +227,9 @@ public class HwMonitorPlatformController extends BaseController {
         hwScenes.get(0).setDefaultFlag("1");}
         return getDataTable(hwScenes);
     }
+    /**
+     * 报警列表
+     * 无alarminfo表
+     * */
+
 }

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorUnitService.java

@@ -38,6 +38,11 @@ public interface IHwMonitorUnitService
      * */
     public List<HwMonitorUnit> selectLimitSubMonitorUnit();
 
+    /**
+     * 报警信息列表
+     * */
+
+
 
 
     /**
@@ -72,7 +77,7 @@ public interface IHwMonitorUnitService
      * 通过tdengine获取设备运行情况
      *
      * @return*/
-    public int[] selectTdengine(String beginTime, String endTime, Long sceneId);
+    public Map<Object, Integer> selectTdengine(String beginTime, String endTime, Long sceneId);
      /**
       * 设备汇总
       *

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<Object, Integer> selectTdengine(String beginTime, String endTime, Long sceneId) {
         DeviceStatus queryDeviceStatus = new DeviceStatus();
 
         Map<String, Object> 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<Object,Integer> valuesMap = new HashMap<>();
         //todo 使用id(以解决)
         //map key时间戳，value List<DeviceStatus>  对象
+        R<?> r = remoteTdEgineService.getOnlineDevicesGroupByDay(queryDeviceStatus);
+        Map<Long, List<DeviceStatus>> deviceStatusMap = (Map<Long, List<DeviceStatus>>) r.getData();
         List<DeviceStatus> list = (List<DeviceStatus>) 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());
+        Set<Long> longs = deviceStatusMap.keySet();
+        for (Object key:longs){
+            List<DeviceStatus> deviceStatuses = deviceStatusMap.get(key);
+            for (int i=0;i<deviceStatuses.size();i++){
+                if (deviceStatuses.get(i).getDeviceType()==1){
+                    sum=sum+hwMonitorUnitMapper.selectReleatedDeviceIdNums(list.get(i).getDeviceId());
                 }
                 else {
-                values[i] = hwDeviceMapper.selectSumDeviceFlagNot0();
+                    sum = sum+1;
+                }
+                valuesMap.put(key,sum);
             }
         }
-        return values;
+
+        return valuesMap;
 
             //设备类型==网关 根据releated_device_id = 网关设备设备id查询个数
             //网关子设备数+非网关设备数（getDeviceType()！=1）
@@ -270,14 +280,18 @@ public class HwMonitorUnitServiceImpl implements IHwMonitorUnitService
 public List<HwMonitorUnit> selectTreeList(List<HwMonitorUnit> hwMonitorUnits) {
     List<HwMonitorUnit> returnList =  new ArrayList<>();
     List<Long> tempList = hwMonitorUnits.stream().map(HwMonitorUnit::getMonitorUnitId).collect(Collectors.toList());
-
+    List<HwMonitorUnit> 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<HwMonitorUnit> list, HwMonitorUnit t)
     {

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwMonitorUnitMapper.xml

@@ -120,7 +120,7 @@ where device_status = '1'GROUP BY scene_id
         where parent_id = #{monitorUnitId}
     </select>
     <select id="selectReleatedDeviceIdNums" parameterType="Long" resultType="Integer">
-        select count(*) from hw_device where device_id = #{deviceId}
+        select count(*) from hw_device where releated_device_id = #{deviceId}
     </select>
 
 <!--    查询该监控单元是否为最小单元-->