add redis MyBatisPlus ControllerBase ftl

update properties IBaseService
add uat.properties
add gitignore

.gitignore

@@ -0,0 +1,38 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+../.idea
+*.iml
+out
+gen
+rebel.xml
+/target/
+
+!/.gitignore

pom.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.6.RELEASE</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>changeing</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<name>changeing</name>
-	<description>Demo project for Spring Boot</description>
+	<description>sxz</description>
 
 	<properties>
 		<java.version>1.8</java.version>
@@ -59,14 +59,32 @@
 		</dependency>
 
 		<dependency>
-			<groupId>tk.mybatis</groupId>
-			<artifactId>mapper-spring-boot-starter</artifactId>
-			<version>2.0.2</version>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.4.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
 		</dependency>
+		<!-- 代码生成器  依赖 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-freemarker</artifactId>
+		</dependency>
+		<!-- pagehelper 依赖 -->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
-			<version>1.2.5</version>
+			<version>1.3.1</version>
+		</dependency>
+		<!-- 					-->
+
+		<dependency>
+			<groupId>com.github.jsqlparser</groupId>
+			<artifactId>jsqlparser</artifactId>
+			<version>2.1</version>
 		</dependency>
 
 		<dependency>
@@ -92,7 +110,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.6</version>
+			<version>1.18.20</version>
 		</dependency>
 
 		<!-- fastjson -->
@@ -141,15 +159,15 @@
 			<version>2.9.5</version>
 		</dependency>
 		<!--<dependency>-->
-			<!--<groupId>com.fasterxml.jackson.core</groupId>-->
-			<!--<artifactId>jackson-databind</artifactId>-->
-			<!--<version>2.3.3</version>-->
-			<!--<exclusions>-->
-				<!--<exclusion>-->
-					<!--<groupId>com.fasterxml.jackson.core</groupId>-->
-					<!--<artifactId>jackson-annotations</artifactId>-->
-				<!--</exclusion>-->
-			<!--</exclusions>-->
+		<!--<groupId>com.fasterxml.jackson.core</groupId>-->
+		<!--<artifactId>jackson-databind</artifactId>-->
+		<!--<version>2.3.3</version>-->
+		<!--<exclusions>-->
+		<!--<exclusion>-->
+		<!--<groupId>com.fasterxml.jackson.core</groupId>-->
+		<!--<artifactId>jackson-annotations</artifactId>-->
+		<!--</exclusion>-->
+		<!--</exclusions>-->
 		<!--</dependency>-->
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
@@ -208,11 +226,6 @@
 
 		<dependency>
 			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
-			<version>3.8</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
 			<version>3.8</version>
 		</dependency>
@@ -224,12 +237,38 @@
 			<classifier>jdk15</classifier>
 		</dependency>
 
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.7.7</version>
+		</dependency>
+
+		<!--lettuce-->
+		<!--redis 相关  依赖-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+
+		<!-- lettuce pool 缓存连接池 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+
+
 		<!-- 钉钉告警 -->
-<!--		<dependency>-->
-<!--			<groupId>com.aliyun</groupId>-->
-<!--			<artifactId>alibaba-dingtalk-service-sdk</artifactId>-->
-<!--			<version>1.0.1</version>-->
-<!--		</dependency>-->
+		<!--		<dependency>-->
+		<!--			<groupId>com.aliyun</groupId>-->
+		<!--			<artifactId>alibaba-dingtalk-service-sdk</artifactId>-->
+		<!--			<version>1.0.1</version>-->
+		<!--		</dependency>-->
 
 	</dependencies>
 
@@ -247,6 +286,7 @@
 					<skipTests>true</skipTests>
 				</configuration>
 			</plugin>
+
 		</plugins>
 	</build>
 

src/main/java/com/example/demo/ChangeingApplication.java

@@ -1,5 +1,6 @@
 package com.example.demo;
 
+import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -7,7 +8,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
-@SpringBootApplication
+@SpringBootApplication(exclude= PageHelperAutoConfiguration.class)
 public class ChangeingApplication extends SpringBootServletInitializer {
 
 	@Override

src/main/java/com/example/demo/config/MyBatisPlusConfig.java

@@ -0,0 +1,39 @@
+package com.example.demo.config;
+
+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;
+
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@MapperScan("com.example.**.mapper")
+public class MyBatisPlusConfig {
+    /*
+     * 分页插件，自动识别数据库类型
+     * 多租户，请参考官网【插件扩展】
+     */
+    /**
+     * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题
+     */
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        //向Mybatis过滤器链中添加分页拦截器
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        //还可以添加其他的拦截器
+        return interceptor;
+    }
+    @Bean
+    ConfigurationCustomizer mybatisConfigurationCustomizer() {
+        return configuration -> configuration.addInterceptor(new com.github.pagehelper.PageInterceptor());
+    }
+
+}

src/main/java/com/example/demo/config/PageHelperAutoConfiguration.java

@@ -0,0 +1,56 @@
+package com.example.demo.config;
+
+
+import com.github.pagehelper.PageInterceptor;
+import com.github.pagehelper.autoconfigure.PageHelperProperties;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Properties;
+
+@Configuration
+@ConditionalOnBean(SqlSessionFactory.class)
+@EnableConfigurationProperties(PageHelperProperties.class)
+@AutoConfigureAfter(MybatisAutoConfiguration.class)
+public class PageHelperAutoConfiguration {
+
+    @Autowired
+    private List<SqlSessionFactory> sqlSessionFactoryList;
+
+    @Autowired
+    private PageHelperProperties properties;
+
+    /**
+     * 接受分页插件额外的属性
+     *
+     * @return
+     */
+    @Bean
+    @ConfigurationProperties(prefix = PageHelperProperties.PAGEHELPER_PREFIX)
+    public Properties pageHelperProperties() {
+        return new Properties();
+    }
+
+    @PostConstruct
+    public void addPageInterceptor() {
+        PageInterceptor interceptor = new PageInterceptor();
+        Properties properties = new Properties();
+        //先把一般方式配置的属性放进去
+        properties.putAll(pageHelperProperties());
+        //在把特殊配置放进去，由于close-conn 利用上面方式时，属性名就是 close-conn 而不是 closeConn，所以需要额外的一步
+        properties.putAll(this.properties.getProperties());
+        interceptor.setProperties(properties);
+        for (SqlSessionFactory sqlSessionFactory : sqlSessionFactoryList) {
+            sqlSessionFactory.getConfiguration().addInterceptor(interceptor);
+        }
+    }
+}

src/main/java/com/example/demo/controller/BaseController.java

