Merge remote-tracking branch 'origin/master'

zengh

2021-03-24 f34a510629676ebf22d75bde2e89e2fe4a2f56be

 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,13 @@
    */
   List<EquipmentVOS> selectList(String deviceType);
   void updateChannel(String heartbeat, String deviceNumber);

   /**
    * 查询在线设备总数
    * @param status 状态码   0：本日   1：本周   2：本月
    * @return
    */
    Integer selectEquipmentCount(Integer status);
   void updateexpireTime(String expireTime, String deviceNumber);
   void updateExstate(String state,String reason, String deviceNumber);
}