修改报警器端口

zengh

2021-03-10 fa9ffa9012d7b1df7692bb99e71be6592f48cd4b

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

@@ -157,14 +157,17 @@
            SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String end = sim.format(dd);
            //把string类型转换为long类型的
            long st = sim.parse(expireTime).getTime();
            long en = sim.parse(end).getTime();
            //计算天数
            int day = (int) ((st - en) / 86400000);
            if (day <= 30) {
               page.getRecords().get(j).setType(1);
            } else {
               page.getRecords().get(j).setType(0);

            if (expireTime != null){
               long st = sim.parse(expireTime).getTime();
               long en = sim.parse(end).getTime();
               //计算天数
               int day = (int) ((st - en) / 86400000);
               if (day <= 30) {
                  page.getRecords().get(j).setType(1);
               } else {
                  page.getRecords().get(j).setType(0);
               }
            }
         }
      }
@@ -340,7 +343,9 @@
      if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
         equipment.setHeartbeat(null);
      }

      String deviceName = equipment.getDeviceName();
      String deviceNumber = equipment.getDeviceNumber();
      catalogService.updateCatalog(deviceName,deviceNumber);
      return R.status(equipmentService.saveOrUpdate(equipment));
   }