添加 我的收藏 添加新功能

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

@@ -14,6 +14,7 @@ import com.cinderella.framework.common.security.util.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,6 +30,7 @@ import java.util.Optional;
 @AllArgsConstructor
 @RequestMapping("/landUserKeep")
 @Api(value = "landUserKeep", tags = "小程序用户地块收藏管理")
+@Slf4j
 public class LandUserKeepController {
 
     private final LandUserKeepService userKeepService;
@@ -41,8 +43,9 @@ public class LandUserKeepController {
      * @return
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
-    @GetMapping("/page")
-    public R<IPage<ViewLand>> getLandUserKeepPage(QueryPage page, LandUserKeepVo landUserKeepVo) {
+    @PostMapping("/page")
+    public R<IPage<ViewLand>> getLandUserKeepPage( QueryPage page,@RequestBody @Validated LandUserKeepVo landUserKeepVo) {
+        log.info("用户收藏查询参数==={}",landUserKeepVo);
         return R.ok(userKeepService.getLandUserKeepPage(page.toPage(), landUserKeepVo));
     }
 
@@ -55,6 +58,12 @@ public class LandUserKeepController {
     @ApiOperation(value = "新增用户收藏地块", notes = "新增用户收藏地块")
     @PostMapping
     public R<Integer> save(@RequestBody @Validated LandUserKeep landUserKeep) {
+        //查询用户每个地区是否添加至20条
+        Optional<Integer> integer = userKeepService.verifyCollectNumber(landUserKeep.getLandId(), landUserKeep.getLandType(),SecurityUtils.getUser().getId());
+        if (integer.isPresent()) {
+            return R.failed("该城市收藏数量已达上限！");
+        }
+        //查询地块是否添加
         Optional<Integer> optional = userKeepService.verifyCollect(landUserKeep.getLandId(), landUserKeep.getLandType());
         if (optional.isPresent()) {
             return R.failed(optional.get(),"该地块已收藏，无需再次收藏");
@@ -83,6 +92,7 @@ public class LandUserKeepController {
     @ApiOperation(value = "通过id批量删除", notes = "通过id批量删除")
     @DeleteMapping("removeByIds")
     public R<Boolean> removeByIds(@RequestParam List<Integer> ids) {
+        log.info("{}",ids.size());
         return R.ok(userKeepService.removeByIds(ids), "删除成功");
     }
 }

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

@@ -3,12 +3,14 @@ package com.air.applets.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 地块视图（包含待挂牌和已挂牌）
@@ -48,4 +50,8 @@ public class ViewLand extends Model<ViewLand> {
     @TableField(exist = false)
     @ApiModelProperty(value = "用户收藏id")
     private Integer landUserkeepId;
+
+    @ApiModelProperty(value = "拍卖日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date auctionDate;
 }

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

@@ -29,4 +29,12 @@ public interface LandUserKeepService extends IService<LandUserKeep> {
 
     Optional<Integer> verifyCollect(String landId, Integer landType);
 
+    /**
+     * 查询当前地区是否到达20条
+     * @param landId
+     * @param landType
+     * @return
+     */
+    Optional<Integer> verifyCollectNumber(String landId, Integer landType,Integer userId);
+
 }

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

@@ -1,17 +1,24 @@
 package com.air.applets.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 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.air.land.entity.LandListed;
+import com.air.land.entity.LandToList;
+import com.air.land.mapper.LandListedMapper;
+import com.air.land.mapper.LandToListMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 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;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.swing.text.html.Option;
@@ -26,6 +33,12 @@ import java.util.Optional;
 @AllArgsConstructor
 public class LandUserKeepServiceImpl extends ServiceImpl<LandUserKeepMapper, LandUserKeep> implements LandUserKeepService {
 
+    @Autowired
+    private LandListedMapper landListedMapper;
+
+    @Autowired
+    private LandToListMapper landToListMapper;
+
 
     @Override
     public IPage<ViewLand> getLandUserKeepPage(Page page, LandUserKeepVo landUserKeepVo) {
@@ -37,9 +50,56 @@ public class LandUserKeepServiceImpl extends ServiceImpl<LandUserKeepMapper, Lan
 
     @Override
     public Optional<Integer> 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));
+        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) ? Optional.of(list.get(0).getId()) : Optional.empty();
+    }
+
+    /**
+     * 查询当前地区是否到达20条
+     * @param landId
+     * @param landType
+     * @param userId
+     * @return
+     */
+    @Override
+    public Optional<Integer> verifyCollectNumber(String landId, Integer landType,Integer userId) {
+        //查询当前添加的地块 城市
+        //待挂牌
+        String city = null;
+        if(landType == 0){
+            LandToList landToList = landToListMapper.selectOne(Wrappers.<LandToList>query().lambda().eq(LandToList::getProposedseriaId, landId));
+            city = landToList.getCity();
+        } else if(landType == 1){
+            LandListed landListed = landListedMapper.selectOne(Wrappers.<LandListed>query().lambda().eq(LandListed::getLandListedId, landId));
+            city = landListed.getCity();
+        }
+        List<LandUserKeep> list = this.list(Wrappers.<LandUserKeep>query().lambda()
+                .eq(LandUserKeep::getUserId, SecurityUtils.getUser().getId()));
+        int i = 0;
+        for (LandUserKeep landUserKeep : list) {
+            if(landUserKeep.getLandType() == 0){
+                LandToList landToList = landToListMapper.selectOne(Wrappers.<LandToList>query().lambda().eq(LandToList::getProposedseriaId, landUserKeep.getLandId()));
+                if(ObjectUtil.isNotNull(landToList) && StringUtils.isNotBlank(landToList.getCity()) ){
+                    System.out.println(landToList.getCity());
+                    if( landToList.getCity().equals(city)){
+                        i += 1;
+                    }
+                }
+            }else if(landUserKeep.getLandType() == 1){
+                LandListed landListed = landListedMapper.selectOne(Wrappers.<LandListed>query().lambda().eq(LandListed::getLandListedId, landUserKeep.getLandId()));
+                if(ObjectUtil.isNotNull(landListed) && StringUtils.isNotBlank(landListed.getCity()) ){
+                    if(landListed.getCity().equals(city)){
+                        System.out.println(landListed.getCity());
+                        i += 1;
+                    }
 
-        return CollectionUtil.isNotEmpty(list)? Optional.of(list.get(0).getId()) :Optional.empty();
+                }
+            }
+        }
+        return i > 20 ? Optional.of(20) : Optional.empty();
     }
 }

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * 用户看地收藏
  *
@@ -28,4 +30,11 @@ public class LandUserKeepVo {
     @ApiModelProperty(value = "特征名称")
     private String characteristicName;
 
+    @ApiModelProperty(value="开始时间")
+    private String startDate;
+
+    @ApiModelProperty(value="结束时间")
+    private String endDate;
+
+
 }

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

@@ -5,7 +5,8 @@
 <mapper namespace="com.air.applets.mapper.LandUserKeepMapper">
 
     <select id="getLandUserKeepPage" resultType="com.air.applets.entity.ViewLand">
-        select vl.*,lu.id landUserkeepId from land_user_keep lu join view_land vl on vl.land_listed_id = lu.land_id
+        select vl.*,lu.id landUserkeepId ,ll.auction_date auctionDate from land_user_keep lu join view_land vl on vl.land_listed_id = lu.land_id
+        JOIN land_listed ll on ll.land_listed_id = lu.land_id
         <where>
             lu.user_id = #{param.userId}
             <if test="param.city != null and param.city != ''">
@@ -14,6 +15,9 @@
             <if test="param.canton != null and param.canton != ''">
                 and vl.canton = #{param.canton}
             </if>
+            <if test="param.startDate != null and param.startDate != '' "> and ll.auction_date &gt;= #{param.startDate}</if>
+            <if test="param.endDate != null and param.endDate != '' "> and ll.auction_date &lt;= #{param.endDate}</if>
+
             <if test="param.transactionStatus != null and param.transactionStatus != ''">
                 and vl.transaction_status = #{param.transactionStatus}
             </if>