Merge remote-tracking branch 'origin/dm_dev' into dm_dev

jz-dm-apigateway/src/main/java/com/jz/dm/config/MybatisPlusConfig.java

 package com.jz.dm.config;
 
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -18,7 +19,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @MapperScan("com.jz.dm.mapper")
 public class MybatisPlusConfig {
 
-    @Bean
+   /* @Bean
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
         // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求  默认false
@@ -29,11 +30,11 @@ public class MybatisPlusConfig {
         paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
 
         return paginationInterceptor;
-    }
-  /*  @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor(){
-        MybatisPlusInterceptor plusInterceptor =new MybatisPlusInterceptor();
-       // plusInterceptor.addInnerInterceptor();
-        return plusInterceptor;
     }*/
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
 }

jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/ApiInterfaceServiceImpl.java

@@ -160,7 +160,6 @@ public class ApiInterfaceServiceImpl implements ApiInterfaceService {
     }
     /**
      * 删除API信息
-     *
      * @param apiKey
      * @return
      */
@@ -356,6 +355,7 @@ public class ApiInterfaceServiceImpl implements ApiInterfaceService {
         }
         UpdateWrapper<ApiInterface> updateWra = new UpdateWrapper<>();
         updateWra.set("is_send_bank", 0);
+        updateWra.eq("id",apiInterface.getId());
         if (apiInterfaceMapper.update(null, updateWra) > 0) {
             return Result.of_success(ResultMsg.UPDATE_SUCCESS);
         }

jz-dm-apigateway/src/main/resources/mapper/ApiInterfaceMapper.xml

@@ -28,13 +28,13 @@
     </select>
     <select id="selectDetail" resultType="com.jz.dm.models.domian.ApiInterface">
         SELECT ai.*,
-        aic.inbox_param AS inboxParam,
-        aic.request_param AS requestParam,
-        aic.response_param AS responseParam,
-        aic.max_row AS maxRow,
-        aic.page_row AS pageRow,
-        aic.resp_code AS respCode,
-        floor(aic.max_row/aic.page_row) AS maxData
+            aic.inbox_param AS inboxParam,
+            aic.request_param AS requestParam,
+            aic.response_param AS responseParam,
+            aic.max_row AS maxRow,
+            aic.page_row AS pageRow,
+            aic.resp_code AS respCode,
+            floor(aic.max_row/aic.page_row) AS maxData
         FROM t_api_interface AS ai
         LEFT JOIN t_api_interface_custom AS aic ON ai.id = aic.api_interface_id AND aic.is_deleted =0
         WHERE