南昌市物联网技防平台-后台
zengh
2021-05-12 10bbe1f4ac8ed0abfcb6cb255a993d6a7a73eea7
设备新增逻辑调整
1 files modified
9 ■■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java 9 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -387,6 +387,11 @@
        if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
            equipment.setHeartbeat(null);
        }
        if (equipment.getJtype() != null && equipment.getJtype().equals("")) {
            equipment.setJtype("0");
        }
        //判断省市区的值是否为数字或者中文字符串
        if(null!=equipment.getProvince()){
            //如果不是数字,则需调用接口匹配数据(直接取区、县参数)
@@ -432,6 +437,10 @@
            equipment.setHeartbeat(null);
        }
        if (equipment.getJtype() != null && equipment.getJtype().equals("")) {
            equipment.setJtype("0");
        }
//        String deviceName = equipment.getDeviceName();
//        String deviceNumber = equipment.getDeviceNumber();
//        String pId = equipment.getPid();