admin 站点统计

admin/src/main/resources/application-dev.yml

@@ -0,0 +1,16 @@
+# EN+充电配置
+en-plus:
+  # 运营商ID
+  operatorId: MA5HJNDG1
+  # 运营商密钥
+  operatorSecret: 5009db3dc1e94ea8
+  # 消息密钥
+  dataSecret: 8c15f5bf050948ba
+  # 消息密钥初始化向量
+  dataSecretIv: 915bea94fa13461d
+  # 签名密钥
+  sigSecret: 46050b0bb5b7415c
+  # 最小充电余额（分）
+  chargeMinAmount: 200
+  # 接口地址
+  apiDomain: https://dev.en-plus.cn/Charge/evcs/v1//MA5HJNDG1/

admin/src/main/resources/application-prod.yml

@@ -0,0 +1,16 @@
+# EN+充电配置
+en-plus:
+  # 运营商ID
+  operatorId: MA5HJNDG1
+  # 运营商密钥
+  operatorSecret: c7fd9b753a9f434e
+  # 消息密钥
+  dataSecret: 5cb7e12da198420a
+  # 消息密钥初始化向量
+  dataSecretIv: 8a6ac88326bc4d3f
+  # 签名密钥
+  sigSecret: 2365b20f69e44817
+  # 最小充电余额（分）
+  chargeMinAmount: 200
+  # 接口地址
+  apiDomain: https://api.en-plus.cn:8080/Charge/evcs/v1//MA5HJNDG1/

admin/src/main/resources/application.yml

@@ -1,4 +1,6 @@
 spring:
+  profiles:
+    active: prod
   application:
     name: admin
   datasource:
@@ -41,6 +43,17 @@ spring:
   main:
     allow-circular-references: true
 
+  data:
+    redis:
+      port: 6380
+      host: 121.40.98.15
+      password: 123456
+      database: 2
+  cache:
+    type: redis
+    redis:
+      # 缓存过期时间：7天
+      time-to-live: 604800
 #mybatis:
 #  mapper-locations: classpath:mappers/*.xml
 #  type-aliases-package: com.kym.charge.entity
@@ -99,23 +112,6 @@ wechat:
     aesKey: #微信小程序消息服务器配置的EncodingAESKey
     msgDataFormat: JSON
 
-
-
-# EN+充电配置
-en-plus:
-  # 运营商ID
-  operatorId: MA5HJNDG1
-  # 运营商密钥
-  operatorSecret: c7fd9b753a9f434e
-  # 消息密钥
-  dataSecret: 5cb7e12da198420a
-  # 消息密钥初始化向量
-  dataSecretIv: 8a6ac88326bc4d3f
-  # 签名密钥
-  sigSecret: 2365b20f69e44817
-  # 最小充电余额（分）
-  charge-min-amount: 200
-
 #文件上传配置
 upload:
   file:

entity/src/main/java/com/kym/entity/enplus/EnConnectorStatsInfo.java

@@ -1,5 +1,6 @@
 package com.kym.entity.enplus;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,10 +17,12 @@ public class EnConnectorStatsInfo {
      * 充电设备接口编码
      * 充电设备接口编码，同一运营商内唯一
      */
-    private String ConnectorID;
+    @JSONField(name = "ConnectorID")
+    private String connectorId;
     /**
      * 充电设备接口累计电量（kWh，精度0.1）
      */
-    private BigDecimal ConnectorElectricity;
+    @JSONField(name = "ConnectorElectricity")
+    private BigDecimal connectorElectricity;
 
 }

entity/src/main/java/com/kym/entity/enplus/EnEquipmentStatsInfo.java

@@ -1,5 +1,6 @@
 package com.kym.entity.enplus;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,11 +17,14 @@ public class EnEquipmentStatsInfo {
      * 设备编码
      * 设备唯一编码，对同一运营商，保证唯一
      */
-    private String EquipmentID;
+    @JSONField(name = "EquipmentID")
+    private String equipmentId;
     /**
      * 充电设别接口累计电量
      */
+    @JSONField(name = "equipmentElectricity")
     private Double EquipmentElectricity;
-    private List<EnConnectorStatsInfo> ConnectorStatsInfos;
+    @JSONField(name = "ConnectorStatsInfos")
+    private List<EnConnectorStatsInfo> connectorStatsInfos;
 
 }

entity/src/main/java/com/kym/entity/enplus/StationStatsInfo.java → entity/src/main/java/com/kym/entity/enplus/EnStationStatsInfo.java

@@ -1,5 +1,6 @@
 package com.kym.entity.enplus;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,27 +12,32 @@ import java.util.List;
  * @date 2023-07-31 16:02
  */
 @Data
-public class StationStatsInfo {
+public class EnStationStatsInfo {
     /**
      * 充电站ID
      */
-    private String StationID;
+    @JSONField(name = "StationID")
+    private String stationId;
     /**
      * 统计开始时间（yyyy-MM-dd）
      */
-    private String StartTime;
+    @JSONField(name = "StartTime")
+    private String startTime;
     /**
      * 统计结束时间（yyyy-MM-dd）
      */
-    private String EndTime;
+    @JSONField(name = "EndTime")
+    private String endTime;
     /**
      * 充电站累积电量（kWh,精度0.1）
      */
+    @JSONField(name = "StationElectricity")
     private BigDecimal StationElectricity;
 
     /**
      * 充电设备统计信息列表
      */
-    private List<EnEquipmentStatsInfo> EquipmentStatsInfos;
+    @JSONField(name = "EquipmentStatsInfos")
+    private List<EnEquipmentStatsInfo> equipmentStatsInfos;
 
 }

service/src/main/java/com/kym/service/admin/AdminUserService.java

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface AdminUserService extends IService<AdminUser> {
 
-    R login(String username,String password);
+    R login(String mobilePhone,String password);
     R logout(Long id);
 
 

service/src/main/java/com/kym/service/admin/StationService.java

@@ -1,11 +1,9 @@
 package com.kym.service.admin;
 
-import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.kym.entity.admin.Station;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.entity.enplus.EnStationStatsInfo;
 import com.kym.entity.enplus.EnStationStatusInfo;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,7 +23,7 @@ public interface StationService extends IService<Station> {
 
     public List<EnStationStatusInfo> stationStatus(String[] ids);
 
-    public JSONObject stationStats(String stationId, String startTime, String endTime);
+    public EnStationStatsInfo stationStats(String stationId, String startTime, String endTime);
 
     @Transactional(rollbackFor = Exception.class)
     public void pullEnStationInfos();