代码生成

admin/src/main/java/com/kym/admin/common/aspect/SysLogAspect.java → admin/src/main/java/com/kym/admin/aspect/SysLogAspect.java

@@ -1,4 +1,4 @@
-package com.kym.admin.common.aspect;
+package com.kym.admin.aspect;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.kym.common.annotation.SysLog;
@@ -90,7 +90,6 @@ public class SysLogAspect {
         systemLog.setExecuteTime(executeTime);
 
         //保存系统日志
-        LOGGER.info(syslog.toString());
         systemLogService.save(systemLog);
     }
 

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

@@ -0,0 +1,18 @@
+package com.kym.admin.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 充电桩接口（枪）信息 前端控制器
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@RestController
+@RequestMapping("/connector-info")
+public class ConnectorInfoController {
+
+}

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

@@ -0,0 +1,18 @@
+package com.kym.admin.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 充电桩桩体设备 前端控制器
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@RestController
+@RequestMapping("/equipment-info")
+public class EquipmentInfoController {
+
+}

admin/src/main/java/com/kym/admin/utils/MybatisPlusGeneratorForAdmin.java

@@ -15,32 +15,31 @@ public class MybatisPlusGeneratorForAdmin {
 
     public static void main(String[] args) {
         // 指定数据源
-        FastAutoGenerator.create("jdbc:mysql://localhost:3306/charge_admin", "root", "root")
+        FastAutoGenerator.create("jdbc:mysql://121.40.98.15:3307/charge_admin", "root", "123456")
                 .globalConfig(builder -> {
                     builder.author("skyline")
                             // 指定输出目录
-                            //.outputDir("D://Java Project/charge/admin/src/main/java")
                             .disableOpenDir();
                 })
                 .packageConfig(builder -> {
                     // 设置父包名
                     builder
-                            //.parent("com.kym.admin")
                             // 设置父包模块名
-                            .entity("com.kym.entity.admin")
-                            .service("com.kym.service.admin")
-                            .serviceImpl("com.kym.service.admin.impl")
-                            .mapper("com.kym.mapper.admin")
+                            .parent("com.kym")
+                            .entity("entity.admin")
+                            .service("service.admin")
+                            .serviceImpl("service.admin.impl")
+                            .mapper("mapper.admin")
                             .xml("mapper.xml")
-                            .controller("com.kym.admin.controller")
+                            .controller("admin.controller")
                             // 设置mapperXml生成路径
                             .pathInfo(Map.of(
-                                    OutputFile.entity, "D://Java Project/charge/entity/src/main/java/com/kym/entity/admin",
-                                    OutputFile.service, "D://Java Project/charge/admin/src/main/java/com/kym/admin/service",
-                                    OutputFile.serviceImpl, "D://Java Project/charge/admin/src/main/java/com/kym/admin/service/impl",
-                                    OutputFile.mapper, "D://Java Project/charge/admin/src/main/java/com/kym/admin/mapper",
-                                    OutputFile.controller, "D://Java Project/charge/admin/src/main/java/com/kym/admin/controller",
-                                    OutputFile.xml, "D://Java Project/charge/admin/src/main/resources/mappers"
+                                    OutputFile.entity, "D://快与慢充电桩/code/charge-java/entity/src/main/java/com/kym/entity/admin",
+                                    OutputFile.service, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/admin",
+                                    OutputFile.serviceImpl, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/admin/impl",
+                                    OutputFile.mapper, "D://快与慢充电桩/code/charge-java/mapper/src/main/java/com/kym/mapper/admin",
+                                    OutputFile.controller, "D://快与慢充电桩/code/charge-java/admin/src/main/java/com/kym/admin/controller",
+                                    OutputFile.xml, "D://快与慢充电桩/code/charge-java/admin/src/main/resources/mappers"
 
                             ));
                 })
@@ -48,12 +47,9 @@ public class MybatisPlusGeneratorForAdmin {
                 .strategyConfig(builder -> {
                     // 设置需要生成的表名
                     builder.addInclude(
-//                                    "t_user",
-//                                    "t_account",
-//                                    "t_station",
-//                                    "t_charge_order",
-//                                    "t_system_log",
-                                    "t_collection"
+//                            "t_equipment_info",
+                            "t_connector_info"
+
                             )
                             // 设置过滤表前缀
                             .addTablePrefix("t_");

admin/src/main/java/com/kym/admin/utils/MybatisPlusGeneratorForMiniApp.java

@@ -1,96 +0,0 @@
-package com.kym.admin.utils;
-
-import com.baomidou.mybatisplus.generator.FastAutoGenerator;
-import com.baomidou.mybatisplus.generator.config.OutputFile;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.Map;
-
-/**
- * mybatis-plus-generator代码生成
- *
- * @author skyline
- */
-public class MybatisPlusGeneratorForMiniApp {
-
-    public static void main(String[] args) {
-        // 指定数据源
-        FastAutoGenerator.create("jdbc:mysql://localhost:3306/charge_app", "root", "root")
-                .globalConfig(builder -> {
-                    builder.author("skyline")
-                            // 指定输出目录
-                            .disableOpenDir();
-                })
-                .packageConfig(builder -> {
-                    // 设置父包名
-                    builder
-                            // 设置父包模块名
-                            .entity("com.kym.entity.miniapp")
-                            .service("com.kym.miniapp.service")
-                            .serviceImpl("com.kym.service.miniapp.impl")
-                            .mapper("com.kym.mapper.miniapp")
-                            .xml("mapper.xml")
-                            .controller("com.kym.miniapp.controller")
-                            // 设置mapperXml生成路径
-                            .pathInfo(Map.of(
-                                    OutputFile.entity, "D://Java Project/charge/entity/src/main/java/com/kym/entity/miniapp",
-                                    OutputFile.service, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/service",
-                                    OutputFile.serviceImpl, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/service/impl",
-                                    OutputFile.mapper, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/mapper",
-                                    OutputFile.controller, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/controller",
-                                    OutputFile.xml, "D://Java Project/charge/miniapp/src/main/resources/mappers"
-
-                            ));
-                })
-
-                .strategyConfig(builder -> {
-                    // 设置需要生成的表名
-                    builder.addInclude(
-//                                    "t_user",
-//                                    "t_account",
-//                                    "t_charge_order",
-//                                    "t_collection",
-                            "t_wallet_detail"
-                            )
-                            // 设置过滤表前缀
-                            .addTablePrefix("t_");
-
-                    // entity配置
-                    builder.entityBuilder()
-                            .enableFileOverride()
-                            .enableLombok();
-
-                    // controller配置
-                    builder.controllerBuilder()
-                            .enableFileOverride()
-                            .enableRestStyle()
-                            .enableHyphenStyle()
-//                            .superClass(BaseController.class)
-                            .formatFileName("%sController");
-
-                    // service配置
-                    builder.serviceBuilder()
-                            .enableFileOverride()
-                            .formatServiceFileName("%sService")
-                            .formatServiceImplFileName("%sServiceImpl");
-
-                    // mapper配置
-                    builder.mapperBuilder()
-                            .enableFileOverride()
-                            .enableBaseResultMap()
-                            .enableBaseColumnList()
-                            .formatMapperFileName("%sMapper")
-                            .formatXmlFileName("%sMapper")
-                            .build();
-
-
-                    builder.build();
-
-                })
-
-                // 使用Freemarker引擎模板，默认的是Velocity引擎模板
-                .templateEngine(new FreemarkerTemplateEngine())
-                .execute();
-    }
-
-}

admin/src/main/resources/mappers/ConnectorInfoMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kym.mapper.admin.ConnectorInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.kym.entity.admin.ConnectorInfo">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="connector_id" property="connectorId" />
+        <result column="connector_name" property="connectorName" />
+        <result column="connector_type" property="connectorType" />
+        <result column="voltage_upper_limits" property="voltageUpperLimits" />
+        <result column="voltage_lower_limits" property="voltageLowerLimits" />
+        <result column="current" property="current" />
+        <result column="power" property="power" />
+        <result column="park_no" property="parkNo" />
+        <result column="national_standard" property="nationalStandard" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_id, connector_id, connector_name, connector_type, voltage_upper_limits, voltage_lower_limits, current, power, park_no, national_standard, create_time, update_time
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kym.mapper.admin.EquipmentInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <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="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
+    </sql>
+
+</mapper>

common/src/main/java/com/kym/common/utils/MybatisPlusGenerator.java

@@ -19,7 +19,7 @@ public class MybatisPlusGenerator {
                 .globalConfig(builder -> {
                     builder.author("skyline")
                             // 指定输出目录
-                            .outputDir("D://Java Project/charge/src/main/java");
+                            .outputDir("D://快与慢充电桩/code/charge-java/src/main/java");
                 })
                 .packageConfig(builder -> {
                     // 设置父包名
@@ -33,7 +33,7 @@ public class MybatisPlusGenerator {
                             .xml("mapper.xml")
                             .controller("controller")
                             // 设置mapperXml生成路径
-                            .pathInfo(Collections.singletonMap(OutputFile.xml, "D://Java Project/charge/src/main/resources/mappers"));
+                            .pathInfo(Collections.singletonMap(OutputFile.xml, "D://快与慢充电桩/code/charge-java/src/main/resources/mappers"));
                 })
 
                 .strategyConfig(builder -> {

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

@@ -0,0 +1,80 @@
+package com.kym.entity.admin;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 充电桩接口（枪）信息
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@Getter
+@Setter
+@TableName("t_connector_info")
+public class ConnectorInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
+
+    /**
+     * 充电桩序列号
+     */
+    private String connectorId;
+
+    /**
+     * 充电桩名称
+     */
+    private String connectorName;
+
+    /**
+     * 充电设备接口类型：1家用插座（模式2）2：交流接口插座（模式3，连接方式B）3：交流接口插头（带枪线，模式3，连接方式C）4：直流接口枪头（带枪线，模式4）5：无线充电座6：其他
+     */
+    private Byte connectorType;
+
+    /**
+     * 额定电压上限（V）
+     */
+    private Integer voltageUpperLimits;
+
+    /**
+     * 额定电压下限（V）
+     */
+    private Integer voltageLowerLimits;
+
+    /**
+     * 额定电流
+     */
+    private Integer current;
+
+    /**
+     * 额定功率
+     */
+    private BigDecimal power;
+
+    /**
+     * 停车场车位编号
+     */
+    private String parkNo;
+
+    /**
+     * 国家标准：1:2011 2:2015
+     */
+    private Byte nationalStandard;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+}

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

@@ -0,0 +1,90 @@
+package com.kym.entity.admin;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 充电桩桩体设备
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@Getter
+@Setter
+@TableName("t_equipment_info")
+public class EquipmentInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
+
+    /**
+     * 充电桩序列号
+     */
+    private String equipmentId;
+
+    /**
+     * 充电桩名称
+     */
+    private String equipmentName;
+
+    /**
+     * 设备生产商组织机构代码
+     */
+    private String manufacturerId;
+
+    /**
+     * 设备生产商名称
+     */
+    private String manufacturerName;
+
+    /**
+     * 设备型号
+     */
+    private String equipmentModel;
+
+    /**
+     * 设备生产日期
+     */
+    private String productionDate;
+
+    /**
+     * 设备类型：1：直流设备 2：交流设备 3：交直流一体设备 4：无线设备 5：其他
+     */
+    private Byte equipmentType;
+
+    /**
+     * 位置坐标
+     */
+    private byte[] location;
+
+    /**
+     * 额定功率 千瓦
+     */
+    private BigDecimal power;
+
+    /**
+     * 网络状态：0-离线 1-在线
+     */
+    private Byte netStatus;
+
+    /**
+     * 服务状态：0-空闲 1-已连接 2-充电 3-结束
+     */
+    private Byte serviceStatus;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+}

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

@@ -2,6 +2,7 @@ package com.kym.entity.enplus;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**

mapper/src/main/java/com/kym/mapper/admin/ConnectorInfoMapper.java

@@ -0,0 +1,16 @@
+package com.kym.mapper.admin;
+
+import com.kym.entity.admin.ConnectorInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 充电桩接口（枪）信息 Mapper 接口
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+public interface ConnectorInfoMapper extends BaseMapper<ConnectorInfo> {
+
+}

mapper/src/main/java/com/kym/mapper/admin/EquipmentInfoMapper.java

@@ -0,0 +1,16 @@
+package com.kym.mapper.admin;
+
+import com.kym.entity.admin.EquipmentInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 充电桩桩体设备 Mapper 接口
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+public interface EquipmentInfoMapper extends BaseMapper<EquipmentInfo> {
+
+}

miniapp/src/main/java/com/kym/miniapp/utils/MybatisPlusGeneratorForMiniApp.java

@@ -27,19 +27,19 @@ public class MybatisPlusGeneratorForMiniApp {
                             // 设置父包模块名
                             .parent("com.kym")
                             .entity("entity.miniapp")
-                            .service("miniapp.service")
-                            .serviceImpl("miniapp.service.impl")
-                            .mapper("miniapp.mapper")
+                            .service("service.miniapp")
+                            .serviceImpl("service.miniapp.impl")
+                            .mapper("mapper.miniapp")
                             .xml("mapper.xml")
                             .controller("miniapp.controller")
                             // 设置mapperXml生成路径
                             .pathInfo(Map.of(
-                                    OutputFile.entity, "D://Java Project/charge/entity/src/main/java/com/kym/entity/miniapp",
-                                    OutputFile.service, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/service",
-                                    OutputFile.serviceImpl, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/service/impl",
-                                    OutputFile.mapper, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/mapper",
-                                    OutputFile.controller, "D://Java Project/charge/miniapp/src/main/java/com/kym/miniapp/controller",
-                                    OutputFile.xml, "D://Java Project/charge/miniapp/src/main/resources/mappers"
+                                    OutputFile.entity, "D://快与慢充电桩/code/charge-java/entity/src/main/java/com/kym/entity/miniapp",
+                                    OutputFile.service, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/miniapp",
+                                    OutputFile.serviceImpl, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/miniapp/impl",
+                                    OutputFile.mapper, "D://快与慢充电桩/code/charge-java/mapper/src/main/java/com/kym/mapper/miniapp",
+                                    OutputFile.controller, "D://快与慢充电桩/code/charge-java/miniapp/src/main/java/com/kym/miniapp/controller",
+                                    OutputFile.xml, "D://快与慢充电桩/code/charge-java/miniapp/src/main/resources/mappers"
 
                             ));
                 })

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

@@ -0,0 +1,16 @@
+package com.kym.service.admin;
+
+import com.kym.entity.admin.ConnectorInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 充电桩接口（枪）信息 服务类
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+public interface ConnectorInfoService extends IService<ConnectorInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.kym.service.admin;
+
+import com.kym.entity.admin.EquipmentInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 充电桩桩体设备 服务类
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+public interface EquipmentInfoService extends IService<EquipmentInfo> {
+
+}

service/src/main/java/com/kym/service/admin/impl/ConnectorInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.kym.service.admin.impl;
+
+import com.kym.entity.admin.ConnectorInfo;
+import com.kym.mapper.admin.ConnectorInfoMapper;
+import com.kym.service.admin.ConnectorInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 充电桩接口（枪）信息 服务实现类
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@Service
+public class ConnectorInfoServiceImpl extends ServiceImpl<ConnectorInfoMapper, ConnectorInfo> implements ConnectorInfoService {
+
+}

service/src/main/java/com/kym/service/admin/impl/EquipmentInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.kym.service.admin.impl;
+
+import com.kym.entity.admin.EquipmentInfo;
+import com.kym.mapper.admin.EquipmentInfoMapper;
+import com.kym.service.admin.EquipmentInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 充电桩桩体设备 服务实现类
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@Service
+public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, EquipmentInfo> implements EquipmentInfoService {
+
+}

service/src/main/java/com/kym/service/enplus/impl/EnNotifyServiceImpl.java

@@ -52,6 +52,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     String handleNotificationStartChargeStatus(JSONObject json) {
         var data = enPlusService.signValidation(json);
         // TODO 业务逻辑处理 更新订单信息 扣费
+        //  这里可能有坑，文档中为TotalSeviceMoney，正确的拼写为TotalServiceMoney
         return null;
     }