修改代码成成

Author: gaoyanguo

src/main/java/com/monkeyzi/code/config/DynamicDataSource.java

@@ -8,6 +8,7 @@
 public class DynamicDataSource extends AbstractRoutingDataSource {
     @Override
     protected Object determineCurrentLookupKey() {
+        System.out.println("当前数据源为=="+DynamicDataSourceContextHolder.getDataSourceType());
         return DynamicDataSourceContextHolder.getDataSourceType();
     }
 }

src/main/java/com/monkeyzi/code/config/DynamicDatasourceInterceptor.java

@@ -1,5 +1,6 @@
 package com.monkeyzi.code.config;
 
+import com.monkeyzi.code.holder.DynamicDataSourceContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
@@ -12,15 +13,16 @@
 @Component
 public class DynamicDatasourceInterceptor implements HandlerInterceptor {
 
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        log.info("进入拦截器了");
         return true;
     }
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
                                 @Nullable Exception ex) {
-        log.info("执行完毕");
+        DynamicDataSourceContextHolder.clearDataSourceType();
+        log.info("执行清除数据源信息完成");
     }
 }

src/main/java/com/monkeyzi/code/config/MvcInterceptorConfig.java

@@ -0,0 +1,23 @@
+package com.monkeyzi.code.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcInterceptorConfig implements WebMvcConfigurer {
+    @Autowired
+    private DynamicDatasourceInterceptor interceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(interceptor).addPathPatterns("/**");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+    }
+}

src/main/java/com/monkeyzi/code/controller/CodeGenController.java

@@ -1,34 +1,48 @@
 package com.monkeyzi.code.controller;
 
 import cn.hutool.core.io.IoUtil;
+import com.github.pagehelper.PageInfo;
+import com.monkeyzi.code.base.BaseController;
+import com.monkeyzi.code.base.Result;
+import com.monkeyzi.code.dto.GenCodeDto;
 import com.monkeyzi.code.dto.GenConfigDto;
+import com.monkeyzi.code.dto.PageRequest;
 import com.monkeyzi.code.service.CodeGenService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 @Slf4j
 @RestController
 @RequestMapping(value = "/gen")
