Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

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

@@ -73,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);
}