소스 검색

导出 问题

shiqian 3 년 전
부모
커밋
467ec08c64
29개의 변경된 파일295개의 추가작업 그리고 47개의 파일을 삭제
  1. 5 0
      boman-api/boman-api-web-core/src/main/java/com/boman/web/core/api/RemoteObjService.java
  2. 32 0
      boman-api/boman-api-web-core/src/main/java/com/boman/web/core/api/RemoteVaccineInfoService.java
  3. 1 1
      boman-api/boman-domain/src/main/java/com/boman/domain/TableDataInfo.java
  4. 28 0
      boman-api/boman-domain/src/main/java/com/boman/domain/utils/CamelLowerUnderScore.java
  5. 1 1
      boman-common/boman-common-core/src/main/java/com/boman/common/core/web/controller/BaseController.java
  6. 2 2
      boman-common/boman-common-redis/src/main/java/com/boman/common/redis/RedisKey.java
  7. 7 0
      boman-modules/boman-file/src/main/java/com/boman/file/RuoYFileApplication.java
  8. 41 9
      boman-modules/boman-file/src/main/java/com/boman/file/controller/ExcelController.java
  9. 5 1
      boman-modules/boman-file/src/main/java/com/boman/file/service/ISysFileService.java
  10. 154 12
      boman-modules/boman-file/src/main/java/com/boman/file/service/LocalSysFileServiceImpl.java
  11. 1 1
      boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java
  12. 1 1
      boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableColumnController.java
  13. 1 1
      boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableRelationController.java
  14. 1 1
      boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobController.java
  15. 1 1
      boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobLogController.java
  16. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysConfigController.java
  17. 1 2
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictDataController.java
  18. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictTypeController.java
  19. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysLogininforController.java
  20. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysNoticeController.java
  21. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysOperlogController.java
  22. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysPostController.java
  23. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java
  24. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleDataController.java
  25. 1 2
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java
  26. 1 1
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserOnlineController.java
  27. 1 1
      boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceSetController.java
  28. 1 1
      boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java
  29. 1 1
      boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoOperationController.java

+ 5 - 0
boman-api/boman-api-web-core/src/main/java/com/boman/web/core/api/RemoteObjService.java

@@ -1,5 +1,7 @@
 package com.boman.web.core.api;
 
+import com.boman.domain.TableDataInfo;
+import com.boman.domain.VaccineInfoOperation;
 import com.boman.domain.constant.ServiceNameConstants;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.FormDataDto;
@@ -44,5 +46,8 @@ public interface RemoteObjService {
      */
     @PostMapping("common/")
     AjaxResult getByMap(@RequestBody FormDataDto dto);
+
+    @GetMapping("core/info/list")
+    TableDataInfo list(VaccineInfoOperation vaccineInfo);
 }
 

+ 32 - 0
boman-api/boman-api-web-core/src/main/java/com/boman/web/core/api/RemoteVaccineInfoService.java

@@ -0,0 +1,32 @@
+package com.boman.web.core.api;
+
+import com.boman.domain.TableDataInfo;
+import com.boman.domain.VaccineInfoOperation;
+import com.boman.domain.constant.ServiceNameConstants;
+import com.boman.domain.dto.AjaxResult;
+import com.boman.domain.dto.FormDataDto;
+import com.boman.domain.dto.ImportExcelDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author shiqian
+ * @date 2021年04月07日 10:31
+ **/
+@FeignClient(contextId = "remoteVaccineInfoService", value = ServiceNameConstants.WEB_CORE_SERVICE)
+public interface RemoteVaccineInfoService {
+
+    /**
+     * 功能描述: 获取疫苗接种列表
+     *
+     * @param vaccineInfo vaccineInfo
+     * @return com.boman.domain.TableDataInfo
+     */
+    @GetMapping("core/info/list")
+    TableDataInfo list(VaccineInfoOperation vaccineInfo);
+
+}
+

+ 1 - 1
boman-common/boman-common-core/src/main/java/com/boman/common/core/web/page/TableDataInfo.java → boman-api/boman-domain/src/main/java/com/boman/domain/TableDataInfo.java

@@ -1,4 +1,4 @@
-package com.boman.common.core.web.page;
+package com.boman.domain;
 
 import java.io.Serializable;
 import java.util.List;

+ 28 - 0
boman-api/boman-domain/src/main/java/com/boman/domain/utils/CamelLowerUnderScore.java

