阀门控制

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -1395,6 +1395,7 @@ public  class DeviceServiceImpl implements DeviceService {
     @Override
     public void setValve(Long deviceId) {
         Device device = deviceMapper.findByDeviceId(deviceId);
+        DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(device.getDeviceType());
         WaterMeterErrorDays waterMeterErrorDays = waterMeterErrorDaysMapper.findByDeviceId(deviceId);
         String sendValveStatus = "0";
 
@@ -1410,17 +1411,22 @@ public  class DeviceServiceImpl implements DeviceService {
         valveCommandRequest.setValveStatus(sendValveStatus);
 
         //1、下发开关阀门
-        if(device.getDeviceType()==30){
+        if(StringUtils.equals("lora188",deviceTypeDto.getEnModel())){
             valveCommandRequest.setMeterCode(device.getWaterMeterNo());
             easylinkinUtils.sendDownlink(device.getDeviceNo(),valveCommandRequest);
-        }else if(device.getDeviceType()==19)
+        }else if(StringUtils.equals("hxgd",deviceTypeDto.getEnModel()))
         {
             valveCommandRequest.setMeterCode(String.valueOf(deviceId));
             gdAgentUtils.setMeterValve(valveCommandRequest);
         }
-        else if(device.getDeviceType()==34)
+        else if(StringUtils.equals("hengxin-nb",deviceTypeDto.getEnModel()))
         {
-            valveCommandRequest.setMeterCode(device.getDeviceNo());
+            valveCommandRequest.setMeterCode(device.getWaterMeterNo());
+            udipEtlDataCommandService.commandSendV2(device.getUdipId(),valveCommandRequest);
+        }
+        else if(StringUtils.equals("ningbo-nb",deviceTypeDto.getEnModel()))
+        {
+            valveCommandRequest.setMeterCode(device.getWaterMeterNo());
             JSONObject commandResult = udipEtlDataCommandService.commandSendV2(device.getUdipId(),valveCommandRequest);
 
             //2、插入开关阀门记录
@@ -1431,7 +1437,7 @@ public  class DeviceServiceImpl implements DeviceService {
             deviceValveRecord.setCommandId(commandResult.getString("commandId"));
             deviceValveRecord.setRemark("");
             deviceValveRecordService.insertSelective(deviceValveRecord);
-        }else
+        }else if(StringUtils.equals("NB-TJ2.0",deviceTypeDto.getEnModel()))
         {
             if (device.getUdipId() != null && !"".equals(device.getUdipId())) {
                 valveCommandRequest.setMeterCode(device.getDeviceNo());
@@ -1447,6 +1453,8 @@ public  class DeviceServiceImpl implements DeviceService {
                 deviceValveRecord.setRemark("");
                 deviceValveRecordService.insertSelective(deviceValveRecord);
             }
+        }else {
+
         }