Преглед на файлове

mybatis替换过时的SqlParser

FengChaoYu преди 8 месеца
родител
ревизия
40e4ae0a2d
променени са 47 файла, в които са добавени 266 реда и са изтрити 276 реда
  1. 6 6
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/AppMapper.java
  2. 4 4
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CategoryMapper.java
  3. 4 5
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CommonMapper.java
  4. 3 4
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CoustomUserCouponMapper.java
  5. 3 4
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomCoupouMapper.java
  6. 3 4
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomGoodsFavoriteMapper.java
  7. 1 1
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomWebsitNumberMapper.java
  8. 3 3
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/DailyReportMapper.java
  9. 2 2
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/GoodsFlagUpdateMapper.java
  10. 8 10
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/GoodsSpecDetailMapper.java
  11. 4 4
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MaterialMapper.java
  12. 4 7
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MyProfitMapper.java
  13. 3 5
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/OrderShareRankMapper.java
  14. 5 6
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/SecActivityStageMapper.java
  15. 4 5
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/SoldNumMapper.java
  16. 3 3
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/UserInfoMapper.java
  17. 6 7
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/WxCustomerMapper.java
  18. 4 5
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/stock/WorkerStockCMapper.java
  19. 2 2
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/workorder/OrderBaseCMapper.java
  20. 44 20
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/config/MyBatisPlusConfig.java
  21. 1 0
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/constant/Constant.java
  22. 6 7
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/AdminMapper.java
  23. 14 14
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java
  24. 11 11
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonPageV2Mapper.java
  25. 8 9
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CountMapper.java
  26. 8 9
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CouponDateMapper.java
  27. 3 3
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CoustomUserCouponMapper.java
  28. 7 8
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomGoodsMapper.java
  29. 2 3
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomMemberMapper.java
  30. 5 5
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomOfflineMapper.java
  31. 2 4
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomSalesReportMapper.java
  32. 2 2
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomTagGroupMapper.java
  33. 2 3
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomWebsitMapper.java
  34. 14 14
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/DailyMapper.java
  35. 3 4
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/GoodsCheckMapper.java
  36. 7 7
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/JxMapper.java
  37. 4 6
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/NoticeRecordBeanMapper.java
  38. 3 3
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/OrderShareReportMapper.java
  39. 6 9
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/SecKillMapper.java
  40. 3 3
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/TaxMapper.java
  41. 3 4
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitMapper.java
  42. 8 9
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java
  43. 6 6
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WxCustomerMapper.java
  44. 3 8
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/luckdraw/LuckDrawMapper.java
  45. 12 12
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/workorder/IncreMapper.java
  46. 5 5
      mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/workorder/OrderBaseCMapper.java
  47. 2 1
      mall-server-api/src/main/java/com/gree/mall/manager/config/MyBatisPlusConfig.java

+ 6 - 6
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/AppMapper.java

@@ -1,7 +1,7 @@
 package com.gree.mall.miniapp.commonmapper;
 
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.miniapp.bean.goods.GoodsNewBean;
 import com.gree.mall.miniapp.bean.order.OrderStatusBean;
