1、充电站、充电桩数据初始化

2、钱包明细排序优化

admin/src/main/java/com/kym/admin/controller/StationController.java

@@ -22,8 +22,11 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/station")
 public class StationController {
 
-    @Autowired
-    private StationService stationService;
+    private final StationService stationService;
+
+    public StationController(StationService stationService) {
+        this.stationService = stationService;
+    }
 
     @SysLog("充电站数据统计")
     @GetMapping("/stationStatusDetail")

entity/src/main/java/com/kym/entity/admin/EquipmentInfo.java

@@ -1,13 +1,14 @@
 package com.kym.entity.admin;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 /**
  * <p>
@@ -15,12 +16,13 @@ import lombok.Setter;
  * </p>
  *
  * @author skyline
- * @since 2023-08-05
+ * @since 2023-09-01
  */
 @Getter
 @Setter
 @TableName("t_equipment_info")
-public class EquipmentInfo extends BaseEntity implements Serializable {
+@Accessors(chain = true)
+public class EquipmentInfo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -34,11 +36,6 @@ public class EquipmentInfo extends BaseEntity implements Serializable {
      */
     private String equipmentId;
 
-    /**
-     * 充电桩名称
-     */
-    private String equipmentName;
-
     /**
      * 设备生产商组织机构代码
      */
@@ -66,8 +63,17 @@ public class EquipmentInfo extends BaseEntity implements Serializable {
 
     /**
      * 位置坐标
+     * <p>
+     * FastjsonTypeHandler
+     * 支持 MVC JSON 解析
+     * 不支持 MySQL JSON 解析
+     * <p>
+     * JacksonTypeHandler
+     * 支持 MVC JSON 解析
+     * 支持 MySQL JSON 解析
      */
-    private byte[] location;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONObject location;
 
     /**
      * 额定功率 千瓦

entity/src/main/java/com/kym/entity/admin/vo/StationVo.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.annotation.JSONCreator;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.kym.entity.BaseEntity;
 import com.kym.entity.enplus.EnEquipmentInfo;

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

@@ -55,7 +55,7 @@ public class EnConnectorInfo {
      * 额定功率（KW）
      */
     @JSONField(name = "Power")
-    private int power;
+    private double power;
 
     /**
      * 停车场车位编号

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

@@ -1,9 +1,9 @@
 package com.kym.entity.enplus;
 
 import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.annotation.JSONCreator;
 import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;
@@ -67,9 +67,17 @@ public class EnEquipmentInfo {
      */
     private List<EnConnectorInfo> connectorInfos;
 
+    /**
+     * 充电桩坐标
+     */
+    private JSONObject location;
+
     @JSONCreator
-    public EnEquipmentInfo(@JSONField(name = "ConnectorInfos") JSONArray array) {
+    public EnEquipmentInfo(@JSONField(name = "ConnectorInfos") JSONArray array,
+                           @JSONField(name = "EquipmentLng") float equipmentLng,
+                           @JSONField(name = "EquipmentLat") float equipmentLat) {
         this.connectorInfos = array.toJavaList(EnConnectorInfo.class);
+        this.location = JSONObject.of("equipmentLng", equipmentLng, "equipmentLat", equipmentLat);
     }
 
 

mapper/src/main/resources/mappers/admin/EquipmentInfoMapper.xml

@@ -4,26 +4,22 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.EquipmentInfo">
-        <id column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="equipment_id" property="equipmentId" />
-        <result column="equipment_name" property="equipmentName" />
         <result column="manufacturer_id" property="manufacturerId" />
         <result column="manufacturer_name" property="manufacturerName" />
         <result column="equipment_model" property="equipmentModel" />
         <result column="production_date" property="productionDate" />
         <result column="equipment_type" property="equipmentType" />
-        <result column="location" property="location" />
+        <result column="location" property="location" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result column="power" property="power" />
         <result column="net_status" property="netStatus" />
         <result column="service_status" property="serviceStatus" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, equipment_id, equipment_name, manufacturer_id, manufacturer_name, equipment_model, production_date, equipment_type, location, power, net_status, service_status, create_time, update_time
+        company_id, equipment_id, manufacturer_id, manufacturer_name, equipment_model, production_date, equipment_type, location, power, net_status, service_status
     </sql>
 
 </mapper>

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

@@ -1,12 +1,7 @@
 package com.kym.service.admin;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.kym.common.enums.EnPlusApi;
-import com.kym.common.utils.AESUtil;
-import com.kym.common.utils.IDGenerator;
 import com.kym.entity.admin.EquipmentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * <p>
@@ -14,7 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
  * </p>
  *
  * @author skyline
- * @since 2023-08-05
+ * @since 2023-09-01
  */
 public interface EquipmentInfoService extends IService<EquipmentInfo> {
+
 }

service/src/main/java/com/kym/service/miniapp/impl/WalletDetailServiceImpl.java

@@ -32,10 +32,10 @@ public class WalletDetailServiceImpl extends ServiceImpl<WalletDetailMapper, Wal
     public List<WalletDetail> listWalletDetail(int type) {
         var userId = StpUtil.getLoginIdAsLong();
         if (type > 0) {
-            return lambdaQuery().eq(WalletDetail::getUserId, userId).eq(WalletDetail::getType, type).list();
+            return lambdaQuery().eq(WalletDetail::getUserId, userId).eq(WalletDetail::getType, type).orderByDesc(WalletDetail::getId).list();
 
         } else {
-            return lambdaQuery().eq(WalletDetail::getUserId, userId).list();
+            return lambdaQuery().eq(WalletDetail::getUserId, userId).orderByDesc(WalletDetail::getId).list();
         }
 
     }