tj

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiResourceController.java

@@ -434,7 +434,7 @@ public class LiResourceController extends AbstractController {
                 }
             }
             mapDic.put("list", childrenDic);
-            /** 如果该子系统下无资源点，不展示*/
+            /** 如果该设备类型下无资源点，不展示*/
             if (childrenDic != null && childrenDic.size() > 0) {
                 childrenStationMap.add(mapDic);
             }
@@ -464,12 +464,6 @@ public class LiResourceController extends AbstractController {
     }
 
     private List<Map<String, Object>> getAllTreeList(LiResourceModel model) {
-//        List<Map<String, Object>> tree = new ArrayList<>();
-//        Map<String, Object> root = new HashMap<>(5);
-//        root.put("name", "资源点列表");
-//        root.put("id", "0");
-//        root.put("level", 1);
-
         LiStationModel stationModel = new LiStationModel();
         List<LiStation> stationList = liStationService.getTreeList(stationModel);
 
@@ -529,7 +523,7 @@ public class LiResourceController extends AbstractController {
                             }
                         }
                         mapDic.put("children", childrenDic);
-                        /** 如果该子系统下无资源点，不展示*/
+                        /** 如果该设备类型下无资源点，不展示*/
                         if (childrenDic != null && childrenDic.size() > 0) {
                             childrenStationMap.add(mapDic);
                         }
@@ -544,9 +538,6 @@ public class LiResourceController extends AbstractController {
             mapStation.put("children", nodes);
             childrenRoot.add(mapStation);
         });
-
-//        root.put("children", childrenRoot);
-//        tree.add(root);
         return childrenRoot;
     }
 

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiStationController.java

@@ -56,6 +56,28 @@ public class LiStationController extends AbstractController {
     return R.ok().put("list", list).put("mapList",mapList);
   }
 
+  /**
+   * 列表页面列表数据获取
+   *
+   * @param model 承接对象
+   * @return
+   */
+  @ApiOperation(value = "根据条件获取线路站点管理表分页数据列表", notes = "根据条件获取线路站点管理表分页数据列表")
+  @ApiImplicitParam(
+          name = "params",
+          value = "参数",
+          required = true,
+          dataType = "Map<String, Object>")
+  @PostMapping("/pageList")
+  public R pageList(@RequestBody LiStationModel model) {
+    if(StringUtils.isBlank(model.getSort())){
+      model.setSort("order_num");
+      model.setOrder("ASC");
+    }
+    List<LiStation> list = liStationService.queryPageByList(model);
+    return R.ok().put("page", getMyPage(list,model));
+  }
+
   /**
    * 添加
    *
@@ -113,7 +135,7 @@ public class LiStationController extends AbstractController {
   /**
    * 根据ID获取线路站点管理表对象
    *
-   * @param id[] 线路站点管理表对象主键数组
+   * @param ids 线路站点管理表对象主键数组
    * @return
    */
   @ApiOperation(value = "根据ID批量删除线路站点管理表数据", notes = "根据ID批量删除线路站点管理表数据")

microservice-alram/src/main/java/com/devplatform/alarm/modules/alarms/dao/AlarmsInfoDao.java

@@ -69,5 +69,10 @@ public interface AlarmsInfoDao extends MyBaseMapper<AlarmsInfo> {
    */
   Integer countNum(@Param("params") Map<String, Object> params);
 
+  /**
+   * 根据报警类型分组查询数量
+   * @param stationId
+   * @return
+   */
   List<Map<String, Object>> queryGroupByAlarmsType(@Param("stationId")String stationId);
 }

microservice-alram/src/main/java/com/devplatform/alarm/modules/alarms/service/AlarmsInfoService.java

@@ -62,5 +62,10 @@ public interface AlarmsInfoService extends MyBaseService<AlarmsInfo> {
    */
   Integer countNum(Map<String, Object> params);
 
+  /**
+   * 根据报警类型分组查询数量
+   * @param stationId
+   * @return
+   */
   List<Map<String, Object>> queryGroupByAlarmsType(String stationId);
 }