2.0.0 修改bug

air/src/main/java/com/air/applets/controller/AppletsMapController.java

@@ -1,7 +1,11 @@
 package com.air.applets.controller;
 
 import com.air.applets.dto.LandLonLatDto;
+import com.air.applets.dto.LandStatisticsDto;
+import com.air.applets.entity.ViewLand;
 import com.air.applets.service.AppletsMapService;
+import com.air.applets.service.ViewLandService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cinderella.framework.common.core.util.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,6 +30,9 @@ public class AppletsMapController {
     @Autowired
     private AppletsMapService mapService;
 
+    @Autowired
+    private ViewLandService viewLandService;
+
 
     /**
      * 查询城市行政区信息
@@ -112,6 +119,12 @@ public class AppletsMapController {
         return R.ok(mapService.getLandList(start, end,city), "查询成功");
     }
 
+    @ApiOperation("查询地块城市统计数据")
+    @GetMapping("getLandStatisticsOfCity")
+    public R<List<LandStatisticsDto>> getLandStatisticsOfCity(){
+        return R.ok(viewLandService.getLandStatisticsOfCity(),"查询成功");
+    }
+
     /**
      * 设置行政区，环线，大组团，小组团经纬度
      *

air/src/main/java/com/air/applets/controller/LandUserKeepController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.air.applets.entity.LandUserKeep;
 import com.air.applets.entity.ViewLand;
 import com.air.applets.service.LandUserKeepService;
+import com.air.applets.vo.LandUserKeepVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cinderella.framework.common.core.util.R;
@@ -36,13 +37,13 @@ public class LandUserKeepController {
      * 分页查询
      *
      * @param page         分页对象
-     * @param landUserKeep
+     * @param landUserKeepVo
      * @return
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page")
-    public R<IPage<ViewLand>> getLandUserKeepPage(QueryPage page, LandUserKeep landUserKeep) {
-        return R.ok(userKeepService.getLandUserKeepPage(page.toPage(), landUserKeep));
+    public R<IPage<ViewLand>> getLandUserKeepPage(QueryPage page, LandUserKeepVo landUserKeepVo) {
+        return R.ok(userKeepService.getLandUserKeepPage(page.toPage(), landUserKeepVo));
     }
 
     /**

air/src/main/java/com/air/applets/controller/ReportController.java

@@ -7,6 +7,7 @@ import com.air.cityarea.service.ReportService;
 import com.air.enums.ReportStatusEnum;
 import com.air.enums.ReportTypeEnum;
 import com.air.utils.FileUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cinderella.framework.common.core.util.R;
@@ -42,7 +43,7 @@ public class ReportController {
      */
     @ApiOperation(value = "报告分页查询", notes = "报告分页查询(reportType:)")
     @GetMapping("/page")
-    public R getReportPage(QueryPage page, @RequestParam(required = false) String reportType,@RequestParam(required = false) String reportName) {
+    public R<IPage<Report>> getReportPage(QueryPage page, @RequestParam(required = false) String reportType, @RequestParam(required = false) String reportName) {
         Page<Report> reportPage = reportService.page(page.toPage(), Wrappers.<Report>query().lambda()
                 .eq(StrUtil.isNotEmpty(reportType), Report::getReportType, reportType)
                 .like(StrUtil.isNotEmpty(reportName), Report::getReportName, reportName)
@@ -51,6 +52,7 @@ public class ReportController {
         if (CollectionUtil.isNotEmpty(reportPage.getRecords())) {
             reportPage.getRecords().stream().forEach(e -> {
                 e.setFilePath(fileUtil.getUrlByInnerPath(e.getFilePath()));
+                e.setReportCoverPath(fileUtil.getUrlByInnerPath(e.getReportCoverPath()));
                 e.setReportTypeName(ReportTypeEnum.getName(e.getReportType()));
                 e.setStatusName(ReportStatusEnum.getName(e.getStatusCd()));
             });
@@ -73,6 +75,7 @@ public class ReportController {
             return R.failed("土地报告id不正确");
         }
         report.setFilePath(fileUtil.getUrlByInnerPath(report.getFilePath()));
+        report.setReportCoverPath(fileUtil.getUrlByInnerPath(report.getReportCoverPath()));
         report.setReportTypeName(ReportTypeEnum.getName(report.getReportType()));
         return R.ok(report);
     }

air/src/main/java/com/air/applets/convert/LandLonLatConvert.java

@@ -28,7 +28,7 @@ public class LandLonLatConvert {
         List<LandLonLatDto> landLonLatDtos = new ArrayList<>();
         list.forEach(e ->{
             LandLonLatDto landLonLatDto = new LandLonLatDto();
-
+            landLonLatDto.setName(e.getName());
             CoordinatePoint coordinatePoint = GeomUtils.lonLatConvertPoint(e.getPos());
             PolygonGeom polygonGeom = GeomUtils.computeGemo(coordinatePoint.getPolygonPoints(), e.getLineColor()
                     , e.getLineOpaqueness(), e.getLineWidth(), e.getFillColor(), e.getFillOpaqueness());

air/src/main/java/com/air/applets/dto/LandLonLatDto.java

@@ -23,5 +23,7 @@ public class LandLonLatDto {
     private List<Double> centerPoint;
     @ApiModelProperty(value = "图形坐标颜色等信息")
     private Feature feature;
+    @ApiModelProperty(value="区域名称")
+    private String name;
 
 }

air/src/main/java/com/air/applets/dto/LandStatisticsDto.java

@@ -0,0 +1,24 @@
+package com.air.applets.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 城市地块统计数据
+ *
+ * @author peihao
+ * @date 2021-11-25 15:47:04
+ */
+@Data
+@ApiModel(value = "城市地块统计数据")
+public class LandStatisticsDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "地块数量")
+    private Integer landAmount;
+
+}

air/src/main/java/com/air/applets/entity/ViewLand.java

@@ -38,6 +38,8 @@ public class ViewLand extends Model<ViewLand> {
     private Integer landType;
     @ApiModelProperty(value = "城市")
     private String city;
+    @ApiModelProperty(value = "行政区")
+    private String canton;
     @ApiModelProperty(value = "交易状态")
     private String transactionStatus;
 

air/src/main/java/com/air/applets/mapper/LandUserKeepMapper.java

@@ -2,6 +2,7 @@ package com.air.applets.mapper;
 
 import com.air.applets.entity.LandUserKeep;
 import com.air.applets.entity.ViewLand;
+import com.air.applets.vo.LandUserKeepVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
@@ -23,6 +24,6 @@ public interface LandUserKeepMapper extends BaseMapper<LandUserKeep> {
      * @date 2021/11/26
      * @return
      **/
-    List<ViewLand> getLandUserKeepPage(Page page,@Param("param") LandUserKeep param);
+    List<ViewLand> getLandUserKeepPage(Page page,@Param("param") LandUserKeepVo param);
 
 }

air/src/main/java/com/air/applets/mapper/ViewLandMapper.java

@@ -1,7 +1,11 @@
 package com.air.applets.mapper;
 
+import com.air.applets.dto.LandStatisticsDto;
 import com.air.applets.entity.ViewLand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @author peihao
@@ -9,4 +13,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ViewLandMapper extends BaseMapper<ViewLand> {
 
+
+    /**
+     * 查询地块城市统计数据
+     * @author peihao
+     * @date 2022/1/19
+     * @return
+     **/
+    @Select("select city,count(1) landAmount from view_land group by city")
+    List<LandStatisticsDto> getLandStatisticsOfCity();
+
 }

air/src/main/java/com/air/applets/service/LandUserKeepService.java

@@ -2,6 +2,7 @@ package com.air.applets.service;
 
 import com.air.applets.entity.LandUserKeep;
 import com.air.applets.entity.ViewLand;
+import com.air.applets.vo.LandUserKeepVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -20,11 +21,11 @@ public interface LandUserKeepService extends IService<LandUserKeep> {
      * 查询用户地块收藏列表
      * @author peihao
      * @param page 分页对象
-     * @param landUserKeep 查询参数
+     * @param landUserKeepVo 查询参数
      * @date 2021/11/26
      * @return
      **/
-    IPage<ViewLand> getLandUserKeepPage(Page page, LandUserKeep landUserKeep);
+    IPage<ViewLand> getLandUserKeepPage(Page page, LandUserKeepVo landUserKeepVo);
 
     Optional<Integer> verifyCollect(String landId, Integer landType);
 

air/src/main/java/com/air/applets/service/ViewLandService.java

@@ -1,12 +1,17 @@
 package com.air.applets.service;
 
+import com.air.applets.dto.LandStatisticsDto;
 import com.air.applets.entity.ViewLand;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @author peihao
  * @date 2021-11-25 15:47:04
  */
 public interface ViewLandService extends IService<ViewLand> {
 
+    List<LandStatisticsDto> getLandStatisticsOfCity();
+
 }

air/src/main/java/com/air/applets/service/impl/LandUserKeepServiceImpl.java

@@ -5,6 +5,7 @@ import com.air.applets.entity.LandUserKeep;
 import com.air.applets.entity.ViewLand;
 import com.air.applets.mapper.LandUserKeepMapper;
 import com.air.applets.service.LandUserKeepService;
+import com.air.applets.vo.LandUserKeepVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,11 +28,9 @@ public class LandUserKeepServiceImpl extends ServiceImpl<LandUserKeepMapper, Lan
 
 
     @Override
-    public IPage<ViewLand> getLandUserKeepPage(Page page, LandUserKeep landUserKeep) {
-        if (null == landUserKeep.getUserId()){
-            landUserKeep.setUserId(SecurityUtils.getUser().getId());
-        }
-        List<ViewLand> landUserKeepPage = this.baseMapper.getLandUserKeepPage(page, landUserKeep);
+    public IPage<ViewLand> getLandUserKeepPage(Page page, LandUserKeepVo landUserKeepVo) {
+        landUserKeepVo.setUserId(SecurityUtils.getUser().getId());
+        List<ViewLand> landUserKeepPage = this.baseMapper.getLandUserKeepPage(page, landUserKeepVo);
         return page.setRecords(landUserKeepPage);
     }
 

air/src/main/java/com/air/applets/service/impl/ViewLandServiceImpl.java

@@ -1,5 +1,6 @@
 package com.air.applets.service.impl;
 
+import com.air.applets.dto.LandStatisticsDto;
 import com.air.applets.entity.ViewLand;
 import com.air.applets.mapper.ViewLandMapper;
 import com.air.applets.service.ViewLandService;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author peihao
  * @date 2021-11-25 15:47:04
@@ -16,4 +19,8 @@ import org.springframework.stereotype.Service;
 public class ViewLandServiceImpl extends ServiceImpl<ViewLandMapper, ViewLand> implements ViewLandService {
 
 
+    @Override
+    public List<LandStatisticsDto> getLandStatisticsOfCity() {
+        return this.baseMapper.getLandStatisticsOfCity();
+    }
 }

air/src/main/java/com/air/applets/vo/LandUserKeepVo.java

@@ -0,0 +1,29 @@
+package com.air.applets.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户看地收藏
+ *
+ * @author peihao
+ * @date 2021-11-25 15:47:04
+ */
+@Data
+@ApiModel(value = "")
+public class LandUserKeepVo {
+
+    private static final long serialVersionUID = 1L;
+    @JsonIgnore
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "行政区")
+    private String canton;
+    @ApiModelProperty(value = "交易状态")
+    private String transactionStatus;
+
+}

air/src/main/java/com/air/cityarea/controller/ReportController.java

@@ -51,6 +51,7 @@ public class ReportController {
         if (CollectionUtil.isNotEmpty(reportPage.getRecords())){
             reportPage.getRecords().stream().forEach(e -> {
                 e.setFilePath(fileUtil.getUrlByInnerPath(e.getFilePath()));
+                e.setReportCoverPath(fileUtil.getUrlByInnerPath(e.getReportCoverPath()));
                 e.setReportTypeName(ReportTypeEnum.getName(e.getReportType()));
                 e.setStatusName(ReportStatusEnum.getName(e.getStatusCd()));
             });
@@ -72,6 +73,7 @@ public class ReportController {
             return R.failed("id正确");
         }
         report.setFilePath(fileUtil.getUrlByInnerPath(report.getFilePath()));
+        report.setReportCoverPath(fileUtil.getUrlByInnerPath(report.getReportCoverPath()));
         report.setReportTypeName(ReportTypeEnum.getName(report.getReportType()));
         return R.ok(report);
     }
@@ -99,6 +101,7 @@ public class ReportController {
             return R.failed("id不能为空");
         }
         report.setFilePath(fileUtil.getInnerPath(report.getFilePath()));
+        report.setReportCoverPath(fileUtil.getInnerPath(report.getReportCoverPath()));
         return R.ok(reportService.updateById(report));
     }
 

air/src/main/java/com/air/cityarea/entity/Report.java

@@ -34,6 +34,8 @@ public class Report extends Model<Report> {
     private String reportName;
     @ApiModelProperty(value="报告类型")
     private String reportType;
+    @ApiModelProperty(value="报告封面地址")
+    private String reportCoverPath;
     @ApiModelProperty(value="文件类型")
     private String fileType;
     @ApiModelProperty(value="文件地址")

air/src/main/java/com/air/enums/ReportTypeEnum.java

@@ -12,7 +12,8 @@ import java.util.Optional;
 public enum ReportTypeEnum {
 
     PROMOTION_REPORT("promotionReport","土地推介"),
-    RESEARCH_REPORT("researchReport","研究报告");
+    RESEARCH_REPORT("researchReport","研究报告"),
+    FEA_STUDY_REPORT("feaStudyReport","air可研");
 
 
     private final String code;

air/src/main/resources/mapper/LandUserKeepMapper.xml

@@ -8,8 +8,14 @@
         select vl.*,lu.id landUserkeepId from land_user_keep lu join view_land vl on vl.land_listed_id = lu.land_id
         <where>
             lu.user_id = #{param.userId}
-            <if test="param.landType != null">
-                and lu.land_type = #{param.landType}
+            <if test="param.city != null and param.city != ''">
+                and vl.city = #{param.city}
+            </if>
+            <if test="param.canton != null and param.canton != ''">
+                and vl.canton = #{param.canton}
+            </if>
+            <if test="param.transactionStatus != null and param.transactionStatus != ''">
+                and vl.transaction_status = #{param.transactionStatus}
             </if>
         </where>
     </select>