合并代码

puzhibing

2024-10-31 5d011e20bd297e5a34b916226f1c37672eff2ef0

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java

@@ -170,19 +170,19 @@
         return AjaxResult.error("设备编号已存在");
      }
      //调用华为Iot创建设备
      AddDevice addDevice = new AddDevice();
      addDevice.setProductId("66da68d21837002b28b34ec0");
      addDevice.setNodeId(chargingPile.getCode());
      addDevice.setDeviceName(chargingPile.getName());
      addDevice.setDescription(chargingPile.getNumber().toString());
      AddDeviceResp deviceResp = iotInterfaceClient.addDevice(addDevice).getData();
      if(null != deviceResp){
         int httpStatusCode = deviceResp.getHttpStatusCode();
         if(httpStatusCode == 201){
            chargingPile.setIotdDeviceId(deviceResp.getDeviceId());
            this.save(chargingPile);
         }
      }
//      AddDevice addDevice = new AddDevice();
//      addDevice.setProductId("66da68d21837002b28b34ec0");
//      addDevice.setNodeId(chargingPile.getCode());
//      addDevice.setDeviceName(chargingPile.getName());
//      addDevice.setDescription(chargingPile.getNumber().toString());
//      AddDeviceResp deviceResp = iotInterfaceClient.addDevice(addDevice).getData();
//      if(null != deviceResp){
//         int httpStatusCode = deviceResp.getHttpStatusCode();
//         if(httpStatusCode == 201){
//            chargingPile.setIotdDeviceId(deviceResp.getDeviceId());
//         }
//      }
      this.save(chargingPile);
      return AjaxResult.success();
   }
   
@@ -266,12 +266,12 @@
      for (Integer id : ids) {
         TChargingPile chargingPile = this.getById(id);
         //调用华为Iot删除设备
         if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
            DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
            if(null != deviceResp && deviceResp.getHttpStatusCode() == 0){
               this.removeById(chargingPile);
            }
         }
//         if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
//            DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
//            if(null != deviceResp && deviceResp.getHttpStatusCode() == 0){
//            }
//         }
         this.removeById(chargingPile);
      }
      return AjaxResult.success();
   }
@@ -600,7 +600,7 @@
            chargingGunService.updateById(chargingGun1);
            
            //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
            TChargingPile chargingPile = this.getById(chargingGun1.getChargingPileId());
            TChargingPile chargingPile = this.getById(chargingGun.getChargingPileId());
            List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
            int size = list1.stream().filter(s -> s.getStatus() == 1 || s.getStatus() == 7).collect(Collectors.toList()).size();
            if(chargingPile.getStatus() == 1 && list1.size() == size){