Merge branch 'master' into dev

# Conflicts:
#	service/src/main/java/com/kym/service/admin/EquipmentRelationService.java
#	service/src/main/java/com/kym/service/admin/impl/EquipmentRelationServiceImpl.java

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

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
-import com.github.yulichang.base.MPJBaseMapper;
 import com.kym.entity.admin.EquipmentRelation;
+import com.kym.mapper.mybatisplus.MyBaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.kym.entity.admin.EquipmentRelation;
  * @author skyline
  * @since 2023-08-07
  */
-public interface EquipmentRelationMapper extends MPJBaseMapper<EquipmentRelation> {
+public interface EquipmentRelationMapper extends MyBaseMapper<EquipmentRelation> {
 
 }

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

@@ -1,8 +1,8 @@
 package com.kym.service.admin;
 
-import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.EquipmentRelation;
 import com.kym.entity.admin.dto.BatchBindEquipmentRelation;
+import com.kym.service.mybatisplus.MyBaseService;
 
 /**
  * <p>
@@ -12,7 +12,7 @@ import com.kym.entity.admin.dto.BatchBindEquipmentRelation;
  * @author skyline
  * @since 2023-08-07
  */
-public interface EquipmentRelationService extends MPJBaseService<EquipmentRelation> {
+public interface EquipmentRelationService extends MyBaseService<EquipmentRelation> {
     EquipmentRelation getByShortId(String shortId);
 
     EquipmentRelation getByEquipmentId(String equipmentId);

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

@@ -2,15 +2,12 @@ package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 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.EquipmentRelation;
 import com.kym.entity.admin.dto.BatchBindEquipmentRelation;
-import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.mapper.admin.EquipmentRelationMapper;
 import com.kym.service.admin.EquipmentRelationService;
+import com.kym.service.mybatisplus.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -22,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 @DS("db-admin")
-public class EquipmentRelationServiceImpl extends MPJBaseServiceImpl<EquipmentRelationMapper, EquipmentRelation> implements EquipmentRelationService {
+public class EquipmentRelationServiceImpl extends MyBaseServiceImpl<EquipmentRelationMapper, EquipmentRelation> implements EquipmentRelationService {
 
     @Override
     public EquipmentRelation getByShortId(String shortId) {

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

@@ -350,7 +350,7 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
         var stations = equipmentRelations.stream().filter(CommUtil.distinctByKey(EquipmentRelation::getStationId))
                 .map(item -> Map.of("stationId", item.getStationId(), "stationName", item.getStationName())).toList();
         var stationList = stations.stream().map(map -> new Station().setStationId(map.get("stationId")).setStationName(map.get("stationName"))).toList();
-        saveBatch(stationList);
+        replaceBatch(stationList);
 
         // t_equipment_info
         var equipmentInfoList = equipmentRelations.stream().map(item -> {
@@ -358,7 +358,7 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
             BeanUtils.copyProperties(item, equipmentInfo, "id");
             return equipmentInfo;
         }).toList();
-        equipmentInfoService.saveBatch(equipmentInfoList);
+        equipmentInfoService.replaceBatch(equipmentInfoList);
 
         // t_connector_info
         var connectorInfoList = equipmentRelations.stream().map(item -> {
@@ -366,10 +366,10 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
             BeanUtils.copyProperties(item, connectorInfo, "id");
             return connectorInfo;
         }).toList();
-        connectorInfoService.saveBatch(connectorInfoList);
+        connectorInfoService.replaceBatch(connectorInfoList);
 
         // t_equipment_relation
-        equipmentRelationService.saveBatch(equipmentRelations);
+        equipmentRelationService.replaceBatch(equipmentRelations);
 
         // 缓存更新
         KymCache.INSTANCE.putStationId2Name(stations.stream().collect(Collectors.toMap(map -> map.get("stationId"), map -> map.get("stationName"))));