@@ -21,14 +21,14 @@ public interface AppMapper {
      * @param userId
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<ShoppingCartList> queryShoppingCartList(@Param("userId") String userId);
 
 
     /**
      * 查询各订单状态数量
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public OrderStatusBean orderStatusCount(@Param("userId") String userId);
 
 
@@ -36,20 +36,20 @@ public interface AppMapper {
      * 秒杀时间段
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<SecKillExtends> queryTimeList(@Param("companyWechatId") String companyWechatId);
 
     /**
      * 秒杀商品列表
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<SecKillList> querySecKillList(@Param("time") String time);
 
     /**
      * 精选分类商品
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<GoodsNewBean> queryNewGoods(
             IPage ipage,
             @Param("objId") String objId,

+ 4 - 4
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CategoryMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.miniapp.bean.goods.CategoryBean;
 import com.gree.mall.miniapp.bean.goods.GoodsNewBean;
@@ -14,10 +14,10 @@ import java.util.List;
 @Mapper
 public interface CategoryMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CategoryBean> queryCategory(@Param("companyWechatId") String companyWechatId,@Param("isServiceShow") Boolean isServiceShow);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsNewBean> listGoods(IPage page,
                                   @Param("currentCompanyWechatId") String currentCompanyWechatId,
                                   @Param("categoryId")String categoryId,
@@ -26,7 +26,7 @@ public interface CategoryMapper {
     /**
      * 查询商品分类
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public GoodsCategory queryGoodsCategoryByGoodsId(@Param("goodsId") String goodsId);
 
     /**

+ 4 - 5
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CommonMapper.java

@@ -1,9 +1,8 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.annotation.DataPermission;
 import com.gree.mall.miniapp.bean.activity.PromotionActivityBean;
 import com.gree.mall.miniapp.bean.chargingstandard.ChargingStandardBean;
 import com.gree.mall.miniapp.bean.es.ESGoodsBean;
@@ -24,7 +23,7 @@ public interface CommonMapper {
     /**
      * 收费标准
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<ChargingStandardBean> queryChargingStandrdList(IPage page,
                                                                 @Param("twoCategoryId") String twoCateogryId,
                                                                 @Param("brandId") String brandId,
@@ -36,7 +35,7 @@ public interface CommonMapper {
     /**
      * 收费标准
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<ChargingStandardBean> queryChargingStandrdDetailList(
             @Param("twoCategoryId") String twoCateogryId,
             @Param("brandId") String brandId,
@@ -49,7 +48,7 @@ public interface CommonMapper {
      * 网点列表
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<WebsitVO> websitList(
             @Param("lng") String lng,
             @Param("lat") String lat,

+ 3 - 4
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CoustomUserCouponMapper.java

@@ -1,16 +1,15 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.miniapp.plus.entity.OrderDetail;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface CoustomUserCouponMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void decreaseLeftTimes(@Param("id") String id);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void increaseLeftTimes(@Param("id") String id);
 }

+ 3 - 4
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomCoupouMapper.java

@@ -1,9 +1,8 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.bean.coupon.CouponObtainBean;
 import com.gree.mall.miniapp.bean.coupon.CustomCoupouBean;
-import com.gree.mall.miniapp.plus.entity.Coupon;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,12 +12,12 @@ import java.util.List;
 @Mapper
 public interface CustomCoupouMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CustomCoupouBean> listCoupou(@Param("userId") String userId,
                                       @Param("orderAmount") BigDecimal orderAmount,
                                       @Param("goodsIds")List<String> goodsIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponObtainBean> listObtainCoupou(@Param("userId") String userId,
                                             @Param("companyWechatId") String companyWechatId);
 

+ 3 - 4
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomGoodsFavoriteMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.miniapp.bean.goods.CategoryBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.bean.goods.GoodsFavoriteBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,8 +9,8 @@ import java.util.List;
 
 @Mapper
 public interface CustomGoodsFavoriteMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsFavoriteBean> queryGoodsFavorite(@Param("userId") String userId,@Param("pageNum") Integer pageNum,@Param("pageSize") Integer pageSize);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     Integer queryGoodsFavoriteCount(@Param("userId") String userId);
 }

+ 1 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomWebsitNumberMapper.java

@@ -9,6 +9,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface CustomWebsitNumberMapper {
 
-//    @SqlParser(filter = true)
+//    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
 //    AdminWebsit queryWebsitNumber(@Param("workUserId") String workUserId,@Param("companyWechatId") String companyWechatId);
 }

+ 3 - 3
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/DailyReportMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.bean.settle.repair.DailyReportBean;
 import com.gree.mall.miniapp.bean.settle.repair.DailyWorkerIssueSalaryBean;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,7 +11,7 @@ import java.util.List;
 @Mapper
 public interface DailyReportMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyReportBean> issueDayList(@Param("workerNumber") String workerNumber,
                                        @Param("date")  String date,
                                        @Param("status") Integer status,
@@ -30,7 +30,7 @@ public interface DailyReportMapper {
                                                            @Param("q") String q
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyWorkerIssueSalaryBean> notIssueList(@Param("workerNumber") String workerNumber,
                                                   @Param("id") String id,
                                                   @Param("q") String q,

+ 2 - 2
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/GoodsFlagUpdateMapper.java

@@ -1,10 +1,10 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface GoodsFlagUpdateMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void updateSecFlag();
 }

+ 8 - 10
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/GoodsSpecDetailMapper.java

@@ -1,28 +1,26 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.miniapp.bean.goods.*;
 import com.gree.mall.miniapp.plus.entity.CommonTemplate;
-import com.gree.mall.miniapp.plus.entity.OrderComment;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface GoodsSpecDetailMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsSpecSecBean> querySpecSec(@Param("goodsId") String goodsId);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     CommonTemplate queryCommonTemplate(@Param("goodsId") String goodsId);
     /**
      * 团购商品列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<PromotionGoodsBean> queryPromotionGoods(IPage page,
                                                          @Param("userId") String userId,
                                                          @Param("goodsCategoryId") String goodsCategoryId,
@@ -32,21 +30,21 @@ public interface GoodsSpecDetailMapper {
     /**
      * 商品评价列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<GoodsComment> goodsCommentList(IPage page,@Param("companyWechatId")String companyWechatId,
                                                 @Param("goodsId") String goodsId,@Param("tag") String tag);
 
     /**
      * 商品评价汇总
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<CommentTagCount> goodsCommentCount(@Param("companyWechatId")String companyWechatId,@Param("goodsId") String goodsId);
 
 
     /**
      * 套购商品列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<GoodsPackageBean> queryGoodsPackage(@Param("userId") String userId,
                                                     @Param("userType") String userType,
                                                     @Param("goodsId") String goodsId,
@@ -56,7 +54,7 @@ public interface GoodsSpecDetailMapper {
     /**
      * 商品列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<GoodsNewBean> queryGoodsList(IPage page,
                                              @Param("brandIds") List<String> brandIds,
                                              @Param("minPrice") BigDecimal minPrice,

+ 4 - 4
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MaterialMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.miniapp.bean.material.*;
@@ -17,7 +17,7 @@ public interface MaterialMapper {
     /**
      * 购买记录
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<SalesOrderBean> buyList(IPage page, @Param("companyWechatId") String companyWechatId, @Param("userId") String userId, @Param("flag") String flag);
 
     /**
@@ -66,7 +66,7 @@ public interface MaterialMapper {
      * @param endTime
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<NormRecordVO> normRecordList(IPage page,
                                        @Param("companyWechatId") String companyWechatId,
                                        @Param("userId") String userId,
@@ -75,7 +75,7 @@ public interface MaterialMapper {
                                        @Param("startTime") String startTime,
                                        @Param("endTime") String endTime);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<PartsRefundVO> partsRefundList(Page<Object> objectPage,
                                          @Param("companyWechatId") String currentCompanyWechatId,
                                          @Param("userId") String userId,

+ 4 - 7
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MyProfitMapper.java

@@ -1,26 +1,23 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.annotation.DataPermission;
 import com.gree.mall.miniapp.bean.settle.OrderShareBean;
 import com.gree.mall.miniapp.bean.user.MyProfitBean;
-import com.gree.mall.miniapp.plus.entity.OrderShare;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Mapper
 public interface MyProfitMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     MyProfitBean queryProfitSum(@Param("userId") String userId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<OrderShareBean> queryOrderShareList(IPage page, @Param("userId") String userId, @Param("status") String status);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     BigDecimal queryProfitSumByTime(@Param("userId") String userId,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
 }

+ 3 - 5
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/OrderShareRankMapper.java

@@ -1,25 +1,23 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.miniapp.bean.user.MyProfitBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.bean.user.RankItemBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface OrderShareRankMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<RankItemBean> queryRankList(@Param("userId") String userId,
                                      @Param("startTime") Date startTime,
                                      @Param("endTime") Date endTime,
                                      @Param("companyWechatId") String companyWechatId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     RankItemBean queryWorkerInfo(@Param("userId") String userId,@Param("companyWechatId") String companyWechatId);
 
 

+ 5 - 6
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/SecActivityStageMapper.java

@@ -1,9 +1,8 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.plus.entity.SecKillActivity;
 import com.gree.mall.miniapp.plus.entity.SecKillActivitySpec;
 import com.gree.mall.miniapp.plus.entity.SecKillStage;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,15 +10,15 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface SecActivityStageMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     Integer queryStageCount(@Param("secKillId") String secKillId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     SecKillStage queryStage(@Param("secKillId") String secKillId);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<SecKillActivitySpec> querySecGoods(Page page,@Param("secKillId") String secKillId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public SecKillActivitySpec getSecKillSpecByGoodsSpecId(@Param("goodsSpecId") String goodsSpecId);
 
     /**

+ 4 - 5
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/SoldNumMapper.java

@@ -1,19 +1,18 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.miniapp.bean.user.ServiceWorkerBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.plus.entity.OrderDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface SoldNumMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void updateGoods(@Param("orderDetail") OrderDetail orderDetail);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void updateGoodsSpec(@Param("orderDetail") OrderDetail orderDetail);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void updateSecGoodsSpec(@Param("orderDetail") OrderDetail orderDetail);
 
 }

+ 3 - 3
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/UserInfoMapper.java

@@ -1,15 +1,15 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.bean.user.ServiceWorkerBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface UserInfoMapper {
-//    @SqlParser(filter = true)
+//    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
 //    ServiceWorkerBean queryWebsit(@Param("userId") String userId);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     ServiceWorkerBean queryWebsitByWorkId(@Param("workUserId") String workUserId,@Param("corpId") String corpId);
 
 }

+ 6 - 7
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/WxCustomerMapper.java

@@ -1,10 +1,9 @@
 package com.gree.mall.miniapp.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.bean.notice.NoticeParamBean;
 import com.gree.mall.miniapp.bean.tag.TagGroupBean;
 import com.gree.mall.miniapp.bean.tag.UserWxCustomerBean;
-import com.gree.mall.miniapp.plus.entity.NoticeParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,25 +12,25 @@ import java.util.List;
 @Mapper
 public interface WxCustomerMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<UserWxCustomerBean> queryCustomerByUser(@Param("userId") String userId,@Param("workUserId") String workUserId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<TagGroupBean> queryTagList(@Param("unionId") String unionId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryCustomTagList(@Param("unionId") String unionId,@Param("workUserId") String workUserId);
 
     /**
      * 映射小程序与公众号的openid关系
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public void updateMpMaRela();
 
     /**
      * 查询需要推送的通知信息
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<NoticeParamBean> queryNoticeParam(@Param("type") Integer type, @Param("errNum") Integer errNum, @Param("time") String time);
 
 }

+ 4 - 5
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/stock/WorkerStockCMapper.java

@@ -1,8 +1,7 @@
 package com.gree.mall.miniapp.commonmapper.stock;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.annotation.DataPermission;
 import com.gree.mall.miniapp.bean.material.stock.WorkerStockBean;
 import com.gree.mall.miniapp.bean.material.stock.WorkerStockDTO;
 import com.gree.mall.miniapp.plus.entity.WebsitGoodsCategory;
@@ -16,14 +15,14 @@ import java.util.List;
 public interface WorkerStockCMapper {
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitGoodsCategory> queryWebsitGoodsCategoryList(
             @Param("websitId") String websitId,
             @Param("userId") String userId,
             @Param("goodsType") String goodsType
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WorkerStockBean> queryWorkerStockList(
             IPage page,
             @Param("websitId") String websitId,
@@ -31,7 +30,7 @@ public interface WorkerStockCMapper {
             @Param("goodsType") String goodsType,
             @Param("categoryId") String categoryId
     );
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WorkerStock> queryExistWorkerStockList(@Param("companyWechatId") String companyWechatId,
                                                 @Param("workerId") String workerId,
                                                 @Param("stockList") List<WorkerStockDTO> stockList);

+ 2 - 2
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/workorder/OrderBaseCMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.miniapp.commonmapper.workorder;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,7 +12,7 @@ public interface OrderBaseCMapper {
      * 工单状态统计
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public CountOrderStatusBean countOrderStatus(
             @Param("workerId") String workerId,
             @Param("pgIncreOrderId") String pgIncreOrderId,

+ 44 - 20
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/config/MyBatisPlusConfig.java

@@ -1,17 +1,16 @@
 package com.gree.mall.miniapp.config;
 
-import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.baomidou.mybatisplus.core.parser.ISqlParser;
-import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.IllegalSQLInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.gree.mall.miniapp.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 @Configuration
 public class MyBatisPlusConfig {
@@ -25,19 +24,19 @@ public class MyBatisPlusConfig {
      * @param: []
      * @return: com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor
      */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        logger.debug("注册分页插件");
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-
-
-        // 攻击 SQL 阻断解析器、加入解析链,阻止恶意的全表更新删除
-        List<ISqlParser> sqlParserList = new ArrayList<>();
-        sqlParserList.add(new BlockAttackSqlParser());
-        paginationInterceptor.setSqlParserList(sqlParserList);
-
-        return paginationInterceptor;
-    }
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        logger.debug("注册分页插件");
+//        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+//
+//
+//        // 攻击 SQL 阻断解析器、加入解析链,阻止恶意的全表更新删除
+//        List<ISqlParser> sqlParserList = new ArrayList<>();
+//        sqlParserList.add(new BlockAttackSqlParser());
+//        paginationInterceptor.setSqlParserList(sqlParserList);
+//
+//        return paginationInterceptor;
+//    }
 
 
     /**
@@ -68,4 +67,29 @@ public class MyBatisPlusConfig {
 //    public ISqlInjector sqlInjector() {
 //        return new LogicSqlInjector();
 //    }
+
+    @Bean
+    public PaginationInnerInterceptor paginationInnerInterceptor() {
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        paginationInnerInterceptor.setMaxLimit(Long.valueOf(Constant.PAGE_SIZE));
+        paginationInnerInterceptor.setDbType(DbType.MYSQL);
+        return paginationInnerInterceptor;
+    }
+
+    /**
+     * 添加分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        // 添加非法SQL拦截器
+        interceptor.addInnerInterceptor(new IllegalSQLInnerInterceptor());
+        // 阻止全表更新删除
+        interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
+        // 自定义权限拦截器
+//        interceptor.addInnerInterceptor(new DataScopeInnerInterceptor());
+        // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType
+        return interceptor;
+    }
 }

+ 1 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/constant/Constant.java

@@ -7,6 +7,7 @@ public class Constant {
 
     //广州格力售后服务(对接工单系统的企业微信)
     public static final String GD_COMPANY_WECHAT_ID = "1";
+    public static final Integer PAGE_SIZE = 100000;
 
     public class Ali{
         //        public final static String ACCESS_KEY_ID = "LTAI4G3XTLh8G8DiTpXHpWgt";

+ 6 - 7
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/AdminMapper.java

@@ -1,13 +1,12 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
 import com.gree.mall.manager.bean.admin.respDto.AdminCompanyWechatRespPageBean;
 import com.gree.mall.manager.bean.common.SysDictCompanyVO;
 import com.gree.mall.manager.bean.common.SysDictVO;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
 import com.gree.mall.manager.plus.entity.AdminUser;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,7 +21,7 @@ public interface AdminMapper {
     /**
      * 商户列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<AdminUser> mchList(IPage page,
                                    @Param("userName") String userName,
                                    @Param("nickName") String nickName,
@@ -37,7 +36,7 @@ public interface AdminMapper {
     /**
      * 商户列表2
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<AdminCompanyWechatRespPageBean> pageCompanyWechat(IPage page,
                                                          @Param("userName") String userName,
                                                          @Param("nickName") String nickName,
@@ -49,16 +48,16 @@ public interface AdminMapper {
     /**
      * 数据字典列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<SysDictVO> sysDictList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
 
     /**
      * 数据字典列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<SysDictCompanyVO> sysDictCompanyList(Page page, @Param("ex") ZfireParamBean zfireParam, List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<AdminDeptWebsitVO> list(Page page, @Param("ex") ZfireParamBean zfireParam);
 }

+ 14 - 14
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.activity.PromotionActivityVO;
@@ -98,7 +98,7 @@ public interface CommonMapper {
     /**
      * 收费标准brandId,oneCategoryId,twoCategoryId,content1
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<ChargingStandardBean> queryChargingStandrdList(IPage page,
                                                                 @Param("type") Integer type,
                                                                 @Param("status") Boolean status,
@@ -109,7 +109,7 @@ public interface CommonMapper {
                                                                 @Param("id") String id,
                                                                 @Param("companyWechatId") String companyWechatId);
 
-//    @SqlParser(filter = true)
+//    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
 //    @Update("update admin_websit a join enterprise_wechat_worker b on a.websit_id=b.main_department\n" +
 //            "set b.department_name = a.name")
 //    public void reloadEnterpriseWebsitName();
@@ -120,7 +120,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WebsitStockVO> websitStockList(IPage page,@Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -129,7 +129,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WebsitStockPVO> websitStockPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -138,7 +138,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WebsitStockAccVO> websitStockAccList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
 
@@ -148,7 +148,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WebsitStockAccPVO> websitStockAccPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -157,7 +157,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WorkerStockVO> workerStockList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -166,7 +166,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WorkerStockAccVO> workerStockAccList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
 
@@ -176,7 +176,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WorkerStockPVO> workerStockPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
 
@@ -186,7 +186,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<WorkerStockAccPVO> workerStockAccPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
     IPage<AmityUrlVO> amityList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
@@ -198,7 +198,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<OrderSmallTypeVO> orderSmallTypeList(IPage page,@Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -207,7 +207,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType);
 
     /**
@@ -345,7 +345,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<OrderBase2VO> orderBaseList2(Page page, @Param("ex") WorkOrderZfireParam zfireParamBean, @Param("adminUserType") Integer adminUserType);
 
     /**

+ 11 - 11
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonPageV2Mapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.CommonTemplateVO;
@@ -22,34 +22,34 @@ import java.util.List;
 @Mapper
 public interface CommonPageV2Mapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CarouselMapVO> pageV2CarouseMap(Page page, @Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<StorageVO> pageV2Storage(Page page, @Param("ex") ZfireParamBean zfireParam,
                                    @Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CommonTemplateVO> pageV2Template(Page page,@Param("ex")  ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsNewsCategoryVO> pageV2GoodsNewsCategory(Page page,@Param("ex")  ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<FreightTemplateVO> pageV2FreightTemplate(Page page, @Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds")  List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<OrderShareVO> pageV2OrderShare(Page page, @Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds")  List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CustomSecSpecBeanVO> pageV2Sec(Page page, @Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds")  List<String> companyWechatIds,@Param("status") Integer status);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<SecKillActivityStageBeanVO> pageV2Activity(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds")  List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<PromotionGroupListVO> pageV2Group(Page page ,@Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CouponPageBeanVO> pageV2Coupon(Page page ,@Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 }

+ 8 - 9
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CountMapper.java

@@ -1,8 +1,7 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.count.*;
 import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
 import com.gree.mall.manager.bean.settle.DataBoardBean;
@@ -20,13 +19,13 @@ public interface CountMapper {
      * 首页基础概况统计
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public CountBean countInfo(@Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
      * 首页销售统计
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public CountOrderBean countSaleOrder(@Param("startTime") String startTime,
                                          @Param("endTime") String endTime,
                                          @Param("workOrderType") String workOrderType,
@@ -36,7 +35,7 @@ public interface CountMapper {
     /**
      * 商品销量排行
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<GoodsRankBean> countGoodsRank(@Param("startTime") String startTime,
                                               @Param("endTime") String endTime,
                                               @Param("companyWechatIds") List<String> companyWechatIds,
@@ -55,24 +54,24 @@ public interface CountMapper {
     /**
      * 今日昨日访问量
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Integer countVisit(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("companyWechatIds") List<String> companyWechatIds);
 
 
     /**
      * 师傅的销售金额统计(外部接口结算用)
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<Map<String,Object>> countWorkAmount(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Map<String,Object> countWebsitAmount(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("websitNumbers") List<String> websitNumbers);
 
 
     /**
      *  优惠券统计列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<GiftExchangeCodeBean> queryExchangeCodeCountList(IPage page,@Param("keyword") String keyword,@Param("adminWebsitId") String adminWebsitId,@Param("companyWechatIds") List<String> companyWechatIds);
 
 

+ 8 - 9
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CouponDateMapper.java

@@ -1,9 +1,8 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
 import com.gree.mall.manager.bean.coupon.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,28 +17,28 @@ public interface CouponDateMapper {
      * @param couponId
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     CouponDataBean data(@Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponTagBean> couponTagDetail(@Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponUserBean> couponTagUser(@Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponUserTypeBean> reissueCouponUser(@Param("companyWechatId")String companyWechatId, @Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CouponPageBean> pageCoupon(Page<CouponPageBean> objectPage, @Param("companyWechatIds")List<String> companyWechatIds,
                                      @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponExportBean> exportCoupon(@Param("companyWechatIds")List<String> companyWechatIds,
                                         @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponExportBean> exportSelfCoupon(@Param("companyWechatIds")List<String> companyWechatIds,
                                             @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 }

+ 3 - 3
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CoustomUserCouponMapper.java

@@ -1,15 +1,15 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface CoustomUserCouponMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void decreaseLeftTimes(@Param("id") String id);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void increaseLeftTimes(@Param("id") String id);
 }

+ 7 - 8
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomGoodsMapper.java

@@ -1,9 +1,8 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.goods.GoodsPackageBean;
 import com.gree.mall.manager.bean.goods.GoodsPackageList;
 import com.gree.mall.manager.bean.goods.GoodsSpecBean;
 import com.gree.mall.manager.bean.goods.GoodsTypeCount;
@@ -34,7 +33,7 @@ public interface CustomGoodsMapper {
      * @param status
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsSpecBean> pageList(Page<GoodsSpecBean> objectPage,
                                   @Param("isTrade") String isTrade,
                                   @Param("flag") String flag,
@@ -49,7 +48,7 @@ public interface CustomGoodsMapper {
                                   @Param("goodsTypes") List<String> goodsTypes,
                                   @Param("companyWechatIds")List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsSpecBean> list(@Param("commonTemplateId") String commonTemplateId);
 
 
@@ -58,7 +57,7 @@ public interface CustomGoodsMapper {
      *
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public GoodsTypeCount countByType(@Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
@@ -66,7 +65,7 @@ public interface CustomGoodsMapper {
      *
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Integer countByFlag(@Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
@@ -74,7 +73,7 @@ public interface CustomGoodsMapper {
      *
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Integer ysq(@Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
@@ -86,7 +85,7 @@ public interface CustomGoodsMapper {
     /**
      * 查询商品分类
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public GoodsCategory queryGoodsCategoryByGoodsId(@Param("goodsId") String goodsId);
 
     /**

+ 2 - 3
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomMemberMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.coupon.CouponDataBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.member.MemberBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,7 +9,7 @@ import java.util.List;
 
 @Mapper
 public interface CustomMemberMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<MemberBean> queryUser(@Param("type")String type, @Param("keyword")String keyword,
                                @Param("websitNos")List<String> websitNos, @Param("startTime")String startTime,
                                @Param("endTime")String endTime, @Param("companyWechatIds")List<String> companyWechatIds);

+ 5 - 5
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomOfflineMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.offline.WebsitBean;
 import com.gree.mall.manager.bean.offline.ZoneBean;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,13 +10,13 @@ import java.util.List;
 
 @Mapper
 public interface CustomOfflineMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<ZoneBean> queryZoneList(@Param("adminUserId")String adminUserId);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitBean> queryWebsitList(@Param("adminUserId")String adminUserId);
-     @SqlParser(filter = true)
+     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<ZoneBean> queryZoneAllList();
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitBean> queryWebsitAllList();
 
 }

+ 2 - 4
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomSalesReportMapper.java

@@ -1,17 +1,15 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.member.MemberBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.plus.entity.SaleReport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface CustomSalesReportMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<SaleReport> queryData(@Param("websitNumbers") List<String> websitNumbers,
                                @Param("startTime") String startTime,
                                @Param("endTime") String endTime,

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomTagGroupMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.tag.CustomTagGroup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,6 +10,6 @@ import java.util.List;
 @Mapper
 public interface CustomTagGroupMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CustomTagGroup> queryTagList(@Param("companyWechatIds") List<String> companyWechatIds);
 }

+ 2 - 3
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomWebsitMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.tag.CustomTagGroup;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,6 +8,6 @@ import java.util.List;
 
 @Mapper
 public interface CustomWebsitMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryById(@Param("id")String id);
 }

+ 14 - 14
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/DailyMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.settle.repair.*;
@@ -17,22 +17,22 @@ public interface DailyMapper {
      * 扣回的
      * @param importBatchNo
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void bindWorkerNumber2(@Param("companyWechatId") String companyWechatId, @Param("importBatchNo") String importBatchNo);
 
     /**
      * 汇总结算-绑定师傅编号
      * @param importBatchNo
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void bindWorkerNumber(@Param("companyWechatId") String companyWechatId, @Param("importBatchNo") String importBatchNo);
     /**
      * 汇总结算-查询重复的
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryDistinctOrderNo(@Param("companyWechatId") String companyWechatId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyTotalCostBean> queryDailyTotalCost(
             @Param("companyWechatId") String companyWechatId,
             @Param("importBatchNo") String importBatchNo,
@@ -40,7 +40,7 @@ public interface DailyMapper {
             @Param("needSummaryStatus") List<String> needSummaryStatus
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyIncrDecrCostCountBean> queryIncrDecrByBatch(
             @Param("companyWechatId") String companyWechatId,
             @Param("importBatchNo") String importBatchNo,
@@ -72,12 +72,12 @@ public interface DailyMapper {
             @Param("companyWechatId") String companyWechatId
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailySummaryDataBean> summaryDayList(@Param("summaryBatchNo") String summaryBatchNo,
                                               @Param("companyWechatIds") List<String> companyWechatIds,
                                               @Param("adminWebsitIds") List<String> adminWebsitIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<DailySummaryDataBean> cwSummaryList(Page page,
                                               @Param("summaryBatchNo") String summaryBatchNo,
                                               @Param("summaryStartTime") String summaryStartTime,
@@ -93,7 +93,7 @@ public interface DailyMapper {
                                                        @Param("companyWechatIds") List<String> companyWechatIds,
                                                        @Param("adminWebsitIds") List<String> adminWebsitIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<DailyNotMonthSummaryCountBean> cwSummaryMonthList(
             IPage page,
             @Param("summaryBatchNo") String summaryBatchNo,
@@ -106,21 +106,21 @@ public interface DailyMapper {
             @Param("adminWebsitIds") List<String> adminWebsitIds
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyNotMonthSummaryCountBean> monthlySummaryList(
             @Param("summaryBatchNo") String summaryBatchNo,
             @Param("companyWechatIds") List<String> companyWechatIds,
             @Param("adminWebsitIds") List<String> adminWebsitIds
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyNotMonthSummaryCountBean> monthlyWebsiteList(
             @Param("summaryBatchNo") String summaryBatchNo,
             @Param("companyWechatIds") List<String> companyWechatIds,
             @Param("adminWebsitIds") List<String> adminWebsitIds
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyWorkerIssueSalaryBean> monthlyDetailList(
             IPage page,
             @Param("summaryMonthBatchNo") String summaryMonthBatchNo,
@@ -130,12 +130,12 @@ public interface DailyMapper {
             @Param("adminWebsitIds") List<String> adminWebsitIds
     );
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DailyMonthTotalBean> queryMonthTotalCost(@Param("companyWechatId") String companyWechatId);
 
     /**
      * 查询月度汇总数据
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     DailyNotMonthSummaryCountBean queryNotMonthSummaryData(@Param("companyWechatId") String companyWechatId);
 }

+ 3 - 4
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/GoodsCheckMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.activity.SecKillActivitySpecBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,9 +8,9 @@ import java.util.List;
 
 @Mapper
 public interface GoodsCheckMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     Integer checkGoodsSec(@Param("goodsId")String goodsId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> checkGoodsSecBatch(@Param("goodsIds")List<String> goodsIds);
 }

+ 7 - 7
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/JxMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.goods.GoodsCodeAccVO;
@@ -18,21 +18,21 @@ import java.util.List;
 @Mapper
 public interface JxMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsStockVO> pageStock(Page page, @Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsCodeAccVO> pageCode(Page page, @Param("ex") ZfireParamBean zfireParam);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsSaleLedgerVO> pageSale(Page page,@Param("ex")  ZfireParamBean zfireParam);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsCategoryItemVO> pageV2(Page page, @Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsCategoryOtherItemVO> listOther(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<OldProductManagerVO> pageManagerV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")  List<String> companyWechatIds);
 }

+ 4 - 6
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/NoticeRecordBeanMapper.java

@@ -1,9 +1,7 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.notice.NoticeRecordReadBean;
 import com.gree.mall.manager.bean.notice.NoticeRecordReadVOBean;
 import com.gree.mall.manager.bean.notice.NoticeVO;
@@ -19,17 +17,17 @@ public interface NoticeRecordBeanMapper {
     /**
      * 获取已读统计
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<NoticeRecordReadBean> readCount(@Param("noticeIds") List<String> noticeIds);
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<NoticeRecordReadBean> list(IPage page,
                                      @Param("ex") ZfireParamBean zfireParam,
                                      @Param("adminUserId") String adminUserId,
                                      @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<NoticeVO> listNotice(IPage page,
                                @Param("ex") ZfireParamBean zfireParam,
                                @Param("adminCompanyIds") List<String> adminCompanyIds);

+ 3 - 3
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/OrderShareReportMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.order.OrderShareReportBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,9 +10,9 @@ import java.util.List;
 @Mapper
 public interface OrderShareReportMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<OrderShareReportBean> queryReport(@Param("orderIds") List<String> orderIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<OrderShareReportBean> queryReport2(@Param("orderShareIdList") List<String> orderShareIdList);
 }

+ 6 - 9
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/SecKillMapper.java

@@ -1,33 +1,30 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
 import com.gree.mall.manager.bean.activity.CustomSpecBean;
 import com.gree.mall.manager.bean.activity.SecKillActivitySpecBean;
 import com.gree.mall.manager.bean.activity.SecKillActivityStageBean;
-import com.gree.mall.manager.bean.goods.GoodsSpecBean;
-import io.swagger.annotations.ApiParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface SecKillMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CustomSecSpecBean> querySecSpec(IPage page,
                                           @Param("keyword")String keyword,
                                           @Param("status") Integer status,
                                           @Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<SecKillActivitySpecBean> querySecDetail(@Param("secKillId")String secKillId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<SecKillActivityStageBean> queryActivity(
             IPage page,
             @Param("status")Integer status,
@@ -36,14 +33,14 @@ public interface SecKillMapper {
             @Param("companyWechatIds") List<String> companyWechatIds);
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CustomSpecBean> querySpecList(
             IPage page,
             @Param("categoryId")String categoryId,
             @Param("keyword")String keyword,
             List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CustomSecSpecBean> querySpecListforCoupon(Page<CustomSecSpecBean> objectPage,@Param("companyWechatIds") List<String> companyWechatIds,
                                                     @Param("categoryId")String categoryId, @Param("keyword")String keyword);
 

+ 3 - 3
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/TaxMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.tax.OrderTaxExcelBean;
@@ -14,10 +14,10 @@ import java.util.List;
 
 @Mapper
 public interface TaxMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     GoodsCategory queryTaxById(@Param("orderDetailId")String orderDetailId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsCategory> queryGoodsCategoryByOrderId(@Param("orderId")String orderId);
 
     List<OrderTaxExcelBean> queryOrderTaxExcelMsg(@Param("companyWechatIds")List<String> companyWechatIds, @Param("adminWebsitIds")List<String> adminWebsitIds

+ 3 - 4
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.plus.entity.GoodsCategory;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.plus.entity.WebsitZone;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,8 +9,8 @@ import java.util.List;
 
 @Mapper
 public interface WebsitMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitZone> queryWebsitIds(@Param("adminUserId")String adminUserId);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryWebsitNumbers(@Param("adminUserId")String adminUserId);
 }

+ 8 - 9
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java

@@ -1,37 +1,36 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.websit.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.scheduling.annotation.Scheduled;
 
 import java.util.List;
 
 @Mapper
 public interface WebsitSalesRetCMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WebsitSalesRetVO> pageV2(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WebsitPartsRetVO> pagePartsRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<SettlementOrderLogicVO> pageSettletV2(Page page,@Param("ex")  ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WithdrawalOrderVO> pageWithdrawalV2(Page page, @Param("ex")  ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WorkerSettlementVO> workerSettlementPageV2(Page page,@Param("ex") ZfireParamBean zfireParam);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WorkerSettlementLineVO> pageLineSettlementV2(Page page,@Param("ex") ZfireParamBean zfireParam);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WebsitPartsFactoryRetVO> pagePartsFactoryRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 }

+ 6 - 6
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WxCustomerMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.user.UserWxCustomerBean;
 import com.gree.mall.manager.bean.wxCustomer.WxCustomerBean;
 import com.gree.mall.manager.plus.entity.CouponTag;
@@ -12,7 +12,7 @@ import java.util.List;
 
 @Mapper
 public interface WxCustomerMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WxCustomerBean> queryCustomerList(@Param("keyword") String keyword,
                                             @Param("startTime") Date startTime,
                                             @Param("endTime") Date endTime,
@@ -20,22 +20,22 @@ public interface WxCustomerMapper {
                                             @Param("pageNum") Integer pageNum,
                                             @Param("pageSize") Integer pageSize);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     Integer queryCustomerCount(@Param("keyword") String keyword,
                                @Param("startTime") Date startTime,
                                @Param("endTime") Date endTime,
                                @Param("tagIds") String[] tagIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     WxCustomerBean queryCustomerDetail(@Param("externalUserId")String externalUserId);
 
     /**
      * 查询指定企业下 与 指定标签绑定的 用户id
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryTagUserIdList(@Param("companyWechatId")String companyWechatId, @Param("couponTags")List<CouponTag> couponTags);
 
-     @SqlParser(filter = true)
+     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<UserWxCustomerBean> queryCustomerByUser(@Param("workUserId")String workUserId,@Param("corpId")String corpId);
 
 

+ 3 - 8
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/luckdraw/LuckDrawMapper.java

@@ -1,18 +1,13 @@
 package com.gree.mall.manager.commonmapper.luckdraw;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.manager.bean.activity.luckdraw.PromotionLuckDrawCodeBean;
 import com.gree.mall.manager.bean.activity.luckdraw.PromotionLuckDrawList;
-import com.gree.mall.manager.bean.count.CountBean;
-import com.gree.mall.manager.bean.count.CountOrderBean;
-import com.gree.mall.manager.bean.count.GoodsRankBean;
-import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface LuckDrawMapper {
@@ -21,7 +16,7 @@ public interface LuckDrawMapper {
     /**
      * 抽奖活动列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<PromotionLuckDrawList> queryList(IPage page,
                                                  @Param("name") String name,
                                                  @Param("status") Boolean status,
@@ -31,7 +26,7 @@ public interface LuckDrawMapper {
     /**
      * 兑换记录列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<PromotionLuckDrawCodeBean> queryLuckDrawCodeList(IPage page,
                                                                  @Param("promotionLuckDrawId") String promotionLuckDrawId,
                                                                  @Param("promotinLuckDrawCouponId") String promotinLuckDrawCouponId,

+ 12 - 12
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/workorder/IncreMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper.workorder;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.workorder.DispatchCherVO;
@@ -16,17 +16,17 @@ import java.util.List;
 @Mapper
 public interface IncreMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<IncreVO> list(IPage page, @Param("ex") ZfireParamBean zfireParam, @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<DispatchVO> listDispatch(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WebsitDispatchVO> listDispatchWebsit(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("adminCompanyIds") List<String> adminCompanyIds);
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> pList(@Param("pId") String pId,
                                @Param("cityCode") String cityCode,
                                @Param("areaCode") String areaCode,
@@ -37,7 +37,7 @@ public interface IncreMapper {
                                @Param("orderSourceId") List<String> orderSourceId,
                                 @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> cList(
             @Param("pId") String pId,
             @Param("cityCode") String cityCode,
@@ -49,7 +49,7 @@ public interface IncreMapper {
             @Param("orderSourceId") List<String> orderSourceId,
             @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> aList(  @Param("pId") String pId,
                                  @Param("cityCode") String cityCode,
                                  @Param("areaCode") String areaCode,
@@ -60,7 +60,7 @@ public interface IncreMapper {
                                  @Param("orderSourceId") List<String> orderSourceId,
                                  @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> sList(@Param("pId") String pId,
                                @Param("cityCode") String cityCode,
                                @Param("areaCode") String areaCode,
@@ -71,7 +71,7 @@ public interface IncreMapper {
                                @Param("orderSourceId") List<String> orderSourceId,
                                @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> channel(
             @Param("pId") String pId,
             @Param("cityCode") String cityCode,
@@ -83,7 +83,7 @@ public interface IncreMapper {
             @Param("orderSourceId") List<String> orderSourceId,
             @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> smallList(  @Param("pId") String pId,
                                      @Param("cityCode") String cityCode,
                                      @Param("areaCode") String areaCode,
@@ -94,7 +94,7 @@ public interface IncreMapper {
                                      @Param("orderSourceId") List<String> orderSourceId,
                                      @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> categoryList( @Param("pId") String pId,
                                        @Param("cityCode") String cityCode,
                                        @Param("areaCode") String areaCode,
@@ -105,7 +105,7 @@ public interface IncreMapper {
                                        @Param("orderSourceId") List<String> orderSourceId,
                                        @Param("adminCompanyIds") List<String> adminCompanyIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<DispatchCherVO> sourceList(
             @Param("pId") String pId,
             @Param("cityCode") String cityCode,

+ 5 - 5
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/workorder/OrderBaseCMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper.workorder;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.workorder.OrderBaseCountBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +15,7 @@ public interface OrderBaseCMapper {
      * 工单状态统计
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<Map<String,Object>> countOrderStatus(@Param("companyWechatId") String companyWechatId,
                                                      @Param("adminWebsitIds") List<String> adminWebsitIds,
                                                      @Param("adminUserType") Integer adminUserType,
@@ -34,15 +34,15 @@ public interface OrderBaseCMapper {
      * 工单状态统计2
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<Map<String, Object>> countOrderStatus2(@Param("companyWechatId") String companyWechatId,
                                                 @Param("adminWebsitIds") List<String> adminWebsitIds,
                                                 @Param("adminUserType") Integer adminUserType,
                                                 @Param("orderSmallTypeText") String orderSmallTypeText);
 
 
-//    @SqlParser(filter = true)
+//    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
 //    public List<Map<String,Long>> countLast7Day1(@Param("companyWechatId") String companyWechatId,@Param("adminWebsitIds") List<String> adminWebsitIds);
-//    @SqlParser(filter = true)
+//    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
 //    public List<Map<String,Long>> countLast7Day2(@Param("companyWechatId") String companyWechatId,@Param("adminWebsitIds") List<String> adminWebsitIds);
 }

+ 2 - 1
mall-server-api/src/main/java/com/gree/mall/manager/config/MyBatisPlusConfig.java

@@ -3,6 +3,7 @@ package com.gree.mall.manager.config;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.IllegalSQLInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.gree.mall.manager.constant.Constant;
 import org.slf4j.Logger;
@@ -73,7 +74,7 @@ public class MyBatisPlusConfig {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         interceptor.addInnerInterceptor(paginationInnerInterceptor());
         // 添加非法SQL拦截器
-//        interceptor.addInnerInterceptor(new IllegalSQLInnerInterceptor());
+        interceptor.addInnerInterceptor(new IllegalSQLInnerInterceptor());
         // 阻止全表更新删除
         interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
         // 自定义权限拦截器