引入mybatis-plus-join支持联表查询

启用t_connector_info表，支持多枪口设备

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

@@ -35,9 +35,9 @@
           size="default" label-width="0px" class="mt5 mb5">
 
         <ext-d-select
-            type="Equipment.netStatus"
+            type="Connector.status"
             v-model="state.formQuery.status"
-            placeholder="网络状态"
+            placeholder="状态"
             clearable
             @change="loadData(true)"
             class="wd150 mr10"/>
@@ -101,12 +101,12 @@
             <template v-else-if="'equipmentType'===field.prop">
               <ext-d-label type="Equipment.type" v-model="row[field.prop]"/>
             </template>
-            <template v-else-if="'serviceStatus'===field.prop">
-              <ext-d-label type="Equipment.serviceStatus" v-model="row[field.prop]"/>
-            </template>
-            <template v-else-if="'netStatus'===field.prop">
-              <ext-d-label type="Equipment.netStatus" v-model="row[field.prop]"/>
+            <template v-else-if="'status'===field.prop">
+              <ext-d-label type="Connector.status" v-model="row[field.prop]"/>
             </template>
+<!--            <template v-else-if="'netStatus'===field.prop">-->
+<!--              <ext-d-label type="Equipment.netStatus" v-model="row[field.prop]"/>-->
+<!--            </template>-->
             <template v-else-if="'equipmentId'===field.prop">
               <el-button link type="primary" @click="handleGotoOrder(row)">{{row[field.prop]}} </el-button>
             </template>
