修改bug

Pu Zhibing

2025-01-17 c80c0184b6e560d41d5aa5691874e07b681fa18f

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java

@@ -8,6 +8,7 @@
import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.api.vo.UpdateChargingPileStatusVo;
import com.ruoyi.chargingPile.dto.ChargeMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
@@ -27,6 +28,8 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.vo.TChargingOrderVo;
@@ -118,7 +121,10 @@
      return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
            .in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds)));
   }

	
	
	
   @RequiresPermissions(value = {"/chargingPile", "/chargingGun"}, logical = Logical.OR)
   @ResponseBody
   @GetMapping("/pageChargingPileList")
   @ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
@@ -126,7 +132,9 @@
      PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
      return AjaxResult.success(list);
   }

	
	
   @RequiresPermissions(value = {"/chargingPile/add"}, logical = Logical.OR)
   @ResponseBody
   @Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
   @PostMapping("/addChargingPile")
@@ -134,8 +142,9 @@
   public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){
      return chargingPileService.addChargingPile(chargingPile);
   }


	
	
   @RequiresPermissions(value = {"/chargingPile/select", "/chargingPile/update"}, logical = Logical.OR)
   @ResponseBody
   @GetMapping("/getChargingPile/{id}")
   @ApiOperation(value = "获取充电桩详情数据", tags = {"管理后台-充电桩信息"})
@@ -143,8 +152,9 @@
      TChargingPile chargingPile = chargingPileService.getChargingPile(id);
      return AjaxResult.success(chargingPile);
   }


	
	
   @RequiresPermissions(value = {"/chargingPile/update"}, logical = Logical.OR)
   @ResponseBody
   @Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
   @PostMapping("/editChargingPile")
@@ -152,9 +162,10 @@
   public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){
      return chargingPileService.editChargingPile(chargingPile);
   }



	
	
	
   @RequiresPermissions(value = {"/chargingPile/del", "/chargingPile/batch_del"}, logical = Logical.OR)
   @ResponseBody
   @DeleteMapping("/delChargingPile")
   @Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -165,8 +176,9 @@
   public AjaxResult delChargingPile(@RequestParam("id") Integer[] id){
      return chargingPileService.delChargingPile(id);
   }


	
	
   @RequiresPermissions(value = {"/chargingPile/accountingStrategy"}, logical = Logical.OR)
   @ResponseBody
   @Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
   @PostMapping("/batchSetAccountingStrategy")
@@ -175,8 +187,9 @@
      chargingPileService.batchSetAccountingStrategy(setAccountingStrategy);
      return AjaxResult.success();
   }


	
	
   @RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
   @ResponseBody
   @GetMapping("/chargeMonitoring/{siteId}")
   @ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
@@ -184,8 +197,9 @@
      ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId);
      return AjaxResult.success(chargeMonitoring);
   }


	
	
   @RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
   @ResponseBody
   @GetMapping("/getChargingGunCountMonitoring/{siteId}")
   @ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
@@ -193,8 +207,9 @@
      ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
      return AjaxResult.success(chargingGunCountMonitoring);
   }


	
	
   @RequiresPermissions(value = {"/operationMaintenanceAnalysis", "/chargingEquipmentMonitoring"}, logical = Logical.OR)
   @ResponseBody
   @GetMapping("/getChargingGunMonitoring")
   @ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
@@ -219,11 +234,13 @@

   /**
    * 更新充电桩状态
    * @param status
    */
   @ResponseBody
   @PostMapping("/updateChargingPileStatus")
   public void updateChargingPileStatus(@RequestParam("pile_code") String pile_code, @RequestParam("gun_code") String gun_code, @RequestParam("status") Integer status){
   public void updateChargingPileStatus(@RequestBody UpdateChargingPileStatusVo vo){
      String pile_code = vo.getPile_code();
      String gun_code = vo.getGun_code();
      Integer status = vo.getStatus();
      Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_gun_online");
      Long time = (Long) charging_pile_online.get(pile_code + gun_code);
      //小于30秒才处理数据，防止频繁查询数据
@@ -232,6 +249,9 @@
      }
      TChargingGun tChargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, (pile_code + gun_code)).eq(TChargingGun::getDelFlag, 0));
      if(null != tChargingGun){
         charging_pile_online.put(tChargingGun.getFullNumber(), System.currentTimeMillis());
         redisService.setCacheMap("charging_gun_online", charging_pile_online);
			
         TChargingPile chargingPile = chargingPileService.getById(tChargingGun.getChargingPileId());
         //枪处于离线或者故障，返回状态为正常，则修改其状态
         if(0 == status && tChargingGun.getStatus() != 2){
@@ -281,11 +301,6 @@
            faultMessage.setContent("设备故障");
            faultMessageService.save(faultMessage);
         }
			
         if(1 != status){
            charging_pile_online.put(tChargingGun.getFullNumber(), System.currentTimeMillis());
            redisService.setCacheMap("charging_gun_online", charging_pile_online);
         }
         if(2 == status){
            TChargingOrderVo order = new TChargingOrderVo();
            order.setChargingPileId(tChargingGun.getChargingPileId());
@@ -312,6 +327,13 @@
               tChargingGun1.setStatus(3);
               chargingGunService.updateById(tChargingGun1);
            }
				
            List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())
                  .isNull(TFaultMessage::getEndTime));
            if(!list.isEmpty()){
               list.forEach(s->s.setEndTime(LocalDateTime.now()));
               faultMessageService.updateBatchById(list);
            }
         }
      }
   }