From 2a55b788f369beec74894b6d63b20400d9725a47 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 25 十月 2024 19:10:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 62 +++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 7 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java index 11b93a1..e90a7ce 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.chargingPile.api.model.TChargingPile; +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.dto.ChargeMonitoring; @@ -25,6 +26,7 @@ import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.log.enums.OperatorType; +import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.other.api.domain.TVip; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -38,7 +40,10 @@ import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * <p> @@ -55,12 +60,12 @@ private final TChargingPileService chargingPileService; private final TChargingGunService chargingGunService; - - @Resource - private TAccountingStrategyService accountingStrategyService; - - @Resource - private TAccountingStrategyDetailService accountingStrategyDetailService; + + @Resource + private RedisService redisService; + + @Resource + private TFaultMessageService faultMessageService; @Autowired @@ -205,6 +210,49 @@ TChargingPile chargingPile = chargingPileService.getById(id); return R.ok(chargingPile); } - + + + /** + * 更新充电桩状态 + * @param code + * @param status + */ + @ResponseBody + @PostMapping("/updateChargingPileStatus") + public void updateChargingPileStatus(@RequestParam("code") String code, @RequestParam("status") Integer status){ + TChargingPile chargingPile = chargingPileService.getOne(new LambdaQueryWrapper<TChargingPile>() + .eq(TChargingPile::getCode, code).eq(TChargingPile::getDelFlag, 0)); + if(null != chargingPile){ + if(chargingPile.getStatus() == 1){ + TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId()) + .eq(TFaultMessage::getStatus, 2).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime)); + if(null == faultMessage){ + faultMessage = new TFaultMessage(); + faultMessage.setSiteId(chargingPile.getSiteId()); + faultMessage.setChargingPileId(chargingPile.getId()); + faultMessage.setStatus(2); + faultMessage.setDownTime(LocalDateTime.now()); + faultMessage.setCreateTime(LocalDateTime.now()); + faultMessage.setDelFlag(false); + faultMessage.setContent("设备故障"); + faultMessageService.save(faultMessage); + + chargingPile.setStatus(0 == status ? 1 : 3); + chargingPileService.updateById(chargingPile); + } + } + if(chargingPile.getStatus() != 1 && 0 == status){ + TFaultMessage one = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId()) + .isNull(TFaultMessage::getEndTime)); + if(null != one){ + one.setEndTime(LocalDateTime.now()); + faultMessageService.updateById(one); + } + } + if(0 == status){ + redisService.getCacheMap("charging_pile_online").put(code, System.currentTimeMillis()); + } + } + } } -- Gitblit v1.7.1