@@ -0,0 +1,28 @@
+package com.boman.domain.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.CaseFormat;
+
+import java.util.Map;
+
+/**
+ * @author shiqian
+ * @date 2021年09月29日 16:46
+ * @description 驼峰和下划线转换
+ **/
+public class CamelLowerUnderScore {
+
+    public static String camel2LowerUnderScore(String input){
+        return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, input);
+    }
+
+    public static JSONObject camel2LowerUnderScore(Map<String, Object> jsonObject) {
+        JSONObject result = new JSONObject(jsonObject.size());
+        for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
+            result.put(camel2LowerUnderScore(entry.getKey()), entry.getValue());
+        }
+
+        return result;
+    }
+
+}

+ 1 - 1
boman-common/boman-common-core/src/main/java/com/boman/common/core/web/controller/BaseController.java

@@ -15,7 +15,7 @@ import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.sql.SqlUtil;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.common.core.web.page.PageDomain;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.core.web.page.TableSupport;
 
 /**

+ 2 - 2
boman-common/boman-common-redis/src/main/java/com/boman/common/redis/RedisKey.java

@@ -34,7 +34,7 @@ public class RedisKey {
     public static final String BILL_SQE = "BILL:SEQ:";
 
     /**
-     * 异步下载时,判断是否下载完成,download:tableName:username
+     * 异步下载时,判断是否下载完成
      */
-    public static final String ASYNC_DOWNLOAD_SIGN = "download:";
+    public static final String ASYNC_DOWNLOAD_YMJZ = "download:ymjz:";
 }

+ 7 - 0
boman-modules/boman-file/src/main/java/com/boman/file/RuoYFileApplication.java

@@ -5,6 +5,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import com.boman.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * 文件服务
@@ -30,4 +32,9 @@ public class RuoYFileApplication
                 " |  |  \\    /  \\      /           \n" +
                 " ''-'   `'-'    `-..-'              ");
     }
+
+    @Bean
+    public RestTemplate restTemplate(){
+        return new RestTemplate();
+    }
 }

+ 41 - 9
boman-modules/boman-file/src/main/java/com/boman/file/controller/ExcelController.java

@@ -1,18 +1,23 @@
 package com.boman.file.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
+import com.boman.domain.VaccineInfoOperation;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.ExportExcelDto;
 import com.boman.file.service.ISysFileService;
 import com.boman.file.service.LocalSysFileServiceImpl;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 
 /**
  * @author shiqian
@@ -76,9 +81,20 @@ public class ExcelController {
      * @return com.boman.domain.dto.AjaxResult
      */
     @PostMapping("async/export")
