From 9b76c84986187440f6be68b6201d4ae6b764c774 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 7 Jul 2022 10:58:01 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"update=20=E6=9B=B4=E6=96=B0@DS"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f8ca0104611004df3bdde8df803125748a53f08a. --- .../jiudian/hotelManagement/mapper/HotelManagementMapper.java | 2 -- .../service/impl/HotelManagementServiceImpl.java | 1 + .../jiudian/hotelcontact/mapper/HotelContactMapper.java | 2 -- .../hotelcontact/service/impl/HotelContactServiceImpl.java | 1 + .../jero/standards/meetingNews/mapper/MeetingNewsMapper.java | 2 -- .../meetingNews/service/impl/MeetingNewsServiceImpl.java | 1 + .../com/jero/standards/memberinfo/mapper/MemberInfoMapper.java | 2 -- .../memberinfo/service/impl/MemberInfoServiceImpl.java | 1 + .../xuanguan/attendmeetings/mapper/AttendMeetingsMapper.java | 2 -- .../attendmeetings/service/impl/AttendMeetingsServiceImpl.java | 1 + .../stablecrosstraining/mapper/StableCrossTrainingMapper.java | 2 -- .../service/impl/StableCrossTrainingServiceImpl.java | 1 + 12 files changed, 6 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/mapper/HotelManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/mapper/HotelManagementMapper.java index 884776e4..de8abd9c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/mapper/HotelManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/mapper/HotelManagementMapper.java @@ -1,6 +1,5 @@ package com.jero.standards.jiudian.hotelManagement.mapper; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.jero.standards.jiudian.hotelManagement.entity.HotelManagement; @@ -14,7 +13,6 @@ import org.springframework.stereotype.Repository; * @Version: V1.0 */ @Repository -@DS(value = "multi-datasource1") public interface HotelManagementMapper extends BaseMapper { /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java index 7e4a5396..880b898d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java @@ -37,6 +37,7 @@ import java.util.List; */ @Service @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) +@DS(value = "multi-datasource1") public class HotelManagementServiceImpl extends ServiceImpl implements IHotelManagementService { @Autowired diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/mapper/HotelContactMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/mapper/HotelContactMapper.java index 1a120903..0eed00cf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/mapper/HotelContactMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/mapper/HotelContactMapper.java @@ -1,6 +1,5 @@ package com.jero.standards.jiudian.hotelcontact.mapper; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import com.jero.standards.jiudian.hotelcontact.entity.HotelContact; @@ -13,7 +12,6 @@ import org.springframework.stereotype.Repository; * @Version: V1.0 */ @Repository -@DS(value = "multi-datasource1") public interface HotelContactMapper extends BaseMapper { Long removeByHotelId(@Param("hotelId") String hotelId); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/service/impl/HotelContactServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/service/impl/HotelContactServiceImpl.java index eac399e5..0e519ca8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/service/impl/HotelContactServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelcontact/service/impl/HotelContactServiceImpl.java @@ -27,6 +27,7 @@ import java.util.List; */ @Service @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) +@DS(value = "multi-datasource1") public class HotelContactServiceImpl extends ServiceImpl implements IHotelContactService { @Autowired private IHotelContactService hotelContactService; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/mapper/MeetingNewsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/mapper/MeetingNewsMapper.java index 5d668565..fe723ee4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/mapper/MeetingNewsMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/mapper/MeetingNewsMapper.java @@ -2,7 +2,6 @@ package com.jero.standards.meetingNews.mapper; import java.util.List; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.standards.jiudian.hotelManagement.entity.HotelManagement; import com.jero.standards.meetingNews.entity.MeetingNews; @@ -18,7 +17,6 @@ import org.springframework.stereotype.Repository; * @Version: V1.0 */ @Repository -@DS(value = "multi-datasource1") public interface MeetingNewsMapper extends BaseMapper { } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/service/impl/MeetingNewsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/service/impl/MeetingNewsServiceImpl.java index ef516da4..5d5c0d1b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/service/impl/MeetingNewsServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/service/impl/MeetingNewsServiceImpl.java @@ -44,6 +44,7 @@ import java.util.*; */ @Service @Transactional +@DS(value = "multi-datasource1") public class MeetingNewsServiceImpl extends ServiceImpl implements IMeetingNewsService { } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java index 73036f3b..0f5c7029 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java @@ -1,7 +1,6 @@ package com.jero.standards.memberinfo.mapper; import cn.hutool.core.date.DateTime; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.standards.memberinfo.entity.SysUser; @@ -18,7 +17,6 @@ import java.util.List; * @Date: 2020-12-24 * @Version: V1.0 */ -@DS(value = "multi-datasource1") public interface MemberInfoMapper extends BaseMapper { Integer countByCompanyName(@Param("companyName")String companyName); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java index 16cad5d9..cd977eb6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java @@ -31,6 +31,7 @@ import java.util.Map; */ @Service @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) +@DS(value = "multi-datasource1") public class MemberInfoServiceImpl extends ServiceImpl implements IMemberInfoService { @Resource MemberInfoMapper memberInfoMapper; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/mapper/AttendMeetingsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/mapper/AttendMeetingsMapper.java index 329f5973..2450775b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/mapper/AttendMeetingsMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/mapper/AttendMeetingsMapper.java @@ -2,7 +2,6 @@ package com.jero.standards.xuanguan.attendmeetings.mapper; import java.util.List; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.standards.xuanguan.attendmeetings.entity.AttendMeetings; import org.apache.ibatis.annotations.Param; @@ -16,7 +15,6 @@ import org.springframework.stereotype.Repository; * @Version: V1.0 */ @Repository -@DS(value = "multi-datasource1") public interface AttendMeetingsMapper extends BaseMapper { /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/service/impl/AttendMeetingsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/service/impl/AttendMeetingsServiceImpl.java index 395502bb..5f5c55ec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/service/impl/AttendMeetingsServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/attendmeetings/service/impl/AttendMeetingsServiceImpl.java @@ -37,6 +37,7 @@ import java.util.*; */ @Service @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) +@DS(value = "multi-datasource1") public class AttendMeetingsServiceImpl extends ServiceImpl implements IAttendMeetingsService { @Autowired private ISysBaseAPI sysBaseAPI; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/mapper/StableCrossTrainingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/mapper/StableCrossTrainingMapper.java index e92b0142..52222383 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/mapper/StableCrossTrainingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/mapper/StableCrossTrainingMapper.java @@ -1,6 +1,5 @@ package com.jero.standards.xuanguan.stablecrosstraining.mapper; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.jero.standards.xuanguan.stablecrosstraining.entity.OSSFileVO; @@ -17,7 +16,6 @@ import java.util.List; * @Version: V1.0 */ @Repository -@DS(value = "multi-datasource1") public interface StableCrossTrainingMapper extends BaseMapper { /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java index 841aaaa1..4bd29a73 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java @@ -47,6 +47,7 @@ import java.util.*; */ @Service @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) +@DS(value = "multi-datasource1") public class StableCrossTrainingServiceImpl extends ServiceImpl implements IStableCrossTrainingService { @Autowired private ISysBaseAPI sysBaseAPI;