Ver código fonte

fix:“修复设备异常离线不提醒问题“

soobin 1 ano atrás
pai
commit
2a734879a6

+ 2 - 1
src/main/java/com/szwl/controller/IndexController.java

@@ -195,7 +195,8 @@ public class IndexController {
                 equipmentDesc.setStick(equipmentVo.getStick());
             }
             // 如果是爆米花机
-            if(newEquipment.getMachineType().equals("1")) {
+            String machineType = newEquipment.getMachineType();
+            if(StringUtils.isNotEmpty(machineType) && newEquipment.getMachineType().equals("1")) {
                 // 爆米花机搅拌温度
                 if (StringUtils.isNotEmpty(cabinetTm)) {
                     equipmentDesc.setStirTm(cabinetTm);

+ 0 - 1
src/main/java/com/szwl/service/impl/TEquipmentServiceImpl.java

@@ -256,7 +256,6 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
     public void checkEquipmentStatus() {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getEqeStatus, 1);
-        query.eq(TEquipment::getAdminId, 34);
         List<TEquipment> equipmentList = equipmentService.list(query);
         if (equipmentList.size() > 0) {
             // 获取当前时间,并检查设备状态是否过期