修复mybatis generator重复生成mapper.xml内容的问题

viteyuan · Jun 19, 2019 · 310696e · 310696e
1 parent 79000a1
commit 310696e
Show file tree

Hide file tree

Showing 149 changed files with 150 additions and 148 deletions.
diff --git a/mall-admin/src/main/java/com/macro/mall/dto/SmsFlashPromotionSessionDetail.java b/mall-admin/src/main/java/com/macro/mall/dto/SmsFlashPromotionSessionDetail.java
@@ -11,5 +11,5 @@
 public class SmsFlashPromotionSessionDetail extends SmsFlashPromotionSession {
     @Setter
     @Getter
-    private Integer productCount;
+    private Long productCount;
 }
diff --git a/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionProductRelationService.java b/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionProductRelationService.java
@@ -46,5 +46,5 @@ public interface SmsFlashPromotionProductRelationService {
      * @param flashPromotionSessionId
      * @return
      */
-    int getCount(Long flashPromotionId,Long flashPromotionSessionId);
+    long getCount(Long flashPromotionId,Long flashPromotionSessionId);
 }
diff --git a/...rc/main/java/com/macro/mall/service/impl/SmsFlashPromotionProductRelationServiceImpl.java b/...rc/main/java/com/macro/mall/service/impl/SmsFlashPromotionProductRelationServiceImpl.java
@@ -53,7 +53,7 @@ public List<SmsFlashPromotionProduct> list(Long flashPromotionId, Long flashProm
     }
 
     @Override
