2.0.0 新增收藏地块校验接口

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

@@ -28,11 +28,11 @@ public class AppletsMapController {
 
 
     /**
-     * 根据定位经纬度范围行政区数据
+     * 查询城市行政区信息
      *
      * @return
      */
-    @ApiOperation(value = "根据定位经纬度范围行政区数据", notes = "根据定位经纬度范围行政区数据")
+    @ApiOperation(value = "查询城市行政区信息", notes = "查询城市行政区信息")
     @GetMapping("getRegionByLocation")
     public R<List<LandLonLatDto>> getRegionByLocation(String city) {
         return R.ok(mapService.getRegionByLocation(city), "查询成功");
@@ -57,52 +57,52 @@ public class AppletsMapController {
 
 
     /**
-     * 根据定位经纬度返回5公里范围内的大组团小组团
+     * 查询城市的大组团和小组团信息
      *
      * @param type 组团类型（表名）
      * @return
      */
-    @ApiOperation(value = "根据定位经纬度返回5公里范围内的大组团小组团", notes = "根据定位经纬度返回5公里范围内的大组团小组团")
+    @ApiOperation(value = "查询城市的大组团和小组团信息（typ:dazutuan,xiaozutuan）", notes = "查询城市的大组团和小组团信息（typ:dazutuan,xiaozutuan）")
     @GetMapping("getTypeRegionByLocation")
     public R<List<LandLonLatDto>> getTypeRegionByLocation(@RequestParam String type,String city) {
         return R.ok(mapService.getTypeRegionByLocation(type,city), "查询成功");
     }
 
     /**
-     * 根据定位经纬度范围行政区数据
+     * 查询城市环线数据
      *
      * @return
      */
-    @ApiOperation(value = "根据定位经纬度范围行政区数据", notes = "根据定位经纬度范围行政区数据")
+    @ApiOperation(value = "查询城市环线数据", notes = "查询城市环线数据")
     @GetMapping("getLoopLine")
     public R<List<LandLonLatDto>> getLoopLine(String city) {
         return R.ok(mapService.getLoopLine(city), "查询成功");
     }
 
     /**
-     * 获取拟挂牌地块数据
+     * 获取城市拟挂牌地块数据
      *
      * @return
      */
-    @ApiOperation(value = "获取拟挂牌地块数据", notes = "获取拟挂牌地块数据")
+    @ApiOperation(value = "获取城市拟挂牌地块数据", notes = "获取城市拟挂牌地块数据")
     @GetMapping("getLandToList")
     public R<List<LandLonLatDto>> getLandToList(String city) {
         return R.ok(mapService.getLandToList(city), "查询成功");
     }
 
     /**
-     * 获取挂牌中数据
+     * 根据获取城市挂牌中数据
      *
      * @return
      */
-    @ApiOperation(value = "获取挂牌中数据", notes = "获取挂牌中数据")
+    @ApiOperation(value = "根据获取城市挂牌中数据", notes = "根据获取城市挂牌中数据")
     @GetMapping("getLandListing")
     public R<List<LandLonLatDto>> getLandListing(String city) {
         return R.ok(mapService.getLandListing(city), "查询成功");
     }
 
     /**
-     * 获取出让地块数据
+     * 根据时间段获取城市出让地块数据
      *
      * @return
      */
@@ -118,11 +118,11 @@ public class AppletsMapController {
      * @author peihao
      * @date 2021/5/25
      **/
-    @ApiOperation(value = "设置行政区，环线，大组团，小组团经纬度", notes = "设置行政区，环线，大组团，小组团经纬度")
+    /*@ApiOperation(value = "设置行政区，环线，大组团，小组团经纬度", notes = "设置行政区，环线，大组团，小组团经纬度")
     @GetMapping(value = "/setGeom/{type}")
     public R setGeom(@PathVariable String type) {
         return R.ok(mapService.setGeom(type));
-    }
+    }*/
 
 }
 

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cinderella.framework.common.core.util.R;
 import com.cinderella.framework.common.data.mybatis.QueryPage;
+import com.cinderella.framework.common.security.util.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -51,14 +52,22 @@ public class LandUserKeepController {
     @ApiOperation(value = "新增用户收藏地块", notes = "新增用户收藏地块")
     @PostMapping
     public R<Boolean> save(@RequestBody @Validated LandUserKeep landUserKeep) {
-        List<LandUserKeep> list = userKeepService.list(Wrappers.<LandUserKeep>query().lambda().eq(LandUserKeep::getLandId, landUserKeep.getLandId())
-                .eq(LandUserKeep::getUserId, landUserKeep.getUserId()).eq(LandUserKeep::getLandType, landUserKeep.getLandType()));
-        if (CollectionUtil.isNotEmpty(list)) {
+        if (userKeepService.verifyCollect(landUserKeep.getLandId(), landUserKeep.getLandType())) {
             return R.failed("该地块已收藏，无需再次收藏");
         }
+        landUserKeep.setUserId(SecurityUtils.getUser().getId());
         return R.ok(userKeepService.save(landUserKeep));
     }
 
+    @ApiOperation(value = "校验用户是否已收藏该地块", notes = "校验用户是否已收藏该地块（0：待挂牌，1：已挂牌）")
+    @GetMapping
+    public R<Boolean> verifyCollect(@RequestParam String landId,@RequestParam Integer landType) {
+        if (userKeepService.verifyCollect(landId,landType)) {
+            return R.failed("该地块已收藏，无需再次收藏");
+        }
+        return R.ok();
+    }
+
     /**
      * 通过id批量删除
      *

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cinderella.framework.common.core.util.R;
 import com.cinderella.framework.common.data.mybatis.QueryPage;
+import com.cinderella.framework.common.security.util.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -36,6 +37,7 @@ public class PlanLandController {
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page")
     public R<IPage<PlanLand>> getPlanLandPage(QueryPage page, PlanLand planLand) {
+        planLand.setCreateUserId(SecurityUtils.getUser().getId().toString());
         return R.ok(planLandService.page(page.toPage(), Wrappers.query(planLand).lambda().orderByDesc(PlanLand::getCreateDate)));
     }
 

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

@@ -5,6 +5,7 @@ import com.air.applets.entity.ViewLand;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author peihao
@@ -22,4 +23,6 @@ public interface LandUserKeepService extends IService<LandUserKeep> {
      **/
     IPage<ViewLand> getLandUserKeepPage(Page page, LandUserKeep landUserKeep);
 
+    boolean verifyCollect(String landId,Integer landType);
+
 }

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

@@ -1,10 +1,12 @@
 package com.air.applets.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 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.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cinderella.framework.common.security.util.SecurityUtils;
@@ -30,4 +32,11 @@ public class LandUserKeepServiceImpl extends ServiceImpl<LandUserKeepMapper, Lan
         List<ViewLand> landUserKeepPage = this.baseMapper.getLandUserKeepPage(page, landUserKeep);
         return page.setRecords(landUserKeepPage);
     }
+
+    @Override
+    public boolean verifyCollect(String landId, Integer landType) {
+        List<LandUserKeep> list = this.list(Wrappers.<LandUserKeep>query().lambda().eq(LandUserKeep::getLandId,landId)
+                .eq(LandUserKeep::getUserId, SecurityUtils.getUser().getId()).eq(LandUserKeep::getLandType, landType));
+        return CollectionUtil.isNotEmpty(list)?true:false;
+    }
 }

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

@@ -15,6 +15,7 @@ import com.air.applets.entity.PlanSpot;
 import com.air.applets.mapper.PlanSpotMapper;
 import com.air.applets.service.PlanSpotService;
 import com.cinderella.framework.common.core.exception.BusinessException;
+import com.cinderella.framework.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +43,7 @@ public class PlanSpotServiceImpl extends ServiceImpl<PlanSpotMapper, PlanSpot> i
         PlanLand planLand = new PlanLand();
         BeanUtil.copyProperties(planLandVo,planLand);
         planLand.setPlanName(DateUtil.fromString(LocalDate.now(),"yyyy-MM-dd")+" 看地计划");
+        planLand.setCreateUserId(SecurityUtils.getUser().getId().toString());
         planLandMapper.insert(planLand);
 
         List<PlanSpot> planSpots = planLandSpotVo.getPlanSpotVos().stream().map(e -> {