Merge remote-tracking branch 'origin/master'

admin-web/src/views/admin/account/index.vue

@@ -156,7 +156,7 @@ const state = reactive({
     data: [] as Array<any>,
     loading: false,
     columns: [
-      {label: '用户ID',width: 180,  prop: 'userId', resizable: true, fixed: 'left'},
+      {label: '用户ID',width: 200,  prop: 'userId', resizable: true, fixed: 'left'},
       // {label: '用户名',width: 150,  prop: 'userName', resizable: true, fixed: 'left'},
       {label: '手机号', width: 120, prop: 'mobilePhone', resizable: true, fixed: 'left'},
       {label: '余额', width: 80, prop: 'balance', resizable: true, fixed: 'left'},

admin-web/src/views/admin/ordering/index.vue

@@ -90,10 +90,10 @@
                     border
                     :data="row.detail"
                     stripe="stripe">
-                  <el-table-column width="120" label="项目" prop="name"></el-table-column>
-                  <el-table-column width="120" label="时长" prop="seconds"></el-table-column>
-                  <el-table-column width="120" label="单价" prop="price"></el-table-column>
-                  <el-table-column width="120" label="费用" prop="amount"></el-table-column>
+                  <el-table-column width="120" label="服务项目" prop="name"></el-table-column>
+                  <el-table-column width="120" label="服务时长" prop="seconds"></el-table-column>
+                  <el-table-column width="120" label="服务单价" prop="price"></el-table-column>
+                  <el-table-column width="120" label="小计金额" prop="amount"></el-table-column>
                 </el-table>
               </div>
             </template>
@@ -178,35 +178,39 @@ const state = reactive({
   exportConfig: {},
   columns: [
     {type: 'expand', width: 60, align: 'center', fixed: 'left'},
-    {width: 260, label: '订单号', prop: 'orderId', query: true, type: 'text', resizable: true, fixed: 'left'},
-    {width: 260, label: '用户', prop: 'userId', query: true, type: 'text', resizable: true},
-    {width: 160, label: '消费总额', prop: 'amount', query: false, resizable: true},
-    {width: 160, label: '应收金额', prop: 'amountReceivable', query: false, type: '', resizable: true},
-    {width: 160, label: '实收金额', prop: 'amountReceived', query: false, type: 'text', resizable: true},
-    {width: 160, label: '卡内余额', prop: 'cardBalance', query: false, type: 'text', resizable: true},
-    {
-      width: 160, label: '卡过期时间',
-      prop: 'cardExpired',
-      query: false,
-      sortable: 'custom',
-      type: 'datetime',
-      resizable: true,
-      conf: {format: (val: any) => u.fmt.fmtDateTime(val)}
-    },
-    {width: 160, label: '卡内码', prop: 'cardId', query: false, type: 'text', resizable: true},
-    {width: 160, label: '卡串号', prop: 'cardSn', query: false, type: 'text', resizable: true},
-    {width: 160, label: '卡类型', prop: 'cardType', query: false, type: '', resizable: true},
+    {width: 220, label: '订单号', prop: 'orderId', query: true, type: 'text', resizable: true, fixed: 'left'},
+    {width: 120, label: '用户手机号', prop: 'mobilePhone', query: true, type: 'text', fixed: 'left'},
+    {width: 140, label: '站点名称', prop: 'stationName', query: false, type: 'text', resizable: true},
+    {width: 100, label: '设备编号', prop: 'shortId', query: false, type: 'text', resizable: true},
+    {width: 160, label: '开始时间', prop: 'startTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
+    {width: 160, label: '结束时间', prop: 'endTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
+    {width: 100, label: '消费总额', prop: 'amount', query: false, resizable: true},
+    {width: 100, label: '应收金额', prop: 'amountReceivable', query: false, type: '', resizable: true},
+    {width: 100, label: '实收金额', prop: 'amountReceived', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '卡内余额', prop: 'cardBalance', query: false, type: 'text', resizable: true},
+    // {
+    //   width: 160, label: '卡过期时间',
+    //   prop: 'cardExpired',
+    //   query: false,
+    //   sortable: 'custom',
+    //   type: 'datetime',
+    //   resizable: true,
+    //   conf: {format: (val: any) => u.fmt.fmtDateTime(val)}
+    // },
+    // {width: 160, label: '卡内码', prop: 'cardId', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '卡串号', prop: 'cardSn', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '卡类型', prop: 'cardType', query: false, type: '', resizable: true},
     {
-      width: 160, label: '关机方式',
+      width: 120, label: '关机方式',
       prop: 'closeType',
-      query: true,
+      query: false,
       type: 'dict',
       conf: {dict: 'Order.closeType'},
       resizable: true
     },
-    {width: 160, label: '投币的累计金额', prop: 'coinMoney', query: false, type: 'text', resizable: true},
-    {width: 160, label: '投币的次数', prop: 'coinNum', query: false, type: 'text', resizable: true},
-    {width: 160, label: '开单时间', prop: 'createTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
+    // {width: 160, label: '投币的累计金额', prop: 'coinMoney', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '投币的次数', prop: 'coinNum', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '开单时间', prop: 'createTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
     // {
     //   width:160,label: '费用明细',
     //   prop: 'detail',
@@ -215,30 +219,26 @@ const state = reactive({
     //   resizable: true
     // },
 
-    {width: 160, label: '设备名称', prop: 'deviceName', query: false, type: 'text', resizable: true},
-    {width: 160, label: '优惠金额', prop: 'discountAmount', query: false, type: '', resizable: true},
-    {width: 160, label: '优惠金额', prop: 'discountMoney', query: false, type: '', resizable: true},
-    {width: 160, label: '优惠方式', prop: 'discountType', query: false, type: 'dict', conf: {dict: 'Activity.discountType'}, resizable: true},
-    {width: 160, label: '结束时间', prop: 'endTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
-    {
-      width: 160, label: '设备空闲关机倒计时剩余时间',
-      prop: 'idleRemainTime',
-      query: true,
-      type: 'text',
-      resizable: true
-    },
-    {width: 160, label: '发票状态', prop: 'invoiceStatus', query: false, type: 'dict', conf: {dict: 'Invoice.status'}, resizable: true},
-    {width: 160, label: '会员折扣比例', prop: 'memberDiscount', query: false, type: 'text', resizable: true},
-    {width: 160, label: '开机方式', prop: 'openType', query: false, type: 'dict', conf: {dict: 'Order.openType'}, resizable: true},
-    {width: 160, label: '订单操作剩余操作时间(单位秒)', prop: 'operationRemainTime', query: false, type: 'text', resizable: true},
-    {width: 160, label: '本机订单号', prop: 'orderIdLocal', query: false, type: 'text', resizable: true},
-    {width: 160, label: '订单状态', prop: 'orderStatus', query: false, type: 'dict', conf: {dict: 'Order.status'}, resizable: true},
-    {width: 160, label: '支付状态', prop: 'payStatus', query: true, type: 'dict', conf: {dict: 'Order.pay'}, resizable: true},
-    {width: 160, label: '本次开机的预付金额', prop: 'prepayMoney', query: true, type: '', resizable: true},
-    {width: 160, label: '产品key', prop: 'productKey', query: false, type: 'text', resizable: true},
-    {width: 160, label: '开始时间', prop: 'startTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
-    {width: 160, label: '站点ID', prop: 'stationId', query: true, type: 'text', resizable: true},
-    {label: '停机原因', prop: 'stopReason', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '优惠金额', prop: 'discountAmount', query: false, type: '', resizable: true},
+    // {width: 160, label: '优惠方式', prop: 'discountType', query: false, type: 'dict', conf: {dict: 'Activity.discountType'}, resizable: true},
+    // {
+    //   width: 160, label: '设备空闲关机倒计时剩余时间',
+    //   prop: 'idleRemainTime',
+    //   query: true,
+    //   type: 'text',
+    //   resizable: true
+    // },
+    // {width: 160, label: '会员折扣比例', prop: 'memberDiscount', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '开机方式', prop: 'openType', query: false, type: 'dict', conf: {dict: 'Order.openType'}, resizable: true},
+    // {width: 160, label: '订单操作剩余操作时间(单位秒)', prop: 'operationRemainTime', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '本机订单号', prop: 'orderIdLocal', query: false, type: 'text', resizable: true},
+    {width: 100, label: '订单状态', prop: 'orderStatus', query: false, type: 'dict', conf: {dict: 'Order.status'}, resizable: true},
+    {width: 100, label: '支付状态', prop: 'payStatus', query: true, type: 'dict', conf: {dict: 'Order.pay'}, resizable: true},
+    {width: 100, label: '发票状态', prop: 'invoiceStatus', query: false, type: 'dict', conf: {dict: 'Invoice.status'}, resizable: true},
+    // {width: 160, label: '本次开机的预付金额', prop: 'prepayMoney', query: true, type: '', resizable: true},
+    // {width: 160, label: '产品key', prop: 'productKey', query: false, type: 'text', resizable: true},
+    // {width: 160, label: '站点ID', prop: 'stationId', query: true, type: 'text', resizable: true},
+    // {label: '停机原因', prop: 'stopReason', query: false, type: 'text', resizable: true},
     {
       width: 160,
       label: '更新时间',
@@ -365,4 +365,4 @@ const handleRowDelete = (row: any) => {
 // defineExpose({
 //     loadData,
 // });
-</script>
+</script>

admin-web/src/views/admin/station/device/index.vue

@@ -100,13 +100,15 @@ const state = reactive({
   exportConfig: {},
   columns: [
     // {type: 'selection', width: 60, align: 'center', fixed: 'left'},
-    {label: '设备名称', prop: 'deviceName', width: 180, query: true, type: 'text', resizable: true, fixed: 'left'},
-    {label: '状态', prop: 'state', width: 180,query: true, type: 'dict', conf: {dict: 'WashDevice.status'}, resizable: true},
-    {label: '网点ID', prop: 'stationId', width: 180,query: true, type: 'text', resizable: true},
-    {label: '产品key', prop: 'productKey', width: 180, query: true, type: 'text', resizable: true},
-    {label: '设备主机状态', prop: 'fsmState', width: 180, query: true, type: 'text', resizable: true},
+    {label: '站点ID', prop: 'stationId', width: 80,query: true, type: 'text', resizable: true},
+    {label: '站点名称', prop: 'stationName', width: 150,query: true, type: 'text', resizable: true},
+    {label: '设备编号', prop: 'shortId', width: 100, query: true, type: 'text', resizable: true, fixed: 'left'},
+    // {label: '设备名称', prop: 'deviceName', width: 180, query: true, type: 'text', resizable: true, fixed: 'left'},
+    // {label: '产品key', prop: 'productKey', width: 180, query: true, type: 'text', resizable: true},
+    {label: '状态', prop: 'state', width: 90,query: true, type: 'dict', conf: {dict: 'WashDevice.status'}, resizable: true},
+    {label: '设备状态', prop: 'fsmState', width: 90, query: true, type: 'text', resizable: true},
     {
-      label: '本次运行时长', prop: 'uptimeMs', width: 180, query: false, type: 'render', resizable: true,
+      label: '运行时长', prop: 'uptimeMs', width: 100, query: false, type: 'render', resizable: true,
       render: (h: any, row: any) => {
         return (
             h('div', null,u.fmt.fmtDuration(row))
@@ -116,7 +118,7 @@ const state = reactive({
     {label: '功能', prop: 'functions', width: 180, query: true, type: 'text', resizable: true},
     {label: '是否有泡沫', prop: 'hasFoam', width: 180, query: true, type: 'dict', conf: {dict: 'WashDevice.foam'}, resizable: true},
     {label: '是否有水', prop: 'hasWater', width: 180, query: true, type: 'dict', conf: {dict: 'WashDevice.water'}, resizable: true},
-    {label: '当前温度', prop: 'temperatureChip', width: 180, query: false, type: 'text', resizable: true},
+    // {label: '当前温度', prop: 'temperatureChip', width: 180, query: false, type: 'text', resizable: true},
     {label: '创建时间', prop: 'createTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
     {label: '更新时间', prop: 'updateTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
     {
@@ -233,4 +235,4 @@ const handleRowDelete = (row: any) => {
 // defineExpose({
 //     loadData,
 // });
-</script>
+</script>

car-wash-admin/src/main/java/com/kym/admin/controller/CustomController.java

@@ -4,12 +4,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
-import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
-import com.kym.service.miniapp.ChargeOrderService;
 import com.kym.service.miniapp.PayLogService;
 import com.kym.service.miniapp.UserService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 用户相关信息
@@ -22,12 +22,10 @@ import org.springframework.web.bind.annotation.*;
 public class CustomController {
 
     private final UserService customUserService;
-    private final ChargeOrderService customChargeOrders;
     private final PayLogService payLogService;
 
-    public CustomController(UserService customUserService, ChargeOrderService customChargeOrders, PayLogService payLogService) {
+    public CustomController(UserService customUserService, PayLogService payLogService) {
         this.customUserService = customUserService;
-        this.customChargeOrders = customChargeOrders;
         this.payLogService = payLogService;
     }
 
@@ -38,25 +36,6 @@ public class CustomController {
         return R.success(customUserService.listCustomUser(params));
     }
 
-    @SysLog("查询用户充电订单列表")
-    @GetMapping("/listChargeOrders")
-    public R<?> listChargeOrders(@ModelAttribute CustomChargeOrdersQueryParam params) {
-        return R.success(customChargeOrders.customChargeOrders(params));
-    }
-
-    @SysLog("订单结算")
-    @GetMapping("/closeChargeOrder/{startChargeSeq}")
-    public R<?> closeChargeOrder(@PathVariable("startChargeSeq") String startChargeSeq) {
-        customChargeOrders.closeChargeOrder(startChargeSeq);
-        return R.success();
-    }
-
-    @SysLog(value = "用户充电订单列表导出", ignoreParams = true)
-    @GetMapping("/exportChargeOrders")
-    public void exportChargeOrders(@ModelAttribute CustomChargeOrdersQueryParam params, HttpServletResponse response) {
-        customChargeOrders.exportCustomChargeOrders(params, response);
-    }
-
     @SysLog("充值记录列表")
     @GetMapping("/listRecharge")
     public R<?> listRecharge(@ModelAttribute CommonQueryParam params) {

car-wash-admin/src/main/java/com/kym/admin/controller/StatController.java

@@ -1,94 +0,0 @@
-package com.kym.admin.controller;
-
-import com.kym.common.R;
-import com.kym.entity.admin.StationStatMonth;
-import com.kym.entity.admin.queryParams.StatQueryParam;
-import com.kym.entity.admin.queryParams.StatementsQueryParam;
-import com.kym.service.admin.StationStatMonthService;
-import com.kym.service.miniapp.ChargeOrderService;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author skyline
- * @description 统计数据
- * @date 2023-09-02 09:44
- */
-@RestController
-@RequestMapping("/stat")
-public class StatController {
-
-    private final ChargeOrderService chargeOrderService;
-    private final StationStatMonthService stationStatMonthService;
-
-    public StatController(ChargeOrderService chargeOrderService, StationStatMonthService stationStatMonthService) {
-        this.chargeOrderService = chargeOrderService;
-        this.stationStatMonthService = stationStatMonthService;
-    }
-
-    /**
-     * 站点充电数据-日/月
-     *
-     * @param params
-     * @return
-     */
-    @GetMapping("/stationStat")
-    R<?> stationStat(@ModelAttribute StatQueryParam params) {
-        return R.success(chargeOrderService.stationStat(params));
-    }
-
-    /**
-     * 站点实时数据
-     *
-     * @return
-     */
-    @GetMapping("/stationTodayStat")
-    R<?> stationTodayStat(String stationId) {
-        return R.success(chargeOrderService.stationTodayStat(stationId));
-    }
-
-    /**
-     * 站点详细数据统计
-     *
-     * @param params
-     * @return
-     */
-    @GetMapping("/stationStatDetail")
-    R<?> stationStatDetail(@ModelAttribute StatQueryParam params) {
-        return R.success(chargeOrderService.stationStatDetail(params));
-    }
-
-    /**
-     * 站点月统计数据列表
-     *
-     * @param params
-     * @return
-     */
-    @GetMapping("/listStatMonth")
-    R<?> listStatMonth(@ModelAttribute StatementsQueryParam params) {
-        return R.success(stationStatMonthService.listStatMonth(params));
-    }
-
-    /**
-     * 单条站点月统计数据
-     *
-     * @param statMonthId
-     * @return
-     */
-    @GetMapping("/getStationStatMonth/{statMonthId}")
-    R<?> getStationStatMonth(@PathVariable("statMonthId") String statMonthId) {
-        return R.success(stationStatMonthService.getById(statMonthId));
-    }
-
-    /**
-     * 修改站点月统计数据（填写电费账单数据）
-     *
-     * @param stationStatMonth
-     * @return
-     */
-    @PostMapping("/modifyStationStatMonth")
-    R<?> modifyStationStatMonth(@RequestBody StationStatMonth stationStatMonth) {
-        stationStatMonthService.modifyStationStatMonth(stationStatMonth);
-        return R.success();
-    }
-
-}

car-wash-admin/src/main/java/com/kym/admin/controller/TestController.java

@@ -1,92 +0,0 @@
-package com.kym.admin.controller;
-
-import com.kym.common.R;
-import com.kym.common.utils.wx.WxPbUtil;
-import com.kym.entity.miniapp.UserCoupon;
-import com.kym.service.mq.producer.UserCouponSender;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
-import me.chanjar.weixin.mp.bean.result.WxMpUserList;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-
-    private final UserCouponSender userCouponSender;
-
-    private final WxMpService wxMpService;
-
-    public TestController(UserCouponSender userCouponSender, WxMpService wxMpService) {
-
-        this.userCouponSender = userCouponSender;
-        this.wxMpService = wxMpService;
-    }
-
-    /**
-     * 测试rabbitmq
-     *
-     * @return
-     */
-    @GetMapping(value = "/test")
-    R<?> test() {
-        for (int i = 0; i < 10; i++) {
-            var userCoupon = new UserCoupon().setUserId(i + 1L);
-            userCouponSender.sendMessage(userCoupon);
-        }
-        return R.success();
-    }
-
-    /**
-     * 测试公众号消息
-     *
-     * @return
-     */
-    @GetMapping(value = "/test2")
-    R<?> test2() {
-        // 通过unionid获取公众号openid
-
-        var params = Map.of(
-                "character_string2.DATA", "order111222333",
-                "thing9.DATA", "测试站点",
-                "character_string3.DATA", "SN0001",
-                "time4.DATA", "2024-07-29 12:00:00"
-        );
-        WxPbUtil.sendPublicTemplateMessage("", "SjszYYiHcN-GaEeZTKJsCcB6ACxYJWfTddkSywf1q1g", params, "", "");
-        return R.success();
-    }
-
-    /**
-     * 测试拉取公众号关注者列表
-     * @return
-     */
-    @GetMapping(value = "/test3")
-    R<?> test3() throws WxErrorException {
-        // 获取公众号所有关注者列表
-        WxMpUserList wxUserList = wxMpService.getUserService().userList();
-        // 通过unionid获取公众号openid
-        String lang = "zh_CN";
-        var unionid2openid = new HashMap<>();
-        wxUserList.getOpenids().forEach(openid -> {
-            try {
-                WxMpUser mpUser = wxMpService.getUserService().userInfo(openid,lang);
-                unionid2openid.put(mpUser.getUnionId(),openid);
-            } catch (WxErrorException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-
-        return R.success(wxUserList);
-    }
-
-
-}

car-wash-common/src/main/java/com/kym/common/config/EnPlusConfig.java

@@ -1,21 +0,0 @@
-package com.kym.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-
-@Data
-@Configuration("EnPlusConfig")
-@ConfigurationProperties(prefix = "en-plus")
-public class EnPlusConfig {
-    private String operatorId;
-    private String operatorSecret;
-    private String dataSecret;
-    private String dataSecretIv;
-    private String sigSecret;
-    private int chargeMinAmount;
-    private String apiDomain;
-    private String sass;
-    private String sassClose;
-}

car-wash-common/src/main/java/com/kym/common/config/WxFapiaoConfig.java

@@ -1,28 +0,0 @@
-package com.kym.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author skyline
- * @description 微信发票
- * @date 2023-07-22 23:09
- */
-@Data
-@Configuration
-@ConfigurationProperties(prefix = "wechat.fapiao")
-public class WxFapiaoConfig {
-
-    private String baseInformation;
-    private String taxCodes;
-    private String fapiaoApplications;
-    private String notifyUrl;
-    private String devConfig;
-    private String fapiaoFiles;
-    private String queryFapiao;
-    private String titleUrl;
-    private String userTitle;
-    private String cardTemplate;
-
-}

car-wash-common/src/main/java/com/kym/common/enums/EnPlusApi.java

@@ -1,45 +0,0 @@
-package com.kym.common.enums;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.kym.common.config.EnPlusConfig;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-
-/**
- * @author skyline
- * @description EN+接口
- * @date 2023-07-29 12:33
- */
-@AllArgsConstructor
-@Getter
-public enum EnPlusApi implements Api {
-
-    // 认证-获取token
-    EN_PLUS_QUERY_TOKEN(Constants.DOMAIN + "query_token", RequestMethod.POST), //获取AccessToken
-
-    // 站点
-    EN_PLUS_QUERY_STATION_INFO(Constants.DOMAIN + "query_stations_info", RequestMethod.POST), // 站点信息
-    EN_PLUS_QUERY_STATION_STATUS(Constants.DOMAIN + "query_station_status", RequestMethod.POST), // 站点状态
-    EN_PLUS_QUERY_STATION_STATS(Constants.DOMAIN + "query_station_stats", RequestMethod.POST), // 站点统计
-    //充电
-    EN_PLUS_QUERY_EQUIP_AUTH(Constants.DOMAIN + "query_equip_auth", RequestMethod.POST), // 请求设备认证
-    EN_PLUS_QUERY_EQUIP_BUSINESS_POLICY(Constants.DOMAIN + "query_equip_business_policy", RequestMethod.POST), // 查询业务策略信息
-    EN_PLUS_QUERY_START_CHARGE(Constants.DOMAIN + "query_start_charge", RequestMethod.POST), // 查询启动充电
-    EN_PLUS_QUERY_STOP_CHARGE(Constants.DOMAIN + "query_stop_charge", RequestMethod.POST), // 请求停止充电
-    EN_PLUS_QUERY_EQUIP_CHARGE_STATUS(Constants.DOMAIN + "query_equip_charge_status", RequestMethod.POST), // 查询设备充电状态
-
-    //微信
-    WX_MP_GET_PHONE("", RequestMethod.POST), // 获取手机号
-    WX_GET_ACCESS_TOKEN("", RequestMethod.POST); // 获取AccessToken
-
-    private final String api;
-    private final RequestMethod requestMethod;
-
-
-    private static class Constants {
-        static EnPlusConfig config = SpringUtil.getBean("EnPlusConfig");
-        private static final String DOMAIN = config.getApiDomain();
-    }
-}

car-wash-common/src/main/java/com/kym/common/handler/ResponseResultHandler.java

@@ -1,7 +1,6 @@
 package com.kym.common.handler;
 
 import com.kym.common.R;
-import com.kym.entity.enplus.response.EnResponse;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -36,7 +35,7 @@ public class ResponseResultHandler implements ResponseBodyAdvice {
                                   Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
 
         // 响应给en+,微信的信息不做处理
-        if (body instanceof R<?> || body instanceof EnResponse || body instanceof ResponseEntity) {
+        if (body instanceof R<?> || body instanceof ResponseEntity) {
             return body;
         } else if (body == null) {
             return R.success();

car-wash-common/src/main/java/com/kym/common/utils/AESUtil.java

@@ -1,133 +0,0 @@
-package com.kym.common.utils;
-
-
-import com.kym.common.config.EnPlusConfig;
-import org.apache.tomcat.util.codec.binary.Base64;
-import org.springframework.stereotype.Component;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.SecureRandom;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author skyline
- * @description AES加解密工具
- * @date 2023-07-30 01:41
- */
-@Component
-public class AESUtil {
-
-    //编码方式
-    public static final String CODE_TYPE = "UTF-8";
-    //AES：加密方式   CBC：工作模式   PKCS5Padding：填充模式
-    private static final String CBC_PKCS5_PADDING = "AES/CBC/PKCS5Padding";
-    private static final String AES = "AES";
-
-
-    static EnPlusConfig config;
-
-    public AESUtil(EnPlusConfig config) {
-        AESUtil.config = config;
-    }
-
-    /**
-     * AES 加密操作
-     *
-     * @param content 待加密内容
-     * @return 返回Base64转码后的加密数据
-     */
-    public static String encrypt(String content) {
-
-        if (content == null || "".equals(content)) {
-            return content;
-        }
-
-        try {
-            /*
-             * 新建一个密码编译器的实例，由三部分构成，用"/"分隔，分别代表如下
-             * 1. 加密的类型(如AES，DES，RC2等)
-             * 2. 模式(AES中包含ECB，CBC，CFB，CTR，CTS等)
-             * 3. 补码方式(包含nopadding/PKCS5Padding等等)
-             * 依据这三个参数可以创建很多种加密方式
-             */
-            Cipher cipher = Cipher.getInstance(CBC_PKCS5_PADDING);
-
-            //偏移量
-            IvParameterSpec zeroIv = new IvParameterSpec(config.getDataSecretIv().getBytes(CODE_TYPE));
-
-            byte[] byteContent = content.getBytes(CODE_TYPE);
-
-            //使用加密秘钥
-            SecretKeySpec skeySpec = new SecretKeySpec(config.getDataSecret().getBytes(CODE_TYPE), AES);
-            //SecretKeySpec skeySpec = getSecretKey(key);
-
-            cipher.init(Cipher.ENCRYPT_MODE, skeySpec, zeroIv);// 初始化为加密模式的密码器
-
-            byte[] result = cipher.doFinal(byteContent);// 加密
-
-            return Base64.encodeBase64String(result);//通过Base64转码返回
-        } catch (Exception ex) {
-            Logger.getLogger(AESUtil.class.getName()).log(Level.SEVERE, null, ex);
-        }
-
-        return null;
-
-    }
-
-    /**
-     * AES 解密操作
-     *
-     * @param content
-     * @return
-     */
-    public static String decrypt(String content) {
-        if (content == null || "".equals(content)) {
-            return content;
-        }
-
-        try {
-            //实例化
-            Cipher cipher = Cipher.getInstance(CBC_PKCS5_PADDING);
-            IvParameterSpec zeroIv = new IvParameterSpec(config.getDataSecretIv().getBytes(CODE_TYPE));
-
-            SecretKeySpec skeySpec = new SecretKeySpec(config.getDataSecret().getBytes(CODE_TYPE), AES);
-            //SecretKeySpec skeySpec = getSecretKey(key);
-            cipher.init(Cipher.DECRYPT_MODE, skeySpec, zeroIv);
-
-            byte[] result = cipher.doFinal(Base64.decodeBase64(content));
-
-            return new String(result, CODE_TYPE);
-        } catch (Exception ex) {
-            Logger.getLogger(AESUtil.class.getName()).log(Level.SEVERE, null, ex);
-        }
-
-        return null;
-    }
-
-    /**
-     * 生成加密秘钥
-     *
-     * @return
-     */
-    private static SecretKeySpec getSecretKey(final String key) {
-        //返回生成指定算法密钥生成器的 KeyGenerator 对象
-        KeyGenerator kg;
-        try {
-            kg = KeyGenerator.getInstance(AES);
-            //AES 要求密钥长度为 128
-            kg.init(128, new SecureRandom(key.getBytes()));
-            //生成一个密钥
-            SecretKey secretKey = kg.generateKey();
-            // 转换为AES专用密钥
-            return new SecretKeySpec(secretKey.getEncoded(), AES);
-        } catch (Exception ex) {
-            Logger.getLogger(AESUtil.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return null;
-    }
-}

car-wash-entity/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.13</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

car-wash-entity/src/main/java/com/kym/entity/admin/ConnectorInfo.java

@@ -1,95 +0,0 @@
-package com.kym.entity.admin;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 充电桩接口（枪）信息
- * </p>
- *
- * @author skyline
- * @since 2023-08-05
- */
-@Getter
-@Setter
-@TableName("t_connector_info")
-@Accessors(chain = true)
-public class ConnectorInfo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 充电桩序列号
-     */
-    private String equipmentId;
-
-    /**
-     * 充电桩接口序列号
-     */
-    private String connectorId;
-
-    /**
-     * 充电桩名称
-     */
-    private String connectorName;
-
-    /**
-     * 充电设备接口类型：1家用插座（模式2）2：交流接口插座（模式3，连接方式B）3：交流接口插头（带枪线，模式3，连接方式C）4：直流接口枪头（带枪线，模式4）5：无线充电座6：其他
-     */
-    private Integer connectorType;
-
-    /**
-     * 额定电压上限（V）
-     */
-    private Integer voltageUpperLimits;
-
-    /**
-     * 额定电压下限（V）
-     */
-    private Integer voltageLowerLimits;
-
-    /**
-     * 额定电流
-     */
-    private Integer current;
-
-    /**
-     * 额定功率
-     */
-    private Double power;
-
-    /**
-     * 停车场车位编号
-     */
-    private String parkingNo;
-
-    /**
-     * 国家标准：1:2011 2:2015
-     */
-    private Integer nationalStandard;
-
-    /**
-     * 充电设备接口状态
-     * 0：离网
-     * 1：空闲
-     * 2：占用（未充电）
-     * 3：占用（充电中）
-     * 4：占用（预约锁定）
-     * 255：故障
-     */
-    private Integer status;
-
-}

car-wash-entity/src/main/java/com/kym/entity/admin/EquipmentInfo.java

@@ -1,152 +0,0 @@
-package com.kym.entity.admin;
-
-import com.alibaba.fastjson2.JSONObject;
-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 lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * <p>
- * 充电桩桩体设备
- * </p>
- *
- * @author skyline
- * @since 2023-09-01
- */
-@Data
-@TableName("t_equipment_info")
-@Accessors(chain = true)
-public class EquipmentInfo extends BaseEntity {
-
-    public static int SERVICE_STATUS_离线 = 0;
-    public static int SERVICE_STATUS_空闲 = 1;
-    public static int SERVICE_STATUS_已连接 = 2;
-    public static int SERVICE_STATUS_充电中 = 3;
-    public static int SERVICE_STATUS_预约中 = 4;
-    public static int SERVICE_STATUS_故障 = 255;
-
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点编号  eg:001,002
-     */
-    @TableField(exist = false)
-    private String stationNo;
-
-    /**
-     * 站点名称
-     */
-    @TableField(exist = false)
-    private String stationName;
-
-    /**
-     * 充电桩序列号
-     */
-    private String equipmentId;
-
-    /**
-     * 充电桩短编号
-     */
-    @TableField(exist = false)
-    private String shortId;
-
-    /**
-     * 设备生产商组织机构代码
-     */
-    private String manufacturerId;
-
-    /**
-     * 设备生产商名称
-     */
-    private String manufacturerName;
-
-    /**
-     * 设备型号
-     */
-    private String equipmentModel;
-
-    /**
-     * 设备生产日期
-     */
-    private String productionDate;
-
-    /**
-     * 设备类型：1：直流设备 2：交流设备 3：交直流一体设备 4：无线设备 5：其他
-     */
-    private Integer equipmentType;
-
-    /**
-     * 车位编号
-     */
-    private String parkingNo;
-
-    /**
-     * 位置坐标
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject location;
-
-    /**
-     * 额定功率 千瓦
-     */
-    private Double power;
-
-    /**
-     * 网络状态：0-离线 1-在线
-     */
-    private Integer netStatus;
-
-    /**
-     * 服务状态：0-离网 1-空闲 2-已连接 3-充电中 4-预约中 255-故障
-     */
-    private Integer serviceStatus;
-
-
-    /**
-     * 充电接口列表
-     */
-    @TableField(exist = false)
-    private List<ConnectorInfo> connectorInfos;
-
-
-    public EquipmentInfo setStationId(String stationId) {
-        this.stationId = stationId;
-        return this;
-    }
-
-
-    public EquipmentInfo setShortId(String shortId) {
-        this.shortId = shortId;
-        if (shortId != null) {
-            setStationNo(shortId.substring(0, 3));
-        }
-        return this;
-    }
-
-    public EquipmentInfo setPower(Double power) {
-        this.power = power;
-        return this;
-    }
-
-    public EquipmentInfo setStationName(String stationName) {
-        this.stationName = stationName;
-        return this;
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/admin/EquipmentRelation.java

@@ -1,60 +0,0 @@
-package com.kym.entity.admin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author skyline
- * @since 2023-08-07
- */
-@Data
-@Accessors(chain = true)
-@TableName("t_equipment_relation")
-public class EquipmentRelation extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * EN+站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点名称
-     */
-    private String stationName;
-
-    /**
-     * 二维码sn号
-     */
-    private String shortId;
-
-    /**
-     * EN+充电的sn号
-     */
-    private String equipmentId;
-    /**
-     * 充电枪口编号
-     */
-    private String connectorId;
-
-    /**
-     * 停车位编号
-     */
-    private String parkingNo;
-
-    /**
-     * 状态 0：启用，1：未启用
-     */
-    private Integer status;
-
-
-}

car-wash-entity/src/main/java/com/kym/entity/admin/InvoiceDetail.java

@@ -1,113 +0,0 @@
-package com.kym.entity.admin;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.kym.entity.BaseEntity;
-import com.kym.entity.typehandle.InvoiceDetailBuyerInformationTypeHandle;
-import com.kym.entity.typehandle.InvoiceDetailSellerInformationTypeHandle;
-import com.kym.entity.wechat.FaPiao;
-import com.kym.entity.wechat.FapiaoApplications;
-import com.kym.entity.wechat.InvoiceBaseInfo;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * <p>
- * 发票详情表
- * </p>
- *
- * @author skyline
- * @since 2024-03-19
- */
-@Getter
-@Setter
-@TableName(schema = "charge_admin",value = "t_invoice_detail",autoResultMap = true)
-@Accessors(chain = true)
-public class InvoiceDetail extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 微信发票申请id
-     */
-    private String applyId;
-
-    /**
-     * 开票时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime fapiaoTime;
-
-    /**
-     * 发票状态：ISSUE_ACCEPTED-开票申请已受理，ISSUED-发票已开具，REVERSE_ACCEPTED-冲红申请已受理，REVERSED-发票已冲红
-     */
-    private String status;
-
-    /**
-     * 蓝票
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private FapiaoApplications.FapiaoInfo blueFapiao;
-
-    /**
-     * 红票
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private Object redFapiao;
-
-    /**
-     * 卡包信息
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private Object cardInformation;
-
-    /**
-     * 总开票金额（分）
-     */
-    private Integer totalAmount;
-
-    /**
-     * 税额（分）
-     */
-    private Integer taxAmount;
-
-    /**
-     * 不含税金额（分）
-     */
-    private Integer amount;
-
-    /**
-     * 售卖方信息
-     */
-    @TableField(typeHandler = InvoiceDetailSellerInformationTypeHandle.class)
-    private InvoiceBaseInfo.SellerInfo sellerInformation;
-
-    /**
-     * 购买方信息
-     */
-    @TableField(typeHandler = InvoiceDetailBuyerInformationTypeHandle.class)
-    private FaPiao.BuyerInformation buyerInformation;
-
-    /**
-     * 扩展信息
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private Object extraInformation;
-
-    /**
-     * 发票明细
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<FapiaoApplications.FapiaoItem> items;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

car-wash-entity/src/main/java/com/kym/entity/admin/Station.java

@@ -1,190 +0,0 @@
-package com.kym.entity.admin;
-
-import com.alibaba.fastjson2.JSONObject;
-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 lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-
-/**
- * <p>
- * 充电站信息
- * </p>
- *
- * @author skyline
- * @since 2023-08-12
- */
-@Getter
-@Setter
-@TableName(value = "t_station", autoResultMap = true)
-@Accessors(chain = true)
-public class Station extends BaseEntity implements Serializable {
-
-    // 站点状态：0：未知 1：建设中 5：关闭下线 6：维护中 50：正常使用
-    public static final int STATION_STATUS_未知 = 0;
-    public static final int STATION_STATUS_建设中 = 1;
-    public static final int STATION_STATUS_关闭下线 = 5;
-    public static final int STATION_STATUS_维护中 = 6;
-    public static final int STATION_STATUS_正常使用 = 50;
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 电站组id
-     */
-    private Long groupId;
-
-    /**
-     * en+充电站id
-     */
-    @JSONField(name = "StationID")
-    private String stationId;
-
-    /**
-     * en+运营商id
-     */
-    @JSONField(name = "OperatorID")
-    private String operatorId;
-
-    /**
-     * 设备所属运营平台组织机构代码
-     */
-    @JSONField(name = "EquipmentOwnerID")
-    private String equipmentOwnerId;
-
-    /**
-     * 站点名称
-     */
-    @JSONField(name = "StationName")
-    private String stationName;
-
-    /**
-     * 充电桩国家代码：CN
-     */
-    @JSONField(name = "CountryCode")
-    private String countryCode;
-
-    /**
-     * 充电站省市辖区编码
-     */
-    @JSONField(name = "AreaCode")
-    private String areaCode;
-
-    /**
-     * 地址
-     */
-    @JSONField(name = "Address")
-    private String address;
-
-    /**
-     * 站点电话
-     */
-    @JSONField(name = "StationTel")
-    private String stationTel;
-
-    /**
-     * 服务电话
-     */
-    @JSONField(name = "ServiceTel")
-    private String serviceTel;
-
-    /**
-     * 站点类型：1：公共 50：个人 100：公交（专业）101：环卫（专用）102：物流（专用）103：出租车（专用）255：其他
-     */
-    @JSONField(name = "StationType")
-    private Integer stationType;
-
-    /**
-     * 站点状态：0：未知 1：建设中 5：关闭下线 6：维护中 50：正常使用
-     */
-    @JSONField(name = "StationStatus")
-    private Integer stationStatus;
-
-    /**
-     * 充电车位数量
-     */
-    @JSONField(name = "ParkNums")
-    private Integer parkingNum;
-
-    /**
-     * 充电桩位置坐标
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject location;
-    /**
-     * 站点引导
-     */
-    @JSONField(name = "SiteGuide")
-    private String siteGuide;
-    /**
-     * 建设场所：1：居民区 2：公共机构 3：企事业单位 4：写字楼 5：工业园区 6：交通枢纽 7：大型文体设施 8：城市绿地 9：大型建筑配建停车场 10：路边停车位 11：城际高速服务区 255：其他
-     */
-    @JSONField(name = "Construction")
-    private Integer construction;
-    /**
-     * 站点照片
-     */
-    private String pictures;
-    /**
-     * 使用车型描述
-     */
-    @JSONField(name = "MatchCars")
-    private String matchCars;
-    /**
-     * 车位楼层及数量描述
-     */
-    @JSONField(name = "ParkInfo")
-    private String parkInfo;
-    /**
-     * 营业时间描述
-     */
-    @JSONField(name = "BusineHours")
-    private String businessHours;
-    /**
-     * 充电费描述
-     */
-    @JSONField(name = "ElectricityFee")
-    private String electricityFee;
-    /**
-     * 服务费率描述
-     */
-    @JSONField(name = "ServiceFee")
-    private String serviceFee;
-    /**
-     * 停车费
-     */
-    @JSONField(name = "ParkFee")
-    private String parkFee;
-    /**
-     * 支付方式：刷卡、线上、现金（电子钱包类卡为刷卡、身份鉴权卡、微信/支付宝、APP为线上）
-     */
-    @JSONField(name = "Payment")
-    private String payment;
-    /**
-     * 是否支持预约：0：不支持 1：支持
-     */
-    @JSONField(name = "SupportOrder")
-    private Integer supportOrder;
-    /**
-     * 备注
-     */
-    @JSONField(name = "Remark")
-    private String remark;
-
-
-}

car-wash-entity/src/main/java/com/kym/entity/admin/StationStatDay.java

@@ -1,94 +0,0 @@
-package com.kym.entity.admin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 站点统计表-日
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@Getter
-@Setter
-@TableName("t_station_stat_day")
-@Accessors(chain = true)
-public class StationStatDay extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 统计时间
-     */
-    private String statDay;
-
-    /**
-     * 充电人数
-     */
-    private Integer chargeUsers;
-
-    /**
-     * 充电有效订单数
-     */
-    private Integer validOrders;
-
-    /**
-     * 总电量
-     */
-    private Double totalPower;
-
-    /**
-     * 总充电费用
-     */
-    private Integer totalMoney;
-
-    /**
-     * 总电费
-     */
-    private Integer elecMoney;
-
-    /**
-     * 总服务费
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 服务费优惠金额
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 总优惠金额
-     */
-    private Integer discountAmount;
-
-    /**
-     * 订单平均充电量
-     */
-    private Double avgOrderElec;
-
-    /**
-     * 订单平均充电费用
-     */
-    private Integer avgOrderMoney;
-
-    /**
-     * 单枪平均日充电量
-     */
-    private Double avgConnectorElec;
-
-    /**
-     * 设备使用率
-     */
-    private Double connectorUsageRate;
-}

car-wash-entity/src/main/java/com/kym/entity/admin/StationStatMonth.java

@@ -1,111 +0,0 @@
-package com.kym.entity.admin;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 站点统计表-月
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@Getter
-@Setter
-@TableName("t_station_stat_month")
-@Accessors(chain = true)
-public class StationStatMonth extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点名称
-     */
-    @TableField(exist = false)
-    private String stationName;
-
-    /**
-     * 统计时间
-     */
-    private String statMonth;
-
-    /**
-     * 充电人数
-     */
-    private Integer chargeUsers;
-
-    /**
-     * 充电有效订单数
-     */
-    private Integer validOrders;
-
-    /**
-     * 总电量
-     */
-    private Double totalPower;
-
-    /**
-     * 总充电费用
-     */
-    private Integer totalMoney;
-
-    /**
-     * 总电费
-     */
-    private Integer elecMoney;
-
-    /**
-     * 总服务费
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 服务费优惠金额
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 总优惠金额
-     */
-    private Integer discountAmount;
-
-    /**
-     * 订单平均充电量
-     */
-    private Double avgOrderElec;
-
-    /**
-     * 订单平均充电费用
-     */
-    private Integer avgOrderMoney;
-
-    /**
-     * 单枪平均日充电量
-     */
-    private Double avgConnectorElec;
-
-    /**
-     * 设备使用率
-     */
-    private Double connectorUsageRate;
-
-    /**
-     * 实际抄表电量
-     */
-    private Double actualPower;
-
-    /**
-     * 实际抄表电费金额（分）
-     */
-    private Integer actualElecMoney;
-}

car-wash-entity/src/main/java/com/kym/entity/admin/vo/ActivityVo.java

@@ -5,7 +5,6 @@ import com.kym.entity.BaseEntity;
 import com.kym.entity.admin.Banner;
 import com.kym.entity.admin.Coupon;
 import com.kym.entity.admin.RechargeRights;
-import com.kym.entity.admin.Station;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -96,10 +95,6 @@ public class ActivityVo extends BaseEntity {
      */
     List<String> stationIds;
 
-    /**
-     * 站点id
-     */
-    List<Station> stationList;
 
     /**
      * 充值权益列表

car-wash-entity/src/main/java/com/kym/entity/admin/vo/LocalStationVo.java

@@ -1,172 +0,0 @@
-package com.kym.entity.admin.vo;
-
-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 com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.kym.entity.BaseEntity;
-import com.kym.entity.admin.Activity;
-import com.kym.entity.admin.EquipmentInfo;
-import com.kym.entity.enplus.EnEquipmentInfo;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 本地充电站信息
- * </p>
- *
- * @author skyline
- * @since 2023-08-12
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class LocalStationVo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 电站组id
-     */
-    private Long groupId;
-
-    /**
-     * en+充电站id
-     */
-    private String stationId;
-
-    /**
-     * en+运营商id
-     */
-    private String operatorId;
-
-    /**
-     * 设备所属运营平台组织机构代码
-     */
-    private String equipmentOwnerId;
-
-    /**
-     * 站点名称
-     */
-    private String stationName;
-
-    /**
-     * 充电中国家代码：CN
-     */
-    private String countryCode;
-
-    /**
-     * 充电站省市辖区编码
-     */
-    private String areaCode;
-
-    /**
-     * 地址
-     */
-    private String address;
-
-    /**
-     * 站点电话
-     */
-    private String stationTel;
-
-    /**
-     * 服务电话
-     */
-    private String serviceTel;
-
-    /**
-     * 站点类型：1：公共 50：个人 100：公交（专业）101：环卫（专用）102：物流（专用）103：出租车（专用）255：其他
-     */
-    private Integer stationType;
-
-    /**
-     * 站点状态：0：未知 1：建设中 5：关闭下线 6：维护中 50：正常使用
-     */
-    private Integer stationStatus;
-
-    /**
-     * 充电车位数量
-     */
-    private Integer parkingNum;
-
-    /**
-     * 充电桩位置坐标
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject location;
-    /**
-     * 站点引导
-     */
-    private String siteGuide;
-    /**
-     * 建设场所：1：居民区 2：公共机构 3：企事业单位 4：写字楼 5：工业园区 6：交通枢纽 7：大型文体设施 8：城市绿地 9：大型建筑配建停车场 10：路边停车位 11：城际高速服务区 255：其他
-     */
-    private Integer construction;
-    /**
-     * 站点照片
-     */
-    private String pictures;
-    /**
-     * 使用车型描述
-     */
-    private String matchCars;
-    /**
-     * 车位楼层及数量描述
-     */
-    private String parkInfo;
-    /**
-     * 营业时间描述
-     */
-    private String businessHours;
-    /**
-     * 充电费描述
-     */
-    private String electricityFee;
-    /**
-     * 服务费率描述
-     */
-    private String serviceFee;
-    /**
-     * 停车费
-     */
-    private String parkFee;
-    /**
-     * 支付方式：刷卡、线上、现金（电子钱包类卡为刷卡、身份鉴权卡、微信/支付宝、APP为线上）
-     */
-    private String payment;
-    /**
-     * 是否支持预约：0：不支持 1：支持
-     */
-    private Integer supportOrder;
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 充电设备信息列表
-     */
-    private List<EquipmentInfo> equipmentInfos;
-    /**
-     * 站点活动
-     */
-    private List<Activity> activityList;
-
-}

car-wash-entity/src/main/java/com/kym/entity/admin/vo/StationVo.java

@@ -1,200 +0,0 @@
-package com.kym.entity.admin.vo;
-
-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 com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.kym.entity.BaseEntity;
-import com.kym.entity.admin.Activity;
-import com.kym.entity.enplus.EnEquipmentInfo;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 充电站信息
- * </p>
- *
- * @author skyline
- * @since 2023-08-12
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class StationVo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 电站组id
-     */
-    private Long groupId;
-
-    /**
-     * en+充电站id
-     */
-    @JSONField(name = "StationID")
-    private String stationId;
-
-    /**
-     * en+运营商id
-     */
-    @JSONField(name = "OperatorID")
-    private String operatorId;
-
-    /**
-     * 设备所属运营平台组织机构代码
-     */
-    @JSONField(name = "EquipmentOwnerID")
-    private String equipmentOwnerId;
-
-    /**
-     * 站点名称
-     */
-    @JSONField(name = "StationName")
-    private String stationName;
-
-    /**
-     * 充电中国家代码：CN
-     */
-    @JSONField(name = "CountryCode")
-    private String countryCode;
-
-    /**
-     * 充电站省市辖区编码
-     */
-    @JSONField(name = "AreaCode")
-    private String areaCode;
-
-    /**
-     * 地址
-     */
-    @JSONField(name = "Address")
-    private String address;
-
-    /**
-     * 站点电话
-     */
-    @JSONField(name = "StationTel")
-    private String stationTel;
-
-    /**
-     * 服务电话
-     */
-    @JSONField(name = "ServiceTel")
-    private String serviceTel;
-
-    /**
-     * 站点类型：1：公共 50：个人 100：公交（专业）101：环卫（专用）102：物流（专用）103：出租车（专用）255：其他
-     */
-    @JSONField(name = "StationType")
-    private Integer stationType;
-
-    /**
-     * 站点状态：0：未知 1：建设中 5：关闭下线 6：维护中 50：正常使用
-     */
-    @JSONField(name = "StationStatus")
-    private Integer stationStatus;
-
-    /**
-     * 充电车位数量
-     */
-    @JSONField(name = "ParkNums")
-    private Integer parkingNum;
-
-    /**
-     * 充电桩位置坐标
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject location;
-    /**
-     * 站点引导
-     */
-    @JSONField(name = "SiteGuide")
-    private String siteGuide;
-    /**
-     * 建设场所：1：居民区 2：公共机构 3：企事业单位 4：写字楼 5：工业园区 6：交通枢纽 7：大型文体设施 8：城市绿地 9：大型建筑配建停车场 10：路边停车位 11：城际高速服务区 255：其他
-     */
-    @JSONField(name = "Construction")
-    private Integer construction;
-    /**
-     * 站点照片
-     */
-    private String pictures;
-    /**
-     * 使用车型描述
-     */
-    @JSONField(name = "MatchCars")
-    private String matchCars;
-    /**
-     * 车位楼层及数量描述
-     */
-    @JSONField(name = "ParkInfo")
-    private String parkInfo;
-    /**
-     * 营业时间描述
-     */
-    @JSONField(name = "BusineHours")
-    private String businessHours;
-    /**
-     * 充电费描述
-     */
-    @JSONField(name = "ElectricityFee")
-    private String electricityFee;
-    /**
-     * 服务费率描述
-     */
-    @JSONField(name = "ServiceFee")
-    private String serviceFee;
-    /**
-     * 停车费
-     */
-    @JSONField(name = "ParkFee")
-    private String parkFee;
-    /**
-     * 支付方式：刷卡、线上、现金（电子钱包类卡为刷卡、身份鉴权卡、微信/支付宝、APP为线上）
-     */
-    @JSONField(name = "Payment")
-    private String payment;
-    /**
-     * 是否支持预约：0：不支持 1：支持
-     */
-    @JSONField(name = "SupportOrder")
-    private Integer supportOrder;
-    /**
-     * 备注
-     */
-    @JSONField(name = "Remark")
-    private String remark;
-
-    /**
-     * 充电设备信息列表
-     */
-    @TableField(exist = false)
-    private List<EnEquipmentInfo> equipmentInfos;
-    /**
-     * 站点活动
-     */
-    @TableField(exist = false)
-    private List<Activity> activityList;
-
-    @JSONCreator
-    public StationVo(@JSONField(name = "StationLng") Double lng, @JSONField(name = "StationLat") Double lat, @JSONField(name = "EquipmentInfos") JSONArray array) {
-        this.location = JSONObject.of("stationLng", lng, "stationLat", lat);
-        this.equipmentInfos = array.toJavaList(EnEquipmentInfo.class);
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnChargeDetails.java

@@ -1,38 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author skyline
- * @description 充电明细信息体
- * @date 2023-08-03 16:32
- */
-@Data
-public class EnChargeDetails {
-    private String DetailStartTime;
-    private String DetailEndTime;
-    /**
-     * 时段电价
-     */
-    private BigDecimal ElecPrice;
-    /**
-     * 时段服务费价格
-     */
-    private BigDecimal ServicePrice;
-
-    /**
-     * 时段充电量（度）
-     */
-    private BigDecimal DetailPower;
-
-    /**
-     * 时段电费
-     */
-    private BigDecimal DetailElecMoney;
-    /**
-     * 时段服务费
-     */
-    private BigDecimal DetailServiceMoney;
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnChargeOrder.java

@@ -1,26 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author skyline
- * @description 单项订单对账信息体
- * @date 2023-08-04 10:29
- */
-@Data
-public class EnChargeOrder {
-    /**
-     * 充电订单号
-     */
-    private String StartChargeSeq;
-    /**
-     * 累积充电量
-     */
-    private BigDecimal TotalPower;
-    /**
-     * 累积总金额
-     */
-    private BigDecimal TotalMoney;
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnCheckOrderSeq.java

@@ -1,33 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author skyline
- * @description 推送订单对账信息
- * @date 2023-08-04 10:25
- */
-@Data
-public class EnCheckOrderSeq {
-
-    private String CheckOrderSeq;
-    private String StartTime;
-    private String EndTime;
-    /**
-     * 订单数量N
-     */
-    private int OrderCount;
-    /**
-     * 总电量
-     */
-    private BigDecimal TotalOrderPower;
-    /**
-     * 总金额
-     */
-    private BigDecimal TotalOrderMoney;
-    private List<EnChargeOrder> ChargeOrders;
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnConnectorInfo.java

@@ -1,73 +0,0 @@
-package com.kym.entity.enplus;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-/**
- * @author skyline
- * @description 充电设备接口信息
- * @date 2023-07-31 15:30
- */
-@Data
-public class EnConnectorInfo {
-    /**
-     * 充电设备接口编码
-     */
-    @JSONField(name = "ConnectorID")
-    private String connectorId;
-
-    /**
-     * 充电设备接口名称
-     */
-    @JSONField(name = "ConnectorName")
-    private String connectorName;
-    /**
-     * 充电设备接口类型
-     * 1：家用插座（模式2）
-     * 2：交流接口插座（模式3，连接方式B）
-     * 3：交流接口插头（带枪线，模式3，连接方式C）
-     * 4:直流接口枪头（带枪线，模式4）
-     * 5：无线充电桩
-     * 6：其他
-     */
-    @JSONField(name = "ConnectorType")
-    private int connectorType;
-
-    /**
-     * 额定电压上限（V）
-     */
-    @JSONField(name = "VoltageUpperLimits")
-    private int voltageUpperLimits;
-
-    /**
-     * 额定电压下限（V）
-     */
-    @JSONField(name = "voltageLowerLimits")
-    private int voltageLowerLimits;
-    /**
-     * 额定电流(A)
-     */
-    @JSONField(name = "Current")
-    private int current;
-
-    /**
-     * 额定功率（KW）
-     */
-    @JSONField(name = "Power")
-    private double power;
-
-    /**
-     * 停车场车位编号
-     */
-    @JSONField(name = "ParkNo")
-    private String parkNo;
-    /**
-     * 国家标准
-     * 1:2011
-     * 2:2015
-     */
-    @JSONField(name = "NationalStandard")
-    private int nationalStandard;
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnConnectorStatsInfo.java

@@ -1,28 +0,0 @@
-package com.kym.entity.enplus;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author skyline
- * @description 充电设备接口统计信息
- * @date 2023-07-31 16:15
- */
-@Data
-public class EnConnectorStatsInfo {
-
-    /**
-     * 充电设备接口编码
-     * 充电设备接口编码，同一运营商内唯一
-     */
-    @JSONField(name = "ConnectorID")
-    private String connectorId;
-    /**
-     * 充电设备接口累计电量（kWh，精度0.1）
-     */
-    @JSONField(name = "ConnectorElectricity")
-    private BigDecimal connectorElectricity;
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnConnectorStatusInfo.java

@@ -1,45 +0,0 @@
-package com.kym.entity.enplus;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-/**
- * @author skyline
- * @description
- * @date 2023-07-31 15:40
- */
-@Data
-public class EnConnectorStatusInfo {
-    /**
-     * 充电设备接口编码
-     */
-    @JSONField(name = "ConnectorID")
-    private String connectorId;
-    /**
-     * 充电设备接口状态
-     * 0：离网
-     * 1：空闲
-     * 2：占用（未充电）
-     * 3：占用（充电中）
-     * 4：占用（预约锁定）
-     * 255：故障
-     */
-    @JSONField(name = "Status")
-    private Integer status;
-    /**
-     * 车位状态
-     * 0：未知
-     * 10：空闲
-     * 50：占用
-     */
-    @JSONField(name = "ParkStatus")
-    private Integer parkStatus;
-    /**
-     * 地锁状态
-     * 0：未知
-     * 10：已解锁
-     * 50：已上锁
-     */
-    @JSONField(name = "LockStatus")
-    private Integer lockStatus;
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnEquipmentInfo.java

@@ -1,97 +0,0 @@
-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 lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description 充电设备信息
- * @date 2023-07-31 15:21
- */
-@Data
-@Accessors(chain = true)
-public class EnEquipmentInfo {
-
-    /**
-     * 设备编码
-     */
-    @JSONField(name = "EquipmentID")
-    private String equipmentId;
-
-    /**
-     * 充电桩短ID
-     */
-    private String shortId;
-
-    /**
-     * 车位编号
-     */
-    private String parkingNo;
-
-    /**
-     * 设备生产商组织机构代码
-     */
-    @JSONField(name = "ManufacturerID")
-    private String manufacturerId;
-
-    /**
-     * 设备生产商名称
-     */
-    @JSONField(name = "ManufacturerName")
-    private String manufacturerName;
-
-    /**
-     * 设备型号
-     */
-    @JSONField(name = "EquipmentModel")
-    private String equipmentModel;
-
-    /**
-     * 设备生产日期(YYYY-MM-DD)
-     */
-    @JSONField(name = "ProductionDate")
-    private String productionDate;
-
-    /**
-     * 设备类型
-     * 1：直流设备
-     * 2：交流设备
-     * 3：交直流一体设备
-     * 4：无线设备
-     * 5：其他
-     */
-    @JSONField(name = "EquipmentType")
-    private Integer equipmentType;
-
-    /**
-     * 充电设备接口信息列表
-     */
-    private List<EnConnectorInfo> connectorInfos;
-
-    /**
-     * 充电桩坐标
-     */
-    private JSONObject location;
-
-    /**
-     * 充电设备总功率
-     */
-    @JSONField(name = "Power")
-    private Double power;
-
-    @JSONCreator
-    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);
-    }
-
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnEquipmentStatsInfo.java

@@ -1,30 +0,0 @@
-package com.kym.entity.enplus;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author skyline
- * @description 充电设备统计信息
- * @date 2023-07-31 16:10
- */
-@Data
-public class EnEquipmentStatsInfo {
-    /**
-     * 设备编码
-     * 设备唯一编码，对同一运营商，保证唯一
-     */
-    @JSONField(name = "EquipmentID")
-    private String equipmentId;
-    /**
-     * 充电设别接口累计电量
-     */
-    @JSONField(name = "equipmentElectricity")
-    private Double EquipmentElectricity;
-    @JSONField(name = "ConnectorStatsInfos")
-    private List<EnConnectorStatsInfo> connectorStatsInfos;
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnNotificationChargeOrderInfo.java

@@ -1,53 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author skyline
- * @description 推送充电订单信息
- * @date 2023-08-04 10:12
- */
-@Data
-public class EnNotificationChargeOrderInfo {
-    private String StartChargeSeq;
-    private String ConnectorID;
-    private String StartTime;
-    private String EndTime;
-    /**
-     * 累积充电量
-     */
-    private BigDecimal TotalPower;
-
-    /**
-     * 总电费
-     */
-    private BigDecimal TotalElecMoney;
-    /**
-     * 总服务费
-     */
-    private BigDecimal TotalServiceMoney;
-    /**
-     * 累积总金额
-     */
-    private BigDecimal TotalMoney;
-    /**
-     * 充电结束原因
-     * 0：用户手动停止充电
-     * 1：客户归属地运营商平台停止充电
-     * 2：BMS停止充电
-     * 3：充电机设备故障
-     * 4：连接器断开
-     * 5~99：自定义
-     */
-    private int StopReason;
-    /**
-     * 时段数N 范围0~32
-     */
-    private int SumPeriod;
-    private List<EnChargeDetails> ChargeDetails;
-
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnNotificationEquipChargeStatus.java

@@ -1,74 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author skyline
- * @description 推送充电状态
- * @date 2023-08-03 16:22
- */
-@Data
-public class EnNotificationEquipChargeStatus {
-
-    private String StartChargeSeq;
-
-    /**
-     * 充电订单状态
-     * 1：启动中
-     * 2：充电中
-     * 3：停止中
-     * 4：已结束
-     * 5：未知
-     */
-    private int StartChargeSeqStat;
-
-    /**
-     * 充电设备接口状态
-     * 1：空闲
-     * 2：占用（未充电）
-     * 3：占用（充电中）
-     * 4：占用（预约锁定）
-     * 255：故障
-     */
-    private String ConnectorStatus;
-
-    private BigDecimal CurrentA;
-    private BigDecimal CurrentB;
-    private BigDecimal CurrentC;
-
-    private BigDecimal VoltageA;
-    private BigDecimal VoltageB;
-    private BigDecimal VoltageC;
-
-    private BigDecimal Soc;
-    private String StartTime;
-    private String EndTime;
-
-    /**
-     * 累积充电量
-     */
-    private BigDecimal TotalPower;
-    /**
-     * 累积电费
-     */
-    private BigDecimal ElecMoney;
-    /**
-     * 累积服务费
-     */
-    private BigDecimal ServiceMoney;
-    /**
-     * 累积总金额
-     */
-    private BigDecimal TotalMoney;
-    /**
-     * 时段数N 范围0~32
-     */
-    private int SumPeriod;
-
-    private List<EnChargeDetails> ChargeDetails;
-
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnNotificationStartChargeResult.java

@@ -1,41 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-/**
- * @author skyline
- * @description 推送停止充电结果
- * @date 2023-08-04 10:05
- */
-@Data
-public class EnNotificationStartChargeResult {
-
-    /**
-     * 充电订单号
-     */
-    private String StartChargeSeq;
-    /**
-     * 充电订单状态
-     * 1：启动中
-     * 2：充电中
-     * 3：停止中
-     * 4：已结束
-     * 5：未知
-     */
-    private int StartChargeSeqStat;
-
-    /**
-     * 充电设备接口编码
-     */
-    private String ConnectorID;
-
-    /**
-     * 充电启动时间
-     */
-    private String StartTime;
-
-    /**
-     * 启动充电时收到的验证码，用于充电桩手动停止充电
-     */
-    private String IdentCode;
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnNotificationStopChargeResult.java

@@ -1,48 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-/**
- * @author skyline
- * @description 推送停止充电结果
- * @date 2023-08-04 10:05
- */
-@Data
-public class EnNotificationStopChargeResult {
-
-    /**
-     * 充电订单号
-     */
-    private String StartChargeSeq;
-    /**
-     * 充电订单状态
-     * 1：启动中
-     * 2：充电中
-     * 3：停止中
-     * 4：已结束
-     * 5：未知
-     */
-    private int StartChargeSeqStat;
-
-    /**
-     * 充电设备接口编码
-     */
-    private String ConnectorID;
-
-    /**
-     * 成功标识
-     * 0：成功
-     * 1：失败
-     */
-    private int SuccStat;
-
-    /**
-     * 停止失败原因
-     * 0：无
-     * 1：此设备不存在
-     * 2：此设备离线
-     * 3：设备已停止充电
-     * 4~99：自定义
-     */
-    private int FailReason;
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnPolicyInfo.java

@@ -1,43 +0,0 @@
-package com.kym.entity.enplus;
-
-import com.alibaba.fastjson2.annotation.JSONCreator;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * @author skyline
- * @description 分时费率
- * @date 2023-08-15 16:11
- */
-@Data
-public class EnPolicyInfo {
-    public final static String[] PRICE_PERIOD = {"谷", "平", "峰", "尖"};
-    /**
-     * 价格时段（尖峰平谷）
-     */
-    public String pricePeriod;
-    /**
-     * 时段开始时间点
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm:ss", timezone = "GMT+8")
-    private LocalTime startTime;
-    /**
-     * 时段电费 小数点后4位
-     */
-    @JSONField(name = "ElecPrice")
-    private Double elecPrice;
-    /**
-     * 时段服务费 小数点后4位
-     */
-    @JSONField(name = "SevicePrice")
-    private Double servicePrice;
-
-    @JSONCreator
-    EnPolicyInfo(@JSONField(name = "StartTime") String startTime) {
-        this.startTime = LocalTime.parse(startTime, DateTimeFormatter.ofPattern("HHmmss"));
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnRespQueryToken.java

@@ -1,39 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-/**
- * @author skyline
- * @description query_token 返回值
- * @date 2023-07-31 11:32
- */
-@Data
-public class EnRespQueryToken {
-    /**
-     * 运营商ID
-     */
-    private String OperatorID;
-    /**
-     * 成功状态
-     * 0：成功
-     * 1：失败
-     */
-    private int SuccStat;
-    /**
-     * 全局唯一凭证
-     */
-    private String AccessToken;
-    /**
-     * 凭证有效期（秒）
-     */
-    private int TokenAvailableTime;
-    /**
-     * 失败原因:
-     * 0：无
-     * 1：无此运营商
-     * 2：密钥错误
-     * 3~99：自定义
-     */
-    private String FailReason;
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnStationInfo.java

@@ -1,151 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author skyline
- * @description 充电站信息
- * @date 2023-07-31 14:55
- */
-@Data
-public class EnStationInfo {
-
-
-    /**
-     * 充电站ID
-     */
-    private String StationID;
-    /**
-     * 运营商ID
-     */
-    private String OperatorID;
-    /**
-     * 设备所属方ID
-     */
-    private String EquipmentOwnerID;
-    /**
-     * 充电站名称
-     */
-    private String StationName;
-    /**
-     * 充电站国家代码
-     */
-    private String CountryCode;
-    /**
-     * 充电站省市辖区码
-     */
-    private String AreaCode;
-    /**
-     * 详细地址(50字符)
-     */
-    private String Address;
-    /**
-     * 站点电话
-     */
-    private String StationTel;
-    /**
-     * 服务电话
-     */
-    private String ServiceTel;
-    /**
-     * 站点类型
-     * 1：公共
-     * 50：个人
-     * 100：公交（专用）
-     * 101：环卫（专用）
-     * 102：物流（专用）
-     * 103：出租车（专用）
-     * 255：其他
-     */
-    private int StationType;
-    /**
-     * 站点状态
-     * 0：未知
-     * 1：建设中
-     * 5：关闭下线
-     * 6：维护中
-     * 50：正常使用
-     */
-    private int StationStatus;
-    /**
-     * 车位数量
-     */
-    private int ParkNums;
-    /**
-     * 经度
-     */
-    private BigDecimal StationLng;
-    /**
-     * 纬度
-     */
-    private BigDecimal StationLat;
-    /**
-     * 站点引导（100字符）
-     */
-    private String SiteGuide;
-    /**
-     * 建设场所
-     * 1：居民区
-     * 2：公共机构
-     * 3：企事业单位
-     * 4：写字楼
-     * 5：工业园区
-     * 6：交通枢纽
-     * 7：大型问题设施
-     * 8：城市绿地
-     * 9：大型建筑配建停车场
-     * 10：路边停车位
-     * 11：城际高速服务区
-     * 255：其他
-     */
-    private int Construction;
-    /**
-     * 站点照片
-     */
-    private String[] Pictures;
-    /**
-     * 使用车型描述
-     */
-    private String MatchCars;
-    /**
-     * 车位楼层及数量描述
-     */
-    private String ParkInfo;
-    /**
-     * 营业时间描述
-     */
-    private String BusineHours;
-    /**
-     * 充电电费率
-     */
-    private String ElectricityFee;
-    /**
-     * 服务费率
-     */
-    private String ServiceFee;
-    /**
-     * 停车费
-     */
-    private String ParkFee;
-    /**
-     * 支付方式
-     */
-    private String Payment;
-    /**
-     * 是否支持预约
-     * 0：不支持
-     * 1：支持
-     */
-    private int SupportOrder;
-    /**
-     * 备注
-     */
-    private String Remark;
-    /**
-     * 充电设备信息列表
-     */
-    private List<EnEquipmentInfo> EquipmentInfos;
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/EnStationStatsInfo.java

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

car-wash-entity/src/main/java/com/kym/entity/enplus/EnStationStatusInfo.java

@@ -1,33 +0,0 @@
-package com.kym.entity.enplus;
-
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.annotation.JSONCreator;
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description
- * @date 2023-07-31 16:00
- */
-@Data
-public class EnStationStatusInfo {
-    /**
-     * 充电站ID（20字符，运营商自定义的唯一编码，不足长度在前方补0）
-     */
-    @JSONField(name = "StationID")
-    private String stationId;
-
-    /**
-     * 充电设备接口状态列表
-     */
-    private List<EnConnectorStatusInfo> connectorStatusInfos;
-
-    @JSONCreator
-    public EnStationStatusInfo(@JSONField(name = "connectorStatusInfos") JSONArray infos) {
-        this.connectorStatusInfos = infos.toJavaList(EnConnectorStatusInfo.class);
-    }
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/response/EnBusinessPolicy.java

@@ -1,67 +0,0 @@
-package com.kym.entity.enplus.response;
-
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.annotation.JSONCreator;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.kym.entity.enplus.EnPolicyInfo;
-import lombok.Data;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author skyline
- * @description 设备策略信息
- * @date 2023-08-15 15:58
- */
-@Data
-public class EnBusinessPolicy {
-    /**
-     * 业务策略查询流水号
-     */
-    @JSONField(name = "EquipBizSeq")
-    private String equipBizSeq;
-    /**
-     * 充电设备接口编码
-     */
-    @JSONField(name = "ConnectorID")
-    private String connectorId;
-    /**
-     * 操作结果
-     * 0：失败
-     * 1：成功
-     */
-    @JSONField(name = "SuccStat")
-    private Integer succStat;
-    /**
-     * 失败原因
-     * 0：无
-     * 1：此充电桩业务策略不存在
-     */
-    @JSONField(name = "FailReason")
-    private Integer failReason;
-    /**
-     * 时段数N 0~32
-     */
-    @JSONField(name = "SumPeriod")
-    private Integer sumPeriod;
-    /**
-     * 单项业务策略信息
-     */
-    private List<EnPolicyInfo> policyInfos;
-
-    @JSONCreator
-    EnBusinessPolicy(@JSONField(name = "PolicyInfos") JSONArray array) {
-        this.policyInfos = array.toJavaList(EnPolicyInfo.class);
-        // 将尖峰平谷信息填入EnPolicyInfo中
-        var elecPriceSet = policyInfos.stream().map(EnPolicyInfo::getElecPrice).collect(Collectors.toSet()).stream().sorted().toList();
-        if (elecPriceSet.size() > 1) {
-            policyInfos = policyInfos.stream().peek(price -> price.setPricePeriod(EnPolicyInfo.PRICE_PERIOD[elecPriceSet.indexOf(price.getElecPrice())])).toList();
-        } else {
-            // 统一电价
-            policyInfos = policyInfos.stream().peek(price -> price.setPricePeriod("统")).toList();
-        }
-    }
-
-
-}

car-wash-entity/src/main/java/com/kym/entity/enplus/response/EnResponse.java

@@ -1,32 +0,0 @@
-package com.kym.entity.enplus.response;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author skyline
- * @description en+接口返回数据
- * @date 2023-07-31 11:59
- */
-@Data
-@NoArgsConstructor
-public class EnResponse {
-    @JsonProperty("Ret")
-    private int Ret;
-    @JsonProperty("Msg")
-    private String Msg;
-    @JsonProperty("Data")
-    private String Data;
-    @JsonProperty("Sig")
-    private String Sig;
-
-
-    public EnResponse(String data) {
-        this.Ret = 0;
-        this.Msg = "";
-        this.Data = data;
-        this.Sig = "";
-    }
-
-}

car-wash-entity/src/main/java/com/kym/entity/miniapp/ChargeOrder.java

@@ -1,170 +0,0 @@
-package com.kym.entity.miniapp;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 充电订单表
- * </p>
- *
- * @author skyline
- * @since 2023-08-08
- */
-@Getter
-@Setter
-@TableName("t_charge_order")
-@Accessors(chain = true)
-public class ChargeOrder extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    public static int ORDER_STATUS_未知 = 0;
-    public static int ORDER_STATUS_成功 = 1;
-    public static int ORDER_STATUS_失败 = 2;
-    public static int ORDER_STATUS_取消 = 3;
-
-
-    public static int CHARGE_STATUS_预约中 = 0;
-    public static int CHARGE_STATUS_启动中 = 1;
-    public static int CHARGE_STATUS_充电中 = 2;
-    public static int CHARGE_STATUS_停止中 = 3;
-    public static int CHARGE_STATUS_已结束 = 4;
-    public static int CHARGE_STATUS_已取消 = 5;
-
-
-    public static int INVOICE_STATUS_待开票 = 0;
-    public static int INVOICE_STATUS_已开票 = 1;
-    public static int INVOICE_STATUS_已作废 = 2;
-    public static int INVOICE_STATUS_开票中 = 3;
-
-
-    public static int IS_BOOKING_否 = 0;
-    public static int IS_BOOKING_是 = 1;
-
-    // 充电停止原因：0：用户手动停止，1：运营平台停止，2：BMS停止，3：充电机器设备故障，4：连接器断开
-    public static int STOP_REASON_用户手动停止 = 0;
-    public static int STOP_REASON_运营平台停止 = 1;
-    public static int STOP_REASON_BMS停止 = 2;
-    public static int STOP_REASON_充电机器设备故障 = 3;
-    public static int STOP_REASON_连接器断开 = 4;
-    public static int STOP_REASON_预约启动充电失败 = 5;
-
-    private Long userId;
-
-    private String stationId;
-
-    /**
-     * 充电订单号（EN+）
-     */
-    private String startChargeSeq;
-
-    /**
-     * 充电设备接口编码（EN+）
-     */
-    private String connectorId;
-
-    /**
-     * 是否为预约订单：0-否 1-是
-     */
-    private Integer isBooking;
-
-    /**
-     * 充电开始时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime startTime;
-
-    /**
-     * 充电结束时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime endTime;
-
-    /**
-     * 电池剩余电量
-     */
-    private Double soc;
-
-    /**
-     * 累积充电量（度）
-     */
-    private Double totalPower;
-
-    /**
-     * 累积总金额（元）
-     */
-    private Integer totalMoney;
-
-    /**
-     * 累积电费（元）
-     */
-    private Integer elecMoney;
-
-    /**
-     * 累积服务费（元）
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 实付金额（分）
-     */
-    private Integer payAmount;
-
-    /**
-     * 优惠方式：RechargeRights-充值权益 Coupon-优惠券
-     */
-    private String discountType;
-
-    /**
-     * 优惠金额（分）
-     */
-    private Integer discountAmount;
-
-    /**
-     * 服务费优惠抵扣金额（分）
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 时段数：0~32
-     */
-    private Integer sumPeriod;
-
-    /**
-     * 充电明细信息
-     */
-    private String chargeDetail;
-
-    /**
-     * 订单状态：0：未知，1：成功，2：失败
-     */
-    private Integer orderStatus;
-
-    /**
-     * 充电状态：1：启动中 2：充电中 3：停止中 4：已结束 5：未知
-     */
-    private Integer chargeStatus;
-
-    /**
-     * 充电停止原因：0：用户手动停止，1：运营平台停止，2：BMS停止，3：充电机器设备故障，4：连接器断开
-     */
-    private Integer stopReason;
-
-    /**
-     * 发票状态：0：未开票 1：已开票
-     */
-    private Integer invoiceStatus;
-
-    /**
-     * 发票id
-     */
-    private Integer invoiceId;
-}

car-wash-entity/src/main/java/com/kym/entity/miniapp/Invoice.java

@@ -1,135 +0,0 @@
-package com.kym.entity.miniapp;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import com.kym.entity.typehandle.InvoiceOrderDetailListTypeHandle;
-import com.kym.entity.wechat.InvoiceOrderDetail;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * <p>
- * 发票记录表
- * </p>
- *
- * @author skyline
- * @since 2023-09-15
- */
-@Setter
-@Getter
-@NoArgsConstructor
-@TableName(schema = "car_wash", value = "t_invoice", autoResultMap = true)
-@Accessors(chain = true)
-public class Invoice extends BaseEntity {
-    public static final String TYPE_个人 = "INDIVIDUAL";
-    public static final String TYPE_企业 = "ORGANIZATION";
-
-    public static final int STATUS_待开票 = 0;
-    public static final int STATUS_已开票 = 1;
-    public static final int STATUS_已作废 = 2;
-    public static final int STATUS_开票中 = 3;
-
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 微信发票申请id
-     */
-    private String applyId;
-
-    private Long userId;
-
-    /**
-     * 发票抬头填写人的openid
-     */
-    private String openid;
-
-    /**
-     * 发票关联订单详情
-     */
-    @TableField(typeHandler = InvoiceOrderDetailListTypeHandle.class)
-    private List<InvoiceOrderDetail> orderDetails;
-
-    /**
-     * 累积充电量（度）
-     */
-    private Double totalPower;
-    /**
-     * 累积总金额（分）
-     */
-    private Integer totalMoney;
-    /**
-     * 累积电费（分）
-     */
-    private Integer elecMoney;
-    /**
-     * 累积服务费（分）
-     */
-    private Integer serviceMoney;
-    /**
-     * 服务费优惠金额（分）
-     */
-    private Integer serviceMoneyDiscount;
-    /**
-     * 接收发票邮箱
-     */
-    private String email;
-    /**
-     * 电话
-     */
-    private String phone;
-    /**
-     * 发票类型:INDIVIDUAL-个人 ORGANIZATION-企业
-     */
-    private String invoiceType;
-    /**
-     * 发票抬头
-     */
-    private String invoiceTitle;
-    /**
-     * 公司税号
-     */
-    private String taxId;
-    /**
-     * 公司地址
-     */
-    private String address;
-    /**
-     * 购买方电话
-     */
-    private String telephone;
-    /**
-     * 开户银行
-     */
-    private String bankName;
-    /**
-     * 银行账户
-     */
-    private String bankAccount;
-    /**
-     * 发票金额（单位：分）
-     */
-    private Integer invoiceAmount;
-    /**
-     * 税额详情信息
-     */
-    private String taxInfo;
-    /**
-     * 开票人
-     */
-    private String biller;
-    /**
-     * 发票状态
-     */
-    private Integer status;
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

car-wash-entity/src/main/java/com/kym/entity/miniapp/InvoiceTitle.java

@@ -1,77 +0,0 @@
-package com.kym.entity.miniapp;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import java.io.Serializable;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 发票记录表
- * </p>
- *
- * @author skyline
- * @since 2023-10-13
- */
-@Getter
-@Setter
-@TableName("t_invoice_title")
-@Accessors(chain = true)
-public class InvoiceTitle extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long userId;
-
-    /**
-     * 接收发票邮箱
-     */
-    private String email;
-
-    /**
-     * 电话
-     */
-    private String phone;
-
-    /**
-     * 发票类型:INDIVIDUAL-个人 ORGANIZATION-企业
-     */
-    private String invoiceType;
-
-    /**
-     * 发票抬头名称
-     */
-    private String invoiceTitle;
-
-    /**
-     * 公司税号
-     */
-    private String taxId;
-
-    /**
-     * 公司地址
-     */
-    private String address;
-
-    /**
-     * 购买方电话
-     */
-    private String telephone;
-
-    /**
-     * 开户银行
-     */
-    private String bankName;
-
-    /**
-     * 银行账户
-     */
-    private String bankAccount;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

car-wash-entity/src/main/java/com/kym/entity/miniapp/WashOrder.java

@@ -55,6 +55,11 @@ public class WashOrder extends BaseEntity {
      */
     private String deviceName;
 
+    /**
+     * 设备编号
+     */
+    private String shortId;
+
     /**
      * 开机方式：button维护按钮，network网络命令，coin投币，card刷卡
      */

car-wash-entity/src/main/java/com/kym/entity/miniapp/other/DiscountCompute.java

@@ -1,7 +1,7 @@
 package com.kym.entity.miniapp.other;
 
 import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.ChargeOrder;
+import com.kym.entity.miniapp.WashOrder;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -13,13 +13,13 @@ import java.time.LocalDateTime;
  */
 @Data
 public class DiscountCompute {
-    public ChargeOrder chargeOrder;
+    public WashOrder washOrder;
     public Account account;
     public LocalDateTime endTime;
     public int discountAmount;
 
-    public DiscountCompute(ChargeOrder chargeOrder, Account account, LocalDateTime endTime) {
-        this.chargeOrder = chargeOrder;
+    public DiscountCompute(WashOrder washOrder, Account account, LocalDateTime endTime) {
+        this.washOrder = washOrder;
         this.account = account;
         this.endTime = endTime;
     }

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/WashOrderQueryParams.java

@@ -10,8 +10,11 @@ import lombok.Data;
  */
 @Data
 public class WashOrderQueryParams extends PageParams {
+    private String userId;
+    private String mobilePhone;
     private String orderId;
     private String stationId;
     private String shortId;
-    private String userId;
+    private Integer payStatus;
+    private Integer orderStatus;
 }

car-wash-entity/src/main/java/com/kym/entity/miniapp/vo/InvoiceVo.java

@@ -1,142 +0,0 @@
-package com.kym.entity.miniapp.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.kym.entity.BaseEntity;
-import com.kym.entity.wechat.InvoiceOrderDetail;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 发票
- *
- * @author skyline
- * @since 2023-09-15
- */
-@Setter
-@Getter
-@NoArgsConstructor
-@Accessors(chain = true)
-public class InvoiceVo extends BaseEntity {
-    public static final String TYPE_个人 = "INDIVIDUAL";
-    public static final String TYPE_企业 = "ORGANIZATION";
-
-    public static final int STATUS_待开票 = 0;
-    public static final int STATUS_已开票 = 1;
-    public static final int STATUS_已作废 = 2;
-    public static final int STATUS_开票中 = 3;
-
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 微信发票申请id
-     */
-    private String applyId;
-
-    private Long userId;
-
-    /**
-     * 用户手机号
-     */
-    private String mobilePhone;
-
-    /**
-     * 发票抬头填写人的openid
-     */
-    private String openid;
-
-    /**
-     * 发票关联订单详情
-     */
-    private List<InvoiceOrderDetail> orderDetails;
-
-    /**
-     * 累积充电量（度）
-     */
-    private Double totalPower;
-    /**
-     * 累积总金额（分）
-     */
-    private Integer totalMoney;
-    /**
-     * 累积电费（分）
-     */
-    private Integer elecMoney;
-    /**
-     * 累积服务费（分）
-     */
-    private Integer serviceMoney;
-    /**
-     * 服务费优惠金额（分）
-     */
-    private Integer serviceMoneyDiscount;
-    /**
-     * 接收发票邮箱
-     */
-    private String email;
-    /**
-     * 电话
-     */
-    private String phone;
-    /**
-     * 发票类型:INDIVIDUAL-个人 ORGANIZATION-企业
-     */
-    private String invoiceType;
-    /**
-     * 发票抬头
-     */
-    private String invoiceTitle;
-    /**
-     * 公司税号
-     */
-    private String taxId;
-    /**
-     * 公司地址
-     */
-    private String address;
-
-    /**
-     * 购买方电话
-     */
-    private String telephone;
-    /**
-     * 开户银行
-     */
-    private String bankName;
-    /**
-     * 银行账户
-     */
-    private String bankAccount;
-    /**
-     * 发票金额（单位：分）
-     */
-    private Integer invoiceAmount;
-    /**
-     * 税额详情信息
-     */
-    private String taxInfo;
-    /**
-     * 开票人
-     */
-    private String biller;
-
-    /**
-     * 开票时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime fapiaoTime;
-    /**
-     * 发票状态
-     */
-    private Integer status;
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

car-wash-entity/src/main/java/com/kym/entity/miniapp/vo/WashDeviceVo.java

@@ -30,19 +30,14 @@ public class WashDeviceVo extends BaseEntity {
     private String stationId;
 
     /**
-     * 站点编号
-     */
-    private String shortId;
-
-    /**
-     * 产品key
+     * 站点名称
      */
-    private String productKey;
+    private String stationName;
 
     /**
-     * 设备名称
+     * 站点编号
      */
-    private String deviceName;
+    private String shortId;
 
     /**
      * 功能
@@ -64,4 +59,24 @@ public class WashDeviceVo extends BaseEntity {
      */
     private String fsmState;
 
+    /**
+     * 本次上电以来的时间戳
+     */
+    private String uptimeMs;
+
+    /**
+     * 是否有水：-1不支持或未开启，0无水，1有水
+     */
+    private Boolean hasWater;
+
+    /**
+     * 是否有泡沫：-1不支持或未开启，0无泡沫，1有泡沫
+     */
+    private Boolean hasFoam;
+
+    /**
+     * 板载温度传感器的温度值
+     */
+    private Integer temperatureChip;
+
 }

car-wash-entity/src/main/java/com/kym/entity/miniapp/vo/WashOrderVo.java

@@ -20,8 +20,12 @@ public class WashOrderVo extends BaseEntity {
 
     private Long userId;
 
+    private String mobilePhone;
+
     private String stationId;
 
+    private String stationName;
+
     /**
      * 产品key
      */
@@ -32,6 +36,15 @@ public class WashOrderVo extends BaseEntity {
      */
     private String deviceName;
 
+    /**
+     * 设备编号
+     */
+    private String shortId;
+
+    /**
+     * 关机方式：button维护按钮，network网络命令，no_balance超过预设金额，idle_timeout设备空闲超时，operation_timeout操作超时，card刷卡。注意:为空表示还没有关机，正在使用
+     */
+    private String closeType;
 
     /**
      * 订单号，和开机命令的order_id相同，如果使用按钮快速开机，order_id是空字符串

car-wash-entity/src/main/java/com/kym/entity/typehandle/InvoiceDetailBuyerInformationTypeHandle.java

@@ -1,28 +0,0 @@
-package com.kym.entity.typehandle;
-
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.kym.entity.wechat.FaPiao;
-
-import java.io.IOException;
-
-/**
- * @author skyline
- * @description 发票中购买方信息序列化处理
- * https://github.com/baomidou/mybatis-plus-samples/blob/master/mybatis-plus-sample-typehandler/src/main/java/com/baomidou/mybatisplus/samples/typehandler/WalletListTypeHandler.java
- */
-public class InvoiceDetailBuyerInformationTypeHandle extends JacksonTypeHandler {
-    public InvoiceDetailBuyerInformationTypeHandle(Class<?> type) {
-        super(type);
-    }
-
-    @Override
-    public Object parse(String json) {
-        try {
-            return getObjectMapper().readValue(json, new TypeReference<FaPiao.BuyerInformation>() {
-            });
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/typehandle/InvoiceDetailItemsTypeHandle.java

@@ -1,30 +0,0 @@
-package com.kym.entity.typehandle;
-
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.kym.entity.wechat.FaPiao;
-import com.kym.entity.wechat.FapiaoApplications;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author skyline
- * @description 发票中发票行
- * https://github.com/baomidou/mybatis-plus-samples/blob/master/mybatis-plus-sample-typehandler/src/main/java/com/baomidou/mybatisplus/samples/typehandler/WalletListTypeHandler.java
- */
-public class InvoiceDetailItemsTypeHandle extends JacksonTypeHandler {
-    public InvoiceDetailItemsTypeHandle(Class<?> type) {
-        super(type);
-    }
-
-    @Override
-    public Object parse(String json) {
-        try {
-            return getObjectMapper().readValue(json, new TypeReference<List<FapiaoApplications.FapiaoItem>>() {
-            });
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/typehandle/InvoiceDetailSellerInformationTypeHandle.java

@@ -1,28 +0,0 @@
-package com.kym.entity.typehandle;
-
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.kym.entity.wechat.InvoiceBaseInfo;
-
-import java.io.IOException;
-
-/**
- * @author skyline
- * @description 发票中购买方信息序列化处理
- * https://github.com/baomidou/mybatis-plus-samples/blob/master/mybatis-plus-sample-typehandler/src/main/java/com/baomidou/mybatisplus/samples/typehandler/WalletListTypeHandler.java
- */
-public class InvoiceDetailSellerInformationTypeHandle extends JacksonTypeHandler {
-    public InvoiceDetailSellerInformationTypeHandle(Class<?> type) {
-        super(type);
-    }
-
-    @Override
-    public Object parse(String json) {
-        try {
-            return getObjectMapper().readValue(json, new TypeReference<InvoiceBaseInfo.SellerInfo>() {
-            });
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/typehandle/InvoiceOrderDetailListTypeHandle.java

@@ -1,30 +0,0 @@
-package com.kym.entity.typehandle;
-
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.kym.entity.wechat.InvoiceOrderDetail;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author skyline
- * @description 发票中订单详情序列化处理
- * https://github.com/baomidou/mybatis-plus-samples/blob/master/mybatis-plus-sample-typehandler/src/main/java/com/baomidou/mybatisplus/samples/typehandler/WalletListTypeHandler.java
- * @date 2023-10-31 16:34
- */
-public class InvoiceOrderDetailListTypeHandle extends JacksonTypeHandler {
-    public InvoiceOrderDetailListTypeHandle(Class<?> type) {
-        super(type);
-    }
-
-    @Override
-    public Object parse(String json) {
-        try {
-            return getObjectMapper().readValue(json, new TypeReference<List<InvoiceOrderDetail>>() {
-            });
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/typehandle/WashOrderDetailTypeHandle.java

@@ -3,7 +3,6 @@ package com.kym.entity.typehandle;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.kym.entity.awoara.Detail;
-import com.kym.entity.wechat.FaPiao;
 
 import java.io.IOException;
 import java.util.List;

car-wash-entity/src/main/java/com/kym/entity/wechat/FaPiao.java

@@ -1,162 +0,0 @@
-package com.kym.entity.wechat;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description 微信区块链电子发票
- * @date 2023-09-16 14:14
- */
-@Data
-@Accessors(chain = true)
-public class FaPiao {
-
-    /**
-     * 微信支付分配的子商户号，服务商模式下必传
-     * 选填
-     */
-    private String sub_mchid;
-
-    /**
-     * 开票场景
-     * 可选取值：
-     * WITH_WECHATPAY: 微信支付场景
-     * WITHOUT_WECHATPAY: 非微信支付场景
-     */
-    private String scene;
-
-    /**
-     * 发票申请单号，唯一标识一次开票行为。当开票场景为WITHOUT_WECHATPAY时，
-     * 为调用【获取抬头填写链接】接口时指定的发票申请单号；当开票场景为WITH_WECHATPAY时，
-     * 为与本次开票关联的微信支付订单号，且必须是属于相应商户的订单（服务商模式下该订单必须属于子商户；
-     * 直连模式下该订单必须属于直连商户）
-     */
-    private String fapiao_apply_id;
-
-    /**
-     * 购买方信息，即发票抬头。若商户使用微信官方抬头，可从【获取用户填写的抬头】接口获取用户填写的抬头；也可自行收集发票抬头
-     */
-    private BuyerInformation buyer_information;
-
-    /**
-     * 需要开具的发票信息。注意：同一个开票申请单最多申请5张发票
-     */
-    private List<FaPiaoInfomation> fapiao_information;
-
-
-    /**
-     * 购买方信息，即发票抬头。若商户使用微信官方抬头，可从【获取用户填写的抬头】接口获取用户填写的抬头；也可自行收集发票抬头
-     */
-    @Data
-    @Accessors(chain = true)
-    public static class BuyerInformation {
-        /**
-         * INDIVIDUAL: 个人
-         * ORGANIZATION: 单位
-         * 必填
-         */
-        private String type;
-
-        /**
-         * 购买方名称(256)
-         * 必填
-         */
-        private String name;
-
-        /**
-         * 购买方纳税人识别号，购买方类型为ORGANIZATION时必须存在(32)
-         */
-        private String taxpayer_id;
-
-        /**
-         * 购买方地址(128)
-         */
-        private String address;
-
-        /**
-         * 购买方电话(32)
-         */
-        private String telephone;
-
-        /**
-         * 购买方开户银行(32)
-         */
-        private String bank_name;
-
-        /**
-         * 购买方银行账号(32)
-         */
-        private String bank_account;
-
-        /**
-         * 用户手机号。注意：该字段为密文字段，加解密算法请参见《微信支付V3版规范》
-         */
-        private String phone;
-
-        /**
-         * 用户邮箱地址。注意：该字段为密文字段，加解密算法请参见《微信支付V3版规范》
-         */
-        private String email;
-    }
-
-
-    @Data
-    @Accessors(chain = true)
-    public static class FaPiaoInfomation {
-
-        /**
-         * 商户发票单号，唯一标识一张要开具的发票。只能是字母、数字、中划线-、下划线_、竖线|、星号*
-         * 这些英文半角字符，且该单号在每个商户下必须唯一
-         */
-        private String fapiao_id;
-
-        /**
-         * 总价税合计，所有发票行单行金额合计的累加，展示在发票的价税合计处，单位：分
-         * 注意：若是微信支付后开票，所有发票的总价税合计之和不能超过对应的微信支付单总金额；
-         * 若是非微信支付开票，所有发票的总价税合计之和不能超过【获取抬头填写链接】接口中指定的总金额
-         */
-        private int total_amount;
-
-        /**
-         * 发票行信息，单张发票的发票行不能超过8行
-         */
-        private List<IssueItem> items;
-
-        @Data
-        @Accessors(chain = true)
-        public static class IssueItem {
-
-            /**
-             * 【税局侧规定的货物或应税劳务、服务税收分类编码】
-             * 税局侧规定的货物或应税劳务、服务税收分类编码。
-             * 可自行指定符合税务部门规定的货物或应税劳务、服务编码；
-             * 若使用在电子发票商户平台配置的商品类型，需要从接口【获取商户可开具的商品和服务税收分类编码对照表】获得商户已配置的编码；
-             * 若该行为折扣行，必须与被折扣行的编码相同。
-             */
-            private String tax_code;
-
-            /**
-             * 数量，展示在发票中间的数量列，单位为10^-8^，100000000表示数量为1。
-             * 若是折扣行或者没有数量概念，则默认为100000000
-             */
-            private int quantity = 100000000;
-
-            /**
-             * 单行金额和税费的和，折扣行的金额为负数，非折扣行的金额为正数，单位:分
-             */
-            private int total_amount;
-
-            /**
-             * 指定该发票行是否折扣行，折扣行必须是被折扣行的下一行
-             */
-            private boolean discount = false;
-
-        }
-
-    }
-
-
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/FapiaoApplications.java

@@ -1,169 +0,0 @@
-package com.kym.entity.wechat;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description 查询电子发票
- * @date 2023-10-07 16:02
- */
-@Data
-public class FapiaoApplications {
-    private int total_count;
-    private List<FapiaoEntity> fapiao_information;
-
-    @Data
-    public static class FapiaoEntity {
-        private String fapiao_id;
-        /**
-         * ISSUE_ACCEPTED: 开票申请已受理
-         * ISSUED: 发票已开具
-         * REVERSE_ACCEPTED: 冲红申请已受理
-         * REVERSED: 发票已冲红
-         */
-        private String status;
-
-        /**
-         * 蓝字发票信息，当发票状态不为ISSUE_ACCEPTED时存在
-         */
-        private FapiaoInfo blue_fapiao;
-        /**
-         * 红字发票信息，当发票状态为REVERSED时存在
-         */
-        private FapiaoInfo red_fapiao;
-
-        /**
-         * 电子发票卡券信息
-         */
-        private CardInfo card_information;
-
-        /**
-         * 总价税合计，所有发票行单行金额合计的累加，单位：分
-         */
-        private int total_amount;
-        /**
-         * 总税额，所有发票行单行税额的累加，单位：分
-         */
-        private int tax_amount;
-        /**
-         * 总金额，所有发票行单行金额的累加，单位：分
-         */
-        private int amount;
-        /**
-         * 销售方信息
-         */
-        private InvoiceBaseInfo.SellerInfo seller_information;
-        /**
-         * 购买方信息
-         */
-        private FaPiao.BuyerInformation buyer_information;
-        /**
-         * 附加信息
-         */
-        private InvoiceBaseInfo.ExtraInfo extra_information;
-
-        /**
-         * 发票行信息
-         */
-        private List<FapiaoItem> items;
-        /**
-         * 备注
-         */
-        private String remark;
-    }
-
-    @Data
-    public static class FapiaoInfo {
-        /**
-         * 发票代码
-         */
-        private String fapiao_code;
-        /**
-         * 发票号码
-         */
-        private String fapiao_number;
-        /**
-         * 校验码
-         */
-        private String check_code;
-        /**
-         * 发票票面密码区内容
-         */
-        private String password;
-        /**
-         * 开票时间，遵循RFC3339标准格式
-         * 2020-07-01T12:00:00+08:00
-         */
-        private String fapiao_time;
-    }
-
-    @Data
-    public static class CardInfo {
-        private String card_appid;
-        private String card_openid;
-        private String card_id;
-        private String card_code;
-        /**
-         * INSERT_ACCEPTED: 插卡申请已受理
-         * INSERTED: 已插入用户卡包
-         * DISCARD_ACCEPTED: 作废申请已受理
-         * DISCARDED: 发票卡券已作废
-         */
-        private String card_status;
-    }
-
-    @Data
-    public static class FapiaoItem {
-        /**
-         * 税局侧规定的货物或应税劳务、服务税收分类编码
-         */
-        private String tax_code;
-        /**
-         * 由商户自定义的货物或应税劳务、服务名称
-         */
-        private String goods_name;
-        /**
-         * 规格型号
-         */
-        private String specification;
-        /**
-         * 单位
-         */
-        private String unit;
-        /**
-         * 数量，单位为10^-8^，100000000表示数量为1
-         */
-        private int quantity;
-        /**
-         * 单价，单位为10^-6^分，100000000表示1元
-         */
-        private long unit_price;
-        /**
-         * 单行金额，单位：分
-         */
-        private int amount;
-        /**
-         * 单行金额和税费的和，单位:分
-         */
-        private int tax_amount;
-        /**
-         * 税率，单位为万分之一，如1300代表13%
-         */
-        private int tax_rate;
-        /**
-         * 税收优惠政策标识可选取值：
-         * NO_FAVORABLE: 无优惠
-         * OUTSIDE_VAT: 不征税
-         * VAT_EXEMPT: 免税
-         * NORMAL_ZERO_RATED: 普通零税率
-         * EXPORT_ZERO_RATED: 出口零税率
-         */
-        private String tax_prefer_mark;
-        /**
-         * 指定该发票行是否折扣行，折扣行一定是被折扣行的下一行
-         */
-        private boolean discount = false;
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/FapiaoDownload.java

@@ -1,24 +0,0 @@
-package com.kym.entity.wechat;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description 发票下载
- * @date 2023-10-07 15:42
- */
-@Data
-public class FapiaoDownload {
-
-    private List<FapiaoDownloadInfo> fapiao_download_info_list;
-
-    @Data
-    public class FapiaoDownloadInfo {
-        private String fapiao_id;
-        private String download_url;
-        private String status;
-    }
-
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/InvoiceBaseInfo.java

@@ -1,74 +0,0 @@
-package com.kym.entity.wechat;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @author skyline
- * @description
- * @date 2023-09-17 01:38
- */
-@Data
-@Accessors(chain = true)
-public class InvoiceBaseInfo {
-
-    /**
-     *  商户配置的销售方信息，展示在电子发票的销售方中
-     */
-    private SellerInfo seller_information;
-
-    @Data
-    @Accessors(chain = true)
-    public static class SellerInfo{
-
-        /**
-         * 销售方名称
-         */
-        private String name;
-
-        /**
-         * 销售方纳税人识别号
-         */
-        private String taxpayer_id;
-
-        /**
-         * 销售方地址
-         */
-        private String address;
-
-        /**
-         * 销售方电话
-         */
-        private String telephone;
-
-        /**
-         * 销售方开户银行
-         */
-        private String bank_name;
-
-    }
-
-    /**
-     * 商户配置的开票附加信息，展示在电子发票下方
-     */
-    private ExtraInfo extra_information;
-
-    @Data
-    @Accessors(chain = true)
-    public static class ExtraInfo{
-
-        /**
-         * 收款人
-         */
-        private String payee;
-        /**
-         * 复核人
-         */
-        private String reviewer;
-        /**
-         * 开票人
-         */
-        private String drawer;
-    }
-
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/InvoiceNotification.java

@@ -1,77 +0,0 @@
-package com.kym.entity.wechat;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description 微信发票回调通知
- * @date 2023-09-17 11:30
- */
-@Data
-public class InvoiceNotification {
-
-    /**
-     * 微信支付分配的商户号
-     */
-    @SerializedName("mchid")
-    private String mchid;
-
-    /**
-     * 开票时指定的发票申请单号
-     */
-    @SerializedName("fapiao_apply_id")
-    private String fapiaoApplyId;
-
-    @SerializedName("fapiao_information")
-    private List<FapiaoInformation> fapiaoInformation;
-
-
-    /**
-     * 发票状态
-     */
-    public enum FapiaoStatus {
-        ISSUE_ACCEPTED, ISSUED, REVERSE_ACCEPTED, REVERSED
-    }
-
-
-    /**
-     * 发票状态-卡包状态
-     */
-    public enum CardStatus {
-        INSERT_ACCEPTED, INSERTED, DISCARD_ACCEPTED, DISCARDED
-    }
-
-    @Data
-    public class FapiaoInformation {
-
-        /**
-         * 商户发票单号，唯一标识一张发票
-         */
-        @SerializedName("fapiao_id")
-        private String fapiaoId;
-
-        /**
-         * 发票状态，枚举值：
-         * ISSUE_ACCEPTED：开票请求已受理
-         * ISSUED：发票已开具
-         * REVERSE_ACCEPTED：冲红申请已受理
-         * REVERSED：发票已冲红
-         */
-        @SerializedName("fapiao_status")
-        private String fapiaoStatus;
-
-        /**
-         * 发票状态，枚举值：
-         * INSERT_ACCEPTED：已插入用户卡包
-         * INSERTED：插卡已受理
-         * DISCARD_ACCEPTED：作废申请已受理
-         * DISCARDED：发票卡券已作废
-         */
-        @SerializedName("card_status")
-        private String cardStatus;
-
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/InvoiceOrderDetail.java

@@ -1,20 +0,0 @@
-package com.kym.entity.wechat;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @author skyline
- * @description 用于发票的订单详情
- * @date 2023-09-23 21:27
- */
-@Data
-@Accessors(chain = true)
-public class InvoiceOrderDetail {
-    private String startChargeSeq;
-    private double totalPower;
-    private int totalMoney;
-    private int elecMoney;
-    private int serviceMoney;
-    private int serviceMoneyDiscount;
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/TaxCodes.java

@@ -1,77 +0,0 @@
-package com.kym.entity.wechat;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description 商品及税收分类编码
- * @date 2023-09-16 23:22
- */
-@Data
-@Accessors(chain = true)
-public class TaxCodes {
-
-    /**
-     * 本次查询的起始位置
-     */
-    private int offset;
-
-    /**
-     * 本次查询的最大数量
-     */
-    private int limit;
-
-    /**
-     * 本次查询到的商品及税收分类编码对照表
-     */
-    private List<TaxCodeItem> data;
-
-    /**
-     * 总记录数
-     */
-    private int total_count;
-
-
-    public class TaxCodeItem {
-        /**
-         * 由商户自定义的货物或应税劳务、服务名称
-         */
-        private String goods_name;
-
-        /**
-         * 企业侧维护的货物或应税劳务、服务编码。
-         * 若使用在电子发票商户平台配置的商品类型进行开票时，需要传该编号
-         */
-        private int goods_id;
-
-        /**
-         * 税局侧规定的货物或应税劳务、服务分类名称
-         */
-        private String goods_category;
-
-        /**
-         * 税局侧规定的货物或应税劳务、服务税收分类编码
-         */
-        private String tax_code;
-
-        /**
-         * 税率，单位为万分之一，如1300代表13%
-         */
-        private int tax_rate;
-
-        /**
-         * 税收优惠政策标识
-         * 可选取值：
-         * NO_FAVORABLE: 无优惠
-         * OUTSIDE_VAT: 不征税
-         * VAT_EXEMPT: 免税
-         * NORMAL_ZERO_RATED: 普通零税率
-         * EXPORT_ZERO_RATED: 出口零税率
-         */
-        private String tax_prefer_mark;
-
-    }
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/TitleUrl.java

@@ -1,33 +0,0 @@
-package com.kym.entity.wechat;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @author skyline
- * @description 发票抬头填写链接
- * @date 2023-10-12 20:19
- */
-@Data
-@Accessors(chain = true)
-public class TitleUrl {
-    /**
-     * 小程序appid
-     */
-    @SerializedName("miniprogram_appid")
-    private String miniprogramAppid;
-
-    /**
-     * 小程序appid
-     */
-    @SerializedName("miniprogram_path")
-    private String miniprogramPath;
-
-    /**
-     * 抬头填写小程序的用户名，即小程序的原始id，当开票来源为WEB时存在
-     */
-    @SerializedName("miniprogram_user_name")
-    private String miniprogramUsername;
-
-}

car-wash-entity/src/main/java/com/kym/entity/wechat/TitleWriteNotification.java

@@ -1,34 +0,0 @@
-package com.kym.entity.wechat;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author skyline
- * @description 发票抬头填写完成回调通知
- * @date 2023-09-17 11:30
- */
-@Data
-public class TitleWriteNotification {
-
-    /**
-     * 微信支付分配的商户号
-     */
-    @SerializedName("mchid")
-    private String mchid;
-
-    /**
-     * 开票时指定的发票申请单号
-     */
-    @SerializedName("fapiao_apply_id")
-    private String fapiaoApplyId;
-
-    /**
-     * 用户完成发票抬头填写的时间
-     */
-    @SerializedName("apply_time")
-    private String applyTime;
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/admin/ConnectorInfoMapper.java

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

car-wash-mapper/src/main/java/com/kym/mapper/admin/EquipmentInfoMapper.java

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

car-wash-mapper/src/main/java/com/kym/mapper/admin/EquipmentRelationMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.admin.EquipmentRelation;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-07
- */
-public interface EquipmentRelationMapper extends MPJBaseMapper<EquipmentRelation> {
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/admin/InvoiceDetailMapper.java

@@ -1,17 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.admin.InvoiceDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 发票详情表 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2024-03-19
- */
-public interface InvoiceDetailMapper extends MPJBaseMapper<InvoiceDetail> {
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/admin/StationMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.Station;
-import com.kym.mapper.mybatisplus.MyBaseMapper;
-
-/**
- * <p>
- * 充电站信息 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-12
- */
-public interface StationMapper extends MyBaseMapper<Station> {
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/admin/StationStatDayMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.StationStatDay;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 站点统计表-日 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-public interface StationStatDayMapper extends BaseMapper<StationStatDay> {
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/admin/StationStatMonthMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.StationStatMonth;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 站点统计表-月 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-public interface StationStatMonthMapper extends BaseMapper<StationStatMonth> {
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/miniapp/ChargeOrderMapper.java

@@ -1,33 +0,0 @@
-package com.kym.mapper.miniapp;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
-import com.kym.entity.admin.queryParams.StatQueryParam;
-import com.kym.entity.admin.vo.CustomOrderVo;
-import com.kym.entity.admin.vo.StationStatVo;
-import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.mapper.mybatisplus.MyBaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 充电订单表 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-08
- */
-public interface ChargeOrderMapper extends MyBaseMapper<ChargeOrder> {
-
-    List<CustomOrderVo> listChargeOrders(@Param("params") CustomChargeOrdersQueryParam params);
-
-    Map<String, Object> statChargeOrders(@Param("params") CustomChargeOrdersQueryParam params);
-
-    List<StationStatVo> stationStat(@Param("params") StatQueryParam params);
-
-    Map<String, Object> stationTodayStat(@Param("stationId") String stationId);
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/miniapp/InvoiceMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.miniapp;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.miniapp.Invoice;
-
-/**
- * <p>
- * 发票记录表 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-09-15
- */
-public interface InvoiceMapper extends MPJBaseMapper<Invoice> {
-
-}

car-wash-mapper/src/main/java/com/kym/mapper/miniapp/InvoiceTitleMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.miniapp;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.miniapp.InvoiceTitle;
-
-/**
- * <p>
- * 发票记录表 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-09-21
- */
-public interface InvoiceTitleMapper extends MPJBaseMapper<InvoiceTitle> {
-
-}

car-wash-mapper/src/main/resources/mappers/admin/ActivityMapper.xml

@@ -1,28 +0,0 @@
-<?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.ActivityMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Activity">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="name" property="name" />
-        <result column="activityDesc" property="activity_desc" />
-        <result column="activityDescPage" property="activity_desc_page" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="discount_type" property="discountType" />
-        <result column="target_users" property="targetUsers" />
-        <result column="apply_station" property="applyStation" />
-        <result column="allow_stacke" property="allowStacke" />
-        <result column="quantity" property="quantity" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,name, activity_desc, activity_desc_page,start_time, end_time, discount_type, target_users, apply_station, allow_stacke, quantity, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/ActivityStationMapper.xml

@@ -1,21 +0,0 @@
-<?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.ActivityStationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.ActivityStation">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="activity_id" property="activityId" />
-        <result column="station_id" property="stationId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,activity_id, station_id,status,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/AdminUserRoleMapper.xml

@@ -1,20 +0,0 @@
-<?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.AdminUserRoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.AdminUserRole">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="role_id" property="roleId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, admin_user_id, role_id,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/AdminUserStationMapper.xml

@@ -1,21 +0,0 @@
-<?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.AdminUserStationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.AdminUserStation">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, admin_user_id, station_id, station_name,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/BannerMapper.xml

@@ -1,25 +0,0 @@
-<?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.BannerMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Banner">
-        <result column="id" property="id" />
-        <result column="activity_id" property="activityId" />
-        <result column="banner_desc" property="bannerDesc" />
-        <result column="banner_url" property="bannerUrl" />
-        <result column="link_url" property="linkUrl" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,activity_id, banner_desc, banner_url, link_url, start_time, end_time, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/CompanyMapper.xml

@@ -1,22 +0,0 @@
-<?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.CompanyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Company">
-        <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="company_id" property="companyId" />
-        <result column="super_admin_id" property="superAdminId" />
-        <result column="super_admin_name" property="superAdminName" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,company_name, super_admin_id, super_admin_name, status, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/ConnectorInfoMapper.xml

@@ -1,28 +0,0 @@
-<?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="status" property="status" />
-        <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, status,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/ContactMapper.xml

@@ -1,21 +0,0 @@
-<?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.ContactMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Contact">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="mobile" property="mobile" />
-        <result column="code_url" property="codeUrl" />
-        <result column="join_us" property="joinUs" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,mobile, code_url, join_us, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/CouponMapper.xml

@@ -1,34 +0,0 @@
-<?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.CouponMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Coupon">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="activity_id" property="activityId" />
-        <result column="name" property="name" />
-        <result column="coupon_desc" property="couponDesc" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="validity" property="validity" />
-        <result column="receive_type" property="receiveType" />
-        <result column="coupon_type" property="couponType" />
-        <result column="min_service_money" property="minServiceMoney" />
-        <result column="discount" property="discount" />
-        <result column="allow_stacke" property="allowStacke" />
-        <result column="quantity" property="quantity" />
-        <result column="claimed_quantity" property="claimedQuantity" />
-        <result column="used_quantity" property="usedQuantity" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,activity_id,name, coupon_desc, start_time, end_time, validity,receive_type,coupon_type, min_service_money, discount, allow_stacke, quantity, claimed_quantity, used_quantity, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/EquipmentInfoMapper.xml

@@ -1,27 +0,0 @@
-<?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">
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="equipment_id" property="equipmentId" />
-        <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="parking_no" property="parkingNo" />
-        <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" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, station_id,equipment_id, manufacturer_id, manufacturer_name, equipment_model, production_date, equipment_type, parking_no,location, power, net_status, service_status,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/EquipmentRelationMapper.xml

@@ -1,25 +0,0 @@
-<?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.EquipmentRelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.EquipmentRelation">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="short_id" property="shortId" />
-        <result column="equipment_id" property="equipmentId" />
-        <result column="connector_id" property="connectorId" />
-        <result column="parking_no" property="parkingNo" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,station_id, station_name,short_id, equipment_id,connector_id, parking_no,status, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/FaqMapper.xml

@@ -1,17 +0,0 @@
-<?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.FaqMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Faq">
-        <result column="question" property="question" />
-        <result column="status" property="status" />
-        <result column="answer" property="answer" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        question, status, answer
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/FeedbackMapper.xml

@@ -1,24 +0,0 @@
-<?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.FeedbackMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Feedback">
-        <result column="title" property="title" />
-        <result column="type" property="type" />
-        <result column="status" property="status" />
-        <result column="content" property="content" />
-        <result column="submit_time" property="submitTime" />
-        <result column="attach_list" property="attachList" />
-        <result column="submit_user_id" property="submitUserId" />
-        <result column="reply_content" property="replyContent" />
-        <result column="reply_time" property="replyTime" />
-        <result column="reply_user_id" property="replyUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        title, type, status, content, submit_time, attach_list, submit_user_id, reply_content, reply_time, reply_user_id
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/InvestorInfoMapper.xml

@@ -1,32 +0,0 @@
-<?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.InvestorInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.InvestorInfo">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="admin_user_name" property="adminUserName" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="vat_rate" property="vatRate" />
-        <result column="splitting_proportion" property="splittingProportion" />
-        <result column="elec_loss_proportion" property="elecLossProportion" />
-        <result column="account_name" property="accountName" />
-        <result column="telephone" property="telephone" />
-        <result column="bank_name" property="bankName" />
-        <result column="bank_card_no" property="bankCardNo" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="tax_no" property="taxNo" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,admin_user_id, admin_user_name, station_id,station_name, vat_rate, splitting_proportion, elec_loss_proportion,account_name, telephone, bank_name, bank_card_no, status, remark,tax_no,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/InvoiceDetailMapper.xml

@@ -1,32 +0,0 @@
-<?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.InvoiceDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.InvoiceDetail">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="apply_id" property="applyId" />
-        <result column="fapiao_time" property="fapiaoTime" />
-        <result column="status" property="status" />
-        <result column="blue_fapiao" property="blueFapiao" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
-        <result column="red_fapiao" property="redFapiao" />
-        <result column="card_information" property="cardInformation" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
-        <result column="total_amount" property="totalAmount" />
-        <result column="tax_amount" property="taxAmount" />
-        <result column="amount" property="amount" />
-        <result column="seller_information" property="sellerInformation" typeHandler="com.kym.entity.typehandle.InvoiceDetailSellerInformationTypeHandle" />
-        <result column="buyer_information" property="buyerInformation" typeHandler="com.kym.entity.typehandle.InvoiceDetailBuyerInformationTypeHandle" />
-        <result column="extra_information" property="extraInformation" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
-        <result column="items" property="items" typeHandler="com.kym.entity.typehandle.InvoiceDetailItemsTypeHandle" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,apply_id, fapiao_time, status, blue_fapiao, red_fapiao, card_information, total_amount, tax_amount, amount, seller_information, buyer_information, extra_information, items, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/MonitorLogMapper.xml

@@ -1,24 +0,0 @@
-<?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.MonitorLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.MonitorLog">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="type" property="type" />
-        <result column="sn" property="sn" />
-        <result column="offline_time" property="offlineTime" />
-        <result column="offline_status" property="offlineStatus" />
-        <result column="is_notice" property="isNotice" />
-        <result column="is_recover" property="isRecover" />
-        <result column="recover_time" property="recoverTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,station_id, type, sn, offline_time, offline_status, is_notice, is_recover, recover_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/PermissionMapper.xml

@@ -1,21 +0,0 @@
-<?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.PermissionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Permission">
-        <result column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="value" property="value" />
-        <result column="pid" property="pid" />
-        <result column="weight" property="weight" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,`name`, `value`, `pid`, weight, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/RechargeRightsMapper.xml

@@ -1,29 +0,0 @@
-<?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.RechargeRightsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.RechargeRights">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="activity_id" property="activityId" />
-        <result column="name" property="name" />
-        <result column="rights_desc" property="rightsDesc" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="validity" property="validity" />
-        <result column="amount_min" property="amountMin" />
-        <result column="amount_max" property="amountMax" />
-        <result column="discount" property="discount" />
-        <result column="allow_stacke" property="allowStacke" />
-        <result column="quantity" property="quantity" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,activity_id,activity_id, name, rights_desc, start_time, end_time,validity, amount_min, amount_max, discount, allow_stacke, quantity, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/RoleMapper.xml

@@ -1,22 +0,0 @@
-<?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.RoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Role">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="parent_id" property="parentId" />
-        <result column="role_name" property="roleName" />
-        <result column="role_desc" property="roleDesc" />
-        <result column="permissions" property="permissions" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, parent_id, role_name, role_desc, permissions, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/RolePermissionMapper.xml

@@ -1,20 +0,0 @@
-<?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.RolePermissionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.RolePermission">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="role_id" property="roleId" />
-        <result column="permission_id" property="permissionId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, role_id, permission_id, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StatementsMapper.xml

@@ -1,46 +0,0 @@
-<?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.StatementsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Statements">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="admin_user_name" property="adminUserName" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="total_power" property="totalPower" />
-        <result column="actual_power" property="actualPower" />
-        <result column="elec_loss_power" property="elecLossPower" />
-        <result column="total_money" property="totalMoney" />
-        <result column="elec_money" property="elecMoney" />
-        <result column="actual_elec_money" property="actualElecMoney" />
-        <result column="elec_loss_money" property="elecLossMoney" />
-        <result column="service_money" property="serviceMoney" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="service_money_discount" property="serviceMoneyDiscount" />
-        <result column="actual_service_money" property="actualServiceMoney" />
-        <result column="splitting_proportion" property="splittingProportion" />
-        <result column="splitting_amount" property="splittingAmount" />
-        <result column="elec_loss_proportion" property="elecLossProportion" />
-        <result column="elec_loss_amount" property="elecLossAmount" />
-        <result column="vat_rate" property="vatRate" />
-        <result column="vat_amount" property="vatAmount" />
-        <result column="actual_splitting_amount" property="actualSplittingAmount" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,admin_user_id, admin_user_name, station_id, station_name, start_time, end_time, total_power, actual_power, elec_loss_power,
-        total_money, elec_money, actual_elec_money, elec_loss_money, service_money, discount_amount, service_money_discount,
-        actual_service_money, splitting_proportion, splitting_amount, elec_loss_proportion,elec_loss_amount,vat_rate, vat_amount, actual_splitting_amount, status, remark, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationMapper.xml

@@ -1,45 +0,0 @@
-<?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.StationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Station">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="group_id" property="groupId" />
-        <result column="station_id" property="stationId" />
-        <result column="operator_id" property="operatorId" />
-        <result column="equipment_owner_id" property="equipmentOwnerId" />
-        <result column="station_name" property="stationName" />
-        <result column="country_code" property="countryCode" />
-        <result column="area_code" property="areaCode" />
-        <result column="picture" property="picture" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
-        <result column="address" property="address" />
-        <result column="station_tel" property="stationTel" />
-        <result column="service_tel" property="serviceTel" />
-        <result column="station_type" property="stationType" />
-        <result column="station_status" property="stationStatus" />
-        <result column="parking_num" property="parkingNum" />
-        <result column="location" property="location" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
-        <result column="site_guide" property="siteGuide" />
-        <result column="construction" property="construction" />
-        <result column="pictures" property="pictures" />
-        <result column="match_cars" property="matchCars" />
-        <result column="park_info" property="parkInfo" />
-        <result column="business_hours" property="businessHours" />
-        <result column="electricity_fee" property="electricityFee" />
-        <result column="service_fee" property="serviceFee" />
-        <result column="park_fee" property="parkFee" />
-        <result column="payment" property="payment" />
-        <result column="support_order" property="supportOrder" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, group_id, station_id, operator_id, equipment_owner_id, station_name, country_code, area_code, picture,address, station_tel, service_tel, station_type, station_status, parking_num, location, site_guide, construction, pictures, match_cars, park_info, business_hours, electricity_fee, service_fee, park_fee, payment, support_order, remark, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationNoticeMapper.xml

@@ -1,20 +0,0 @@
-<?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.StationNoticeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationNotice">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="notice_id" property="noticeId" />
-        <result column="station_id" property="stationId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,notice_id, station_id,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationStatDayMapper.xml

@@ -1,32 +0,0 @@
-<?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.StationStatDayMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationStatDay">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="stat_day" property="statDay" />
-        <result column="charge_users" property="chargeUsers" />
-        <result column="valid_orders" property="validOrders" />
-        <result column="total_power" property="totalPower" />
-        <result column="total_money" property="totalMoney" />
-        <result column="elec_money" property="elecMoney" />
-        <result column="service_money" property="serviceMoney" />
-        <result column="service_money_discount" property="serviceMoneyDiscount" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="avg_order_elec" property="avgOrderElec" />
-        <result column="avg_order_money" property="avgOrderMoney" />
-        <result column="avg_connector_elec" property="avgConnectorElec" />
-        <result column="connector_usage_rate" property="connectorUsageRate" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,station_id, stat_day, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationStatMonthMapper.xml

@@ -1,34 +0,0 @@
-<?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.StationStatMonthMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationStatMonth">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="stat_month" property="statMonth" />
-        <result column="charge_users" property="chargeUsers" />
-        <result column="valid_orders" property="validOrders" />
-        <result column="total_power" property="totalPower" />
-        <result column="total_money" property="totalMoney" />
-        <result column="elec_money" property="elecMoney" />
-        <result column="service_money" property="serviceMoney" />
-        <result column="service_money_discount" property="serviceMoneyDiscount" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="avg_order_elec" property="avgOrderElec" />
-        <result column="avg_order_money" property="avgOrderMoney" />
-        <result column="avg_connector_elec" property="avgConnectorElec" />
-        <result column="connector_usage_rate" property="connectorUsageRate" />
-        <result column="actual_power" property="actualPower" />
-        <result column="actual_elec_money" property="actualElecMoney" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,station_id, stat_month, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,actual_power,actual_elec_money,create_time,update_time,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/SystemLogMapper.xml

@@ -1,25 +0,0 @@
-<?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.SystemLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.SystemLog">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="username" property="username" />
-        <result column="ip" property="ip" />
-        <result column="operation" property="operation" />
-        <result column="method" property="method" />
-        <result column="request_param" property="requestParam" />
-        <result column="execute_time" property="executeTime" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, user_id, username, ip, operation, method, request_param, execute_time, create_time, update_time
-    </sql>
-
-</mapper>