-    public AjaxResult asyncExportExcelCommon(HttpServletResponse response, @RequestBody ExportExcelDto dto) {
+    public AjaxResult asyncExportExcelCommon(HttpServletRequest request, HttpServletResponse response, @RequestBody ExportExcelDto dto) {
         try {
-            return fileService.asyncExportExcelCommon(response, dto);
+            return fileService.asyncExportExcelCommon(request, response, dto);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return AjaxResult.error("失败");
+    }
+
+    @PostMapping("async/export/ymjz")
+    public AjaxResult asyncExportYmjzExcel(HttpServletResponse response, @RequestBody VaccineInfoOperation info) {
+        try {
+            return fileService.asyncExportYmjzExcel(response, info);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -93,13 +109,29 @@ public class ExcelController {
      */
     @GetMapping("/before/download")
     public AjaxResult canDownloadIfOrNot() {
-        String redisKey = RedisKey.ASYNC_DOWNLOAD_SIGN + SecurityUtils.getUsername();
-        String sign = redisService.getCacheObject(redisKey);
-        if (LocalSysFileServiceImpl.DOWNLOADING.equals(sign)) {
-            return AjaxResult.success(false);
-        }
-
-        return AjaxResult.error(true);
+        String redisKey = RedisKey.ASYNC_DOWNLOAD_YMJZ + SecurityUtils.getUsername();
+        JSONObject jsonObject = redisService.getCacheObject(redisKey);
+        String fileAbsPath = jsonObject.getString("fileAbsPath");
+        String fileStaticPath = jsonObject.getString("fileStaticPath");
+        File file = new File(fileAbsPath);
+        long length = file.length();
+        return length == 0 ? AjaxResult.success(false) : AjaxResult.success(fileStaticPath, true);
+
+//        if (length == 0) {
+//            return AjaxResult.success(false);
+//        } else {
+//            return AjaxResult.success(true);
+//        }
+//        // 可以下载
+//        if (BooleanUtils.isFalse(download)) {
+//            jsonObject.put("download", true);
+//            redisService.deleteObject(redisKey);
+//            return AjaxResult.success(jsonObject);
+//        }
+//
+//        jsonObject.clear();
+//        jsonObject.put("download", false);
+//        return AjaxResult.success(false);
     }
 
     /**

+ 5 - 1
boman-modules/boman-file/src/main/java/com/boman/file/service/ISysFileService.java

@@ -1,11 +1,13 @@
 package com.boman.file.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.boman.domain.VaccineInfoOperation;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.ExportExcelDto;
 import com.boman.domain.dto.ImportExcelDto;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
@@ -71,7 +73,9 @@ public interface ISysFileService
      *                 condition 查询条件
      * @return com.boman.domain.dto.AjaxResult
      */
-    AjaxResult asyncExportExcelCommon(HttpServletResponse response, ExportExcelDto dto) throws IOException;
+    AjaxResult asyncExportExcelCommon(HttpServletRequest request, HttpServletResponse response, ExportExcelDto dto) throws IOException;
+
+    AjaxResult asyncExportYmjzExcel(HttpServletResponse response, VaccineInfoOperation info) throws IOException;
 
     /**
      * 功能描述: 导出数据,只是sql不一样,其余的都是通用接口的内容

+ 154 - 12
boman-modules/boman-file/src/main/java/com/boman/file/service/LocalSysFileServiceImpl.java

@@ -1,22 +1,31 @@
 package com.boman.file.service;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.boman.common.core.utils.SecurityUtils;
+import com.boman.common.core.utils.ServletUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
-import com.boman.domain.GenTable;
-import com.boman.domain.GenTableColumn;
+import com.boman.domain.*;
+import com.boman.domain.constant.CacheConstants;
 import com.boman.domain.constant.MaskConstant;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.ExportExcelDto;
 import com.boman.domain.dto.FormDataDto;
 import com.boman.domain.dto.ImportExcelDto;
+import com.boman.domain.utils.CamelLowerUnderScore;
 import com.boman.domain.utils.ThreadPoolService;
 import com.boman.file.utils.FileUploadUtils;
+import com.boman.system.api.RemoteDeptService;
+import com.boman.system.api.model.LoginUser;
 import com.boman.web.core.api.RemoteAttendanceService;
 import com.boman.web.core.api.RemoteObjService;
+import com.boman.web.core.api.RemoteVaccineInfoService;
+import com.google.common.base.CaseFormat;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
@@ -25,15 +34,19 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import static com.boman.common.core.utils.obj.ObjectUtils.isEmpty;
 import static com.boman.common.core.utils.obj.ObjectUtils.map;
 
 /**
@@ -56,6 +69,10 @@ public class LocalSysFileServiceImpl implements ISysFileService
     private RedisService redisService;
     @Resource
     private RemoteAttendanceService remoteAttendanceService;
+    @Resource
+    private RemoteVaccineInfoService remoteVaccineInfoService;
+    @Resource
+    private RemoteDeptService remoteDeptService;
 
     /**
      * 资源映射路径 前缀
@@ -186,7 +203,7 @@ public class LocalSysFileServiceImpl implements ISysFileService
      * @return com.boman.domain.dto.AjaxResult
      */
     @Override
-    public AjaxResult asyncExportExcelCommon(HttpServletResponse response, ExportExcelDto dto) throws IOException {
+    public AjaxResult asyncExportExcelCommon(HttpServletRequest request, HttpServletResponse response, ExportExcelDto dto) {
         String tableName = dto.getTableName();
         Boolean empty = dto.getEmpty();
         ObjectUtils.requireNonNull(tableName, "exportExcelCommon tableName is empty");
@@ -196,36 +213,115 @@ public class LocalSysFileServiceImpl implements ISysFileService
         List<GenTableColumn> allColumn = genTable.getColumns();
         List<GenTableColumn> columns = ExcelUtil.filterData(allColumn, 4, MaskConstant.LIST_VISIBLE::equals);
 
-        String filename = UUID.randomUUID().toString() + ".xlsx";
+        String filename = UUID.randomUUID() + ".xlsx";
         String fileAbsPath = localFilePath + "/" + filename;
         String fileStaticPath = domain + localFilePrefix + "/" + filename;
         File file = new File(fileAbsPath);
 
         ExcelUtil<JSONObject> util = new ExcelUtil<>(JSONObject.class);
+        String username = SecurityUtils.getUsername();
+
+        String token = SecurityUtils.getToken(request);
+        LoginUser loginUser = redisService.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token);
+        Long deptId = loginUser.getSysUser().getDeptId();
+        List<SysDept> sysDepts = remoteDeptService.listChildrenDepts(deptId);
+        List<Long> deptIdList = new ArrayList<>();
+        if (sysDepts != null && sysDepts.size() > 0) {
+            for (SysDept sysDept : sysDepts) {
+                Long id = sysDept.getId();
+                deptIdList.add(id);
+            }
+        }
 
         ThreadPoolService.execute(() -> {
             List<Map<String, Object>> list;
             int size = 0;
-            if (BooleanUtils.isTrue(empty)) {
+            Boolean emptyIn = empty;
+            if (BooleanUtils.isTrue(emptyIn)) {
                 list = new ArrayList<>(0);
             } else {
                 LOGGER.info("开始查询, 线程名称: {}", Thread.currentThread().getName());
                 long currentTimeMillis = System.currentTimeMillis();
-                list = getData(dto, tableName, columns);
-                size = list.size();
+                list = getData1(dto, tableName, columns, deptIdList);
+                if (isEmpty(list)) {
+                    size =0;
+                    emptyIn = true;
+                } else {
+                    size = list.size();
+                }
+
                 LOGGER.info("查询到的数据长度为: {}, 查询耗时:{}秒", size, (System.currentTimeMillis() - currentTimeMillis) / 1000);
             }
 
             try {
-                util.asyncExportExcelCommon(new FileOutputStream(file), list, "sheet1", columns, empty, false);
-                long timeout = 1L;
+                util.asyncExportExcelCommon(new FileOutputStream(file), list, "sheet1", columns, emptyIn, false);
+                long timeout = 2L;
                 if (size > 100000 && size < 500000) {
-                    timeout = 2L;
+                    timeout = 5L;
                 } else if(size > 500000){
-                    timeout = 4L;
+                    timeout = 10L;
                 }
 
-                redisService.setCacheObject(RedisKey.ASYNC_DOWNLOAD_SIGN + SecurityUtils.getUsername(), DOWNLOADING, timeout, TimeUnit.MINUTES);
+                String key = RedisKey.ASYNC_DOWNLOAD_YMJZ + username;
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("fileStaticPath", fileStaticPath);
+                jsonObject.put("fileAbsPath", fileAbsPath);
+                redisService.setCacheObject(key, jsonObject, timeout, TimeUnit.MINUTES);
+            } catch (IOException e) {
+                LOGGER.error("导出失败", e);
+                e.printStackTrace();
+            }
+        });
+
+        return AjaxResult.success("成功", fileStaticPath);
+    }
+
+
+
+    /**
+     * 功能描述: 通用的导出接口
+     *
+     * @param response response
+     * @param info      查询条件
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @Override
+    public AjaxResult asyncExportYmjzExcel(HttpServletResponse response, VaccineInfoOperation info) throws IOException {
+        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + "vaccine_info");
+        List<GenTableColumn> allColumn = genTable.getColumns();
+        List<GenTableColumn> columns = ExcelUtil.filterData(allColumn, 4, MaskConstant.LIST_VISIBLE::equals);
+
+        String filename = UUID.randomUUID() + ".xlsx";
+        String fileAbsPath = localFilePath + "/" + filename;
+        String fileStaticPath = domain + localFilePrefix + "/" + filename;
+        File file = new File(fileAbsPath);
+
+        ExcelUtil<JSONObject> util = new ExcelUtil<>(JSONObject.class);
+        String username = SecurityUtils.getUsername();
+
+        ThreadPoolService.execute(() -> {
+            List<Map<String, Object>> list;
+            LOGGER.info("开始查询, 线程名称: {}", Thread.currentThread().getName());
+            long currentTimeMillis = System.currentTimeMillis();
+            list = listYmjz(info, columns);
+            boolean empty = isEmpty(list);
+            int size = BooleanUtils.isFalse(empty) ? 0 : list.size();
+            LOGGER.info("查询到的数据长度为: {}, 查询耗时:{}秒", size, (System.currentTimeMillis() - currentTimeMillis) / 1000);
+
+            try {
+                String key = RedisKey.ASYNC_DOWNLOAD_YMJZ + username;
+                util.asyncExportExcelCommon(new FileOutputStream(file), list, "sheet1", columns, empty, false);
+                long timeout = 2L;
+                if (size > 100000 && size < 500000) {
+                    timeout = 5L;
+                } else if (size > 500000) {
+                    timeout = 10L;
+                }
+
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("fileStaticPath", fileStaticPath);
+                jsonObject.put("fileAbsPath", fileAbsPath);
+                redisService.setCacheObject(key, jsonObject, timeout, TimeUnit.MINUTES);
             } catch (IOException e) {
                 LOGGER.error("导出失败", e);
                 e.printStackTrace();
@@ -252,6 +348,52 @@ public class LocalSysFileServiceImpl implements ISysFileService
         return list;
     }
 
+    private List<Map<String, Object>> getData1(ExportExcelDto dto, String tableName, List<GenTableColumn> columns, List<Long> deptIdList) {
+        List<Map<String, Object>> list = null;
+        FormDataDto condition = new FormDataDto();
+        condition.setTable(tableName);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("dept_id", deptIdList);
+        condition.setFixedData(jsonObject);
+        condition.setPageSize(Integer.MAX_VALUE);
+        condition.setPageNo(1);
+        AjaxResult ajaxResult = remoteObjService.getByMap(condition);
+        if (AjaxResult.checkSuccess(ajaxResult)) {
+            list = ((List<Map<String, Object>>) ajaxResult.get(AjaxResult.DATA_TAG));
+            handleNullColumnValue(list, map(columns, GenTableColumn::getColumnName));
+        }
+
+        return list;
+    }
+
+    /**
+     * 功能描述: 单独去查疫苗接种信息的
+     *
+     * @param info       info
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     */
+    private List<Map<String, Object>> listYmjz(VaccineInfoOperation info, List<GenTableColumn> columns) {
+//        TableDataInfo list = remoteObjService.list(info);
+//        LOGGER.info("查询结果:{}", JSON.toJSONString(list));
+//        List<?> rows = list.getRows();
+//        return JSON.parseObject(JSON.toJSONString(rows), new TypeReference<List<Map<String, Object>>>() {
+//        }.getType());
+
+        List<Map<String, Object>> list = null;
+        FormDataDto condition = new FormDataDto();
+        condition.setTable("vaccine_info");
+        condition.setFixedData(new JSONObject());
+        condition.setPageSize(Integer.MAX_VALUE);
+        condition.setPageNo(1);
+        AjaxResult ajaxResult = remoteObjService.getByMap(condition);
+        if (AjaxResult.checkSuccess(ajaxResult)) {
+            list = ((List<Map<String, Object>>) ajaxResult.get(AjaxResult.DATA_TAG));
+            handleNullColumnValue(list, map(columns, GenTableColumn::getColumnName));
+        }
+
+        return list;
+    }
+
     /**
      * 功能描述: 导出数据,只是sql不一样,其余的都是通用接口的内容
      *

+ 1 - 1
boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.text.Convert;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableColumnController.java

@@ -5,7 +5,7 @@ import com.boman.domain.constant.UserConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.domain.GenTableColumn;

+ 1 - 1
boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableRelationController.java

@@ -4,7 +4,7 @@ package com.boman.gen.controller;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.domain.GenTableRelation;
 import com.boman.gen.service.IGenTableRelationService;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobController.java

@@ -18,7 +18,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobLogController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysConfigController.java

@@ -18,7 +18,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 2
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictDataController.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.boman.domain.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,7 +20,7 @@ import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictTypeController.java

@@ -18,7 +18,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysLogininforController.java

@@ -17,7 +17,7 @@ import com.boman.common.core.utils.ip.IpUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysNoticeController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysOperlogController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysPostController.java

@@ -18,7 +18,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -18,7 +18,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleDataController.java

@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 2
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.domain.SysDept;
 import com.boman.system.service.*;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
@@ -32,7 +31,7 @@ import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;

+ 1 - 1
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserOnlineController.java

@@ -14,7 +14,7 @@ import com.boman.domain.constant.CacheConstants;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.redis.service.RedisService;

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceSetController.java

@@ -2,7 +2,7 @@ package com.boman.web.core.controller;
 
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.web.core.domain.AttendanceSet;

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -8,7 +8,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.domain.dto.AjaxResult;

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoOperationController.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
-import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.domain.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.domain.dto.AjaxResult;