From 3b533f35c37e990d8ef6de1c8ee7c0cd7ffc6dbf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 15:50:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 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 b237c1f..0f54b24 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
@@ -1,17 +1,18 @@
package com.ruoyi.chargingPile.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
-import com.ruoyi.chargingPile.service.TChargingGunService;
-import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -25,6 +26,8 @@
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;
import io.swagger.annotations.ApiImplicitParams;
@@ -36,7 +39,11 @@
import org.springframework.beans.factory.annotation.Autowired;
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>
@@ -53,6 +60,12 @@
private final TChargingPileService chargingPileService;
private final TChargingGunService chargingGunService;
+
+ @Resource
+ private RedisService redisService;
+
+ @Resource
+ private TFaultMessageService faultMessageService;
@Autowired
@@ -110,7 +123,7 @@
}
@ResponseBody
- @Log(title = "添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@PostMapping("/addChargingPile")
@ApiOperation(value = "添加充电桩数据", tags = {"管理后台-充电桩信息"})
public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){
@@ -128,7 +141,7 @@
@ResponseBody
- @Log(title = "编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/editChargingPile")
@ApiOperation(value = "编辑充电桩数据", tags = {"管理后台-充电桩信息"})
public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){
@@ -139,7 +152,7 @@
@ResponseBody
@DeleteMapping("/delChargingPile")
- @Log(title = "删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(value = "删除充电桩", tags = {"管理后台-充电桩信息"})
@ApiImplicitParams({
@ApiImplicitParam(value = "充电桩id", name = "id", dataTypeClass = Integer.class, required = true)
@@ -150,7 +163,7 @@
@ResponseBody
- @Log(title = "批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/batchSetAccountingStrategy")
@ApiOperation(value = "批量设置计费策略", tags = {"管理后台-充电桩信息"})
public AjaxResult batchSetAccountingStrategy(@RequestBody BatchSetAccountingStrategy setAccountingStrategy){
@@ -197,5 +210,44 @@
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 = new TFaultMessage();
+ faultMessage.setSiteId(chargingPile.getSiteId());
+ faultMessage.setChargingPileId(chargingPile.getId());
+ faultMessage.setStatus(1);
+ 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