From 2d1daa178aa08842d51df3084a011323603ad36b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 八月 2024 10:36:42 +0800
Subject: [PATCH] 站点修改
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml | 7 +++++--
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 5 +++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index af7f048..e483d89 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -295,6 +295,11 @@
@Override
public List<SiteVO> getMapSiteList(SiteQuery query) {
+
+ if(StringUtils.isEmpty(query.getLon()) || StringUtils.isEmpty(query.getLat())){
+ return new ArrayList<>();
+ }
+
// 获取当前登录用户id
Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
index 4eaa411..8bf52f8 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
@@ -212,7 +212,7 @@
ts.id, ts.partner_id, ts.code, ts.`name`, ts.site_type, ts.business_category, ts.status, ts.construction_site, ts.img_url,
ts.lon, ts.lat, ts.address, ts.country_code, ts.phone,ts.guide, ts.service_description, ts.vehicle_description,
ts.parking_space, ts.rate_description, ts.space_charge_explain, ts.accounting_strategy_id,ts.del_flag,tcg.fastCount,
- tcg.slowCount,tcg.superCount,tasd.electrovalence,tasd.vipElectrovalence,
+ tcg.slowCount,tcg.superCount,tasd.electrovalence,tasd.vipElectrovalence,tcg.superFreeCount,tcg.fastFreeCount,tcg.slowFreeCount,
ROUND(
6378.138 * 2 * ASIN(
SQRT(
@@ -239,7 +239,10 @@
select site_id,
SUM(CASE WHEN charge_mode = 1 THEN 1 ELSE 0 END) AS superCount,
SUM(CASE WHEN charge_mode = 2 THEN 1 ELSE 0 END) AS fastCount,
- SUM(CASE WHEN charge_mode = 3 THEN 1 ELSE 0 END) AS slowCount
+ SUM(CASE WHEN charge_mode = 3 THEN 1 ELSE 0 END) AS slowCount,
+ SUM(CASE WHEN charge_mode = 1 and `status` = 2 THEN 1 ELSE 0 END) AS superFreeCount,
+ SUM(CASE WHEN charge_mode = 2 and `status` = 2 THEN 1 ELSE 0 END) AS fastFreeCount,
+ SUM(CASE WHEN charge_mode = 3 and `status` = 2 THEN 1 ELSE 0 END) AS slowFreeCount
from
t_charging_gun
where
--
Gitblit v1.7.1