@@ -0,0 +1,150 @@
+package com.example.demo.controller;
+
+import cn.hutool.core.io.IoUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.example.demo.util.IPUtil;
+import com.example.demo.util.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+
+
+@Slf4j
+public class BaseController {
+
+
+    @Autowired
+    protected HttpServletRequest request;
+
+    @Autowired
+    protected HttpServletResponse response;
+
+    /**
+     * 获取HttpServletRequest流里面的数据转换为JSONObject
+     *
+     * @return JSONObject
+     */
+    public static JSONObject requestToJson(HttpServletRequest request) {
+        try {
+            BufferedReader br = new BufferedReader(new InputStreamReader(
+                    request.getInputStream()));
+            StringBuffer sb = new StringBuffer();
+            String currentLine = "";
+            while ((currentLine = br.readLine()) != null) {
+                sb.append(currentLine);
+            }
+            return JSON.parseObject(sb.toString());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 获取ip地址
+     *
+     * @return ip地址
+     */
+    public static String getIp(HttpServletRequest request) {
+       return IPUtil.getIP(request);
+    }
+
+    /**
+     * 处理成功
+     *
+     * @return data
+     */
+    public <K> Result success(Object data) {
+        return Result.success(data);
+    }
+
+    /**
+     * 处理成功
+     *
+     * @param msg 消息
+     * @return data
+     */
+    public <K> Result success(String msg) {
+        return Result.success(msg);
+    }
+
+    /**
+     * 处理成功
+     *
+     * @return data
+     */
+    public <K> Result success() {
+        return Result.success();
+    }
+
+    /**
+     * 处理成功
+     *
+     * @param msg  消息
+     * @param data 数据对象
+     * @return data
+     */
+    public <K> Result success(String msg, Object data) {
+        return Result.success(msg, data);
+    }
+
+    /**
+     * 处理失败，并返回数据（一般为错误信息）
+     *
+     * @param code 错误代码
+     * @param msg  消息
+     * @return data
+     */
+    public <K> Result failure(int code, String msg) {
+        return Result.failure(code, msg);
+    }
+
+    /**
+     * 处理失败
+     *
+     * @param msg 消息
+     * @return data
+     */
+    public <K> Result failure(String msg) {
+        return Result.failure(msg);
+    }
+
+    /**
+     *  下载文件
+     * @param file 文件
+     * @param fileName  文件名
+     * @param suffix  后缀
+     * @param deleteOnExit  是否删除 ture/false
+     */
+    public void downloadFile(File file, String fileName, String suffix, boolean deleteOnExit) {
+        response.setCharacterEncoding(request.getCharacterEncoding());
+        response.setContentType("application/" + suffix);
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(file);
+            response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("gb2312"), "ISO8859-1"));
+            IoUtil.copy(fis,response.getOutputStream());
+            response.flushBuffer();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            log.error("下载文件报错{}", e.getMessage());
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                    if (deleteOnExit) {
+                        file.deleteOnExit();
+                    }
+                } catch (IOException e) {
+                    log.error("删除上传文件缓存报错{}", e.getMessage());
+                    log.error(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+
+}

src/main/java/com/example/demo/controller/ImportDataController.java

@@ -1,25 +1,25 @@
 package com.example.demo.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.example.demo.constant.CodeConstant;
 import com.example.demo.entity.SceneLightEntity;
 import com.example.demo.entity.SceneStyleEntity;
-import com.example.demo.entity.StatisticsEntity;
 import com.example.demo.mq.TopicRabbitConfig;
 import com.example.demo.service.*;
 import com.example.demo.util.*;
 import com.example.demo.vo.response.ResponseRenovationBuildDetail;
 import com.example.demo.vo.response.ResponseRenovationPartsDetail;
-import com.github.pagehelper.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.IOP.Codec;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,7 +27,6 @@ import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.io.File;
 import java.net.URLDecoder;
@@ -41,7 +40,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 @RestController
 @RequestMapping("/change")
 @Api(tags = "生成风格模块")
-public class ImportDataController {
+public class ImportDataController extends BaseController  {
 
     @Autowired
     private UploadToOssUtil uploadToOssUtil;
@@ -130,14 +129,14 @@ public class ImportDataController {
                 sceneStyleEntity.setStatus(2);
                 sceneStyleService.save(sceneStyleEntity);
             }else {
-                Condition condition = new Condition(SceneStyleEntity.class);
-                condition.and().andEqualTo("styleNum", styleNum);
-                condition.orderBy("num").desc();
-                List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+                LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+                wrapper.eq(SceneStyleEntity::getStyleNum,styleNum);
+                wrapper.orderByDesc(SceneStyleEntity::getNum);
+                List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
                 if(list != null && list.size() > 0) {
                     SceneStyleEntity sceneStyleEntity = list.get(0);
                     sceneStyleEntity.setStyleName(styleName);
-                    sceneStyleService.update(sceneStyleEntity);
+                    sceneStyleService.updateById(sceneStyleEntity);
                 }
             }
 
@@ -286,10 +285,11 @@ public class ImportDataController {
             if(StringUtils.isEmpty(sceneNum) || StringUtils.isEmpty(styleNum)){
                 return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
             }
-            Condition condition = new Condition(SceneStyleEntity.class);
-            condition.and().andEqualTo("styleNum", styleNum);
-            condition.orderBy("num").desc();
-            List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+
+            LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+            wrapper.eq(SceneStyleEntity::getStyleNum,styleNum);
+            wrapper.orderByDesc(SceneStyleEntity::getNum);
+            List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
 
             SceneStyleEntity sceneStyleEntity = null;
             if(StringUtils.isEmpty(buildType) || "all".equals(buildType)){
@@ -300,7 +300,7 @@ public class ImportDataController {
                     }
                     sceneStyleEntity.setStatus(0);
                     sceneStyleEntity.setProgress(0);
-                    sceneStyleService.update(sceneStyleEntity);
+                    sceneStyleService.updateById(sceneStyleEntity);
                 }else {
                     return Result.failure(CodeConstant.FAILURE_CODE_4003, CodeConstant.FAILURE_MSG_4003);
                 }
@@ -353,7 +353,7 @@ public class ImportDataController {
                         }
                         sceneStyleEntity.setPanoStatus(0);
                     }
-                    sceneStyleService.update(sceneStyleEntity);
+                    sceneStyleService.updateById(sceneStyleEntity);
 
                     sceneLightEntity.setStatus(0);
                     sceneLightEntity.setProgress(0);
@@ -457,7 +457,7 @@ public class ImportDataController {
             }
 
             JSONObject entryJson = new JSONObject();
-            if(StringUtil.isEmpty(entry)){
+            if(StrUtil.isEmpty(entry)){
                 FileUtils.downLoadFromUrl("https://4dkk.4dage.com/images/images" + num + "/vision.modeldata?t=" + System.currentTimeMillis(),
                         "vision.modeldata", basePath);
 
@@ -530,7 +530,7 @@ public class ImportDataController {
             JSONArray inputArray = null;
             JSONObject resultJson = new JSONObject();
             JSONArray resultArray = new JSONArray();
-            if(StringUtil.isNotEmpty(data)){
+            if(StrUtil.isNotEmpty(data)){
                 inputJson = JSON.parseObject(data);
                 if(inputJson.containsKey("floors")) {
                     inputArray = inputJson.getJSONArray("floors");
@@ -674,7 +674,7 @@ public class ImportDataController {
             JSONArray inputArray = null;
             JSONObject resultJson = new JSONObject();
             JSONArray resultArray = new JSONArray();
-            if(StringUtil.isNotEmpty(data)){
+            if(StrUtil.isNotEmpty(data)){
                 inputJson = JSON.parseObject(data);
                 if(inputJson.containsKey("floors")) {
                     inputArray = inputJson.getJSONArray("floors");
@@ -777,7 +777,7 @@ public class ImportDataController {
     @RequestMapping(value = "/updateDecorationJson", method = RequestMethod.GET)
     public Result updateDecorationJson() throws Exception{
 
-        List<SceneStyleEntity> list = sceneStyleService.findAll();
+        List<SceneStyleEntity> list = sceneStyleService.list();
         String path = "";
         String lightPath = "";
         String data = "";
@@ -949,7 +949,8 @@ public class ImportDataController {
                             }
                         }
 
-                        FileUtils.writeFile(path.replace("decoration.json", "decorationBack.json"), object.toJSONString(SerializerFeature.WriteMapNullValue));
+                        FileUtils.writeFile(path.replace("decoration.json", "decorationBack.json"),
+                                JSON.toJSONString(object,SerializerFeature.WriteMapNullValue));
                         uploadToOssUtil.upload(path.replace("decoration.json", "decorationBack.json"),
                                 "data/data" + sceneStyleEntity.getStyleNum() + "/changeData/decoration.json");
                     }
@@ -1135,7 +1136,8 @@ public class ImportDataController {
                             }
                         }
 
-                        FileUtils.writeFile(lightPath.replace("decoration.json", "decorationBack.json"), object.toJSONString(SerializerFeature.WriteMapNullValue));
+                        FileUtils.writeFile(lightPath.replace("decoration.json", "decorationBack.json"),
+                                JSON.toJSONString(object,SerializerFeature.WriteMapNullValue));
                         uploadToOssUtil.upload(lightPath.replace("decoration.json", "decorationBack.json"),
                                 "data/data" + sceneStyleEntity.getStyleNum() + "/proLightData/decoration.json");
                     }

src/main/java/com/example/demo/controller/LoginController.java

@@ -2,6 +2,9 @@ package com.example.demo.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.example.demo.util.RedisUtil;
 import com.example.demo.constant.CodeConstant;
 import com.example.demo.entity.StatisticsEntity;
 import com.example.demo.service.IStatisticsService;
@@ -14,18 +17,19 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by Hb_zzZ on 2020/7/8.
@@ -34,7 +38,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/change")
 @Api(tags = "登陆模块")
-public class LoginController {
+public class LoginController extends BaseController  {
 
     @Value("${main.url}")
     private String mainUrl;
@@ -42,6 +46,7 @@ public class LoginController {
     @Autowired
     private IStatisticsService statisticsService;
 
+
     /**
      * 登陆
      * @param user
@@ -65,14 +70,13 @@ public class LoginController {
         }else {
             object.put("isAdmin", 0);
         }
-
-        Condition condition = new Condition(StatisticsEntity.class);
-        condition.and().andEqualTo("statisticsDate", DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-        List<StatisticsEntity> statisticsEntityList = statisticsService.findAll(condition);
+        LambdaQueryWrapper<StatisticsEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(StatisticsEntity::getStatisticsDate,DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+        List<StatisticsEntity> statisticsEntityList = statisticsService.list(wrapper);
         if(statisticsEntityList.size() > 0){
             StatisticsEntity statisticsEntity = statisticsEntityList.get(0);
             statisticsEntity.setLoginNum(statisticsEntity.getLoginNum() + 1);
-            statisticsService.update(statisticsEntity);
+            statisticsService.updateById(statisticsEntity);
         }else {
             StatisticsEntity statisticsEntity = new StatisticsEntity();
             statisticsEntity.setLoginNum(1);

src/main/java/com/example/demo/controller/ManagerController.java

@@ -1,5 +1,6 @@
 package com.example.demo.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -15,13 +16,11 @@ import com.example.demo.vo.response.ResponseRenovationPartsDetailManager;
 import com.example.demo.vo.response.ResponseRenovationPartsSize;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
-import com.github.pagehelper.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +41,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/manager")
 @Api(tags = "管理后台模块")
-public class ManagerController {
+public class ManagerController extends BaseController  {
 
     @Value("${server.file.location}")
     private String buildPath;
@@ -120,7 +119,7 @@ public class ManagerController {
         String userId = request.getParameter("userId");
         String userType = request.getParameter("userType");
 
-        if (StringUtil.isEmpty(userId) || StringUtil.isEmpty(userType) || file.isEmpty()){
+        if (StrUtil.isEmpty(userId) || StrUtil.isEmpty(userType) || file.isEmpty()){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
@@ -220,7 +219,7 @@ public class ManagerController {
         String jsonData = request.getParameter("jsonData");
         String compressionRatioHasChanged = request.getParameter("compressionRatioHasChanged");
 
-        if (StringUtil.isEmpty(modelId) || StringUtil.isEmpty(jsonData)){
+        if (StrUtil.isEmpty(modelId) || StrUtil.isEmpty(jsonData)){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
@@ -268,7 +267,7 @@ public class ManagerController {
                 buildPath + modelUploadEntity.getObjPath().replace(".obj", "-base.obj") , json.getString("matrix").replace("[", "").replace("]", ""));
 
 
-        if(StringUtil.isNotEmpty(compressionRatioHasChanged) &&
+        if(StrUtil.isNotEmpty(compressionRatioHasChanged) &&
                 Boolean.valueOf(compressionRatioHasChanged) &&
                 json.containsKey("compressionRatio")){
             int compressionRatio = json.getIntValue("compressionRatio");
@@ -304,7 +303,7 @@ public class ManagerController {
 
         String objPath = "";
 
-        if (StringUtil.isEmpty(modelId)){
+        if (StrUtil.isEmpty(modelId)){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
@@ -315,7 +314,7 @@ public class ManagerController {
         }
 
         modelUploadEntity.setStatus(0);
-        modelUploadService.update(modelUploadEntity);
+        modelUploadService.updateById(modelUploadEntity);
 
         String path = buildPath + "upload";
         File targetFile = new File(path);
@@ -345,14 +344,14 @@ public class ManagerController {
 
         if(!new File(objPath).exists()){
             modelUploadEntity.setStatus(-1);
-            modelUploadService.update(modelUploadEntity);
+            modelUploadService.updateById(modelUploadEntity);
             log.error("转换obj数据失败-{}", modelUploadEntity.getFileId());
             return Result.failure(CodeConstant.FAILURE_CODE_4006, CodeConstant.FAILURE_MSG_4006);
         }
 
         modelUploadEntity.setStatus(1);
         modelUploadEntity.setObjPath(objPath.replace(buildPath, ""));
-        modelUploadService.update(modelUploadEntity);
+        modelUploadService.updateById(modelUploadEntity);
         return Result.success(modelUploadEntity);
     }
 
@@ -377,7 +376,7 @@ public class ManagerController {
             param.setUserId(null);
         }
 
-        if(StringUtil.isEmpty(param.getName())){
+        if(StrUtil.isEmpty(param.getName())){
             param.setName(null);
         }
 
@@ -480,7 +479,7 @@ public class ManagerController {
         if(param.getId() == null){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
-        if (StringUtils.isBlank(param.getZhName())) {
+        if (StrUtil.isBlank(param.getZhName())) {
             return Result.failure(1, "模型名称不能为空");
         }
 
@@ -488,12 +487,12 @@ public class ManagerController {
         BeanUtils.copyProperties(param, renovationPartsDetailEntity);
         renovationPartsDetailEntity.setExamine(null);
 
-        renovationPartsDetailService.update(renovationPartsDetailEntity);
+        renovationPartsDetailService.updateById(renovationPartsDetailEntity);
         if("I".equals(renovationPartsDetailEntity.getRecStatus())){
             ModelUploadEntity modelUploadEntity = modelUploadService.findByPartsDetailId(renovationPartsDetailEntity.getId());
             if(modelUploadEntity != null){
                 modelUploadEntity.setRecStatus("I");
-                modelUploadService.update(modelUploadEntity);
+                modelUploadService.updateById(modelUploadEntity);
             }
         }
 
@@ -516,7 +515,7 @@ public class ManagerController {
                 renovationPartsAttachingEntity.setWallAttaching(false);
                 renovationPartsAttachingEntity.setFloorAttaching(true);
             }
-            renovationPartsAttachingService.update(renovationPartsAttachingEntity);
+            renovationPartsAttachingService.updateById(renovationPartsAttachingEntity);
         }
 
         if(param.getX() != null && param.getY() != null && param.getZ() != null){
@@ -527,7 +526,7 @@ public class ManagerController {
             renovationPartsSizeEntity.setZ(param.getZ());
             if(responseRenovationPartsSize != null){
                 renovationPartsSizeEntity.setId(responseRenovationPartsSize.getId());
-                renovationPartsSizeService.update(renovationPartsSizeEntity);
+                renovationPartsSizeService.updateById(renovationPartsSizeEntity);
             }else {
                 renovationPartsSizeEntity.setPartsDetailId(renovationPartsDetailEntity.getId());
                 renovationPartsSizeService.save(renovationPartsSizeEntity);
@@ -563,7 +562,7 @@ public class ManagerController {
         log.info("obj转换成glb格式路径-{}", glbPath);
         CreateObjUtil.objToGlb(buildPath + modelUploadEntity.getObjPath(), glbPath);
         modelUploadEntity.setObjSize((int) new File(buildPath + modelUploadEntity.getObjPath()).length());
-        modelUploadService.update(modelUploadEntity);
+        modelUploadService.updateById(modelUploadEntity);
 
         //上传obj、mtl、jpg和glb
         String str = FileUtils.readFile(buildPath + "upload/" + modelUploadEntity.getFileId() + "/uploadList.txt");
@@ -614,12 +613,12 @@ public class ManagerController {
         // 加锁，同一个模型只能请求一次3d渲染,防止同一账号在登录多个客户端下同时操作一个模型导致出问题
         Result result;
         synchronized (param.getModelUploadId()) {
-            result = synchronizedUpdateModel(param, modelUploadEntity, jsonObject, glbPath, renovationPartsDetailEntity);
+            result = synchronizedupdateByIdModel(param, modelUploadEntity, jsonObject, glbPath, renovationPartsDetailEntity);
         }
         return result;
     }
 
-    private Result synchronizedUpdateModel(RequestRenovationPartsDetailManager param,
+    private Result synchronizedupdateByIdModel(RequestRenovationPartsDetailManager param,
                                            ModelUploadEntity modelUploadEntity,
                                            JSONObject jsonObject, String glbPath,
                                            RenovationPartsDetailEntity renovationPartsDetailEntity) throws Exception {
@@ -690,7 +689,7 @@ public class ManagerController {
 
         //修改上传信息，关联模型id
         modelUploadEntity.setPartsDetailId(renovationPartsDetailEntity.getId());
-        int row =  modelUploadService.update(modelUploadEntity);
+        Boolean row =  modelUploadService.updateById(modelUploadEntity);
         log.info("执行行数-{}", row);
         return Result.success();
     }
@@ -710,7 +709,7 @@ public class ManagerController {
     @ApiOperation("获取所有企业信息")
     @RequestMapping(value = "/findCompanyList", method = RequestMethod.POST)
     public Result findCompanyList(){
-        return Result.success(companyService.findAll());
+        return Result.success(companyService.list());
     }
 
     /**
@@ -746,7 +745,7 @@ public class ManagerController {
             renovationPartsDetailEntity.setPath(renovationPartsDetailEntity.getPath().replace("/temp/", "/models/"));
         }
 
-        renovationPartsDetailService.update(renovationPartsDetailEntity);
+        renovationPartsDetailService.updateById(renovationPartsDetailEntity);
 
         return Result.success();
     }
@@ -812,7 +811,7 @@ public class ManagerController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "id的集合用逗号分割", dataType = "String")})
     public Result deleteUploadModel(@RequestBody RequestRenovationParts param){
-        if(StringUtil.isEmpty(param.getIds())){
+        if(StrUtil.isEmpty(param.getIds())){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
@@ -822,7 +821,7 @@ public class ManagerController {
             modelUploadEntity.setId(Long.valueOf(id));
             modelUploadEntity.setRecStatus("I");
 
-            modelUploadService.update(modelUploadEntity);
+            modelUploadService.updateById(modelUploadEntity);
         }
 
         return Result.success();
@@ -839,7 +838,7 @@ public class ManagerController {
             @ApiImplicitParam(name = "modelId", value = "模型id", dataType = "String")})
     public Result createImg(Long modelId, String jsonData) throws Exception {
 
-        if(StringUtils.isEmpty(jsonData) || modelId == null){
+        if(StrUtil.isEmpty(jsonData) || modelId == null){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
@@ -854,7 +853,7 @@ public class ManagerController {
                 modelUploadEntity.getFileId() + ":;" + modelUploadEntity.getUserId() + ":;" +
                         modelUploadEntity.getId() + ":;" + jsonData + ":;modelPreview");
 
-        modelUploadService.update(modelUploadEntity);
+        modelUploadService.updateById(modelUploadEntity);
         return Result.success();
     }
 
@@ -899,7 +898,7 @@ public class ManagerController {
         }
 
         modelUploadEntity.setCacheData(cacheData);
-        modelUploadService.update(modelUploadEntity);
+        modelUploadService.updateById(modelUploadEntity);
 
         return Result.success(modelUploadEntity);
     }
@@ -913,7 +912,7 @@ public class ManagerController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "多个以逗号分割", dataType = "String")})
     public Result uploadObj(@RequestBody RequestRenovationParts param){
-        if(StringUtil.isEmpty(param.getName())){
+        if(StrUtil.isEmpty(param.getName())){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
@@ -934,7 +933,7 @@ public class ManagerController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "多个以逗号分割", dataType = "String")})
     public Result updateGlb(@RequestBody RequestRenovationParts param) throws Exception{
-        if(StringUtil.isEmpty(param.getName())){
+        if(StrUtil.isEmpty(param.getName())){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
@@ -972,7 +971,7 @@ public class ManagerController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "多个以逗号分割", dataType = "String")})
     public Result objToToolbag(@RequestBody RequestRenovationParts param) throws Exception{
-        if(StringUtil.isEmpty(param.getName())){
+        if(StrUtil.isEmpty(param.getName())){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 

src/main/java/com/example/demo/controller/MaterialController.java

@@ -1,12 +1,11 @@
 package com.example.demo.controller;
 
-import com.example.demo.constant.CodeConstant;
 import com.example.demo.entity.MaterialEntity;
-import com.example.demo.entity.ModelUploadEntity;
 import com.example.demo.service.IMaterialService;
 import com.example.demo.service.IModelUploadService;
 import com.example.demo.util.Result;
 import com.example.demo.vo.request.RequestMaterial;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * Created by Hb_zzZ on 2021/4/8.
  */
@@ -26,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/change/material")
 @Api(tags = "材质管理模块")
-public class MaterialController {
+public class MaterialController extends BaseController  {
 
     @Autowired
     private IMaterialService materialService;
@@ -35,18 +36,32 @@ public class MaterialController {
     private IModelUploadService modelUploadService;
 
     /**
-     * 根据模型名称删除
+     * 分页查询
      * @return
      */
-    @ApiOperation("根据模型名称删除")
+    @ApiOperation("分页查询")
     @RequestMapping(value = "/findByPage", method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageSize", value = "页数", dataType = "int"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", dataType = "int")})
+            @ApiImplicitParam(name = "pageNum", value = "页码", dataType = "int"),
+            @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "string"),
+            @ApiImplicitParam(name = "sortBy", value = "排序表示", dataType = "string")})
     public Result findByPage(@RequestBody RequestMaterial param){
+        PageInfo<MaterialEntity> list = materialService.listByPage(param);
+        return Result.success(list);
+    }
 
-        PageInfo<MaterialEntity> pageInfo = materialService.findAll(param.getPageNum(), param.getPageSize());
-        return Result.success(pageInfo);
+    @ApiOperation("修改信息")
+    @RequestMapping(value = "/updateById", method = RequestMethod.POST)
+     @ApiImplicitParams({
+     @ApiImplicitParam(name = "id", value = "主键", dataType = "Long")})
+    public Result updateById(@RequestBody RequestMaterial company) {
+        MaterialEntity a= materialService.findById(company.getId());
+        a.setName("hhhh");
+        Boolean updateFlag=  materialService.updateById(a);
+        a.setId(null);
+        Boolean saveflag=  materialService.save(a);
+        return Result.success(updateFlag);
     }
 
 //    /**

src/main/java/com/example/demo/controller/ModelExistController.java

@@ -1,5 +1,7 @@
 package com.example.demo.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.example.demo.constant.CodeConstant;
 import com.example.demo.entity.ModelExistEntity;
 import com.example.demo.entity.ModelUploadEntity;
@@ -18,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.util.*;
 
@@ -29,7 +30,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/change/modelExist")
 @Api(tags = "现有模型模块")
-public class ModelExistController {
+public class ModelExistController  extends BaseController  {
 
     @Autowired
     private IModelExistService modelExistService;
@@ -52,9 +53,10 @@ public class ModelExistController {
         }
 
         String[] nameArr = param.getNames().split(",");
-        Condition condition = new Condition(ModelExistEntity.class);
-        condition.and().andIn("name", Arrays.asList(nameArr));
-        List<ModelExistEntity> list = modelExistService.findAll(condition);
+
+        LambdaQueryWrapper<ModelExistEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.in(ModelExistEntity::getName,Arrays.asList(nameArr));
+        List<ModelExistEntity> list = modelExistService.list(wrapper);
 
         List<String> nameList = new ArrayList<>();
         for (ModelExistEntity modelExistEntity : list) {

src/main/java/com/example/demo/controller/RenovationController.java

@@ -1,13 +1,10 @@
 package com.example.demo.controller;
 
 import com.example.demo.constant.CodeConstant;
-import com.example.demo.entity.RenovationBuildDetailEntity;
 import com.example.demo.entity.RenovationPartsDetailEntity;
-import com.example.demo.mapper.IRenovationBuildDetailMapper;
 import com.example.demo.service.*;
 import com.example.demo.util.Result;
 import com.example.demo.vo.request.RequestRenovationParts;
-import com.example.demo.vo.response.ResponseRenovationBuildDetail;
 import com.example.demo.vo.response.ResponseRenovationPartsDetail;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -17,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.IOP.Codec;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -26,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,7 +31,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/change")
 @Api(tags = "装修配件模块")
-public class RenovationController {
+public class RenovationController extends BaseController  {
 
     @Autowired
     private IRenovationPartsService renovationPartsService;
@@ -101,7 +96,7 @@ public class RenovationController {
     @ApiOperation("获取所有装饰总类")
     @RequestMapping(value = "/findAllParts", method = RequestMethod.POST)
     public Result findAllParts(){
-        return Result.success(renovationPartsService.findAll());
+        return Result.success(renovationPartsService.list());
     }
 
     /**
@@ -111,7 +106,7 @@ public class RenovationController {
     @ApiOperation("获取所有硬装总类")
     @RequestMapping(value = "/findAllBuild", method = RequestMethod.POST)
     public Result findAllBuild(){
-        return Result.success(renovationBuildService.findAll());
+        return Result.success(renovationBuildService.list());
     }
 
     /**
@@ -222,7 +217,7 @@ public class RenovationController {
     @ApiOperation("获取所有家装色系")
     @RequestMapping(value = "/findPartsColorList", method = RequestMethod.POST)
     public Result findPartsColorList(){
-        return Result.success(renovationPartsColorService.findAll());
+        return Result.success(renovationPartsColorService.list());
     }
 
     /**
@@ -257,7 +252,7 @@ public class RenovationController {
     @ApiOperation("获取所有家装风格")
     @RequestMapping(value = "/findPartsStyleList", method = RequestMethod.POST)
     public Result findPartsStyleList(){
-        return Result.success(renovationPartsStyleService.findAll());
+        return Result.success(renovationPartsStyleService.list());
     }
 
     /**
@@ -267,7 +262,7 @@ public class RenovationController {
     @ApiOperation("获取所有家装分类")
     @RequestMapping(value = "/findPartsClassifyList", method = RequestMethod.POST)
     public Result findPartsClassifyList(){
-        return Result.success(renovationPartsClassifyService.findAll());
+        return Result.success(renovationPartsClassifyService.list());
     }
 
     /**
@@ -277,7 +272,7 @@ public class RenovationController {
     @ApiOperation("获取所有家装形状")
     @RequestMapping(value = "/findPartsShapeList", method = RequestMethod.POST)
     public Result findPartsShapeList(){
-        return Result.success(renovationPartsShapeService.findAll());
+        return Result.success(renovationPartsShapeService.list());
     }
 
 
@@ -288,6 +283,6 @@ public class RenovationController {
     @ApiOperation("获取所有品牌")
     @RequestMapping(value = "/findPartsBrandList", method = RequestMethod.POST)
     public Result findPartsBrandList(){
-        return Result.success(renovationPartsBrandService.findAll());
+        return Result.success(renovationPartsBrandService.list());
     }
 }

src/main/java/com/example/demo/controller/SceneController.java

@@ -2,10 +2,8 @@ package com.example.demo.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.example.demo.mq.TopicRabbitConfig;
-import com.example.demo.util.Base64Converter;
 import com.example.demo.util.HttpRequestorUtil;
 import com.example.demo.vo.request.RequestScene;
-import com.example.demo.vo.request.RequestUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("/change")
 @Api(tags = "四维看看场景模块")
-public class SceneController {
+public class SceneController extends BaseController  {
 
     @Value("${main.url}")
     private String mainUrl;

src/main/java/com/example/demo/controller/SceneLightStyleController.java

@@ -1,5 +1,7 @@
 package com.example.demo.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.example.demo.constant.CodeConstant;
 import com.example.demo.entity.SceneLightStyleEntity;
 import com.example.demo.service.ISceneLightStyleService;
@@ -11,13 +13,11 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.util.Date;
 
@@ -28,7 +28,7 @@ import java.util.Date;
 @RestController
 @RequestMapping("/change/sceneLightStyle")
 @Api(tags = "灯光方案管理模块")
-public class SceneLightStyleController {
+public class SceneLightStyleController  extends BaseController  {
 
     @Autowired
     private ISceneLightStyleService sceneLightStyleService;
@@ -59,7 +59,7 @@ public class SceneLightStyleController {
         if(lightStyle.getId() != null){
             entity.setId(lightStyle.getId());
             entity.setUpdateTime(new Date());
-            sceneLightStyleService.update(entity);
+            sceneLightStyleService.updateById(entity);
             return Result.success();
         }
 
@@ -81,12 +81,12 @@ public class SceneLightStyleController {
         if(lightStyle.getSceneStyleId() == null){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
+        LambdaQueryWrapper<SceneLightStyleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(SceneLightStyleEntity::getSceneStyleId, lightStyle.getSceneStyleId())
+                .eq(SceneLightStyleEntity::getRecStatus,"A");
+        wrapper.orderByDesc(SceneLightStyleEntity::getId);
 
-        Condition condition = new Condition(SceneLightStyleEntity.class);
-        condition.and().andEqualTo("sceneStyleId", lightStyle.getSceneStyleId()).andEqualTo("recStatus", "A");
-        condition.orderBy("id").desc();
-
-        return Result.success(sceneLightStyleService.findAll(condition));
+        return Result.success(sceneLightStyleService.list(wrapper));
     }
 
     /**
@@ -108,7 +108,7 @@ public class SceneLightStyleController {
         entity.setId(lightStyle.getId());
         entity.setRecStatus("I");
         entity.setUpdateTime(new Date());
-        sceneLightStyleService.update(entity);
+        sceneLightStyleService.updateById(entity);
         return Result.success();
     }
 

src/main/java/com/example/demo/controller/SceneStyleController.java

@@ -1,6 +1,8 @@
 package com.example.demo.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.example.demo.constant.CodeConstant;
 import com.example.demo.entity.SceneLightEntity;
 import com.example.demo.entity.SceneStyleEntity;
@@ -11,7 +13,6 @@ import com.example.demo.util.Result;
 import com.example.demo.vo.request.RequestSceneLight;
 import com.example.demo.vo.request.RequestSceneStyle;
 import com.example.demo.vo.response.ResponseSceneLight;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -27,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
@@ -41,7 +41,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/change/sceneStyle")
 @Api(tags = "风格管理模块")
-public class SceneStyleController {
+public class SceneStyleController extends BaseController {
 
     @Autowired
     private ISceneStyleService sceneStyleService;
@@ -64,10 +64,11 @@ public class SceneStyleController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Result save(@RequestBody RequestSceneStyle style){
         long num = 1;
-        Condition condition = new Condition(SceneStyleEntity.class);
-        condition.and().andEqualTo("sceneNum", style.getSceneNum());
-        condition.orderBy("num").desc();
-        List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+
+        LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(SceneStyleEntity::getSceneNum, style.getSceneNum());
+        wrapper.orderByDesc(SceneStyleEntity::getNum);
+        List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
         if(list != null && list.size() > 0){
             num = list.get(0).getNum() + 1;
         }
@@ -78,9 +79,8 @@ public class SceneStyleController {
         sceneStyleEntity.setSceneNum(style.getSceneNum());
         sceneStyleEntity.setStyleName(style.getStyleName());
         sceneStyleEntity.setStyleNum("vr-" + style.getSceneNum() + "-" + String.format("%3d", num).replace(" ", "0"));
-        sceneStyleService.save(sceneStyleEntity);
-
-        return Result.success();
+        Boolean saveFlag=sceneStyleService.save(sceneStyleEntity);
+        return Result.success(saveFlag);
     }
 
 
@@ -101,7 +101,7 @@ public class SceneStyleController {
         SceneStyleEntity sceneStyleEntity = sceneStyleService.findById(style.getId());
         sceneStyleEntity.setStyleName(style.getStyleName());
 
-        sceneStyleService.update(sceneStyleEntity);
+        sceneStyleService.updateById(sceneStyleEntity);
 
         return Result.success();
     }
@@ -124,7 +124,7 @@ public class SceneStyleController {
         SceneStyleEntity sceneStyleEntity = sceneStyleService.findById(style.getId());
         sceneStyleEntity.setRecStatus("I");
 
-        sceneStyleService.update(sceneStyleEntity);
+        sceneStyleService.updateById(sceneStyleEntity);
 
         JSONObject data = new JSONObject();
         data.put("sceneNum", sceneStyleEntity.getStyleNum());
@@ -147,15 +147,13 @@ public class SceneStyleController {
             @ApiImplicitParam(name = "pageSize", value = "页数", dataType = "String")})
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@RequestBody RequestSceneStyle style){
-        Condition condition = new Condition(SceneStyleEntity.class);
-        condition.and().andEqualTo("sceneNum", style.getSceneNum());
+        LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(SceneStyleEntity::getSceneNum, style.getSceneNum());
         if(!StringUtils.isEmpty(style.getStyleName())){
-            condition.and().andLike("styleName", "%" + style.getStyleName() + "%");
+            wrapper.like(SceneStyleEntity::getStyleName, style.getSceneNum());
         }
-
-        PageInfo<SceneStyleEntity> pageInfo =  sceneStyleService.findAll(condition, style.getPageNum(), style.getPageSize(), "id desc");
-
-        return Result.success(pageInfo);
+        PageInfo<SceneStyleEntity> list =  sceneStyleService.listByPage(style,wrapper);
+        return Result.success(list);
     }
 
     /**
@@ -171,10 +169,9 @@ public class SceneStyleController {
         if(StringUtils.isEmpty(style.getStyleNum())){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
-
-        Condition condition = new Condition(SceneStyleEntity.class);
-        condition.and().andEqualTo("styleNum", style.getStyleNum());
-        List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+        LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(SceneStyleEntity::getStyleNum, style.getStyleNum());
+        List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
         SceneStyleEntity sceneStyleEntity = null;
         if(list != null && list.size() > 0){
             sceneStyleEntity = list.get(0);
@@ -198,10 +195,11 @@ public class SceneStyleController {
         if(StringUtils.isEmpty(style.getStyleNum()) || StringUtils.isEmpty(style.getRecStatus())){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
-        Condition condition = new Condition(SceneStyleEntity.class);
-        condition.and().andEqualTo("styleNum", style.getStyleNum());
-        condition.orderBy("createTime").desc();
-        List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+        LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(SceneStyleEntity::getStyleNum, style.getStyleNum());
+        wrapper.orderByDesc(SceneStyleEntity::getCreateTime);
+
+        List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
         SceneStyleEntity sceneStyleEntity = null;
         if(list != null && list.size() > 0){
             sceneStyleEntity = list.get(0);
@@ -212,12 +210,13 @@ public class SceneStyleController {
         List<ResponseSceneLight> result = new ArrayList<>();
         ResponseSceneLight responseSceneLight = null;
 
-        Condition conditionLight = new Condition(SceneLightEntity.class);
-        conditionLight.and().andEqualTo("sceneStyleId", sceneStyleEntity.getId())
-                .andEqualTo("isShow", 1).andEqualTo("recStatus", style.getRecStatus());
-        conditionLight.orderBy("createTime").desc();
+        LambdaQueryWrapper<SceneLightEntity> wrapper1 =  Wrappers.lambdaQuery();
+        wrapper1.eq(SceneLightEntity::getSceneStyleId,sceneStyleEntity.getId())
+                .eq(SceneLightEntity::getIsShow,1)
+                .eq(SceneLightEntity::getRecStatus, style.getRecStatus())
+                .orderByDesc(SceneLightEntity::getCreateTime);
 
-        List<SceneLightEntity> sceneLightEntityList = sceneLightService.findAll(conditionLight);
+        List<SceneLightEntity> sceneLightEntityList = sceneLightService.list(wrapper1);
         for (SceneLightEntity sceneLightEntity : sceneLightEntityList) {
             responseSceneLight = new ResponseSceneLight();
             BeanUtils.copyProperties(sceneLightEntity, responseSceneLight);
@@ -244,7 +243,7 @@ public class SceneStyleController {
         entity.setId(style.getId());
         entity.setRecStatus("I");
         entity.setUpdateTime(new Date());
-        sceneLightService.update(entity);
+        sceneLightService.updateById(entity);
 
         return Result.success();
     }
@@ -263,20 +262,20 @@ public class SceneStyleController {
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
-        Condition condition = new Condition(SceneStyleEntity.class);
-        condition.and().andEqualTo("styleNum", style.getStyleNum());
-        List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+        LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(SceneStyleEntity::getStyleNum,style.getStyleNum());
+
+        List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
         SceneStyleEntity sceneStyleEntity = null;
         if(list != null && list.size() > 0){
             sceneStyleEntity = list.get(0);
         }else {
             return Result.failure(CodeConstant.FAILURE_CODE_4003, CodeConstant.FAILURE_MSG_4003);
         }
-
-        Condition lightCondition = new Condition(SceneLightEntity.class);
-        lightCondition.and().andEqualTo("sceneStyleId", sceneStyleEntity.getId()).andEqualTo("status", 0);
-        lightCondition.orderBy("id").desc();
-        List<SceneLightEntity> lightEntityList = sceneLightService.findAll(lightCondition);
+        LambdaQueryWrapper<SceneLightEntity> wrapper1 =  Wrappers.lambdaQuery();
+        wrapper1.eq(SceneLightEntity::getSceneStyleId,sceneStyleEntity.getId())
+                .orderByDesc(SceneLightEntity::getId);
+        List<SceneLightEntity> lightEntityList = sceneLightService.list(wrapper1);
         SceneLightEntity sceneLightEntity = null;
         if(lightEntityList != null && lightEntityList.size() > 0){
             sceneLightEntity = lightEntityList.get(0);
@@ -331,11 +330,11 @@ public class SceneStyleController {
 
         //设置该图片为封面图
         sceneLightEntity.setIsCover(1);
-        sceneLightService.update(sceneLightEntity);
+        sceneLightService.updateById(sceneLightEntity);
 
         //修改场景封面图
         sceneStyleEntity.setThumb(sceneLightEntity.getImg());
-        sceneStyleService.update(sceneStyleEntity);
+        sceneStyleService.updateById(sceneStyleEntity);
         return Result.success();
     }
 

src/main/java/com/example/demo/controller/VisualAngleController.java

@@ -1,14 +1,17 @@
 package com.example.demo.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.example.demo.constant.CodeConstant;
 import com.example.demo.entity.SceneStyleEntity;
 import com.example.demo.entity.VisualAngleEntity;
-import com.example.demo.service.IRenovationPartsDetailService;
 import com.example.demo.service.ISceneStyleService;
 import com.example.demo.service.IVisualAngleService;
 import com.example.demo.util.Result;
 import com.example.demo.util.UploadToOssUtil;
 import com.example.demo.vo.request.RequestVisualAngle;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -19,7 +22,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.io.File;
 import java.util.List;
@@ -31,7 +33,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/change/visualAngle")
 @Api(tags = "相机视角模块")
-public class VisualAngleController {
+public class VisualAngleController extends BaseController {
 
     @Autowired
     private IVisualAngleService visualAngleService;
@@ -105,7 +107,7 @@ public class VisualAngleController {
         VisualAngleEntity visualAngleEntity = visualAngleService.findById(param.getId());
         if(visualAngleEntity != null){
             visualAngleEntity.setRecStatus("I");
-            visualAngleService.update(visualAngleEntity);
+            visualAngleService.updateById(visualAngleEntity);
         }
         return Result.success();
     }
@@ -124,10 +126,11 @@ public class VisualAngleController {
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
-        Condition condition = new Condition(VisualAngleEntity.class);
-        condition.and().andEqualTo("sceneStyleId", param.getSceneStyleId());
 
-        return Result.success(visualAngleService.findAll(condition));
+        LambdaQueryWrapper<VisualAngleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(VisualAngleEntity::getSceneStyleId,param.getSceneStyleId()) ;
+
+        return Result.success(visualAngleService.list(wrapper));
     }
 
     /**
@@ -145,10 +148,10 @@ public class VisualAngleController {
         if(param.getSceneStyleId() == null){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
+        LambdaQueryWrapper<VisualAngleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(VisualAngleEntity::getSceneStyleId,param.getSceneStyleId()) ;
 
-        Condition condition = new Condition(VisualAngleEntity.class);
-        condition.and().andEqualTo("sceneStyleId", param.getSceneStyleId());
-
-        return Result.success(visualAngleService.findAll(condition, param.getPageNum(), param.getPageSize()));
+        PageInfo<VisualAngleEntity>  list=visualAngleService.listByPage(param,wrapper);
+        return Result.success(list);
     }
 }

src/main/java/com/example/demo/controller/testController.java

@@ -0,0 +1,43 @@
+package com.example.demo.controller;
+
+import com.example.demo.util.RedisUtil;
+import com.example.demo.util.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/change")
+@Api(tags = "测试模块")
+public class testController extends BaseController{
+
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     * 测试redis
+     * @param key
+     * @param val
+     * @return
+     */
+    @ApiOperation("redis")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "key", value = "key", dataType = "String"),
+            @ApiImplicitParam(name = "val", value = "val", dataType = "String")})
+    @RequestMapping(value = "/redis", method = RequestMethod.POST)
+    public Result redis(String key, String val){
+        redisUtil.set(key,val);
+        return  success(redisUtil.get(key)) ;
+    }
+
+
+
+}

src/main/java/com/example/demo/entity/BaseEntity.java

@@ -1,71 +1,27 @@
 package com.example.demo.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
-import javax.persistence.*;
 import java.util.Date;
 
-@MappedSuperclass
+@Data
 public abstract class BaseEntity {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
+    @TableId(value="id", type= IdType.AUTO)
     private Long id;
 
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
     private Date createTime;
 
-    @Temporal(TemporalType.TIMESTAMP)
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "update_time")
+    @TableField(value = "update_time",fill = FieldFill.UPDATE)
     private Date updateTime;
 
-    @Column(name = "rec_status")
+    @TableField(value = "rec_status")
+    @TableLogic(value = "A",delval = "I")
     private String recStatus;
-
-/*    @Column(name = "update_by")
-    private Long updateBy;*/
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getRecStatus() {
-        return recStatus;
-    }
-
-    public void setRecStatus(String recStatus) {
-        this.recStatus = recStatus;
-    }
-
-/*    public Long getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(Long updateBy) {
-        this.updateBy = updateBy;
-    }*/
 }

src/main/java/com/example/demo/entity/CompanyEntity.java

@@ -1,20 +1,33 @@
 package com.example.demo.entity;
 
 import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
- * Created by Hb_zzZ on 2020/12/24.
+ * @description:  Model
+ * @author: Xiewj
+ * @date: 2021-08-16 13:12:02
  */
 @Data
-@Table(name = "tb_company")
-public class CompanyEntity extends BaseEntity{
+@TableName("tb_company")
+public class CompanyEntity extends BaseEntity {
+
+    private static final long serialVersionUID = 1629090722021L;
 
-    @Column(name = "company_name")
+    /**
+     * 公司名称
+     */
+    @TableField("company_name")
     private String companyName;
 
-    @Column(name = "key_word")
+    /**
+     *
+     */
+    @TableField("key_word")
     private String keyWord;
+
+
 }

src/main/java/com/example/demo/entity/MaterialEntity.java

@@ -1,36 +1,39 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2021/4/8.
  */
 @Data
-@Table(name = "tb_material")
+@TableName(  "tb_material")
 public class MaterialEntity extends BaseEntity{
 
-    @Column(name = "name")
+    @TableField("materialId")
+    private String materialId;
+
+
+    @TableField("name")
     private String name;
 
-    @Column(name = "keyword")
-    private String keyword;
 
-    @Column(name = "prefix_url")
-    private String prefixUrl;
+    @TableField("prefix_url")
+    private String prefix_url;
 
-    @Column(name = "ue4_data")
-    private String ue4Data;
 
-    @Column(name = "thumb")
+    @TableField("thumb")
     private String thumb;
 
-    @Column(name = "toolbag_data")
-    private String toolbagData;
 
-    @Column(name = "material_url")
-    private String materialUrl;
+    @TableField("material_url")
+    private String material_url;
+
+    @TableField("colorMap")
+    private String colorMap;
+
+
 
 }

src/main/java/com/example/demo/entity/ModelExistEntity.java

@@ -1,17 +1,17 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2021/1/20.
  */
 @Data
-@Table(name = "tb_model_exist")
+@TableName("tb_model_exist")
 public class ModelExistEntity extends BaseEntity {
 
-    @Column(name = "name")
+    @TableField("name")
     private String name;
 }

src/main/java/com/example/demo/entity/ModelUploadEntity.java

@@ -1,65 +1,65 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/12/1.
  */
 @Data
-@Table(name = "tb_model_upload")
+@TableName("tb_model_upload")
 public class ModelUploadEntity extends BaseEntity{
 
-    @Column(name = "user_id")
+    @TableField("user_id")
     private Long userId;
 
-    @Column(name = "user_type")
+    @TableField("user_type")
     private Integer userType;
 
-    @Column(name = "file_id")
+    @TableField("file_id")
     private String fileId;
 
-    @Column(name = "parts_detail_id")
+    @TableField("parts_detail_id")
     private Long partsDetailId;
 
-    @Column(name = "status")
+    @TableField("status")
     private Integer status;
 
-    @Column(name = "obj_path")
+    @TableField("obj_path")
     private String objPath;
 
-    @Column(name = "img_path")
+    @TableField("img_path")
     private String imgPath;
 
-    @Column(name = "file_type")
+    @TableField("file_type")
     private Integer fileType;
 
-    @Column(name = "thum_path")
+    @TableField("thum_path")
     private String thumPath;
 
-    @Column(name = "progress")
+    @TableField("progress")
     private Integer progress;
 
-    @Column(name = "upload_file")
+    @TableField("upload_file")
     private String uploadFile;
 
-    @Column(name = "faces_num")
+    @TableField("faces_num")
     private Integer facesNum;
 
     /**
      * 封面图生成状态。0生成中，1成功，-1失败，2未重新生成
      */
-    @Column(name = "thum_status")
+    @TableField("thum_status")
     private Integer thumStatus;
 
-    @Column(name = "thum_progress")
+    @TableField("thum_progress")
     private Integer thumProgress;
 
-    @Column(name = "obj_size")
+    @TableField("obj_size")
     private Integer objSize;
 
-    @Column(name = "cache_data")
+    @TableField("cache_data")
     private String cacheData;
 }

src/main/java/com/example/demo/entity/RenovationBuildDetailEntity.java

@@ -1,33 +1,33 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@Table(name = "tb_renovation_build_detail")
+@TableName( "tb_renovation_build_detail")
 public class RenovationBuildDetailEntity extends BaseEntity {
 
-    @Column(name = "build_id")
+    @TableField( "build_id")
     private Long buildId;
 
-    @Column(name = "name")
+    @TableField( "name")
     private String name;
 
-    @Column(name = "key_word")
+    @TableField( "key_word")
     private String keyWord;
 
-    @Column(name = "origin_img")
+    @TableField( "origin_img")
     private String originImg;
 
-    @Column(name = "high_img")
+    @TableField( "high_img")
     private String highImg;
 
-    @Column(name = "thumbnail")
+    @TableField( "thumbnail")
     private String thumbnail;
 
 }

src/main/java/com/example/demo/entity/RenovationBuildEntity.java

@@ -1,21 +1,20 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
-
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@Table(name = "tb_renovation_build")
+@TableName( "tb_renovation_build")
 public class RenovationBuildEntity extends BaseEntity {
 
-    @Column(name = "name")
+    @TableField( "name")
     private String name;
 
-    @Column(name = "key_word")
+    @TableField( "key_word")
     private String keyWord;
 
 }

src/main/java/com/example/demo/entity/RenovationPartsAttachingEntity.java

@@ -1,26 +1,26 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@Table(name = "tb_renovation_parts_attaching")
+@TableName( "tb_renovation_parts_attaching")
 public class RenovationPartsAttachingEntity extends BaseEntity {
 
-    @Column(name = "parts_detail_id")
+    @TableField( "parts_detail_id")
     private Long partsDetailId;
 
-    @Column(name = "wall_attaching")
+    @TableField( "wall_attaching")
     private boolean wallAttaching;
 
-    @Column(name = "ceil_attaching")
+    @TableField( "ceil_attaching")
     private boolean ceilAttaching;
 
-    @Column(name = "floor_attaching")
+    @TableField( "floor_attaching")
     private boolean floorAttaching;
 }

src/main/java/com/example/demo/entity/RenovationPartsBrandEntity.java

@@ -1,17 +1,17 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Data
-@Table(name = "tb_renovation_parts_brand")
+@TableName( "tb_renovation_parts_brand")
 public class RenovationPartsBrandEntity extends BaseEntity {
 
-    @Column(name = "brand_name")
+    @TableField( "brand_name")
     private String brandName;
 }

src/main/java/com/example/demo/entity/RenovationPartsClassifyEntity.java

@@ -1,17 +1,17 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Data
-@Table(name = "tb_renovation_parts_classify")
+@TableName( "tb_renovation_parts_classify")
 public class RenovationPartsClassifyEntity extends BaseEntity {
 
-    @Column(name = "classify_name")
+    @TableField( "classify_name")
     private String classifyName;
 }

src/main/java/com/example/demo/entity/RenovationPartsColorEntity.java

@@ -1,20 +1,20 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/11/12.
  */
 @Data
-@Table(name = "tb_renovation_parts_color")
+@TableName( "tb_renovation_parts_color")
 public class RenovationPartsColorEntity extends BaseEntity {
 
-    @Column(name = "color_name")
+    @TableField( "color_name")
     private String colorName;
 
-    @Column(name = "color_value")
+    @TableField( "color_value")
     private String colorValue;
 }

src/main/java/com/example/demo/entity/RenovationPartsDetailEntity.java

@@ -1,73 +1,73 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@Table(name = "tb_renovation_parts_detail")
+@TableName( "tb_renovation_parts_detail")
 public class RenovationPartsDetailEntity extends BaseEntity {
 
-    @Column(name = "parts_type_id")
+    @TableField( "parts_type_id")
     private Long partsTypeId;
 
-    @Column(name = "parts_color_id")
+    @TableField( "parts_color_id")
     private Long partsColorId;
 
-    @Column(name = "parts_style_id")
+    @TableField( "parts_style_id")
     private Long partsStyleId;
 
-    @Column(name = "parts_classify_id")
+    @TableField( "parts_classify_id")
     private Long partsClassifyId;
 
-    @Column(name = "parts_shape_id")
+    @TableField( "parts_shape_id")
     private Long partsShapeId;
 
-    @Column(name = "parts_brand_id")
+    @TableField( "parts_brand_id")
     private Long partsBrandId;
 
-    @Column(name = "company_id")
+    @TableField( "company_id")
     private Long companyId;
 
-    @Column(name = "key_word")
+    @TableField( "key_word")
     private String keyWord;
 
-    @Column(name = "type")
+    @TableField( "type")
     private String type;
 
-    @Column(name = "description")
+    @TableField( "description")
     private String description;
 
-    @Column(name = "img")
+    @TableField( "img")
     private String img;
 
-    @Column(name = "high_img")
+    @TableField( "high_img")
     private String highImg;
 
-    @Column(name = "path")
+    @TableField( "path")
     private String path;
 
-    @Column(name = "name")
+    @TableField( "name")
     private String name;
 
-    @Column(name = "zh_name")
+    @TableField( "zh_name")
     private String zhName;
 
-    @Column(name = "is_show")
+    @TableField( "is_show")
     private Integer isShow;
 
-    @Column(name = "examine")
+    @TableField( "examine")
     private Integer examine;
 
-    @Column(name = "examine_time")
+    @TableField( "examine_time")
     private Date examineTime;
 
-    @Column(name = "has_toolbag")
+    @TableField( "has_toolbag")
     private Integer hasToolbag;
 
 }

src/main/java/com/example/demo/entity/RenovationPartsEntity.java

@@ -1,23 +1,23 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@Table(name = "tb_renovation_parts")
+@TableName( "tb_renovation_parts")
 public class RenovationPartsEntity extends BaseEntity {
 
-    @Column(name = "name")
+    @TableField( "name")
     private String name;
 
-    @Column(name = "type")
+    @TableField( "type")
     private String type;
 
-    @Column(name = "description")
+    @TableField( "description")
     private String description;
 }

src/main/java/com/example/demo/entity/RenovationPartsShapeEntity.java

@@ -1,17 +1,17 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Data
-@Table(name = "tb_renovation_parts_shape")
+@TableName( "tb_renovation_parts_shape")
 public class RenovationPartsShapeEntity extends BaseEntity {
 
-    @Column(name = "shape_name")
+    @TableField( "shape_name")
     private String shapeName;
 }

src/main/java/com/example/demo/entity/RenovationPartsSizeEntity.java

@@ -1,26 +1,26 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@Table(name = "tb_renovation_parts_size")
+@TableName( "tb_renovation_parts_size")
 public class RenovationPartsSizeEntity extends BaseEntity {
 
-    @Column(name = "parts_detail_id")
+    @TableField( "parts_detail_id")
     private Long partsDetailId;
 
-    @Column(name = "x")
+    @TableField( "x")
     private Integer x;
 
-    @Column(name = "y")
+    @TableField( "y")
     private Integer y;
 
-    @Column(name = "z")
+    @TableField( "z")
     private Integer z;
 }

src/main/java/com/example/demo/entity/RenovationPartsStyleEntity.java

@@ -1,17 +1,17 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Data
-@Table(name = "tb_renovation_parts_style")
+@TableName( "tb_renovation_parts_style")
 public class RenovationPartsStyleEntity extends BaseEntity {
 
-    @Column(name = "style_name")
+    @TableField( "style_name")
     private String styleName;
 }

src/main/java/com/example/demo/entity/RenovationPartsTypeEntity.java

@@ -1,30 +1,30 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@Table(name = "tb_renovation_parts_type")
+@TableName( "tb_renovation_parts_type")
 public class RenovationPartsTypeEntity extends BaseEntity {
 
-    @Column(name = "parts_id")
+    @TableField( "parts_id")
     private Long partsId;
 
-    @Column(name = "key_word")
+    @TableField( "key_word")
     private String keyWord;
 
-    @Column(name = "type")
+    @TableField( "type")
     private String type;
 
-    @Column(name = "description")
+    @TableField( "description")
     private String description;
 
-    @Column(name = "img")
+    @TableField( "img")
     private String img;
 
 }

src/main/java/com/example/demo/entity/SceneLightEntity.java

@@ -1,50 +1,50 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/10/29.
  */
 @Data
-@Table(name = "tb_scene_light")
+@TableName( "tb_scene_light")
 public class SceneLightEntity extends BaseEntity{
 
-    @Column(name = "scene_style_id")
+    @TableField( "scene_style_id")
     private Long sceneStyleId;
 
-    @Column(name = "img")
+    @TableField( "img")
     private String img;
 
-    @Column(name = "file_path")
+    @TableField( "file_path")
     private String filePath;
 
-    @Column(name = "status")
+    @TableField( "status")
     private Integer status;
 
-    @Column(name = "progress")
+    @TableField( "progress")
     private Integer progress;
 
-    @Column(name = "is_show")
+    @TableField( "is_show")
     private Integer isShow;
 
-    @Column(name = "is_cover")
+    @TableField( "is_cover")
     private Integer isCover;
 
-    @Column(name = "type")
+    @TableField( "type")
     private Integer type;
 
     /**
      * 像素
      */
-    @Column(name = "pixel")
+    @TableField( "pixel")
     private String pixel;
 
     /**
      * quality
      */
-    @Column(name = "quality")
+    @TableField( "quality")
     private String quality;
 }

src/main/java/com/example/demo/entity/SceneLightStyleEntity.java

@@ -1,23 +1,23 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/10/29.
  */
 @Data
-@Table(name = "tb_scene_light_style")
+@TableName( "tb_scene_light_style")
 public class SceneLightStyleEntity extends BaseEntity {
 
-    @Column(name = "scene_style_id")
+    @TableField( "scene_style_id")
     private Long sceneStyleId;
 
-    @Column(name = "light_style_name")
+    @TableField( "light_style_name")
     private String lightStyleName;
 
-    @Column(name = "pro_light_json")
+    @TableField( "pro_light_json")
     private String proLightJson;
 }

src/main/java/com/example/demo/entity/SceneStyleEntity.java

@@ -1,48 +1,48 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2020/7/14.
  */
 @Data
-@Table(name = "tb_scene_style")
+@TableName("tb_scene_style")
 public class SceneStyleEntity extends BaseEntity{
 
-    @Column(name = "scene_num")
+    @TableField("scene_num")
     private String sceneNum;
 
-    @Column(name = "style_name")
+    @TableField("style_name")
     private String styleName;
 
-    @Column(name = "style_num")
+    @TableField("style_num")
     private String styleNum;
 
-    @Column(name = "thumb")
+    @TableField("thumb")
     private String thumb;
 
-    @Column(name = "num")
+    @TableField("num")
     private Long num;
 
-    @Column(name = "status")
+    @TableField("status")
     private Integer status;
 
-    @Column(name = "progress")
+    @TableField("progress")
     private Integer progress;
 
-    @Column(name = "light_status")
+    @TableField("light_status")
     private Integer lightStatus;
 
-    @Column(name = "light_version")
+    @TableField("light_version")
     private Integer lightVersion;
 
-    @Column(name = "pano_status")
+    @TableField("pano_status")
     private Integer panoStatus;
 
-    @Column(name = "pano_version")
+    @TableField("pano_version")
     private Integer panoVersion;
 
 

src/main/java/com/example/demo/entity/StatisticsEntity.java

@@ -1,30 +1,30 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2021/4/7.
  */
 @Data
-@Table(name = "tb_statistics")
+@TableName( "tb_statistics")
 public class StatisticsEntity extends BaseEntity {
 
-    @Column(name = "login_num")
+    @TableField( "login_num")
     private Integer loginNum;
 
-    @Column(name = "build_num")
+    @TableField( "build_num")
     private Integer buildNum;
 
-    @Column(name = "light_num")
+    @TableField( "light_num")
     private Integer lightNum;
 
-    @Column(name = "pano_num")
+    @TableField( "pano_num")
     private Integer panoNum;
 
-    @Column(name = "statistics_date")
+    @TableField( "statistics_date")
     private String statisticsDate;
 
 }

src/main/java/com/example/demo/entity/VisualAngleEntity.java

@@ -1,23 +1,23 @@
 package com.example.demo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
 
 /**
  * Created by Hb_zzZ on 2021/1/19.
  */
 @Data
-@Table(name = "tb_visual_angle")
+@TableName( "tb_visual_angle")
 public class VisualAngleEntity extends BaseEntity{
 
-    @Column(name = "scene_style_id")
+    @TableField( "scene_style_id")
     private Long sceneStyleId;
 
-    @Column(name = "img_path")
+    @TableField( "img_path")
     private String imgPath;
 
-    @Column(name = "angle_data")
+    @TableField( "angle_data")
     private String angleData;
 }

src/main/java/com/example/demo/entity/ZhiSceneNum.java

@@ -1,26 +1,23 @@
 package com.example.demo.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.*;
-import java.util.Date;
-
 /**
  * Created by Hb_zzZ on 2020/8/13.
  */
 @Data
-@Table(name = "t_scene_3d_num_new")
-@MappedSuperclass
+@TableName( "t_scene_3d_num_new")
 public class ZhiSceneNum extends BaseEntity {
 
-    @Column(name = "used")
+    @TableField( "used")
     private Integer used;
 
-    @Column(name = "folder_name")
+    @TableField( "folder_name")
     private String folderName;
 
-    @Column(name = "code")
+    @TableField( "code")
     private String code;
 
 }

src/main/java/com/example/demo/generator/BaseDto.java

@@ -0,0 +1,21 @@
+package com.example.demo.generator;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.io.Serializable;
+
+/**
+ * @description:1
+ **/
+public class BaseDto implements Serializable {
+
+	private static final long serialVersionUID = 4537093877314249859L;
+
+	@Override
+	public String toString() {
+		return JSONObject.toJSONString(this);
+	}
+
+
+
+}

src/main/java/com/example/demo/generator/CloumnEnums.java

@@ -0,0 +1,84 @@
+package com.example.demo.generator;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description:
+ **/
+public enum CloumnEnums {
+
+    /**
+     * 字段隐射枚举
+     */
+    BIGINT("BIGINT", "Long", null),
+    TIMESTAMP("TIMESTAMP", "Date", "java.util.Date"),
+    DATE("DATE", "LocalDate", "java.time.LocalDate"),
+    DATETIME("DATETIME", "Date", "java.util.Date"),
+    DECIMAL("DECIMAL", "java.math.BigDecimal", "java.math.BigDecimal"),
+    TEXT("TEXT", "String", null),
+    LONGTEXT("LONGTEXT", "String", null),
+    VARCHAR("VARCHAR", "String", null),
+    CHAR("CHAR", "String", null),
+    JSON("JSON", "String", null),
+    INT("INT", "Integer", null),
+    TINYINT("TINYINT", "Integer", null),
+    DOUBLE("DOUBLE", "Double", null),
+    FLOAT("FLOAT", "Float", null),
+    BIGINTUNSIGNED("BIGINT UNSIGNED", "Long", null),
+    BIT("BIT", "Boolean", null),
+    INTUNSIGNED("INT UNSIGNED", "Integer", null),
+    ;
+
+    static Map<String, CloumnEnums> DICT = new HashMap<String, CloumnEnums>();
+
+    static {
+        CloumnEnums[] es = CloumnEnums.values();
+        for (CloumnEnums e : es) {
+            DICT.put(e.getDbType(), e);
+        }
+    }
+
+    private String dbType;
+
+    private String javaType;
+
+    private String javaPakage;
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
+
+    public String getJavaType() {
+        return javaType;
+    }
+
+    public void setJavaType(String javaType) {
+        this.javaType = javaType;
+    }
+
+    public String getJavaPakage() {
+        return javaPakage;
+    }
+
+    public void setJavaPakage(String javaPakage) {
+        this.javaPakage = javaPakage;
+    }
+
+    CloumnEnums(String dbType, String javaType, String javaPakage) {
+        this.dbType = dbType;
+        this.javaType = javaType;
+        this.javaPakage = javaPakage;
+    }
+
+
+    public static CloumnEnums matchCloumnEnums(String dbType) {
+        return DICT.get(dbType);
+    }
+
+
+}

src/main/java/com/example/demo/generator/CodeGenerator.java

@@ -0,0 +1,356 @@
+package com.example.demo.generator;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.setting.dialect.Props;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @description: 自动代码生成器
+ **/
+public class CodeGenerator {
+
+    static FreemarkerUtil freemarkerUtil = new FreemarkerUtil();
+
+    static Logger log = LoggerFactory.getLogger(CodeGenerator.class);
+
+    public static String getPropValue(String key) {
+        Props prop = new Props("generator.properties");
+        return prop.getStr(key);
+    }
+
+    /**
+     * 构造表模型实体类
+     *
+     * @param val
+     */
+    static void buildEntity(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("EntityName", val.getEntityName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("entity.ftl", root, val.getEntityName() + ".java", "entity");
+    }
+    /**
+     * 构造表模型实体类
+     *
+     * @param val
+     */
+    static void buildRequestVO(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("EntityName", val.getEntityName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+        freemarkerUtil.fprint("RequestVO.ftl", root, "Request"+val.getModelName() + ".java", "vo.request");
+    }
+
+    /**
+     * 构造表模型实体类
+     *
+     * @param val
+     */
+    static void buildResponseVO(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("EntityName", val.getEntityName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+        freemarkerUtil.fprint("ResponseVO.ftl", root, "Response"+val.getModelName() + ".java", "vo.response");
+    }
+
+
+    /**
+     * Dto构造
+     *
+     * @param val
+     */
+    static void buildDetailDto(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        FiledsDto ff = tablesDto.getFields().get(1);
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("DetailDto.ftl", root, val.getModelName() + "DetailDto.java", "dto/response");
+    }
+
+    static void buildEditDto(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        FiledsDto ff = tablesDto.getFields().get(1);
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("EditDto.ftl", root, val.getModelName() + "EditDto.java", "dto/request");
+    }
+
+    static void buildQueryDto(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        FiledsDto ff = tablesDto.getFields().get(1);
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("QueryDto.ftl", root, val.getModelName() + "QueryDto.java", "dto/request");
+    }
+
+    static void buildListDto(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        FiledsDto ff = tablesDto.getFields().get(1);
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("ListDto.ftl", root, val.getModelName() + "ListDto.java", "dto/response");
+    }
+
+    /**
+     * Mapper构造
+     *
+     * @param val
+     */
+    static void buildMapper(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("EntityName", val.getEntityName());
+        root.put("ModelNameLower", val.getModelNameLower());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("Mapper.ftl", root, "I"+val.getModelName() + "Mapper.java", "mapper");
+    }
+
+
+    /**
+     * Mapper构造
+     *
+     * @param val
+     */
+    static void buildMapperXml(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("ModelNameLower", val.getModelNameLower());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+        root.put("c_status", "#{c_status}");
+        root.put("c_startTime", "#{c_startTime}");
+        root.put("c_endTime", "#{c_endTime}");
+        freemarkerUtil.fprint("MapperXml.ftl", root, val.getModelName() + "Mapper.xml", "xml");
+    }
+
+
+    /**
+     * IService构造
+     *
+     * @param val
+     */
+    static void buildIservice(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("EntityName", val.getEntityName());
+        root.put("ModelName", val.getModelName());
+        root.put("ModelNameLower", val.getModelNameLower());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("Service.ftl", root, "I"+val.getModelName()+ "Service.java", "service");
+    }
+
+    /**
+     * Service Impl构造
+     *
+     * @param val
+     */
+    static void buildServiceImpl(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("EntityName", val.getEntityName());
+        root.put("ModelNameLower", val.getModelNameLower());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+
+        freemarkerUtil.fprint("ServiceImpl.ftl", root, val.getModelName() + "ServiceImpl.java", "service/impl");
+    }
+
+    /**
+     * Controller构造
+     *
+     * @param val
+     */
+    static void buildController(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("ModelNameLower", val.getModelNameLower());
+        root.put("EntityName", val.getEntityName());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        root.put("mgnModule", val.getMgnModule());
+        root.put("pageModule", val.getPageModule());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+        freemarkerUtil.fprint("Controller.ftl", root, val.getModelName() + "Controller.java", "controller");
+    }
+
+    static void buildControllerTest(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("ModelNameLower", val.getModelNameLower());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        root.put("mgnModule", val.getMgnModule());
+        root.put("pageModule", val.getPageModule());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+        freemarkerUtil.fprint("ControllerTest.ftl", root, val.getModelName() + "ControllerTest.java", "controllerTest");
+    }
+
+    /**
+     * Controller构造
+     *
+     * @param val
+     */
+    static void buildFeign(TemplateVal val) {
+        Map<String, Object> root = new HashMap<String, Object>();
+        root.put("ModuleName", val.getModuleName());
+        root.put("ModelName", val.getModelName());
+        root.put("ModelNameLower", val.getModelNameLower());
+        root.put("tableComment", val.getTableComment());
+        root.put("author", val.getAuthor());
+        root.put("crateDate", val.getCrateDate());
+        root.put("tableName", val.getTableName());
+        root.put("mgnModule", val.getMgnModule());
+        root.put("pageModule", val.getPageModule());
+        TablesDto tablesDto = val.getTablesDto();
+        root.put("fields", tablesDto);
+        root.put("serialVersionUID", System.currentTimeMillis() + "L");
+        freemarkerUtil.fprint("feign.ftl", root, val.getModelName() + "FeignClient.java", "feign");
+    }
+
+
+    public static void buildCode() {
+        DbUtils.init();
+        Map<String, TablesDto> tables = DbUtils.getTablesDb();
+        TemplateVal val = new TemplateVal();
+        for (Entry<String, TablesDto> entry : tables.entrySet()) {
+            if (entry.getKey() == null) {
+                continue;
+            }
+            log.info(entry.getValue().getTableName());
+            val = new TemplateVal();
+            val.setModuleName(GeneratorConf.PACKAGE);
+            val.setModelName(entry.getValue().getBuzName().replaceAll("Tb",""));
+            val.setEntityName(entry.getValue().getBuzName().replaceAll("Tb","")+"Entity");
+            String firstNameLower = val.getModelName().substring(0, 1).toLowerCase() + val.getModelName().substring(1);
+            val.setModelNameLower(firstNameLower);
+            val.setTableComment(entry.getValue().getTableComment());
+            val.setAuthor(GeneratorConf.AUTHOR);
+            val.setCrateDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            val.setTableName(entry.getValue().getTableName());
+            val.setTablesDto(entry.getValue());
+            val.setMgnModule(getPropValue("MgnModule"));
+            val.setPageModule(getPropValue("PageModule"));
+            log.info(entry.getValue().getTableName());
+            buildEntity(val);
+            buildRequestVO(val);
+            buildResponseVO(val);
+//            buildDetailDto(val);
+//            buildEditDto(val);
+//            buildQueryDto(val);
+//            buildListDto(val);
+            buildMapper(val);
+            buildMapperXml(val);
+            buildIservice(val);
+            buildServiceImpl(val);
+            buildController(val);
+            //buildControllerTest(val);
+//            buildFeign(val);
+        }
+    }
+
+    public static void main(String[] args) {
+        DbUtils.putTables(new TablesDto());
+        buildCode();
+    }
+
+}

src/main/java/com/example/demo/generator/DbUtils.java

@@ -0,0 +1,193 @@
+package com.example.demo.generator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.*;
+import java.util.*;
+import java.util.Map.Entry;
+
+/**
+ * @description:
+ **/
+public class DbUtils {
+
+    private static final long serialVersionUID = -2598048238676523383L;
+
+    private static Logger logger = LoggerFactory.getLogger(DbUtils.class);
+
+    private static Map<String, TablesDto> TABLESDB = new HashMap<String, TablesDto>();
+
+    public static void putTables(TablesDto tables) {
+        TABLESDB.put(tables.getTableName(), tables);
+    }
+
+    public static Map<String, TablesDto> getTablesDb() {
+        return TABLESDB;
+    }
+
+    private static Connection getConn() {
+        String driver = GeneratorConf.DbConf.DRIVERCLASSNAME;
+        String url = GeneratorConf.DbConf.DBURL;
+        String username = GeneratorConf.DbConf.USER;
+        String password = GeneratorConf.DbConf.PWD;
+        Connection conn = null;
+        try {
+            Class.forName(driver); // classLoader,加载对应驱动
+            conn = (Connection) DriverManager.getConnection(url, username, password);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return conn;
+    }
+
+
+    public static void showTables() {
+        Connection conn = getConn();
+        logger.info("获取数据库[{}]表集合开始", GeneratorConf.DbConf.DBNAME);
+        try {
+            DatabaseMetaData md = conn.getMetaData();
+            ResultSet rs = md.getTables(null, null, "%", null);
+            TablesDto dto = null;
+            int i = 1;
+            Map<String, String> tables = GeneratorConf.tablesMap();
+            while (rs.next()) {
+                if (tables.get(rs.getString(3)) == null) {
+                    continue;
+                }
+                dto = new TablesDto();
+                logger.info("Tables : [{}] {}", i, rs.getString(3));
+                dto.setTableName(rs.getString(3));
+                putTables(dto);
+                i++;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        logger.info("获取数据库[{}]表集合结束", GeneratorConf.DbConf.DBNAME);
+    }
+
+    public static void showTablesColumns() {
+        Connection conn = getConn();
+        for (Entry<String, TablesDto> entry : getTablesDb().entrySet()) {
+            showSingleTablesColumns(GeneratorConf.DbConf.DBNAME, entry.getValue(), conn);
+            comment(GeneratorConf.DbConf.DBNAME, entry.getValue(), conn);
+        }
+    }
+
+    static void showSingleTablesColumns(String databaseName, TablesDto tablesDto, Connection conn) {
+        try {
+            String tableName = tablesDto.getTableName();
+            logger.info("数据库[{}]表[{}]分析开始.", databaseName, tableName);
+            DatabaseMetaData meta = conn.getMetaData();
+            ResultSet resultSet = meta.getColumns(databaseName, null, tableName, "%");
+            List<FiledsDto> fields = new ArrayList<FiledsDto>();
+            FiledsDto tempFiledsDto = null;
+            while (resultSet.next()) {
+                tempFiledsDto = new FiledsDto();
+                tempFiledsDto.setFieldName(resultSet.getString(4));
+
+                if (CloumnEnums.matchCloumnEnums(resultSet.getString("TYPE_NAME")) == null) {
+                    logger.warn("数据库类型[{}]未在枚举类型匹配", resultSet.getString("TYPE_NAME"));
+                }
+                List<String> label=new ArrayList<>();
+                label.add("id");
+                label.add("create_time");
+                label.add("update_time");
+                label.add("rec_status");
+                if (label.contains(tempFiledsDto.getFieldName().toLowerCase(Locale.ROOT))){
+                    continue;
+                }
+                tempFiledsDto.setFiled(CloumnEnums.matchCloumnEnums(resultSet.getString("TYPE_NAME")));
+                fields.add(tempFiledsDto);
+                String nullableStr = resultSet.getString("NULLABLE");
+                if("0".equals(nullableStr)){
+                    tempFiledsDto.setRequired("true");
+                }else{
+                    tempFiledsDto.setRequired("false");
+                }
+
+                logger.info("列[{}]类型[{}]是否允许为空[{}]", resultSet.getString(4), resultSet.getString("TYPE_NAME"), resultSet.getString("NULLABLE"));
+            }
+            fullFieldComment(databaseName, tablesDto, conn, fields);
+            tablesDto.setFields(fields);
+            logger.info("数据库[{}]表[{}]分析结束.", databaseName, tableName);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("获取表结构数据异常.");
+        }
+    }
+
+    /**
+     * 字段备注
+     * @param databaseName
+     * @param tablesDto
+     * @param conn
+     * @param fields
+     */
+    static void fullFieldComment(String databaseName, TablesDto tablesDto, Connection conn, List<FiledsDto> fields) {
+        try {
+            Statement stmt = conn.createStatement();
+            String table = tablesDto.getTableName();
+            ResultSet rs = stmt.executeQuery("show full columns from " + table);
+            Map<String, String> map = new HashMap<String, String>();
+            while (rs.next()) {
+                map.put(rs.getString("Field"), rs.getString("Comment"));
+                logger.info("Filed[{}]comment[{}]", rs.getString("Field"), rs.getString("Comment"));
+            }
+            for (FiledsDto field : fields) {
+                field.setFieldComment(map.get(field.getFieldName()) + "");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    static void comment(String databaseName, TablesDto tablesDto, Connection conn) {
+        try {
+            Statement stmt = conn.createStatement();
+            ResultSet rs = stmt.executeQuery("SHOW CREATE TABLE " + tablesDto.getTableName());
+            if (rs != null && rs.next()) {
+                String createDdl = rs.getString(2);
+                String comment = parse(createDdl);
+                tablesDto.setTableComment(comment);
+                logger.info("TABLE[{}] COMMENT[{}]", tablesDto.getTableName(), comment);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 返回注释信息
+     *
+     * @param all
+     * @return
+     */
+
+    static String parse(String all) {
+        String comment = null;
+        int index = all.indexOf("COMMENT='");
+        if (index < 0) {
+            return "";
+        }
+        comment = all.substring(index + 9);
+        comment = comment.substring(0, comment.length() - 1);
+        return comment;
+    }
+
+    public static void init() {
+        showTables();
+        showTablesColumns();
+    }
+
+    public static void main(String[] args) {
+        showTables();
+        showTablesColumns();
+    }
+
+
+}

src/main/java/com/example/demo/generator/FiledsDto.java

@@ -0,0 +1,55 @@
+package com.example.demo.generator;
+
+
+public class FiledsDto extends BaseDto {
+
+    private String fieldName;
+
+    private String fieldComment;
+
+    private CloumnEnums filed;
+
+    private String javaType;
+
+    private String required;
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getFieldComment() {
+        return fieldComment;
+    }
+
+    public void setFieldComment(String fieldComment) {
+        this.fieldComment = fieldComment;
+    }
+
+    public CloumnEnums getFiled() {
+        return filed;
+    }
+
+    public void setFiled(CloumnEnums filed) {
+        this.filed = filed;
+    }
+
+    public String getJavaType() {
+        return javaType;
+    }
+
+    public void setJavaType(String javaType) {
+        this.javaType = javaType;
+    }
+
+    public String getRequired() {
+        return required;
+    }
+
+    public void setRequired(String required) {
+        this.required = required;
+    }
+}

src/main/java/com/example/demo/generator/FreemarkerUtil.java

@@ -0,0 +1,114 @@
+package com.example.demo.generator;
+
+import com.example.demo.generator.freemarker.LineToHumpDirective;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+
+/**
+ * @description:
+ **/
+public class FreemarkerUtil {
+
+    public Template getTemplate(String name) {
+        try {
+            // 通过Freemarker的Configuration读取相应的ftl
+            Configuration configuration = new Configuration(Configuration.VERSION_2_3_23);// 这里是对应的你使用jar包的版本号：<version>2.3.23</version>
+
+            // configuration.setDirectoryForTemplateLoading(new File("/ftl")); //如果是maven项目可以使用这种方式
+            configuration.setSharedVariable("linetohump", new LineToHumpDirective());
+            // 第二个参数 为你对应存放.ftl文件的包名
+            configuration.setClassForTemplateLoading(this.getClass(), "/ftl");
+            Template template = configuration.getTemplate(name);
+
+            return template;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public void print(String name, Map<String, Object> root) {
+        // 通过Template可以将模版文件输出到相应的文件流
+        Template template = this.getTemplate(name);
+        try {
+            template.process(root, new PrintWriter(System.out));// 在控制台输出内容
+        } catch (TemplateException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 输出HTML文件
+     *
+     * @param name
+     * @param root
+     * @param outFile
+     */
+    public void fprint(String name, Map<String, Object> root, String outFile) {
+        FileWriter out = null;
+        try {
+            // 通过一个文件输出流，就可以写到相应的文件中，此处用的是绝对路径
+            out = new FileWriter(new File(GeneratorConf.BuilderConf.LOCALDIR + outFile));
+            Template temp = this.getTemplate(name);
+            temp.process(root, out);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (TemplateException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 输出HTML文件
+     *
+     * @param name
+     * @param root
+     * @param outFile
+     */
+    public void fprint(String name, Map<String, Object> root, String outFile, String dir) {
+        FileWriter out = null;
+        try {
+            File file = new File(GeneratorConf.BuilderConf.LOCALDIR + File.separator + dir + File.separator + outFile);
+            if (!file.getParentFile().exists()) {
+                file.getParentFile().mkdirs();
+            }
+            // 通过一个文件输出流，就可以写到相应的文件中，此处用的是绝对路径
+            out = new FileWriter(file);
+            Template temp = this.getTemplate(name);
+
+            temp.process(root, out);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (TemplateException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

src/main/java/com/example/demo/generator/GeneratorConf.java

@@ -0,0 +1,65 @@
+package com.example.demo.generator;
+
+import cn.hutool.setting.dialect.Props;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description:
+ **/
+public class GeneratorConf implements Serializable {
+
+    private static final long serialVersionUID = 4577177833736664043L;
+
+
+    public static String getPropValue(String key) {
+        Props prop = new Props("generator.properties");
+        return prop.getStr(key);
+    }
+
+    public static String AUTHOR = getPropValue("AUTHOR");
+
+    public static String PACKAGE = getPropValue("PACKAGE");
+
+
+    public static String[] TABLES;
+
+    public static Map<String, String> tablesMap() {
+        Map<String, String> map = new HashMap<String, String>();
+        TABLES = getPropValue("TABLES").split(",");
+        for (String table : TABLES) {
+            map.put(table, table);
+        }
+        return map;
+    }
+
+
+    /**
+     * 数据库配置
+     */
+    public static class DbConf {
+
+
+        public static String DBURL = getPropValue("DBURL");
+        public static String DBNAME = getPropValue("DBNAME");
+
+
+        public static String USER = getPropValue("USER");
+
+        public static String PWD = getPropValue("PWD");
+
+        public static String DRIVERCLASSNAME = getPropValue("DRIVERCLASSNAME");
+
+    }
+
+    public static class BuilderConf {
+
+        //		public static String LOCALDIR = "/Users/lijiayu/Downloads/test/autoCode";
+        public static String LOCALDIR = getPropValue("LOCALDIR");
+
+    }
+
+
+}

src/main/java/com/example/demo/generator/Main.java

@@ -0,0 +1,15 @@
+package com.example.demo.generator;
+
+/**
+ * @description: Main
+ **/
+public class Main {
+
+
+    /**
+     *   执行main方法，根据generator.properties配置文件生成代码
+     **/
+    public static void main(String[] args) {
+        CodeGenerator.buildCode();
+    }
+}

src/main/java/com/example/demo/generator/TablesDto.java

@@ -0,0 +1,84 @@
+package com.example.demo.generator;
+
+import java.util.List;
+
+/**
+ * @description:
+ **/
+public class TablesDto extends BaseDto {
+
+    private static final long serialVersionUID = -5505686808979964428L;
+
+    private String tableName;
+
+    private String tableComment;
+
+    private List<FiledsDto> fields;
+
+    public List<FiledsDto> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<FiledsDto> fields) {
+        this.fields = fields;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getTableComment() {
+        return tableComment;
+    }
+
+    public void setTableComment(String tableComment) {
+        this.tableComment = tableComment;
+    }
+
+    public String getBuzName() {
+        String tableName = this.getTableName();
+        String[] arr = tableName.split("_");
+        String buzName = "";
+        for (String str : arr) {
+            if ("t".equals(str)) {
+                continue;
+            }
+            buzName = buzName + str.substring(0, 1).toUpperCase() + str.substring(1);
+        }
+        return buzName;
+    }
+
+    public String getPoName() {
+        return this.getTableName();
+    }
+
+    public String getVoName() {
+        return getBuzName() + "Vo";
+    }
+
+    public String getMapperName() {
+        return getBuzName() + "Mapper";
+    }
+
+    public String getIdaoName() {
+        return "I" + getBuzName() + "Dao";
+    }
+
+    public String getDaoImplName() {
+        return getBuzName() + "DaoImpl";
+    }
+
+    public String getIserviceName() {
+        return "I" + getBuzName() + "Service";
+    }
+
+    public String getServiceImplName() {
+        return getBuzName() + "ServiceImpl";
+    }
+
+
+}

src/main/java/com/example/demo/generator/TemplateVal.java

@@ -0,0 +1,38 @@
+package com.example.demo.generator;
+
+import lombok.Data;
+
+/**
+ * @description: TemplateVal
+ **/
+@Data
+public class TemplateVal {
+
+    private String modelName;
+
+    /**
+     * 第一个字母大写的实体名称
+     */
+    private String modelNameLower;
+
+    private String tableName;
+
+    private String tableComment;
+
+    private String moduleName;
+
+    private String entityName;
+
+    private String author;
+
+
+    private String crateDate;
+
+    private String serialVersionUid;
+
+    private TablesDto tablesDto;
+
+    private String mgnModule;
+
+    private String pageModule;
+}

src/main/java/com/example/demo/generator/freemarker/LineToHumpDirective.java

@@ -0,0 +1,31 @@
+package com.example.demo.generator.freemarker;
+
+import freemarker.core.Environment;
+import freemarker.template.TemplateDirectiveBody;
+import freemarker.template.TemplateDirectiveModel;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateModel;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Map;
+
+/**
+ * @description:
+ **/
+@Component
+public class LineToHumpDirective implements TemplateDirectiveModel {
+
+    @Override
+    public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
+            throws TemplateException, IOException {
+        Writer out = env.getOut();
+        Object value = params.get("value");
+        String valueStr = String.valueOf(value);
+        String result = Tool.lineToHump(valueStr);
+
+        out.write(result);
+    }
+
+}

src/main/java/com/example/demo/generator/freemarker/Tool.java

@@ -0,0 +1,62 @@
+package com.example.demo.generator.freemarker;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @description:
+
+ **/
+public class Tool {
+
+    private static Pattern linePattern = Pattern.compile("_(\\w)");
+
+    /**
+     * 表字段的前缀
+     */
+    private static final String TABLE_PREFIX = "f_";
+
+    /**
+     * 下划线转驼峰
+     */
+    public static String lineToHump(String str) {
+        // 处理表字段 f_ 前缀
+        if (str.startsWith(TABLE_PREFIX)) {
+            str = str.substring(2);
+        }
+        str = str.toLowerCase();
+        Matcher matcher = linePattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    private static Pattern humpPattern = Pattern.compile("[A-Z]");
+
+    /**
+     * 驼峰转下划线
+     */
+    public static String humpToLine(String str) {
+        Matcher matcher = humpPattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, "_" + matcher.group(0).toLowerCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    public static void main(String[] args) {
+        String lineToHump = lineToHump("f_parent_no_leader");
+        // fParentNoLeader
+        System.out.println(lineToHump);
+        // f_parent_no_leader
+        System.out.println(humpToLine(lineToHump));
+        lineToHump = lineToHump.substring(0, 1).toUpperCase() + lineToHump.substring(1);
+        System.out.println(lineToHump);
+
+    }
+}

src/main/java/com/example/demo/handler/MyMetaObjectHandler.java

@@ -0,0 +1,32 @@
+package com.example.demo.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @description: 处理createTime，updateTime字段的插入和更新
+ * @author: Xiewj
+ * @date: 2021-08-16 15:32:55
+ **/
+@Slf4j
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        log.info("开始插入填充 ....");
+        // 起始版本 3.3.3(推荐)
+        this.strictInsertFill(metaObject, "createTime", () -> new Date(), Date.class);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        log.info("开始更新填充....");
+        // 起始版本 3.3.3(推荐)
+        this.strictUpdateFill(metaObject, "updateTime", () ->new Date(), Date.class);
+    }
+}

src/main/java/com/example/demo/listener/RunBuild.java

@@ -2,12 +2,11 @@ package com.example.demo.listener;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.example.demo.constant.ConstantFileName;
 import com.example.demo.constant.ConstantFilePath;
-import com.example.demo.entity.ModelUploadEntity;
-import com.example.demo.entity.SceneLightEntity;
-import com.example.demo.entity.SceneStyleEntity;
-import com.example.demo.entity.StatisticsEntity;
+import com.example.demo.entity.*;
 import com.example.demo.service.IModelUploadService;
 import com.example.demo.service.ISceneLightService;
 import com.example.demo.service.ISceneStyleService;
@@ -20,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.io.File;
 import java.io.IOException;
@@ -110,9 +108,10 @@ public class RunBuild {
 
         SceneStyleEntity sceneStyleEntity = null;
 
-        Condition condition = new Condition(SceneStyleEntity.class);
-        condition.and().andEqualTo("styleNum", vrNum);
-        List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+
+        LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(SceneStyleEntity::getStyleNum,vrNum);
+        List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
         if(list != null && list.size() > 0) {
             sceneStyleEntity = list.get(0);
         }else {
@@ -217,7 +216,7 @@ public class RunBuild {
                         log.info("vrNum-{}, 第{}次获取渲染进度，进度为{}%", vrNum, times++, progress);
                         updateSceneStyleEntity.setProgress(progress);
                         updateSceneStyleEntity.setUpdateTime(new Date());
-                        sceneStyleService.update(updateSceneStyleEntity);
+                        sceneStyleService.updateById(updateSceneStyleEntity);
                     }
                 }
 
@@ -259,15 +258,18 @@ public class RunBuild {
                 updateSceneStyleEntity.setThumb(finalPath);
             }
             updateSceneStyleEntity.setUpdateTime(new Date());
-            sceneStyleService.update(updateSceneStyleEntity);
+            sceneStyleService.updateById(updateSceneStyleEntity);
+
+
+            LambdaQueryWrapper<StatisticsEntity> wrapper1 =  Wrappers.lambdaQuery();
+            wrapper1.eq(StatisticsEntity::getStatisticsDate,DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+
 
-            condition = new Condition(StatisticsEntity.class);
-            condition.and().andEqualTo("statisticsDate", DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-            List<StatisticsEntity> statisticsEntityList = statisticsService.findAll(condition);
+            List<StatisticsEntity> statisticsEntityList = statisticsService.list(wrapper1);
             if(statisticsEntityList.size() > 0){
                 StatisticsEntity statisticsEntity = statisticsEntityList.get(0);
                 statisticsEntity.setBuildNum(statisticsEntity.getBuildNum() + 1);
-                statisticsService.update(statisticsEntity);
+                statisticsService.updateById(statisticsEntity);
             }else {
                 StatisticsEntity statisticsEntity = new StatisticsEntity();
                 statisticsEntity.setBuildNum(1);
@@ -277,7 +279,7 @@ public class RunBuild {
         }catch (Exception e){
             updateSceneStyleEntity.setStatus(-1);
             updateSceneStyleEntity.setUpdateTime(new Date());
-            sceneStyleService.update(updateSceneStyleEntity);
+            sceneStyleService.updateById(updateSceneStyleEntity);
 
             try{
                 Map<String, Object> map1 = new HashMap<>();
@@ -454,9 +456,12 @@ public class RunBuild {
 
                     SceneStyleEntity sceneStyleEntity = null;
 
-                    Condition condition = new Condition(SceneStyleEntity.class);
-                    condition.and().andEqualTo("styleNum", vrNum);
-                    List<SceneStyleEntity> list = sceneStyleService.findAll(condition);
+
+                    LambdaQueryWrapper<SceneStyleEntity> wrapper =  Wrappers.lambdaQuery();
+                    wrapper.eq(SceneStyleEntity::getStyleNum,vrNum);
+
+
+                     List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
                     if(list != null && list.size() > 0) {
                         sceneStyleEntity = list.get(0);
                     }else {
@@ -554,7 +559,7 @@ public class RunBuild {
                                     SceneLightEntity sceneLightEntity = new SceneLightEntity();
                                     sceneLightEntity.setId(Long.valueOf(taskId));
                                     sceneLightEntity.setProgress(progress);
-                                    sceneLightService.update(sceneLightEntity);
+                                    sceneLightService.updateById(sceneLightEntity);
                                 }
                             }
 
@@ -577,20 +582,20 @@ public class RunBuild {
                 updateSceneStyleEntity.setPanoVersion(sceneStyleEntity.getPanoVersion() + 1);
             }
             updateSceneStyleEntity.setUpdateTime(new Date());
-            sceneStyleService.update(updateSceneStyleEntity);
+            sceneStyleService.updateById(updateSceneStyleEntity);
 
             SceneLightEntity sceneLightEntity = new SceneLightEntity();
             sceneLightEntity.setId(Long.valueOf(taskId));
             if("light".equals(buildType)){
                 sceneLightEntity.setImg("https://4dkk.4dage.com/images/images" + vrNum + "/tiles/preview/" + taskId +"/preview.jpg");
 
-                condition = new Condition(StatisticsEntity.class);
-                condition.and().andEqualTo("statisticsDate", DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-                List<StatisticsEntity> statisticsEntityList = statisticsService.findAll(condition);
+                LambdaQueryWrapper<StatisticsEntity> wrapper1 =  Wrappers.lambdaQuery();
+                wrapper1.eq(StatisticsEntity::getStatisticsDate,DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+                List<StatisticsEntity> statisticsEntityList = statisticsService.list(wrapper1);
                 if(statisticsEntityList.size() > 0){
                     StatisticsEntity statisticsEntity = statisticsEntityList.get(0);
                     statisticsEntity.setLightNum(statisticsEntity.getLightNum() + 1);
-                    statisticsService.update(statisticsEntity);
+                    statisticsService.updateById(statisticsEntity);
                 }else {
                     StatisticsEntity statisticsEntity = new StatisticsEntity();
                     statisticsEntity.setLightNum(1);
@@ -615,13 +620,13 @@ public class RunBuild {
                     sceneLightEntity.setFilePath("https://4dkk.4dage.com/images/images" + vrNum + "/tiles/pano/" + taskId + "/vtour/tour.html");
                 }
 
-                condition = new Condition(StatisticsEntity.class);
-                condition.and().andEqualTo("statisticsDate", DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-                List<StatisticsEntity> statisticsEntityList = statisticsService.findAll(condition);
+                LambdaQueryWrapper<StatisticsEntity> wrapper1 =  Wrappers.lambdaQuery();
+                wrapper1.eq(StatisticsEntity::getStatisticsDate,DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+                List<StatisticsEntity> statisticsEntityList = statisticsService.list(wrapper1);
                 if(statisticsEntityList.size() > 0){
                     StatisticsEntity statisticsEntity = statisticsEntityList.get(0);
                     statisticsEntity.setPanoNum(statisticsEntity.getPanoNum() + 1);
-                    statisticsService.update(statisticsEntity);
+                    statisticsService.updateById(statisticsEntity);
                 }else {
                     StatisticsEntity statisticsEntity = new StatisticsEntity();
                     statisticsEntity.setPanoNum(1);
@@ -631,19 +636,19 @@ public class RunBuild {
             }
             sceneLightEntity.setStatus(1);
             sceneLightEntity.setUpdateTime(new Date());
-            sceneLightService.update(sceneLightEntity);
+            sceneLightService.updateById(sceneLightEntity);
         }catch (Exception e){
             //渲染失败，修改风格表和灯光预览相册集
             updateSceneStyleEntity.setLightStatus(-1);
             updateSceneStyleEntity.setLightVersion(sceneStyleEntity.getLightVersion() + 1);
             updateSceneStyleEntity.setUpdateTime(new Date());
-            sceneStyleService.update(updateSceneStyleEntity);
+            sceneStyleService.updateById(updateSceneStyleEntity);
 
             SceneLightEntity sceneLightEntity = new SceneLightEntity();
             sceneLightEntity.setId(Long.valueOf(taskId));
             sceneLightEntity.setStatus(-1);
             sceneLightEntity.setUpdateTime(new Date());
-            sceneLightService.update(sceneLightEntity);
+            sceneLightService.updateById(sceneLightEntity);
 
             log.error("渲染失败-{}", e);
         }
@@ -706,7 +711,7 @@ public class RunBuild {
             if(!ObjProcess.hasVt(obj)){
                 //没有vt，直接报错
                 modelUploadEntity.setStatus(-2);
-                modelUploadService.update(modelUploadEntity);
+                modelUploadService.updateById(modelUploadEntity);
                 return;
             }
 
@@ -734,7 +739,7 @@ public class RunBuild {
             postJson(fileId, filePath, jsonObject);
 
             Thread.sleep(1000L);
-            
+
             checkResultJson(fileId, filePath, jsonObject, modelUploadId);
 
             Integer facesNum = 0;
@@ -782,12 +787,12 @@ public class RunBuild {
             modelUploadEntity.setObjPath(objPath.replace(buildPath, ""));
 //            modelUploadEntity.setImgPath(imgPath.replace(buildPath, ""));
             modelUploadEntity.setFacesNum(facesNum);
-            modelUploadService.update(modelUploadEntity);
+            modelUploadService.updateById(modelUploadEntity);
         }catch (Exception e){
             log.error("修改模型报错-{}", e);
             log.error("修改模型报错-{}", e);
             modelUploadEntity.setStatus(-1);
-            modelUploadService.update(modelUploadEntity);
+            modelUploadService.updateById(modelUploadEntity);
         }
 
     }
@@ -837,7 +842,7 @@ public class RunBuild {
                     ModelUploadEntity modelUploadEntity = new ModelUploadEntity();
                     modelUploadEntity.setId(Long.valueOf(modelUploadId));
                     modelUploadEntity.setProgress(progress);
-                    modelUploadService.update(modelUploadEntity);
+                    modelUploadService.updateById(modelUploadEntity);
                 }
 
             }
@@ -916,13 +921,13 @@ public class RunBuild {
             modelUploadEntity.setId(Long.valueOf(modelId));
             modelUploadEntity.setThumStatus(1);
             modelUploadEntity.setProgress(100);
-            modelUploadService.update(modelUploadEntity);
+            modelUploadService.updateById(modelUploadEntity);
         }catch (Exception e){
             log.error("生成封面失败-{}", e);
             modelUploadEntity = new ModelUploadEntity();
             modelUploadEntity.setId(Long.valueOf(modelId));
             modelUploadEntity.setThumStatus(-1);
-            modelUploadService.update(modelUploadEntity);
+            modelUploadService.updateById(modelUploadEntity);
         }
 
     }
@@ -972,7 +977,7 @@ public class RunBuild {
                     ModelUploadEntity modelUploadEntity = new ModelUploadEntity();
                     modelUploadEntity.setId(Long.valueOf(modelId));
                     modelUploadEntity.setProgress(objectJson.getInteger("progress"));
-                    modelUploadService.update(modelUploadEntity);
+                    modelUploadService.updateById(modelUploadEntity);
                 }
             }
 

src/main/java/com/example/demo/mapper/IBaseMapper.java

@@ -1,15 +1,7 @@
 package com.example.demo.mapper;
 
-import com.example.demo.entity.BaseEntity;
-import tk.mybatis.mapper.common.BaseMapper;
-import tk.mybatis.mapper.common.ConditionMapper;
-import tk.mybatis.mapper.common.IdsMapper;
-import tk.mybatis.mapper.common.special.InsertListMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.io.Serializable;
+public interface IBaseMapper<T> extends BaseMapper<T> {
 
-public interface IBaseMapper<T extends BaseEntity, ID extends Serializable> extends BaseMapper<T>,
-        ConditionMapper<T>,
-        IdsMapper<T>,
-        InsertListMapper<T> {
 }

src/main/java/com/example/demo/mapper/ICompanyMapper.java

@@ -1,11 +1,16 @@
 package com.example.demo.mapper;
 
 import com.example.demo.entity.CompanyEntity;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Mapper
-public interface ICompanyMapper extends IBaseMapper<CompanyEntity, Long> {
+@Component("ICompanyMapper")
+public interface ICompanyMapper extends IBaseMapper<CompanyEntity> {
 }

src/main/java/com/example/demo/mapper/IMaterialMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.MaterialEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2021/4/8.
  */
 @Mapper
-public interface IMaterialMapper extends IBaseMapper<MaterialEntity, Long> {
+@Component("IMaterialMapper")
+public interface IMaterialMapper extends IBaseMapper<MaterialEntity> {
 }

src/main/java/com/example/demo/mapper/IModelExistMapper.java

@@ -3,12 +3,14 @@ package com.example.demo.mapper;
 import com.example.demo.entity.ModelExistEntity;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2021/1/20.
  */
 @Mapper
-public interface IModelExistMapper extends IBaseMapper<ModelExistEntity, Long>{
+@Component("IModelExistMapper")
+public interface IModelExistMapper extends IBaseMapper<ModelExistEntity>{
 
     @Delete("DELETE FROM tb_model_exist WHERE name = #{name}")
     void deleteByName(String name);

src/main/java/com/example/demo/mapper/IModelUploadMapper.java

@@ -4,6 +4,7 @@ import com.example.demo.entity.ModelUploadEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -11,7 +12,8 @@ import java.util.List;
  * Created by Hb_zzZ on 2020/12/1.
  */
 @Mapper
-public interface IModelUploadMapper extends IBaseMapper<ModelUploadEntity, Long> {
+@Component("IModelUploadMapper")
+public interface IModelUploadMapper extends IBaseMapper<ModelUploadEntity> {
 
     @Select("SELECT * FROM tb_model_upload WHERE file_id = #{fileId}")
     ModelUploadEntity findByFileId(@Param("fileId") String fileId);

src/main/java/com/example/demo/mapper/IRenovationBuildDetailMapper.java

@@ -4,6 +4,7 @@ import com.example.demo.entity.RenovationBuildDetailEntity;
 import com.example.demo.vo.response.ResponseRenovationBuildDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -11,7 +12,8 @@ import java.util.List;
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Mapper
-public interface IRenovationBuildDetailMapper extends IBaseMapper<RenovationBuildDetailEntity, Long> {
+@Component("IRenovationBuildDetailMapper")
+public interface IRenovationBuildDetailMapper extends IBaseMapper<RenovationBuildDetailEntity> {
 
     @Select("select id, name, thumbnail, origin_img as originImg, high_img as highImg, key_word as keyWord, build_id as buildId from tb_renovation_build_detail where build_id = #{buildId} and rec_status = 'A'")
     List<ResponseRenovationBuildDetail> findBuildDetail(Long buildId);

src/main/java/com/example/demo/mapper/IRenovationBuildMapper.java

@@ -4,6 +4,7 @@ import com.example.demo.entity.RenovationBuildEntity;
 import com.example.demo.vo.response.ResponseRenovationBuild;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -11,7 +12,8 @@ import java.util.List;
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Mapper
-public interface IRenovationBuildMapper extends IBaseMapper<RenovationBuildEntity, Long> {
+@Component("IRenovationBuildMapper")
+public interface IRenovationBuildMapper extends IBaseMapper<RenovationBuildEntity> {
 
     @Select("select id, name, key_word as keyWord from tb_renovation_build where rec_status = 'A'")
     List<ResponseRenovationBuild> findBuild();

src/main/java/com/example/demo/mapper/IRenovationPartsAttachingMapper.java

@@ -4,14 +4,14 @@ import com.example.demo.entity.RenovationPartsAttachingEntity;
 import com.example.demo.vo.response.ResponseRenovationPartsAttaching;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Mapper
-public interface IRenovationPartsAttachingMapper extends IBaseMapper<RenovationPartsAttachingEntity, Long>{
+@Component("IRenovationPartsAttachingMapper")
+public interface IRenovationPartsAttachingMapper extends IBaseMapper<RenovationPartsAttachingEntity>{
 
     @Select("select wall_attaching as wallAttaching, ceil_attaching as ceilAttaching, floor_attaching as floorAttaching from tb_renovation_parts_attaching where parts_detail_id = #{partsDetailId} and rec_status = 'A'")
     ResponseRenovationPartsAttaching findAttachinByDetailId(Long partsDetailId);

src/main/java/com/example/demo/mapper/IRenovationPartsBrandMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.RenovationPartsBrandEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Mapper
-public interface IRenovationPartsBrandMapper extends IBaseMapper<RenovationPartsBrandEntity, Long>{
+@Component("IRenovationPartsBrandMapper")
+public interface IRenovationPartsBrandMapper extends IBaseMapper<RenovationPartsBrandEntity>{
 }

src/main/java/com/example/demo/mapper/IRenovationPartsClassifyMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.RenovationPartsClassifyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Mapper
-public interface IRenovationPartsClassifyMapper extends IBaseMapper<RenovationPartsClassifyEntity, Long>{
+@Component("IRenovationPartsClassifyMapper")
+public interface IRenovationPartsClassifyMapper extends IBaseMapper<RenovationPartsClassifyEntity>{
 }

src/main/java/com/example/demo/mapper/IRenovationPartsColorMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.RenovationPartsColorEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/11/12.
  */
 @Mapper
-public interface IRenovationPartsColorMapper extends IBaseMapper<RenovationPartsColorEntity, Long>{
+@Component("IRenovationPartsColorMapper")
+public interface IRenovationPartsColorMapper extends IBaseMapper<RenovationPartsColorEntity>{
 }

src/main/java/com/example/demo/mapper/IRenovationPartsDetailMapper.java

@@ -5,6 +5,7 @@ import com.example.demo.vo.response.ResponseRenovationPartsDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -12,7 +13,8 @@ import java.util.List;
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Mapper
-public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPartsDetailEntity, Long>{
+@Component("IRenovationPartsDetailMapper")
+public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPartsDetailEntity>{
 
     @Select("<script>" +
             "select id, key_word as keyWord, type, description, img, high_img as highImg, path, name, zh_name as zhName, parts_type_id as partsTypeId, has_toolbag as hasToolbag " +

src/main/java/com/example/demo/mapper/IRenovationPartsMapper.java

@@ -4,6 +4,7 @@ import com.example.demo.entity.RenovationPartsEntity;
 import com.example.demo.vo.response.ResponseRenovationParts;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -11,7 +12,8 @@ import java.util.List;
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Mapper
-public interface IRenovationPartsMapper extends IBaseMapper<RenovationPartsEntity, Long> {
+@Component("IRenovationPartsMapper")
+public interface IRenovationPartsMapper extends IBaseMapper<RenovationPartsEntity> {
 
     @Select("select * from tb_renovation_parts where rec_status = 'A'")
     List<ResponseRenovationParts> findParts();

src/main/java/com/example/demo/mapper/IRenovationPartsShapeMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.RenovationPartsShapeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Mapper
-public interface IRenovationPartsShapeMapper extends IBaseMapper<RenovationPartsShapeEntity, Long>{
+@Component("IRenovationPartsShapeMapper")
+public interface IRenovationPartsShapeMapper extends IBaseMapper<RenovationPartsShapeEntity>{
 }

src/main/java/com/example/demo/mapper/IRenovationPartsSizeMapper.java

@@ -4,12 +4,14 @@ import com.example.demo.entity.RenovationPartsSizeEntity;
 import com.example.demo.vo.response.ResponseRenovationPartsSize;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/11/3.
  */
 @Mapper
-public interface IRenovationPartsSizeMapper extends IBaseMapper<RenovationPartsSizeEntity, Long>{
+@Component("IRenovationPartsSizeMapper")
+public interface IRenovationPartsSizeMapper extends IBaseMapper<RenovationPartsSizeEntity>{
 
     @Select("select id, x, y, z from tb_renovation_parts_size where parts_detail_id = #{partsDetailId} and rec_status = 'A'")
     ResponseRenovationPartsSize findSizeByDetailId(Long partsDetailId);

src/main/java/com/example/demo/mapper/IRenovationPartsStyleMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.RenovationPartsStyleEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
 @Mapper
-public interface IRenovationPartsStyleMapper extends IBaseMapper<RenovationPartsStyleEntity, Long>{
+@Component("IRenovationPartsStyleMapper")
+public interface IRenovationPartsStyleMapper extends IBaseMapper<RenovationPartsStyleEntity>{
 }

src/main/java/com/example/demo/mapper/IRenovationPartsTypeMapper.java

@@ -4,6 +4,7 @@ import com.example.demo.entity.RenovationPartsTypeEntity;
 import com.example.demo.vo.response.ResponseRenovationPartsType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -11,7 +12,8 @@ import java.util.List;
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Mapper
-public interface IRenovationPartsTypeMapper extends IBaseMapper<RenovationPartsTypeEntity, Long> {
+@Component("IRenovationPartsTypeMapper")
+public interface IRenovationPartsTypeMapper extends IBaseMapper<RenovationPartsTypeEntity> {
 
     @Select("select id, description, key_word as keyWord, type, img from tb_renovation_parts_type where parts_id = #{partsId} and rec_status = 'A'")
     List<ResponseRenovationPartsType> findTypeByPartsId(Long partsId);

src/main/java/com/example/demo/mapper/ISceneLightMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -13,7 +14,8 @@ import java.util.List;
  * Created by Hb_zzZ on 2020/10/29.
  */
 @Mapper
-public interface ISceneLightMapper extends IBaseMapper<SceneLightEntity, Long> {
+@Component("ISceneLightMapper")
+public interface ISceneLightMapper extends IBaseMapper<SceneLightEntity> {
 
     @Select("SELECT * FROM tb_scene_light WHERE scene_style_id = #{sceneStyleId} AND is_show = 1 AND rec_status = #{recStatus}")
     List<SceneLightEntity> findLightBySceneTypeIdAndRecStatus(RequestSceneLight style);

src/main/java/com/example/demo/mapper/ISceneLightStyleMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.SceneLightStyleEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/10/29.
  */
 @Mapper
-public interface ISceneLightStyleMapper extends IBaseMapper<SceneLightStyleEntity, Long>{
+@Component("ISceneLightStyleMapper")
+public interface ISceneLightStyleMapper extends IBaseMapper<SceneLightStyleEntity>{
 }

src/main/java/com/example/demo/mapper/ISceneStyleMapper.java

@@ -5,12 +5,14 @@ import com.example.demo.vo.request.RequestSceneLight;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2020/7/14.
  */
 @Mapper
-public interface ISceneStyleMapper extends IBaseMapper<SceneStyleEntity, Long> {
+@Component("ISceneStyleMapper")
+public interface ISceneStyleMapper extends IBaseMapper<SceneStyleEntity> {
 
     @Select("select max(num) from tb_scene_style where scene_num = #{sceneNum}")
     Integer findLastNum(String sceneNum);

src/main/java/com/example/demo/mapper/IStatisticsMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.StatisticsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2021/4/7.
  */
 @Mapper
-public interface IStatisticsMapper extends IBaseMapper<StatisticsEntity, Long> {
+@Component("IStatisticsMapper")
+public interface IStatisticsMapper extends IBaseMapper<StatisticsEntity> {
 }

src/main/java/com/example/demo/mapper/IVisualAngleMapper.java

@@ -2,10 +2,12 @@ package com.example.demo.mapper;
 
 import com.example.demo.entity.VisualAngleEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by Hb_zzZ on 2021/1/19.
  */
 @Mapper
-public interface IVisualAngleMapper extends IBaseMapper<VisualAngleEntity, Long>{
+@Component("IVisualAngleMapper")
+public interface IVisualAngleMapper extends IBaseMapper<VisualAngleEntity>{
 }

src/main/java/com/example/demo/mapper/IZhiSceneNumMapper.java

@@ -3,15 +3,16 @@ package com.example.demo.mapper;
 import com.example.demo.entity.ZhiSceneNum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.Set;
 
 /**
  * Created by Hb_zzZ on 2020/7/14.
  */
 @Mapper
-public interface IZhiSceneNumMapper extends IBaseMapper<ZhiSceneNum, Long> {
+@Component("IZhiSceneNumMapper")
+public interface IZhiSceneNumMapper extends IBaseMapper<ZhiSceneNum> {
 
     @Select("select code from t_scene_3d_num_new")
     Set<String> findAll();

src/main/java/com/example/demo/service/IBaseService.java

@@ -1,47 +1,56 @@
 package com.example.demo.service;
 
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.demo.vo.request.RequestBase;
 import com.github.pagehelper.PageInfo;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.io.Serializable;
 import java.util.List;
 
-public interface IBaseService<T, ID extends Serializable> {
-
-    public abstract T findById(ID id);
-
-    public abstract T findOne(T entity);
-
-    public abstract List<T> findByIds(String ids);
-
-    public abstract long count();
-
-    public abstract boolean exists(ID id);
-
-    public abstract int save(T entity);
-
-    public abstract int update(T entity);
-
-    public abstract int updateAll(T entity);
-
-    public abstract int deleteById(ID id);
-
-    public abstract int deleteByIds(String ids);
-
-    public abstract int delete(T entity);
-
-    public abstract List<T> findAll(Condition condition, String orderBy);
-
-    public abstract List<T> findAll(Condition condition);
-
-    public abstract List<T> findAll();
-
-    public abstract PageInfo<T> findAll(int pageNum, int pageSize);
-
-    public abstract PageInfo<T> findAll(int pageNum, int pageSize, String orderBy);
-
-    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize);
-
-    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize, String orderBy);
+public interface IBaseService<T> extends IService<T> {
+
+
+
+
+    /**
+     * 根据实体参数返回一行记录
+     * @param condition
+     * @return
+     */
+    T getOne(T condition);
+
+    /**
+     * 根据实体参数返回列表数据
+     * @param condition
+     * @return
+     */
+    List<T> list(T condition);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    PageInfo<T> listByPage(RequestBase page, T condition);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    PageInfo<T> listByPage(RequestBase page, Wrapper<T> queryWrapper);
+
+    /**
+     * 分页查询
+     * @param page
+     * @return
+     */
+    PageInfo<T> listByPage(RequestBase page);
+
+    T findById(Serializable id);
 
 }

src/main/java/com/example/demo/service/ICompanyService.java

@@ -3,7 +3,10 @@ package com.example.demo.service;
 import com.example.demo.entity.CompanyEntity;
 
 /**
- * Created by Hb_zzZ on 2020/12/24.
- */
-public interface ICompanyService extends IBaseService<CompanyEntity, Long> {
+ * @description: Company 相关的服务接口类
+ * @author: Xiewj
+ * @date: 2021-08-16 13:11:08
+ **/
+public interface ICompanyService extends IBaseService<CompanyEntity> {
+
 }

src/main/java/com/example/demo/service/IMaterialService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.MaterialEntity;
 /**
  * Created by Hb_zzZ on 2021/4/8.
  */
-public interface IMaterialService extends IBaseService<MaterialEntity, Long> {
+public interface IMaterialService extends IBaseService<MaterialEntity> {
 }

src/main/java/com/example/demo/service/IModelExistService.java

@@ -5,7 +5,7 @@ import com.example.demo.entity.ModelExistEntity;
 /**
  * Created by Hb_zzZ on 2021/1/20.
  */
-public interface IModelExistService extends IBaseService<ModelExistEntity, Long> {
+public interface IModelExistService extends IBaseService<ModelExistEntity> {
 
     void deleteByName(String name);
 }

src/main/java/com/example/demo/service/IModelUploadService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/12/1.
  */
-public interface IModelUploadService extends IBaseService<ModelUploadEntity, Long> {
+public interface IModelUploadService extends IBaseService<ModelUploadEntity> {
 
     ModelUploadEntity findByFileId(String fileId);
 

src/main/java/com/example/demo/service/IRenovationBuildDetailService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
-public interface IRenovationBuildDetailService extends IBaseService<RenovationBuildDetailEntity, Long> {
+public interface IRenovationBuildDetailService extends IBaseService<RenovationBuildDetailEntity> {
 
     List<ResponseRenovationBuildDetail> findBuildDetail(Long id);
 

src/main/java/com/example/demo/service/IRenovationBuildService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
-public interface IRenovationBuildService extends IBaseService<RenovationBuildEntity, Long> {
+public interface IRenovationBuildService extends IBaseService<RenovationBuildEntity> {
 
     List<ResponseRenovationBuild> getRenovationBuildList();
 }

src/main/java/com/example/demo/service/IRenovationPartsAttachingService.java

@@ -7,7 +7,7 @@ import com.example.demo.vo.response.ResponseRenovationPartsAttaching;
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
-public interface IRenovationPartsAttachingService extends IBaseService<RenovationPartsAttachingEntity, Long> {
+public interface IRenovationPartsAttachingService extends IBaseService<RenovationPartsAttachingEntity> {
 
     ResponseRenovationPartsAttaching findAttachinByDetailId(Long id);
 

src/main/java/com/example/demo/service/IRenovationPartsBrandService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.RenovationPartsBrandEntity;
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
-public interface IRenovationPartsBrandService extends IBaseService<RenovationPartsBrandEntity, Long> {
+public interface IRenovationPartsBrandService extends IBaseService<RenovationPartsBrandEntity> {
 }

src/main/java/com/example/demo/service/IRenovationPartsClassifyService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.RenovationPartsClassifyEntity;
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
-public interface IRenovationPartsClassifyService extends IBaseService<RenovationPartsClassifyEntity, Long> {
+public interface IRenovationPartsClassifyService extends IBaseService<RenovationPartsClassifyEntity> {
 }

src/main/java/com/example/demo/service/IRenovationPartsColorService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.RenovationPartsColorEntity;
 /**
  * Created by Hb_zzZ on 2020/11/12.
  */
-public interface IRenovationPartsColorService extends IBaseService<RenovationPartsColorEntity, Long> {
+public interface IRenovationPartsColorService extends IBaseService<RenovationPartsColorEntity> {
 }

src/main/java/com/example/demo/service/IRenovationPartsDetailService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
-public interface IRenovationPartsDetailService extends IBaseService<RenovationPartsDetailEntity, Long> {
+public interface IRenovationPartsDetailService extends IBaseService<RenovationPartsDetailEntity> {
 
     List<ResponseRenovationPartsDetail> findDetailByTypeId(Long id, Long colorId, Long classifyId);
 

src/main/java/com/example/demo/service/IRenovationPartsService.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
-public interface IRenovationPartsService extends IBaseService<RenovationPartsEntity, Long> {
+public interface IRenovationPartsService extends IBaseService<RenovationPartsEntity> {
 
     List<ResponseRenovationParts> getRenovationPartsList();
 }

src/main/java/com/example/demo/service/IRenovationPartsShapeService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.RenovationPartsShapeEntity;
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
-public interface IRenovationPartsShapeService extends IBaseService<RenovationPartsShapeEntity, Long> {
+public interface IRenovationPartsShapeService extends IBaseService<RenovationPartsShapeEntity> {
 }

src/main/java/com/example/demo/service/IRenovationPartsSizeService.java

@@ -6,7 +6,7 @@ import com.example.demo.vo.response.ResponseRenovationPartsSize;
 /**
  * Created by Hb_zzZ on 2020/11/3.
  */
-public interface IRenovationPartsSizeService extends IBaseService<RenovationPartsSizeEntity, Long>{
+public interface IRenovationPartsSizeService extends IBaseService<RenovationPartsSizeEntity>{
 
     ResponseRenovationPartsSize findSizeByDetailId(Long id);
 }

src/main/java/com/example/demo/service/IRenovationPartsStyleService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.RenovationPartsStyleEntity;
 /**
  * Created by Hb_zzZ on 2020/12/24.
  */
-public interface IRenovationPartsStyleService extends IBaseService<RenovationPartsStyleEntity, Long> {
+public interface IRenovationPartsStyleService extends IBaseService<RenovationPartsStyleEntity> {
 }

src/main/java/com/example/demo/service/IRenovationPartsTypeService.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/8/11.
  */
-public interface IRenovationPartsTypeService extends IBaseService<RenovationPartsTypeEntity, Long> {
+public interface IRenovationPartsTypeService extends IBaseService<RenovationPartsTypeEntity> {
 
     List<ResponseRenovationPartsType> findTypeByPartsId(Long id);
 }

src/main/java/com/example/demo/service/ISceneLightService.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/10/29.
  */
-public interface ISceneLightService extends IBaseService<SceneLightEntity, Long> {
+public interface ISceneLightService extends IBaseService<SceneLightEntity> {
 
     List<SceneLightEntity> findLightBySceneTypeIdAndRecStatus(RequestSceneLight style);
 

src/main/java/com/example/demo/service/ISceneLightStyleService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.SceneLightStyleEntity;
 /**
  * Created by Hb_zzZ on 2020/10/29.
  */
-public interface ISceneLightStyleService extends IBaseService<SceneLightStyleEntity, Long>{
+public interface ISceneLightStyleService extends IBaseService<SceneLightStyleEntity>{
 }

src/main/java/com/example/demo/service/ISceneStyleService.java

@@ -6,7 +6,7 @@ import com.example.demo.vo.request.RequestSceneLight;
 /**
  * Created by Hb_zzZ on 2020/7/14.
  */
-public interface ISceneStyleService extends IBaseService<SceneStyleEntity, Long>{
+public interface ISceneStyleService extends IBaseService<SceneStyleEntity>{
 
     Integer findLastNum(String sceneNum);
 

src/main/java/com/example/demo/service/IStatisticsService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.StatisticsEntity;
 /**
  * Created by Hb_zzZ on 2021/4/7.
  */
-public interface IStatisticsService extends IBaseService<StatisticsEntity, Long> {
+public interface IStatisticsService extends IBaseService<StatisticsEntity> {
 }

src/main/java/com/example/demo/service/IVisualAngleService.java

@@ -5,5 +5,5 @@ import com.example.demo.entity.VisualAngleEntity;
 /**
  * Created by Hb_zzZ on 2021/1/19.
  */
-public interface IVisualAngleService extends IBaseService<VisualAngleEntity, Long> {
+public interface IVisualAngleService extends IBaseService<VisualAngleEntity> {
 }