Merge branch 'dev' of codeup.aliyun.com:67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java

@@ -182,4 +182,11 @@ public interface MemberBasicInfoService {
 	ConfirmStartChargingMemberVO queryMemberInfoByCardCode(String physicsCard, String merchantId, String stationId);
 
 	ConfirmStartChargingMemberVO queryByVinCode(String vinCode, String merchantId, String stationId);
+
+	/**
+	 * 统计总会员数
+	 *
+	 * @return 会员总数
+	 */
+	Long countTotalMembers();
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java

@@ -684,4 +684,24 @@ public interface OrderBasicInfoService{
     List<RealTimeMonitorData> getRealTimeMonitorDataList(List<String> transactionCodeList);
 
     int batchUpdateOrderReview(UpdateOrderReviewDTO dto);
+
+    /**
+     * 大数据平台-使用率趋势数据
+     *
+     * @param dto 查询条件
+     * @return 趋势数据列表
+     */
+    List<UsageTrendVO> getUsageTrendData(IndexQueryDTO dto);
+
+    /**
+     * 大数据平台-订单总数
+     *
+     * @return 订单总数
+     */
+    Long countTotalOrders();
+
+    /**
+     * 大数据平台-充电时段分布
+     */
+    List<TimeDistributionVO> getTimeDistribution(IndexQueryDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java

@@ -14,7 +14,9 @@ import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.ningxiajiaotou.NXJTStationInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
+import com.jsowell.pile.vo.web.CityDeviceCountVO;
 import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.pile.vo.web.StationMapVO;
 import com.jsowell.pile.vo.web.StationSelectVO;
 
 import java.util.List;
@@ -229,4 +231,23 @@ public interface PileStationInfoService {
 	 * @return
 	 */
 	List<String> getStationIdsByMerchantIds(List<String> merchantIdList);
+
+	/**
+	 * 统计充电站总数
+	 *
+	 * @return 充电站总数
+	 */
+	Long countTotalStations();
+
+	/**
+	 * 查询所有充电站坐标（用于地图展示）
+	 *
+	 * @return 站点坐标列表
+	 */
+	List<StationMapVO> getStationMapData();
+
+	/**
+	 * 按城市统计设备数量
+	 */
+	List<CityDeviceCountVO> getCityDeviceCount();
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -915,4 +915,9 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
 		return memberVO;
 	}
 
+	@Override
+	public Long countTotalMembers() {
+		return memberBasicInfoMapper.countTotalMembers();
+	}
+
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -6691,5 +6691,20 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         }
         return resultList;
     }
+
+    @Override
+    public List<UsageTrendVO> getUsageTrendData(IndexQueryDTO dto) {
+        return orderBasicInfoMapper.getUsageTrendData(dto);
+    }
+
+    @Override
+    public Long countTotalOrders() {
+        return orderBasicInfoMapper.countTotalOrders();
+    }
+
+    @Override
+    public List<TimeDistributionVO> getTimeDistribution(IndexQueryDTO dto) {
+        return orderBasicInfoMapper.getTimeDistribution(dto);
+    }
 }
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java

@@ -36,7 +36,9 @@ import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationOrderQuantityInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
 import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
+import com.jsowell.pile.vo.web.CityDeviceCountVO;
 import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.pile.vo.web.StationMapVO;
 import com.jsowell.pile.vo.web.StationSelectVO;
 import com.jsowell.system.service.SysDeptService;
 import com.jsowell.system.service.SysUserService;
@@ -1688,4 +1690,19 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
         return pileStationInfoMapper.getStationIdsByMerchantIds(merchantIdList);
     }
 
+    @Override
+    public Long countTotalStations() {
+        return pileStationInfoMapper.countTotalStations();
+    }
+
+    @Override
+    public List<StationMapVO> getStationMapData() {
+        return pileStationInfoMapper.getStationMapData();
+    }
+
+    @Override
+    public List<CityDeviceCountVO> getCityDeviceCount() {
+        return pileStationInfoMapper.getCityDeviceCount();
+    }
+
 }