-    public int getCount(Long flashPromotionId, Long flashPromotionSessionId) {
+    public long getCount(Long flashPromotionId, Long flashPromotionSessionId) {
         SmsFlashPromotionProductRelationExample example = new SmsFlashPromotionProductRelationExample();
         example.createCriteria()
                 .andFlashPromotionIdEqualTo(flashPromotionId)

diff --git a/...-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionSessionServiceImpl.java b/...-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionSessionServiceImpl.java
@@ -70,7 +70,7 @@ public List<SmsFlashPromotionSessionDetail> selectList(Long flashPromotionId) {
         for (SmsFlashPromotionSession promotionSession : list) {
             SmsFlashPromotionSessionDetail detail = new SmsFlashPromotionSessionDetail();
             BeanUtils.copyProperties(promotionSession, detail);
-            int count = relationService.getCount(flashPromotionId, promotionSession.getId());
+            long count = relationService.getCount(flashPromotionId, promotionSession.getId());
             detail.setProductCount(count);
             result.add(detail);
         }

diff --git a/mall-mbg/pom.xml b/mall-mbg/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-core</artifactId>
-            <version>1.3.3</version>
+            <version>1.3.7</version>
         </dependency>
         <!-- MyBatis-->
         <dependency>

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsHelpCategoryMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsHelpCategoryMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsHelpCategoryMapper {
-    int countByExample(CmsHelpCategoryExample example);
+    long countByExample(CmsHelpCategoryExample example);
 
     int deleteByExample(CmsHelpCategoryExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsHelpMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsHelpMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsHelpMapper {
-    int countByExample(CmsHelpExample example);
+    long countByExample(CmsHelpExample example);
 
     int deleteByExample(CmsHelpExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsMemberReportMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsMemberReportMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsMemberReportMapper {
-    int countByExample(CmsMemberReportExample example);
+    long countByExample(CmsMemberReportExample example);
 
     int deleteByExample(CmsMemberReportExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsPrefrenceAreaMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsPrefrenceAreaMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsPrefrenceAreaMapper {
-    int countByExample(CmsPrefrenceAreaExample example);
+    long countByExample(CmsPrefrenceAreaExample example);
 
     int deleteByExample(CmsPrefrenceAreaExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsPrefrenceAreaProductRelationMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsPrefrenceAreaProductRelationMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsPrefrenceAreaProductRelationMapper {
-    int countByExample(CmsPrefrenceAreaProductRelationExample example);
+    long countByExample(CmsPrefrenceAreaProductRelationExample example);
 
     int deleteByExample(CmsPrefrenceAreaProductRelationExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectCategoryMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectCategoryMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsSubjectCategoryMapper {
-    int countByExample(CmsSubjectCategoryExample example);
+    long countByExample(CmsSubjectCategoryExample example);
 
     int deleteByExample(CmsSubjectCategoryExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectCommentMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectCommentMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsSubjectCommentMapper {
-    int countByExample(CmsSubjectCommentExample example);
+    long countByExample(CmsSubjectCommentExample example);
 
     int deleteByExample(CmsSubjectCommentExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsSubjectMapper {
-    int countByExample(CmsSubjectExample example);
+    long countByExample(CmsSubjectExample example);
 
     int deleteByExample(CmsSubjectExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectProductRelationMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsSubjectProductRelationMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsSubjectProductRelationMapper {
-    int countByExample(CmsSubjectProductRelationExample example);
+    long countByExample(CmsSubjectProductRelationExample example);
 
     int deleteByExample(CmsSubjectProductRelationExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsTopicCategoryMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsTopicCategoryMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsTopicCategoryMapper {
-    int countByExample(CmsTopicCategoryExample example);
+    long countByExample(CmsTopicCategoryExample example);
 
     int deleteByExample(CmsTopicCategoryExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsTopicCommentMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsTopicCommentMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsTopicCommentMapper {
-    int countByExample(CmsTopicCommentExample example);
+    long countByExample(CmsTopicCommentExample example);
 
     int deleteByExample(CmsTopicCommentExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/CmsTopicMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/CmsTopicMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface CmsTopicMapper {
-    int countByExample(CmsTopicExample example);
+    long countByExample(CmsTopicExample example);
 
     int deleteByExample(CmsTopicExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsCartItemMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsCartItemMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsCartItemMapper {
-    int countByExample(OmsCartItemExample example);
+    long countByExample(OmsCartItemExample example);
 
     int deleteByExample(OmsCartItemExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsCompanyAddressMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsCompanyAddressMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsCompanyAddressMapper {
-    int countByExample(OmsCompanyAddressExample example);
+    long countByExample(OmsCompanyAddressExample example);
 
     int deleteByExample(OmsCompanyAddressExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderItemMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderItemMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsOrderItemMapper {
-    int countByExample(OmsOrderItemExample example);
+    long countByExample(OmsOrderItemExample example);
 
     int deleteByExample(OmsOrderItemExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsOrderMapper {
-    int countByExample(OmsOrderExample example);
+    long countByExample(OmsOrderExample example);
 
     int deleteByExample(OmsOrderExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderOperateHistoryMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderOperateHistoryMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsOrderOperateHistoryMapper {
-    int countByExample(OmsOrderOperateHistoryExample example);
+    long countByExample(OmsOrderOperateHistoryExample example);
 
     int deleteByExample(OmsOrderOperateHistoryExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderReturnApplyMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderReturnApplyMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsOrderReturnApplyMapper {
-    int countByExample(OmsOrderReturnApplyExample example);
+    long countByExample(OmsOrderReturnApplyExample example);
 
     int deleteByExample(OmsOrderReturnApplyExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderReturnReasonMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderReturnReasonMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsOrderReturnReasonMapper {
-    int countByExample(OmsOrderReturnReasonExample example);
+    long countByExample(OmsOrderReturnReasonExample example);
 
     int deleteByExample(OmsOrderReturnReasonExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderSettingMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/OmsOrderSettingMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface OmsOrderSettingMapper {
-    int countByExample(OmsOrderSettingExample example);
+    long countByExample(OmsOrderSettingExample example);
 
     int deleteByExample(OmsOrderSettingExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsAlbumMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsAlbumMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsAlbumMapper {
-    int countByExample(PmsAlbumExample example);
+    long countByExample(PmsAlbumExample example);
 
     int deleteByExample(PmsAlbumExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsAlbumPicMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsAlbumPicMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsAlbumPicMapper {
-    int countByExample(PmsAlbumPicExample example);
+    long countByExample(PmsAlbumPicExample example);
 
     int deleteByExample(PmsAlbumPicExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsBrandMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsBrandMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsBrandMapper {
-    int countByExample(PmsBrandExample example);
+    long countByExample(PmsBrandExample example);
 
     int deleteByExample(PmsBrandExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsCommentMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsCommentMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsCommentMapper {
-    int countByExample(PmsCommentExample example);
+    long countByExample(PmsCommentExample example);
 
     int deleteByExample(PmsCommentExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsCommentReplayMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsCommentReplayMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsCommentReplayMapper {
-    int countByExample(PmsCommentReplayExample example);
+    long countByExample(PmsCommentReplayExample example);
 
     int deleteByExample(PmsCommentReplayExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsFeightTemplateMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsFeightTemplateMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsFeightTemplateMapper {
-    int countByExample(PmsFeightTemplateExample example);
+    long countByExample(PmsFeightTemplateExample example);
 
     int deleteByExample(PmsFeightTemplateExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsMemberPriceMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsMemberPriceMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsMemberPriceMapper {
-    int countByExample(PmsMemberPriceExample example);
+    long countByExample(PmsMemberPriceExample example);
 
     int deleteByExample(PmsMemberPriceExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductAttributeCategoryMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductAttributeCategoryMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductAttributeCategoryMapper {
-    int countByExample(PmsProductAttributeCategoryExample example);
+    long countByExample(PmsProductAttributeCategoryExample example);
 
     int deleteByExample(PmsProductAttributeCategoryExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductAttributeMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductAttributeMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductAttributeMapper {
-    int countByExample(PmsProductAttributeExample example);
+    long countByExample(PmsProductAttributeExample example);
 
     int deleteByExample(PmsProductAttributeExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductAttributeValueMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductAttributeValueMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductAttributeValueMapper {
-    int countByExample(PmsProductAttributeValueExample example);
+    long countByExample(PmsProductAttributeValueExample example);
 
     int deleteByExample(PmsProductAttributeValueExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductCategoryAttributeRelationMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductCategoryAttributeRelationMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductCategoryAttributeRelationMapper {
-    int countByExample(PmsProductCategoryAttributeRelationExample example);
+    long countByExample(PmsProductCategoryAttributeRelationExample example);
 
     int deleteByExample(PmsProductCategoryAttributeRelationExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductCategoryMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductCategoryMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductCategoryMapper {
-    int countByExample(PmsProductCategoryExample example);
+    long countByExample(PmsProductCategoryExample example);
 
     int deleteByExample(PmsProductCategoryExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductFullReductionMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductFullReductionMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductFullReductionMapper {
-    int countByExample(PmsProductFullReductionExample example);
+    long countByExample(PmsProductFullReductionExample example);
 
     int deleteByExample(PmsProductFullReductionExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductLadderMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductLadderMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductLadderMapper {
-    int countByExample(PmsProductLadderExample example);
+    long countByExample(PmsProductLadderExample example);
 
     int deleteByExample(PmsProductLadderExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductMapper {
-    int countByExample(PmsProductExample example);
+    long countByExample(PmsProductExample example);
 
     int deleteByExample(PmsProductExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductOperateLogMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductOperateLogMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductOperateLogMapper {
-    int countByExample(PmsProductOperateLogExample example);
+    long countByExample(PmsProductOperateLogExample example);
 
     int deleteByExample(PmsProductOperateLogExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductVertifyRecordMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsProductVertifyRecordMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsProductVertifyRecordMapper {
-    int countByExample(PmsProductVertifyRecordExample example);
+    long countByExample(PmsProductVertifyRecordExample example);
 
     int deleteByExample(PmsProductVertifyRecordExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/PmsSkuStockMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/PmsSkuStockMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface PmsSkuStockMapper {
-    int countByExample(PmsSkuStockExample example);
+    long countByExample(PmsSkuStockExample example);
 
     int deleteByExample(PmsSkuStockExample example);
 

diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/SmsCouponHistoryMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/SmsCouponHistoryMapper.java
@@ -6,7 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 public interface SmsCouponHistoryMapper {
-    int countByExample(SmsCouponHistoryExample example);
+    long countByExample(SmsCouponHistoryExample example);
 
     int deleteByExample(SmsCouponHistoryExample example);