Merge branch 'feature/v1.0.0' of http://139.159.180.147/air/back-end into feature/v1.0.0

air/src/main/java/com/air/land/controller/LandToListController.java

@@ -1,13 +1,9 @@
 package com.air.land.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.poi.excel.ExcelWriter;
 import com.air.common.Constant;
-import com.air.land.entity.LandListed;
 import com.air.land.entity.LandToList;
-import com.air.land.service.LandListedService;
 import com.air.land.service.LandToListService;
 import com.air.land.vo.LandListedPageVo;
 import com.air.land.vo.LandToListVo;
@@ -18,7 +14,6 @@ import com.cinderella.framework.common.core.util.R;
 import com.cinderella.framework.common.data.mybatis.QueryPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +22,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

air/src/main/java/com/air/macro/controller/MacroDataController.java

@@ -4,6 +4,7 @@ import com.air.macro.entity.MacroData;
 import com.air.macro.service.MacroDataService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cinderella.framework.common.core.util.R;
+import com.cinderella.framework.common.data.mybatis.QueryPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

air/src/main/java/com/air/macro/entity/MacroData.java

@@ -29,7 +29,7 @@ public class MacroData extends Model<MacroData> {
     private Long dataId;
 
     @ApiModelProperty(value = "年份")
-    private LocalDateTime year;
+    private int year;
 
     @ApiModelProperty(value = "城市")
     private String city;

air/src/main/java/com/air/macro/service/MacroDataService.java

@@ -3,6 +3,7 @@ package com.air.macro.service;
 import com.air.macro.entity.MacroData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cinderella.framework.common.data.mybatis.QueryPage;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;

air/src/main/java/com/air/macro/service/impl/MacroDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.air.macro.service.impl;
 
+import com.air.enums.CommonStatusEnum;
 import com.air.macro.entity.MacroData;
 import com.air.macro.mapper.MacroDataMapper;
 import com.air.macro.service.MacroDataService;
@@ -30,7 +31,8 @@ public class MacroDataServiceImpl extends ServiceImpl<MacroDataMapper, MacroData
 
     @Override
     public Page getMacroDataPage(Page page, MacroData macroData) {
-        return macroDataMapper.selectMapsPage(page, Wrappers.query(macroData));
+        Page<MacroData> p = macroDataMapper.selectPage(page,Wrappers.<MacroData>lambdaQuery().eq(MacroData::getStatusCd, CommonStatusEnum.SYS_MESSAGE_STATUS_1000.getCode()));
+        return p;
     }
 
     @Override