Merge remote-tracking branch 'origin/master'

Administrator

2021-03-12 a5b6b004f1737bf06aaaeb8d06e40b9702de25e5

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java

@@ -43,6 +43,8 @@
    */
   List<EquipmentVOS> tree();

   List<EquipmentVO> listAll();

   void updateOne(Equipment equipment);

   void s(Equipment equipment);
@@ -71,4 +73,11 @@
    */
   List<EquipmentVOS> selectList(String deviceType);
   void updateChannel(String heartbeat, String deviceNumber);

   /**
    * 查询在线设备总数
    * @param status 状态码   0：本日   1：本周   2：本月
    * @return
    */
    Integer selectEquipmentCount(Integer status);
}