1'

pom.xml

@@ -40,13 +40,37 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
+
         <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-db</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.25</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <scope>compile</scope>
+            <version>3.4.3.4</version>
+        </dependency>
+
+        <!--mybatis-plus代码生成器-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <scope>compile</scope>
+            <version>3.5.1</version>
+        </dependency>
+
+        <!--velocity模板-->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
         </dependency>
 
         <dependency>
@@ -173,21 +197,21 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
 
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-surefire-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <testFailureIgnore>true</testFailureIgnore>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-compiler-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <source>8</source>-->
-<!--                    <target>8</target>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>

src/main/java/com/fdkankan/ucenter/common/PageInfo.java

@@ -0,0 +1,43 @@
+package com.fdkankan.ucenter.common;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageInfo<T> {
+
+    private long pageNum;
+
+    private long pageSize;
+
+    private long total;
+
+    private T list;
+
+    public static PageInfo PageInfo(Page page){
+        return PageInfo.builder()
+            .pageNum(page.getCurrent())
+            .pageSize(page.getSize())
+            .total(page.getTotal())
+            .list(page.getRecords())
+            .build();
+    }
+    public static PageInfo PageInfo(Long currentPage, Long pageSize, Long total, List<?> list){
+        return PageInfo.builder()
+            .pageNum(currentPage)
+            .pageSize(pageSize)
+            .total(total)
+            .list(list)
+            .build();
+    }
+
+
+}

src/main/java/com/fdkankan/ucenter/config/MybatisPlusPageConfig.java

@@ -0,0 +1,22 @@
+package com.fdkankan.ucenter.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+public class MybatisPlusPageConfig {
+
+    /**
+     * mybatisPlus配置分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

src/main/java/com/fdkankan/ucenter/controller/CustomResponseAdvice.java

@@ -3,7 +3,7 @@ package com.fdkankan.ucenter.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;

src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.CameraParam;

src/main/java/com/fdkankan/ucenter/service/IDownloadOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.DownNumParam;

src/main/java/com/fdkankan/ucenter/service/IExpansionOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.ExpansionOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.VirtualOrderParam;

src/main/java/com/fdkankan/ucenter/service/IFusionService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 
 public interface IFusionService {

src/main/java/com/fdkankan/ucenter/service/IIncrementOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.IncrementOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.entity.IncrementType;

src/main/java/com/fdkankan/ucenter/service/IOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.fdkankan.ucenter.entity.IncrementOrder;
 import com.fdkankan.ucenter.entity.Order;

src/main/java/com/fdkankan/ucenter/service/IUserIncrementService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.UserIncrement;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.IncrementParam;

src/main/java/com/fdkankan/ucenter/service/IVirtualOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.VirtualOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.IncrementOrderParam;

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.OssPath;

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileSizeUtil;
 import com.fdkankan.ucenter.entity.*;

src/main/java/com/fdkankan/ucenter/service/impl/DownloadOrderServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.fdkankan.ucenter.entity.Invoice;

src/main/java/com/fdkankan/ucenter/service/impl/ExpansionOrderServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.ExpansionOrder;
 import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.mapper.IExpansionOrderMapper;

src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -3,7 +3,7 @@ package com.fdkankan.ucenter.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;

src/main/java/com/fdkankan/ucenter/service/impl/IncrementOrderServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.ucenter.common.SkuEnum;
 import com.fdkankan.ucenter.constant.LoginConstant;

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.redis.util.RedisUtil;

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusVoidServiceImpl.java

@@ -3,7 +3,7 @@ package com.fdkankan.ucenter.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.entity.ScenePlus;

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.RandomUtil;

src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;

src/main/java/com/fdkankan/ucenter/service/impl/VirtualOrderServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.entity.VirtualOrder;
 import com.fdkankan.ucenter.mapper.IVirtualOrderMapper;

src/main/resources/bootstrap.yml

@@ -2,4 +2,8 @@ spring:
   profiles:
     active: dev
 
-
+logging:
+  config: classpath:logback-spring.xml
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志