@@ -171,14 +171,16 @@ const state = reactive({
       {label: '充电桩编号', prop: 'shortId', resizable: true, width: 110, fixed: 'left'},
       {label: '车位编号', prop: 'parkingNo', resizable: true, width: 90, fixed: 'left'},
       {label: '充电桩序列号', prop: 'equipmentId', width: 180, resizable: true},
-      {label: '设备型号', prop: 'equipmentModel', width: 150, resizable: true},
-      {label: '服务状态', prop: 'serviceStatus', resizable: true, width: 130},
-      {label: '设备类型', prop: 'equipmentType', resizable: true, width: 130},
+      {label: '充电桩接口编号', prop: 'connectorId', width: 180, resizable: true},
+      // {label: '设备型号', prop: 'equipmentModel', width: 150, resizable: true},
+      // {label: '服务状态', prop: 'status', resizable: true, width: 130},
+      // {label: '设备类型', prop: 'equipmentType', resizable: true, width: 130},
       // {label: '位置坐标', prop: 'location', resizable: true, width: 150},
-      {label: '网络状态', prop: 'netStatus', resizable: true, width: 130},
+      // {label: '网络状态', prop: 'netStatus', resizable: true, width: 130},
+      {label: '状态', prop: 'status', resizable: true, width: 130},
       // {label: '设备生产商组织机构代码', prop: 'manufacturerId', width: 200, resizable: true},
       // {label: '设备生产商名称', prop: 'manufacturerName', width: 160, resizable: true},
-      {label: '设备生产日期', prop: 'productionDate', width: 160, resizable: true},
+      // {label: '设备生产日期', prop: 'productionDate', width: 160, resizable: true},
       {label: '更新时间', prop: 'updateTime', sortable: 'custom', resizable: true, width: 180},
       /*{
         label: '操作', prop: 'action', width: 1, align: 'center', fixed: 'right',
@@ -237,7 +239,7 @@ const loadData = (refresh: boolean = false) => {
     state.pageQuery.pageNum = 1;
   }
   state.tableData.loading = true;
-  $get(`/equipment/listEquipment`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
+  $get(`/connector/listConnectors`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
     let {list, total} = res;
     state.tableData.data = list;
     state.pageQuery.total = total;

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

@@ -0,0 +1,45 @@
+package com.kym.admin.controller;
+
+import com.kym.common.R;
+import com.kym.entity.admin.queryParams.EquipmentQueryParam;
+import com.kym.entity.admin.vo.ConnectorInfoVo;
+import com.kym.entity.common.PageBean;
+import com.kym.service.admin.ConnectorInfoService;
+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;
+
+/**
+ * <p>
+ * 充电桩桩体设备 前端控制器
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@RestController
+@RequestMapping("/connector")
+public class ConnectorInfoController {
+
+    private final ConnectorInfoService connectorInfoService;
+
+    public ConnectorInfoController(ConnectorInfoService connectorInfoService) {
+        this.connectorInfoService = connectorInfoService;
+    }
+
+
+    /**
+     * 充电桩列表
+     *
+     * @param params
+     * @return
+     */
+    @GetMapping("/listConnectors")
+    R<?> listEquipment(@ModelAttribute EquipmentQueryParam params) {
+        PageBean<ConnectorInfoVo> res = connectorInfoService.listConnectors(params);
+        return R.success(res);
+    }
+
+
+}

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

@@ -1,11 +1,10 @@
 package com.kym.admin.controller;
 
 import com.kym.common.R;
-import com.kym.entity.admin.EquipmentInfo;
-import com.kym.entity.admin.queryParams.EquipmentQueryParam;
-import com.kym.entity.common.PageBean;
 import com.kym.service.admin.EquipmentInfoService;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -25,17 +24,6 @@ public class EquipmentInfoController {
         this.equipmentInfoService = equipmentInfoService;
     }
 
-    /**
-     * 充电桩列表
-     *
-     * @param params
-     * @return
-     */
-    @GetMapping("/listEquipment")
-    R listEquipment(@ModelAttribute EquipmentQueryParam params) {
-        PageBean<EquipmentInfo> res = equipmentInfoService.listEquipment(params);
-        return R.success(res);
-    }
 
     /**
      * 统计充电桩状态
@@ -43,7 +31,7 @@ public class EquipmentInfoController {
      * @return
      */
     @GetMapping("/statEquipmentStatus")
-    R statEquipment(String stationId) {
+    R<?> statEquipment(String stationId) {
         return R.success(equipmentInfoService.statEquipmentStatus(stationId));
     }
 

entity/pom.xml

@@ -29,6 +29,12 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.3.2</version>
         </dependency>
+        <!-- 联表查询插件 -->
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+            <version>1.4.7.2</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>

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

@@ -1,5 +1,6 @@
 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;
@@ -28,9 +29,19 @@ public class ConnectorInfo extends BaseEntity implements Serializable {
      */
     private Long companyId;
 
+    /**
+     * 站点id
+     */
+    private String stationId;
+
     /**
      * 充电桩序列号
      */
+    private String equipmentId;
+
+    /**
+     * 充电桩接口序列号
+     */
     private String connectorId;
 
     /**
@@ -66,10 +77,22 @@ public class ConnectorInfo extends BaseEntity implements Serializable {
     /**
      * 停车场车位编号
      */
-    private String parkNo;
+    private String parkingNo;
 
     /**
      * 国家标准：1:2011 2:2015
      */
     private Integer nationalStandard;
+
+    /**
+     * 充电设备接口状态
+     * 0：离网
+     * 1：空闲
+     * 2：占用（未充电）
+     * 3：占用（充电中）
+     * 4：占用（预约锁定）
+     * 255：故障
+     */
+    private Integer status;
+
 }

entity/src/main/java/com/kym/entity/admin/queryParams/EquipmentQueryParam.java

@@ -21,6 +21,11 @@ public class EquipmentQueryParam extends PageParams {
      */
     private String equipmentId;
 
+    /**
+     * 充电枪id
+     */
+    private String connectorId;
+
     /**
      * 状态
      */

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

@@ -0,0 +1,104 @@
+package com.kym.entity.admin.vo;
+
+import com.kym.entity.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 充电桩接口（枪）信息
+ * </p>
+ *
+ * @author skyline
+ * @since 2023-08-05
+ */
+@Data
+@Accessors(chain = true)
+public class ConnectorInfoVo extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
+
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 站点编号
+     */
+    private String stationNo;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 充电桩接口短编号
+     */
+    private String shortId;
+    /**
+     * 充电桩序列号
+     */
+    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;
+
+    public ConnectorInfoVo setShortId(String shortId) {
+        this.shortId = shortId;
+        this.stationNo = shortId.substring(0, 3);
+        return this;
+    }
+
+}

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

@@ -16,7 +16,7 @@ public class EnConnectorStatusInfo {
     @JSONField(name = "ConnectorID")
     private String connectorId;
     /**
-     * 充个设备接口状态
+     * 充电设备接口状态
      * 0：离网
      * 1：空闲
      * 2：占用（未充电）

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

@@ -1,16 +1,16 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.Activity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author skyline
  * @since 2023-10-18
  */
-public interface ActivityMapper extends BaseMapper<Activity> {
+public interface ActivityMapper extends MPJBaseMapper<Activity> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.ActivityStation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-10-18
  */
-public interface ActivityStationMapper extends BaseMapper<ActivityStation> {
+public interface ActivityStationMapper extends MPJBaseMapper<ActivityStation> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.kym.mapper.admin;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.AdminUser;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.vo.AdminUserVo;
@@ -16,7 +16,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-07-11
  */
-public interface AdminUserMapper extends BaseMapper<AdminUser> {
+public interface AdminUserMapper extends MPJBaseMapper<AdminUser> {
     List<AdminUserVo> listUserPermissions(@Param("userId") Long loginId);
 
     List<AdminUserVo> listAdminUser(@Param("params") CommonQueryParam params);

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.AdminUserRole;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-09-04
  */
-public interface AdminUserRoleMapper extends BaseMapper<AdminUserRole> {
+public interface AdminUserRoleMapper extends MPJBaseMapper<AdminUserRole> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.AdminUserStation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-09-18
  */
-public interface AdminUserStationMapper extends BaseMapper<AdminUserStation> {
+public interface AdminUserStationMapper extends MPJBaseMapper<AdminUserStation> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.Banner;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-10-18
  */
-public interface BannerMapper extends BaseMapper<Banner> {
+public interface BannerMapper extends MPJBaseMapper<Banner> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.Company;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-07-12
  */
-public interface CompanyMapper extends BaseMapper<Company> {
+public interface CompanyMapper extends MPJBaseMapper<Company> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.ConnectorInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-08-05
  */
-public interface ConnectorInfoMapper extends BaseMapper<ConnectorInfo> {
+public interface ConnectorInfoMapper extends MPJBaseMapper<ConnectorInfo> {
 
 }

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

@@ -1,16 +1,16 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.Contact;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author skyline
  * @since 2023-08-15
  */
-public interface ContactMapper extends BaseMapper<Contact> {
+public interface ContactMapper extends MPJBaseMapper<Contact> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.EquipmentInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-08-05
  */
-public interface EquipmentInfoMapper extends BaseMapper<EquipmentInfo> {
+public interface EquipmentInfoMapper extends MPJBaseMapper<EquipmentInfo> {
 
 }

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

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

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.MonitorLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-08-29
  */
-public interface MonitorLogMapper extends BaseMapper<MonitorLog> {
+public interface MonitorLogMapper extends MPJBaseMapper<MonitorLog> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.Permission;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-09-23
  */
-public interface PermissionMapper extends BaseMapper<Permission> {
+public interface PermissionMapper extends MPJBaseMapper<Permission> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.RechargeRights;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-10-18
  */
-public interface RechargeRightsMapper extends BaseMapper<RechargeRights> {
+public interface RechargeRightsMapper extends MPJBaseMapper<RechargeRights> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.Role;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-09-23
  */
-public interface RoleMapper extends BaseMapper<Role> {
+public interface RoleMapper extends MPJBaseMapper<Role> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.RolePermission;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-07-12
  */
-public interface RolePermissionMapper extends BaseMapper<RolePermission> {
+public interface RolePermissionMapper extends MPJBaseMapper<RolePermission> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.Station;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-08-12
  */
-public interface StationMapper extends BaseMapper<Station> {
+public interface StationMapper extends MPJBaseMapper<Station> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.SystemLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-07-10
  */
-public interface SystemLogMapper extends BaseMapper<SystemLog> {
+public interface SystemLogMapper extends MPJBaseMapper<SystemLog> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/AccountMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.Account;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-08-07
  */
-public interface AccountMapper extends BaseMapper<Account> {
+public interface AccountMapper extends MPJBaseMapper<Account> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/AppLogMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.AppLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-08-20
  */
-public interface AppLogMapper extends BaseMapper<AppLog> {
+public interface AppLogMapper extends MPJBaseMapper<AppLog> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/AttachmentMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.Attachment;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zuy
  * @since 2023-08-12
  */
-public interface AttachmentMapper extends BaseMapper<Attachment> {
+public interface AttachmentMapper extends MPJBaseMapper<Attachment> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/CarsMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.Cars;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-07-26
  */
-public interface CarsMapper extends BaseMapper<Cars> {
+public interface CarsMapper extends MPJBaseMapper<Cars> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/ChargeOrderMapper.java

@@ -1,6 +1,6 @@
 package com.kym.mapper.miniapp;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
@@ -19,7 +19,7 @@ import java.util.Map;
  * @author skyline
  * @since 2023-08-08
  */
-public interface ChargeOrderMapper extends BaseMapper<ChargeOrder> {
+public interface ChargeOrderMapper extends MPJBaseMapper<ChargeOrder> {
 
     List<CustomOrderVo> listChargeOrders(@Param("params") CustomChargeOrdersQueryParam params);
 

mapper/src/main/java/com/kym/mapper/miniapp/CollectMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.Collect;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-07-27
  */
-public interface CollectMapper extends BaseMapper<Collect> {
+public interface CollectMapper extends MPJBaseMapper<Collect> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/DataDictMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.DataDict;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zuy
  * @since 2023-08-13
  */
-public interface DataDictMapper extends BaseMapper<DataDict> {
+public interface DataDictMapper extends MPJBaseMapper<DataDict> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/InvoiceMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.Invoice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-09-15
  */
-public interface InvoiceMapper extends BaseMapper<Invoice> {
+public interface InvoiceMapper extends MPJBaseMapper<Invoice> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/InvoiceTitleMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.InvoiceTitle;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-09-21
  */
-public interface InvoiceTitleMapper extends BaseMapper<InvoiceTitle> {
+public interface InvoiceTitleMapper extends MPJBaseMapper<InvoiceTitle> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/OrderRechargeRightsMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.OrderRechargeRights;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-10-19
  */
-public interface OrderRechargeRightsMapper extends BaseMapper<OrderRechargeRights> {
+public interface OrderRechargeRightsMapper extends MPJBaseMapper<OrderRechargeRights> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/PayLogMapper.java

@@ -1,9 +1,9 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.vo.CustomRechargeVo;
 import com.kym.entity.miniapp.PayLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-08-12
  */
-public interface PayLogMapper extends BaseMapper<PayLog> {
+public interface PayLogMapper extends MPJBaseMapper<PayLog> {
     List<CustomRechargeVo> listRecharge(@Param("params") CommonQueryParam params);
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/QuestionAnswerMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.QuestionAnswer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-10-26
  */
-public interface QuestionAnswerMapper extends BaseMapper<QuestionAnswer> {
+public interface QuestionAnswerMapper extends MPJBaseMapper<QuestionAnswer> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/RefundLogMapper.java

@@ -1,6 +1,6 @@
 package com.kym.mapper.miniapp;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.miniapp.RefundLog;
 import com.kym.entity.miniapp.vo.RefundVo;
@@ -16,6 +16,6 @@ import java.util.List;
  * @author skyline
  * @since 2023-09-11
  */
-public interface RefundLogMapper extends BaseMapper<RefundLog> {
+public interface RefundLogMapper extends MPJBaseMapper<RefundLog> {
     List<RefundVo> listRefundLog(@Param("params") CommonQueryParam params);
 }

mapper/src/main/java/com/kym/mapper/miniapp/UserMapper.java

@@ -1,6 +1,6 @@
 package com.kym.mapper.miniapp;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.vo.CustomUserVo;
 import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.vo.UserVo;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-07-26
  */
-public interface UserMapper extends BaseMapper<User> {
+public interface UserMapper extends MPJBaseMapper<User> {
 
     @Select("SELECT \n" +
             "  u.id,\n" +

mapper/src/main/java/com/kym/mapper/miniapp/UserRechargeRightsMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.UserRechargeRights;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-10-18
  */
-public interface UserRechargeRightsMapper extends BaseMapper<UserRechargeRights> {
+public interface UserRechargeRightsMapper extends MPJBaseMapper<UserRechargeRights> {
 
 }

mapper/src/main/java/com/kym/mapper/miniapp/WalletDetailMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.miniapp;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.miniapp.WalletDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-08-09
  */
-public interface WalletDetailMapper extends BaseMapper<WalletDetail> {
+public interface WalletDetailMapper extends MPJBaseMapper<WalletDetail> {
 
 }

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

@@ -15,13 +15,14 @@
         <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, create_time, update_time
+        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>

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

@@ -1,6 +1,6 @@
 package com.kym.service.admin;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Activity;
 import com.kym.entity.admin.queryParams.ActivityQueryParam;
 import com.kym.entity.admin.vo.ActivityVo;
@@ -14,7 +14,7 @@ import com.kym.entity.common.PageBean;
  * @author skyline
  * @since 2023-10-18
  */
-public interface ActivityService extends IService<Activity> {
+public interface ActivityService extends MPJBaseService<Activity> {
 
     void createActivity(ActivityVo activityVo);
 

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.ActivityStation;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-10-18
  */
-public interface ActivityStationService extends IService<ActivityStation> {
+public interface ActivityStationService extends MPJBaseService<ActivityStation> {
 
 }

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

@@ -1,5 +1,6 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.AdminUserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-09-04
  */
-public interface AdminUserRoleService extends IService<AdminUserRole> {
+public interface AdminUserRoleService extends MPJBaseService<AdminUserRole> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.kym.service.admin;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.common.R;
 import com.kym.entity.admin.AdminUser;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-07-11
  */
-public interface AdminUserService extends IService<AdminUser> {
+public interface AdminUserService extends MPJBaseService<AdminUser> {
 
     R login(String mobilePhone, String password);
 

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.AdminUserStation;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-09-18
  */
-public interface AdminUserStationService extends IService<AdminUserStation> {
+public interface AdminUserStationService extends MPJBaseService<AdminUserStation> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.kym.service.admin;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Banner;
 import com.kym.entity.admin.queryParams.BannerQueryParam;
 import com.kym.entity.common.PageBean;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-10-18
  */
-public interface BannerService extends IService<Banner> {
+public interface BannerService extends MPJBaseService<Banner> {
 
     Banner createBanner(Banner banner);
 

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Company;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-07-12
  */
-public interface CompanyService extends IService<Company> {
+public interface CompanyService extends MPJBaseService<Company> {
 
 }

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

@@ -1,7 +1,10 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.ConnectorInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.entity.admin.queryParams.EquipmentQueryParam;
+import com.kym.entity.admin.vo.ConnectorInfoVo;
+import com.kym.entity.common.PageBean;
 
 /**
  * <p>
@@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-08-05
  */
-public interface ConnectorInfoService extends IService<ConnectorInfo> {
+public interface ConnectorInfoService extends MPJBaseService<ConnectorInfo> {
+    PageBean<ConnectorInfoVo> listConnectors(EquipmentQueryParam params);
 
 }

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

@@ -1,16 +1,16 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Contact;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author skyline
  * @since 2023-08-15
  */
-public interface ContactService extends IService<Contact> {
+public interface ContactService extends MPJBaseService<Contact> {
 
 }

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

@@ -1,9 +1,7 @@
 package com.kym.service.admin;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.EquipmentInfo;
-import com.kym.entity.admin.queryParams.EquipmentQueryParam;
-import com.kym.entity.common.PageBean;
 
 import java.util.Map;
 
@@ -15,9 +13,7 @@ import java.util.Map;
  * @author skyline
  * @since 2023-09-01
  */
-public interface EquipmentInfoService extends IService<EquipmentInfo> {
-
-    PageBean<EquipmentInfo> listEquipment(EquipmentQueryParam params);
+public interface EquipmentInfoService extends MPJBaseService<EquipmentInfo> {
 
     Map<Integer, Long> statEquipmentStatus(String stationId);
 }

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

@@ -1,17 +1,17 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.EquipmentRelation;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author skyline
  * @since 2023-08-07
  */
-public interface EquipmentRelationService extends IService<EquipmentRelation> {
+public interface EquipmentRelationService extends MPJBaseService<EquipmentRelation> {
     EquipmentRelation getByShortId(String shortId);
 
     EquipmentRelation getByEquipmentId(String equipmentId);

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.MonitorLog;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-08-29
  */
-public interface MonitorLogService extends IService<MonitorLog> {
+public interface MonitorLogService extends MPJBaseService<MonitorLog> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Permission;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-09-23
  */
-public interface PermissionService extends IService<Permission> {
+public interface PermissionService extends MPJBaseService<Permission> {
 
 }

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

@@ -1,9 +1,9 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.RechargeRights;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.kym.entity.common.PageParams;
 import com.kym.entity.common.PageBean;
+import com.kym.entity.common.PageParams;
 
 /**
  * <p>
@@ -13,7 +13,7 @@ import com.kym.entity.common.PageBean;
  * @author skyline
  * @since 2023-10-18
  */
-public interface RechargeRightsService extends IService<RechargeRights> {
+public interface RechargeRightsService extends MPJBaseService<RechargeRights> {
 
-    PageBean<RechargeRights> listRechargeRight(PageParams pageParams,String activityId);
+    PageBean<RechargeRights> listRechargeRight(PageParams pageParams, String activityId);
 }

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.RolePermission;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-07-12
  */
-public interface RolePermissionService extends IService<RolePermission> {
+public interface RolePermissionService extends MPJBaseService<RolePermission> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Role;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-09-23
  */
-public interface RoleService extends IService<Role> {
+public interface RoleService extends MPJBaseService<Role> {
 
     Object listRole(String roleName);
 

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

@@ -1,8 +1,8 @@
 package com.kym.service.admin;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Station;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.kym.entity.admin.vo.StationVo;
 import com.kym.entity.enplus.EnStationStatsInfo;
 import com.kym.entity.enplus.EnStationStatusInfo;
@@ -18,7 +18,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-08-12
  */
-public interface StationService extends IService<Station> {
+public interface StationService extends MPJBaseService<Station> {
 
     public List<StationVo> queryStationInfo(int pageNum, int pageSize) throws JsonProcessingException;
 

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.SystemLog;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-07-10
  */
-public interface SystemLogService extends IService<SystemLog> {
+public interface SystemLogService extends MPJBaseService<SystemLog> {
 
 }

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

@@ -2,8 +2,8 @@ package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.IDGenerator;
 import com.kym.entity.admin.*;
@@ -43,7 +43,7 @@ import static com.kym.entity.admin.Activity.DISCOUNT_TYPE_服务费折扣权益;
 @Service
 @DS("db-admin")
 @Slf4j
-public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements ActivityService {
+public class ActivityServiceImpl extends MPJBaseServiceImpl<ActivityMapper, Activity> implements ActivityService {
 
     /**
      * 线程池

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

@@ -1,9 +1,9 @@
 package com.kym.service.admin.impl;
 
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.ActivityStation;
 import com.kym.mapper.admin.ActivityStationMapper;
 import com.kym.service.admin.ActivityStationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-10-18
  */
 @Service
-public class ActivityStationServiceImpl extends ServiceImpl<ActivityStationMapper, ActivityStation> implements ActivityStationService {
+public class ActivityStationServiceImpl extends MPJBaseServiceImpl<ActivityStationMapper, ActivityStation> implements ActivityStationService {
 
 }

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

@@ -1,10 +1,10 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.AdminUserRole;
 import com.kym.mapper.admin.AdminUserRoleMapper;
 import com.kym.service.admin.AdminUserRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db_admin")
-public class AdminUserRoleServiceImpl extends ServiceImpl<AdminUserRoleMapper, AdminUserRole> implements AdminUserRoleService {
+public class AdminUserRoleServiceImpl extends MPJBaseServiceImpl<AdminUserRoleMapper, AdminUserRole> implements AdminUserRoleService {
 
 }

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

@@ -8,8 +8,8 @@ import cn.hutool.crypto.digest.DigestAlgorithm;
 import cn.hutool.crypto.digest.Digester;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.R;
 import com.kym.common.constant.ResponseEnum;
 import com.kym.common.utils.CommUtil;
@@ -46,7 +46,7 @@ import java.util.Map;
  */
 @Service
 @DS("db-admin")
-public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser> implements AdminUserService {
+public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, AdminUser> implements AdminUserService {
     final static Digester MD5 = new Digester(DigestAlgorithm.MD5);
     private static final Logger LOGGER = LoggerFactory.getLogger(AdminUserServiceImpl.class);
 

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

@@ -2,7 +2,7 @@ package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.AdminUserStation;
 import com.kym.mapper.admin.AdminUserStationMapper;
 import com.kym.service.admin.AdminUserStationService;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @DS("db-admin")
-public class AdminUserStationServiceImpl extends ServiceImpl<AdminUserStationMapper, AdminUserStation> implements AdminUserStationService {
+public class AdminUserStationServiceImpl extends MPJBaseServiceImpl<AdminUserStationMapper, AdminUserStation> implements AdminUserStationService {
 
     @PostConstruct
     private void init() {

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.IDGenerator;
 import com.kym.entity.admin.Banner;
@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Service
 @DS("db-admin")
-public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> implements BannerService {
+public class BannerServiceImpl extends MPJBaseServiceImpl<BannerMapper, Banner> implements BannerService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)

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

@@ -1,10 +1,10 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.Company;
 import com.kym.mapper.admin.CompanyMapper;
 import com.kym.service.admin.CompanyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-admin")
-public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
+public class CompanyServiceImpl extends MPJBaseServiceImpl<CompanyMapper, Company> implements CompanyService {
 
 }

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

@@ -1,12 +1,24 @@
 package com.kym.service.admin.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.pagehelper.PageHelper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.ConnectorInfo;
+import com.kym.entity.admin.queryParams.EquipmentQueryParam;
+import com.kym.entity.admin.vo.ConnectorInfoVo;
+import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.ConnectorInfoMapper;
 import com.kym.service.admin.ConnectorInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kym.service.cache.KymCache;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+
+import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
+
 /**
  * <p>
  * 充电桩接口（枪）信息 服务实现类
@@ -17,6 +29,36 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-admin")
-public class ConnectorInfoServiceImpl extends ServiceImpl<ConnectorInfoMapper, ConnectorInfo> implements ConnectorInfoService {
-
+public class ConnectorInfoServiceImpl extends MPJBaseServiceImpl<ConnectorInfoMapper, ConnectorInfo> implements ConnectorInfoService {
+    @Override
+    public PageBean<ConnectorInfoVo> listConnectors(EquipmentQueryParam params) {
+        // 判断数据权限
+        var adminStationId = KymCache.INSTANCE.getAdminUserStationId(StpUtil.getLoginIdAsLong());
+        if (adminStationId != null) {
+            params.setStationId(adminStationId);
+        }
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        var connectorInfos = lambdaQuery()
+                .likeLeft(isNotNull(params.getEquipmentId()), ConnectorInfo::getEquipmentId, params.getEquipmentId())
+                .eq(isNotNull(params.getStationId()), ConnectorInfo::getStationId, params.getStationId())
+                .eq(isNotNull(params.getStatus()), ConnectorInfo::getStatus, params.getStatus())
+                .list();
+        // 转换成vo
+        var connectorInfoVos = new ArrayList<ConnectorInfoVo>(connectorInfos.parallelStream()
+                .map(item -> {
+                            var vo = new ConnectorInfoVo();
+                            BeanUtils.copyProperties(item, vo);
+                            return vo;
+                        }
+                ).toList());
+        var page = new PageBean<>(connectorInfoVos);
+        // parallelStream 这里可能有坑，注意检查
+        var res = connectorInfoVos.parallelStream().map(item ->
+                item.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(item.getConnectorId()))
+                        .setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId()))
+                        .setParkingNo(KymCache.INSTANCE.getParkNoByEquipmentIdOrConnectorId(item.getConnectorId()))
+        ).sorted(Comparator.comparing(ConnectorInfoVo::getShortId)).toList();
+        page.setList(res);
+        return page;
+    }
 }

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

@@ -1,15 +1,15 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.Contact;
 import com.kym.mapper.admin.ContactMapper;
 import com.kym.service.admin.ContactService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author skyline
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-admin")
-public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> implements ContactService {
+public class ContactServiceImpl extends MPJBaseServiceImpl<ContactMapper, Contact> implements ContactService {
 
 }

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

@@ -3,13 +3,15 @@ package com.kym.service.admin.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.utils.CommUtil;
+import com.kym.entity.admin.ConnectorInfo;
 import com.kym.entity.admin.EquipmentInfo;
 import com.kym.entity.admin.queryParams.EquipmentQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.EquipmentInfoMapper;
+import com.kym.service.admin.ConnectorInfoService;
 import com.kym.service.admin.EquipmentInfoService;
 import com.kym.service.cache.KymCache;
 import jakarta.annotation.PostConstruct;
@@ -31,7 +33,13 @@ import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
  */
 @Service
 @DS("db-admin")
-public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, EquipmentInfo> implements EquipmentInfoService {
+public class EquipmentInfoServiceImpl extends MPJBaseServiceImpl<EquipmentInfoMapper, EquipmentInfo> implements EquipmentInfoService {
+
+    private final ConnectorInfoService connectorInfoService;
+
+    public EquipmentInfoServiceImpl(ConnectorInfoService connectorInfoService) {
+        this.connectorInfoService = connectorInfoService;
+    }
 
 
     @PostConstruct
@@ -42,30 +50,6 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
         DynamicDataSourceContextHolder.poll();
     }
 
-
-    @Override
-    public PageBean<EquipmentInfo> listEquipment(EquipmentQueryParam params) {
-        // 判断数据权限
-        var adminStationId = KymCache.INSTANCE.getAdminUserStationId(StpUtil.getLoginIdAsLong());
-        if (adminStationId != null) {
-            params.setStationId(adminStationId);
-        }
-        PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        var equipmentInfos = lambdaQuery()
-                .eq(isNotNull(params.getEquipmentId()), EquipmentInfo::getEquipmentId, isNotNull(params.getEquipmentId()) ? KymCache.INSTANCE.getConnectorId(params.getEquipmentId()).substring(0, 16) : "")
-                .eq(isNotNull(params.getStationId()), EquipmentInfo::getStationId, params.getStationId())
-                .eq(isNotNull(params.getStatus()), EquipmentInfo::getNetStatus, params.getStatus())
-                .list();
-        var page = new PageBean<>(equipmentInfos);
-        // TODO: 2023-09-02  parallelStream 这里可能有坑，注意检查
-        var res = equipmentInfos.parallelStream().map(item ->
-                item.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(item.getEquipmentId()))
-                        .setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId()))
-        ).toList().stream().sorted(Comparator.comparing(EquipmentInfo::getShortId)).toList();
-        page.setList(res);
-        return page;
-    }
-
     @Override
     public Map<Integer, Long> statEquipmentStatus(String stationId) {
         if (CommUtil.null2Long(stationId) <= 0) {

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

@@ -2,7 +2,7 @@ package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.EquipmentRelation;
 import com.kym.mapper.admin.EquipmentRelationMapper;
 import com.kym.service.admin.EquipmentRelationService;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @DS("db-admin")
-public class EquipmentRelationServiceImpl extends ServiceImpl<EquipmentRelationMapper, EquipmentRelation> implements EquipmentRelationService {
+public class EquipmentRelationServiceImpl extends MPJBaseServiceImpl<EquipmentRelationMapper, EquipmentRelation> implements EquipmentRelationService {
 
 
     @PostConstruct

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

@@ -1,10 +1,10 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.MonitorLog;
 import com.kym.mapper.admin.MonitorLogMapper;
 import com.kym.service.admin.MonitorLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-admin")
-public class MonitorLogServiceImpl extends ServiceImpl<MonitorLogMapper, MonitorLog> implements MonitorLogService {
+public class MonitorLogServiceImpl extends MPJBaseServiceImpl<MonitorLogMapper, MonitorLog> implements MonitorLogService {
 
 }

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

@@ -1,5 +1,6 @@
 package com.kym.service.admin.impl;
 
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.Permission;
 import com.kym.mapper.admin.PermissionMapper;
 import com.kym.service.admin.PermissionService;
@@ -15,6 +16,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-09-23
  */
 @Service
-public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
+public class PermissionServiceImpl extends MPJBaseServiceImpl<PermissionMapper, Permission> implements PermissionService {
 
 }

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

@@ -1,11 +1,11 @@
 package com.kym.service.admin.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.RechargeRights;
-import com.kym.entity.common.PageParams;
 import com.kym.entity.common.PageBean;
+import com.kym.entity.common.PageParams;
 import com.kym.mapper.admin.RechargeRightsMapper;
 import com.kym.service.admin.RechargeRightsService;
 import org.springframework.stereotype.Service;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-10-18
  */
 @Service
-public class RechargeRightsServiceImpl extends ServiceImpl<RechargeRightsMapper, RechargeRights> implements RechargeRightsService {
+public class RechargeRightsServiceImpl extends MPJBaseServiceImpl<RechargeRightsMapper, RechargeRights> implements RechargeRightsService {
 
     @Override
     public PageBean<RechargeRights> listRechargeRight(PageParams pageParams, String activityId) {

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.RolePermission;
 import com.kym.mapper.admin.RolePermissionMapper;
 import com.kym.service.admin.RolePermissionService;
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-admin")
-public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService {
+public class RolePermissionServiceImpl extends MPJBaseServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService {
 
 }

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

@@ -1,11 +1,11 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.Role;
 import com.kym.mapper.admin.RoleMapper;
 import com.kym.service.admin.RoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,11 +21,11 @@ import java.util.List;
  * @since 2023-09-23
  */
 @Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+public class RoleServiceImpl extends MPJBaseServiceImpl<RoleMapper, Role> implements RoleService {
 
     @Override
     public Object listRole(String roleName) {
-        return lambdaQuery().eq(!CommUtil.isEmptyOrNull(roleName),Role::getRoleName,roleName).list();
+        return lambdaQuery().eq(!CommUtil.isEmptyOrNull(roleName), Role::getRoleName, roleName).list();
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -50,12 +50,12 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     @Override
     public void saveList(List<Role> roleList) {
 
-      roleList.forEach(role->{
-          UpdateWrapper update  = new UpdateWrapper();
-            update.eq("id",role.getId());
-            update.set("permissions",role.getPermissions());
-            baseMapper.update(role,update);
-      });
+        roleList.forEach(role -> {
+            UpdateWrapper update = new UpdateWrapper();
+            update.eq("id", role.getId());
+            update.set("permissions", role.getPermissions());
+            baseMapper.update(role, update);
+        });
     }
 
     @Override

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

@@ -3,7 +3,7 @@ package com.kym.service.admin.impl;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.annotation.DynamicCache;
 import com.kym.common.enums.EnPlusApi;
 import com.kym.common.utils.AESUtil;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @DS("db-admin")
-public class StationServiceImpl extends ServiceImpl<StationMapper, Station> implements StationService {
+public class StationServiceImpl extends MPJBaseServiceImpl<StationMapper, Station> implements StationService {
 
     private final EnPlusService enPlusService;
     private final EquipmentInfoService equipmentInfoService;

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

@@ -1,7 +1,7 @@
 package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.admin.SystemLog;
 import com.kym.mapper.admin.SystemLogMapper;
 import com.kym.service.admin.SystemLogService;
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-admin")
-public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog> implements SystemLogService {
+public class SystemLogServiceImpl extends MPJBaseServiceImpl<SystemLogMapper, SystemLog> implements SystemLogService {
 
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.kym.common.cache.ConnectorStatusCache;
 import com.kym.common.config.RedisDBChangeUtil;
+import com.kym.entity.admin.ConnectorInfo;
 import com.kym.entity.admin.EquipmentInfo;
 import com.kym.entity.admin.MonitorLog;
 import com.kym.entity.common.RedisKeys;
@@ -14,6 +15,7 @@ import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.OrderRechargeRights;
 import com.kym.entity.miniapp.UserRechargeRights;
 import com.kym.entity.miniapp.WalletDetail;
+import com.kym.service.admin.ConnectorInfoService;
 import com.kym.service.admin.EquipmentInfoService;
 import com.kym.service.admin.MonitorLogService;
 import com.kym.service.cache.KymCache;
@@ -57,6 +59,8 @@ public class EnNotifyServiceImpl implements EnNotifyService {
 
     private final EquipmentInfoService equipmentInfoService;
 
+    private final ConnectorInfoService connectorInfoService;
+
     private final UserRechargeRightsService userRechargeRightsService;
 
     private final OrderRechargeRightsService orderRechargeRightsService;
@@ -69,7 +73,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     public EnNotifyServiceImpl(EnPlusService enPlusService, ChargeOrderService chargeOrderService,
                                ChargeService chargeService, AccountService accountService, WalletDetailService walletDetailService,
                                MonitorLogService monitorLogService, EquipmentInfoService equipmentInfoService,
-                               UserRechargeRightsService userRechargeRightsService, OrderRechargeRightsService orderRechargeRightsService, RedisDBChangeUtil redisDBChangeUtil) {
+                               ConnectorInfoService connectorInfoService, UserRechargeRightsService userRechargeRightsService, OrderRechargeRightsService orderRechargeRightsService, RedisDBChangeUtil redisDBChangeUtil) {
         this.enPlusService = enPlusService;
         this.chargeOrderService = chargeOrderService;
         this.chargeService = chargeService;
@@ -77,6 +81,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
         this.walletDetailService = walletDetailService;
         this.monitorLogService = monitorLogService;
         this.equipmentInfoService = equipmentInfoService;
+        this.connectorInfoService = connectorInfoService;
         this.userRechargeRightsService = userRechargeRightsService;
         this.orderRechargeRightsService = orderRechargeRightsService;
         this.redisDBChangeUtil = redisDBChangeUtil;
@@ -108,6 +113,11 @@ public class EnNotifyServiceImpl implements EnNotifyService {
                 .set(EquipmentInfo::getServiceStatus, connectorStatusInfo.getStatus())
                 .update();
 
+        connectorInfoService.lambdaUpdate()
+                .eq(ConnectorInfo::getConnectorId, connectorId)
+                .set(ConnectorInfo::getStatus, connectorStatusInfo.getStatus())
+                .update();
+
         // 切换到admin对应的db
         redisDBChangeUtil.setDataBase(0);
 

service/src/main/java/com/kym/service/miniapp/AccountService.java

@@ -1,6 +1,6 @@
 package com.kym.service.miniapp;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.Account;
 
 /**
@@ -11,7 +11,7 @@ import com.kym.entity.miniapp.Account;
  * @author skyline
  * @since 2023-08-07
  */
-public interface AccountService extends IService<Account> {
+public interface AccountService extends MPJBaseService<Account> {
 
     Account getAccountByUserId(Long userId);
 

service/src/main/java/com/kym/service/miniapp/AppLogService.java

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.AppLog;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-08-20
  */
-public interface AppLogService extends IService<AppLog> {
+public interface AppLogService extends MPJBaseService<AppLog> {
 
 }

service/src/main/java/com/kym/service/miniapp/AttachmentService.java

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.Attachment;
-import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -15,7 +15,7 @@ import java.io.IOException;
  * @author zuy
  * @since 2023-08-12
  */
-public interface AttachmentService extends IService<Attachment> {
+public interface AttachmentService extends MPJBaseService<Attachment> {
 
     Attachment upload(MultipartFile file) throws IOException;
 

service/src/main/java/com/kym/service/miniapp/CarsService.java

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.Cars;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-07-26
  */
-public interface CarsService extends IService<Cars> {
+public interface CarsService extends MPJBaseService<Cars> {
 
 }

service/src/main/java/com/kym/service/miniapp/ChargeOrderService.java

@@ -1,6 +1,6 @@
 package com.kym.service.miniapp;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
 import com.kym.entity.admin.queryParams.StatQueryParam;
 import com.kym.entity.admin.vo.CustomOrderVo;
@@ -22,7 +22,7 @@ import java.util.Map;
  * @author skyline
  * @since 2023-08-08
  */
-public interface ChargeOrderService extends IService<ChargeOrder> {
+public interface ChargeOrderService extends MPJBaseService<ChargeOrder> {
 
     ChargeOrder getChargingOrderByUserId(Long userId);
 

service/src/main/java/com/kym/service/miniapp/CollectService.java

@@ -1,8 +1,8 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.entity.miniapp.Collect;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-07-31
  */
-public interface CollectService extends IService<Collect> {
+public interface CollectService extends MPJBaseService<Collect> {
 
     void updateCollect(String stationId, Integer status);
 

service/src/main/java/com/kym/service/miniapp/DataDictService.java

@@ -1,8 +1,8 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.common.IQuery;
 import com.kym.entity.miniapp.DataDict;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 
 /**
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author zuy
  * @since 2023-08-13
  */
-public interface DataDictService extends IService<DataDict> {
+public interface DataDictService extends MPJBaseService<DataDict> {
 
     Object list(IQuery<DataDict> query);
 

service/src/main/java/com/kym/service/miniapp/InvoiceService.java

@@ -1,6 +1,6 @@
 package com.kym.service.miniapp;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.queryParams.InvoiceQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.Invoice;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-09-15
  */
-public interface InvoiceService extends IService<Invoice> {
+public interface InvoiceService extends MPJBaseService<Invoice> {
 
     TitleUrl applyInvoice(ApplyInvoiceParams params);
 

service/src/main/java/com/kym/service/miniapp/InvoiceTitleService.java

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.InvoiceTitle;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-09-21
  */
-public interface InvoiceTitleService extends IService<InvoiceTitle> {
+public interface InvoiceTitleService extends MPJBaseService<InvoiceTitle> {
 
 }

service/src/main/java/com/kym/service/miniapp/OrderRechargeRightsService.java

@@ -1,8 +1,8 @@
 package com.kym.service.miniapp;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.OrderRechargeRights;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -13,6 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-10-19
  */
 @DS("db-miniapp")
-public interface OrderRechargeRightsService extends IService<OrderRechargeRights> {
+public interface OrderRechargeRightsService extends MPJBaseService<OrderRechargeRights> {
 
 }

service/src/main/java/com/kym/service/miniapp/PayLogService.java

@@ -1,6 +1,6 @@
 package com.kym.service.miniapp;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.vo.CustomRechargeVo;
 import com.kym.entity.common.PageBean;
@@ -14,7 +14,7 @@ import com.kym.entity.miniapp.PayLog;
  * @author skyline
  * @since 2023-08-12
  */
-public interface PayLogService extends IService<PayLog> {
+public interface PayLogService extends MPJBaseService<PayLog> {
 
     PageBean<CustomRechargeVo> listRecharge(CommonQueryParam params);
 

service/src/main/java/com/kym/service/miniapp/QuestionAnswerService.java

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.QuestionAnswer;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-10-26
  */
-public interface QuestionAnswerService extends IService<QuestionAnswer> {
+public interface QuestionAnswerService extends MPJBaseService<QuestionAnswer> {
 
 }

service/src/main/java/com/kym/service/miniapp/RefundLogService.java

@@ -1,9 +1,9 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.RefundLog;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.kym.entity.miniapp.vo.RefundVo;
 
 /**
@@ -14,6 +14,6 @@ import com.kym.entity.miniapp.vo.RefundVo;
  * @author skyline
  * @since 2023-09-11
  */
-public interface RefundLogService extends IService<RefundLog> {
+public interface RefundLogService extends MPJBaseService<RefundLog> {
     PageBean<RefundVo> listRefundLog(CommonQueryParam params);
 }

service/src/main/java/com/kym/service/miniapp/UserRechargeRightsService.java

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.UserRechargeRights;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-10-18
  */
-public interface UserRechargeRightsService extends IService<UserRechargeRights> {
+public interface UserRechargeRightsService extends MPJBaseService<UserRechargeRights> {
 
 }

service/src/main/java/com/kym/service/miniapp/UserService.java

@@ -1,6 +1,6 @@
 package com.kym.service.miniapp;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.common.R;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.vo.CustomUserVo;
@@ -17,7 +17,7 @@ import com.kym.entity.miniapp.vo.UserVo;
  * @author skyline
  * @since 2023-06-27
  */
-public interface UserService extends IService<User> {
+public interface UserService extends MPJBaseService<User> {
 
     UserVo getMe();
 

service/src/main/java/com/kym/service/miniapp/WalletDetailService.java

@@ -1,8 +1,7 @@
 package com.kym.service.miniapp;
 
-import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.miniapp.WalletDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -14,7 +13,7 @@ import java.util.List;
  * @author skyline
  * @since 2023-08-09
  */
-public interface WalletDetailService extends IService<WalletDetail> {
+public interface WalletDetailService extends MPJBaseService<WalletDetail> {
 
     WalletDetail getWalletDetailByOrderNo(String orderNo, Integer status);
 

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

@@ -1,7 +1,7 @@
 package com.kym.service.miniapp.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.miniapp.Account;
 import com.kym.mapper.miniapp.AccountMapper;
 import com.kym.service.miniapp.AccountService;
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-miniapp")
-public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements AccountService {
+public class AccountServiceImpl extends MPJBaseServiceImpl<AccountMapper, Account> implements AccountService {
 
     @Override
     public Account getAccountByUserId(Long userId) {

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

@@ -1,9 +1,9 @@
 package com.kym.service.miniapp.impl;
 
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.miniapp.AppLog;
 import com.kym.mapper.miniapp.AppLogMapper;
 import com.kym.service.miniapp.AppLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-08-20
  */
 @Service
-public class AppLogServiceImpl extends ServiceImpl<AppLogMapper, AppLog> implements AppLogService {
+public class AppLogServiceImpl extends MPJBaseServiceImpl<AppLogMapper, AppLog> implements AppLogService {
 
 }

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

@@ -5,7 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.UUID;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.OssUtil;
 import com.kym.entity.miniapp.Attachment;
@@ -30,7 +30,7 @@ import java.util.Objects;
  */
 @DS("db-miniapp")
 @Service
-public class AttachmentServiceImpl extends ServiceImpl<AttachmentMapper, Attachment> implements AttachmentService {
+public class AttachmentServiceImpl extends MPJBaseServiceImpl<AttachmentMapper, Attachment> implements AttachmentService {
 
     @Value("${upload.file.storage}")
     private String fileStoragePath;

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

@@ -1,10 +1,10 @@
 package com.kym.service.miniapp.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.miniapp.Cars;
 import com.kym.mapper.miniapp.CarsMapper;
 import com.kym.service.miniapp.CarsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS("db-miniapp")
-public class CarsServiceImpl extends ServiceImpl<CarsMapper, Cars> implements CarsService {
+public class CarsServiceImpl extends MPJBaseServiceImpl<CarsMapper, Cars> implements CarsService {
 
 }