-public class CodeGenController {
+public class CodeGenController extends BaseController {
 
    @Autowired
    private CodeGenService codeGenService;
 
 
-    @PostMapping("/code")
+   @GetMapping("/page")
+   public Result page(PageRequest page, GenCodeDto genCodeDto){
+       PageInfo pageInfo=codeGenService.pageQuery(page,genCodeDto);
+       Map<String,Object> results=super.getDataTable(pageInfo);
+       return Result.ok(results);
+   }
+
+
+    @GetMapping("/code")
     @SneakyThrows
-    public void generatorCode(@RequestBody GenConfigDto genConfig, HttpServletResponse response) {
+    public void generatorCode(GenConfigDto genConfig, HttpServletResponse response) {
         byte[] data = codeGenService.generatorCode(genConfig);
         response.reset();
-        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=%s.zip", genConfig.getTableName()));
+        response.setHeader(HttpHeaders.CONTENT_DISPOSITION,
+                String.format("attachment; filename=%s.zip", genConfig.getTableName()));
         response.addHeader(HttpHeaders.CONTENT_LENGTH, String.valueOf(data.length));
         response.setContentType("application/octet-stream; charset=UTF-8");
         IoUtil.write(response.getOutputStream(), Boolean.TRUE, data);

src/main/java/com/monkeyzi/code/controller/DatasourceConfigController.java

@@ -3,7 +3,6 @@
 import com.github.pagehelper.PageInfo;
 import com.monkeyzi.code.base.BaseController;
 import com.monkeyzi.code.base.Result;
-import com.monkeyzi.code.config.DynamicDataSourceConfig;
 import com.monkeyzi.code.dto.PageRequest;
 import com.monkeyzi.code.entity.SysDatasourceConf;
 import com.monkeyzi.code.service.DataSourceConfService;
@@ -26,8 +25,6 @@ public class DatasourceConfigController extends BaseController {
 
     @Autowired
     private DataSourceConfService dataSourceConfService;
-    @Autowired
-    private DynamicDataSourceConfig dataSourceConfig;
 
     @GetMapping("/page")
     public Result getSysDatasourceConfPage(PageRequest page, SysDatasourceConf sysDatasourceConf) {

src/main/java/com/monkeyzi/code/controller/view/CodeGenViewController.java

@@ -1,22 +1,31 @@
 package com.monkeyzi.code.controller.view;
 
 import com.monkeyzi.code.constant.CommonConstants;
+import com.monkeyzi.code.entity.SysGenConfig;
 import com.monkeyzi.code.service.CodeGenService;
+import com.monkeyzi.code.service.SysGenConfigService;
 import com.monkeyzi.code.utils.NpmsUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+import java.util.Optional;
+
 @Slf4j
 @Controller
 @RequestMapping(CommonConstants.VIEW_PREFIX)
 public class CodeGenViewController {
 
    @Autowired
    private CodeGenService codeGenService;
+    @Autowired
+    private SysGenConfigService sysGenConfigService;
 
 
     @GetMapping("gen/code")
@@ -25,4 +34,19 @@ public String generator() {
         return NpmsUtils.view("gen/gen");
     }
 
+    @GetMapping("gen/genCode")
+    @RequiresPermissions("gen:view")
+    public String genCode(Model model,Integer id,String tableName) {
+        List<SysGenConfig> config = sysGenConfigService.list();
+        final boolean present = Optional.of(config).isPresent();
+        SysGenConfig con=new SysGenConfig();
+        if (present){
+            con=config.get(0);
+        }
+        con.setDsId(id);
+        con.setTableName(tableName);
+        model.addAttribute("config", con);
+        return NpmsUtils.view("gen/genCode");
+    }
+
 }

src/main/java/com/monkeyzi/code/dto/GenCodeDto.java

@@ -0,0 +1,15 @@
+package com.monkeyzi.code.dto;
+
+import lombok.Data;
+
+@Data
+public class GenCodeDto {
+    /**
+     * 数据源Id
+     */
+    private Integer id;
+    /**
+     * 表名
+     */
+    private String tableName;
+}

src/main/java/com/monkeyzi/code/entity/SysGenConfig.java

@@ -1,5 +1,6 @@
 package com.monkeyzi.code.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -36,4 +37,9 @@ public class SysGenConfig extends Model<SysGenConfig> {
 
     private LocalDateTime updateTime;
 
+    @TableField(exist = false)
+    private Integer dsId;
+
+    @TableField(exist = false)
+    private String tableName;
 }

src/main/java/com/monkeyzi/code/mapper/MysqlCodeGenMapper.java

@@ -1,10 +1,17 @@
 package com.monkeyzi.code.mapper;
 
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
 public interface MysqlCodeGenMapper {
-
+    /**
+     * 查询当前库的表信息
+     * @param tableName
+     * @return
+     */
+    List<Map<String, Object>> queryList(@Param("tableName") String tableName);
     /**
      * 查询表信息
      *

src/main/java/com/monkeyzi/code/mapper/OracleCodeGenMapper.java

@@ -0,0 +1,30 @@
+package com.monkeyzi.code.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface OracleCodeGenMapper {
+    /**
+     * 查询当前库的表信息
+     * @param tableName
+     * @return
+     */
+    List<Map<String, Object>> queryList(@Param("tableName") String tableName);
+    /**
+     * 查询表信息
+     *
+     * @param tableName 表名称
+     * @return
+     */
+    Map<String, String> queryTable(String tableName);
+
+    /**
+     * 查询表列信息
+     *
+     * @param tableName 表名称
+     * @return
+     */
+    List<Map<String, String>> queryColumns(String tableName);
+}

src/main/java/com/monkeyzi/code/service/CodeGenService.java

@@ -1,8 +1,19 @@
 package com.monkeyzi.code.service;
 
+import com.github.pagehelper.PageInfo;
+import com.monkeyzi.code.dto.GenCodeDto;
 import com.monkeyzi.code.dto.GenConfigDto;
+import com.monkeyzi.code.dto.PageRequest;
 
 public interface CodeGenService {
 
     byte[] generatorCode(GenConfigDto genConfig);
+
+    /**
+     * 分页查询表信息
+     * @param page
+     * @param genCodeDto
+     * @return
+     */
+    PageInfo pageQuery(PageRequest page, GenCodeDto genCodeDto);
 }

src/main/java/com/monkeyzi/code/service/impl/CodeGenServiceImpl.java

@@ -1,10 +1,17 @@
 package com.monkeyzi.code.service.impl;
 
 import cn.hutool.core.io.IoUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.monkeyzi.code.dto.GenCodeDto;
 import com.monkeyzi.code.dto.GenConfigDto;
+import com.monkeyzi.code.dto.PageRequest;
+import com.monkeyzi.code.entity.SysDatasourceConf;
 import com.monkeyzi.code.holder.DynamicDataSourceContextHolder;
 import com.monkeyzi.code.mapper.MysqlCodeGenMapper;
+import com.monkeyzi.code.mapper.OracleCodeGenMapper;
 import com.monkeyzi.code.service.CodeGenService;
+import com.monkeyzi.code.service.DataSourceConfService;
 import com.monkeyzi.code.utils.CodeGenUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,28 +20,73 @@
 import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.zip.ZipOutputStream;
 
 @Slf4j
 @Service
 public class CodeGenServiceImpl implements CodeGenService {
 
+    private static final String DEFAULT_DB_TYPE="mysql";
+    @Autowired
+    private DataSourceConfService dataSourceConfService;
     @Autowired
     private MysqlCodeGenMapper mysqlCodeGenMapper;
+    @Autowired
+    private OracleCodeGenMapper oracleCodeGenMapper;
 
 
     @Override
     public byte[] generatorCode(GenConfigDto genConfig) {
+        String dbType=this.getDbType(genConfig.getId());
         DynamicDataSourceContextHolder.setDataSourceType(genConfig.getId());
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
         //查询表信息
-        Map<String, String> table = mysqlCodeGenMapper.queryTable(genConfig.getTableName());
+        Map<String, String> table;
         //查询列信息
-        List<Map<String, String>> columns = mysqlCodeGenMapper.queryColumns(genConfig.getTableName());
+        List<Map<String, String>> columns;
+        if (dbType.equals(DEFAULT_DB_TYPE)){
+            table = mysqlCodeGenMapper.queryTable(genConfig.getTableName());
+            columns=mysqlCodeGenMapper.queryColumns(genConfig.getTableName());
+        }else {
+            table = oracleCodeGenMapper.queryTable(genConfig.getTableName());
+            columns=oracleCodeGenMapper.queryColumns(genConfig.getTableName());
+        }
         //生成代码
         CodeGenUtils.generatorCode(genConfig, table, columns, zip);
         IoUtil.close(zip);
         return outputStream.toByteArray();
     }
+
+    @Override
+    public PageInfo pageQuery(PageRequest page, GenCodeDto genCodeDto) {
+        String dbType=this.getDbType(genCodeDto.getId());
+        DynamicDataSourceContextHolder.setDataSourceType(genCodeDto.getId());
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        List<Map<String, Object>> maps;
+        //分数据库类型查询
+        if (dbType.equals(DEFAULT_DB_TYPE)){
+            maps = this.mysqlCodeGenMapper.queryList(genCodeDto.getTableName());
+        }else {
+            maps=this.oracleCodeGenMapper.queryList(genCodeDto.getTableName());
+        }
+        return new PageInfo(maps);
+
+    }
+
+    /**
+     * 查询数据源类型
+     * @param id
+     * @return
+     */
+    private String  getDbType(Integer id){
+        String dbType=DEFAULT_DB_TYPE;
+        if (id!=null){
+            SysDatasourceConf datasourceConf=this.dataSourceConfService.getById(id);
+            boolean flag= Optional.of(datasourceConf).isPresent();
+            dbType=flag?datasourceConf.getDbType():dbType;
+        }
+        return dbType;
+    }
 }