FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 重写了一些诡异的代码

Browse Source
This commit is contained in:
yinglong zhang
2021-06-24 09:58:06 +08:00
parent a01ca3fd49
commit f284c60088
7 changed files with 285 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
+11 -11
View File
@@ -1,24 +1,25 @@
package com.adc.da.search.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.adc.da.base.web.BaseController;
import com.adc.da.excel.poi.excel.ExcelExportUtil;
import com.adc.da.excel.poi.excel.entity.ExportParams;
import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
import com.adc.da.http.PageInfo;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.search.dto.*;
import com.adc.da.search.entity.SarAdvanceSearchVO;
import com.adc.da.search.entity.SeniorSearchInfoEO;
import com.adc.da.search.service.ElasticsearchService;
import com.adc.da.search.service.SearchCenterService;
import com.adc.da.util.exception.AdcDaBaseException;
import com.adc.da.util.http.PageInfo;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.adc.da.util.utils.IOUtils;
import com.adc.da.util.utils.StringUtils;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.util.IOUtils;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.elasticsearch.client.transport.TransportClient;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +34,6 @@ import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
import static com.adc.da.sys.common.ReadExcelName.encodeFileName;
@RestController
@@ -271,7 +271,7 @@ public class SearchCenterController extends BaseController<Map<String, Object>>
dtoDatas.add(exportDto);
}
//导出数据到Excel
workbook = ExcelExportUtil.exportExcel(exportParams, SearchMsgExportDto.class, dtoDatas);
workbook = com.adc.da.excel.poi.excel.ExcelExportUtil.exportExcel(exportParams, SearchMsgExportDto.class, dtoDatas);
}
os = response.getOutputStream();
adc-da-search/src/main/java/com/adc/da/search/controller/StandLawsSearchController.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.adc.da.search.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.search.service.ElasticsearchService;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.elasticsearch.common.xcontent.XContentBuilder;