|
@@ -1,12 +1,15 @@
|
|
|
package com.sysu.admin.controller.crop;
|
|
|
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
|
|
|
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
|
|
|
import com.querydsl.core.types.Predicate;
|
|
|
import com.querydsl.jpa.impl.JPAUpdateClause;
|
|
|
import com.sysu.admin.controller.city.*;
|
|
|
import com.sysu.admin.controller.crop.range.LandRangeIndexService;
|
|
|
import com.sysu.admin.controller.crop.xls.CropExcel;
|
|
|
import com.sysu.admin.controller.crop.xls.CropExcelService;
|
|
|
+import com.sysu.admin.controller.crop.xls.CustomHandler;
|
|
|
import com.sysu.admin.controller.crop.xls.PublishCropExcelListener;
|
|
|
import com.sysu.admin.controller.geo.land.LandTaskStatus;
|
|
|
import com.sysu.admin.support.base.ServiceContext;
|
|
@@ -15,6 +18,7 @@ import com.sysu.admin.utils.shape.GeoCastUtil;
|
|
|
import com.xiesx.fastboot.base.result.BaseResult;
|
|
|
import com.xiesx.fastboot.base.result.R;
|
|
|
import com.xiesx.fastboot.utils.CopyUtils;
|
|
|
+import org.apache.catalina.util.URLEncoder;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.locationtech.jts.geom.MultiPolygon;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -26,7 +30,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.transaction.Transactional;
|
|
|
import java.io.IOException;
|
|
|
-import java.net.URLEncoder;
|
|
|
+import java.nio.charset.Charset;
|
|
|
import java.nio.file.Path;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -164,9 +168,10 @@ public class CropLandController extends ServiceContext {
|
|
|
String inlineType = "attachment"; // 是否内联附件
|
|
|
response.setContentType(mimetype);
|
|
|
response.setHeader("Content-Disposition", inlineType
|
|
|
- + ";filename=" + URLEncoder.encode(downFileName));
|
|
|
+ + ";filename=" + URLEncoder.DEFAULT.encode(downFileName, Charset.defaultCharset()));
|
|
|
try {
|
|
|
- EasyExcel.write(response.getOutputStream(), CropExcel.class).sheet("sheet1").doWrite(cropExcelList);
|
|
|
+ EasyExcel.write(response.getOutputStream(), CropExcel.class).registerWriteHandler(new CustomHandler())
|
|
|
+ .sheet("sheet1").doWrite(cropExcelList);
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|