From 0c45451476c81374c76423adf804e900831a1047 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 27 Aug 2024 16:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WeatherController.java         | 25 +++----------------
 .../modules/basicdata/entity/Weather.java     |  2 +-
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java
index 9817086f2..2410f3341 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/WeatherController.java
@@ -12,10 +12,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -231,27 +228,13 @@ public class WeatherController {
     @ApiOperation(value = "导出excel天气信息信息", notes = "导出excel天气信息信息", httpMethod = "POST")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<Weather> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                Weather weather = JSON.parseObject(deString, Weather.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(weather, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<Weather> pageList = weatherService.list(queryWrapper);
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "天气信息列表");
         mv.addObject(NormalExcelConstants.CLASS, Weather.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("天气信息列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("天气信息列表数据", "模版信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList<>());
         return mv;
     }
 
@@ -272,7 +255,7 @@ public class WeatherController {
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
             MultipartFile file = entity.getValue();// 获取上传文件对象
             ImportParams params = new ImportParams();
-            params.setTitleRows(2);
+            params.setTitleRows(1);
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Weather.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Weather.java
index 07a06dcbc..b4f9ad319 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Weather.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Weather.java
@@ -80,7 +80,7 @@ public class Weather implements Serializable {
      */
     @Excel(name = "风力等级", width = 15)
     @ApiModelProperty(value = "风力等级")
-    private Double winSpeed;
+    private String winSpeed;
     /**
      * 风向
      */