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

 Conflicts:

	air/src/main/java/com/air/housing/entity/HousingEstates.java

	air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java

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

@@ -0,0 +1,30 @@
+package com.air.enums;
+
+import lombok.Getter;
+
+/**
+ * 楼栋信息爬虫数据状态
+ *
+ * @author peihao
+ * @date 2021-05-20
+ **/
+@Getter
+public enum BlocksOriginStatusEnum {
+    /**
+     * 待处理
+     */
+    READY_TO_HANDLE("0","待处理"),
+    /**
+     * 已处理
+     */
+    HANDLED("1","已处理");
+
+    private final String code;
+    private final String name;
+
+    BlocksOriginStatusEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+}

air/src/main/java/com/air/housing/entity/Format.java

@@ -1,5 +1,6 @@
 package com.air.housing.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.math.BigDecimal;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -18,7 +20,7 @@ import java.time.LocalDateTime;
  * @date 2021-06-09 09:13:16
  */
 @Data
-@TableName("format")
+@TableName("`format`")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "业态信息")
 public class Format extends Model<Format> {
@@ -34,6 +36,7 @@ private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "大业态")
     private String largeFormat;
     @ApiModelProperty(value = "业态")
+    @TableField(value = "`format`")
     private String format;
     @ApiModelProperty(value = "拟售总价")
     private BigDecimal preTotalPrice;

air/src/main/java/com/air/housing/entity/HousingEstates.java

@@ -1,6 +1,5 @@
 package com.air.housing.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -51,6 +50,7 @@ public class HousingEstates extends Model<HousingEstates> {
     private String largeFormat;
 
     @ApiModelProperty(value = "业态")
+    @TableField(value = "`format`")
     private String format;
 
     @ApiModelProperty(value = "拟售总价")

air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java

@@ -1,13 +1,16 @@
 package com.air.housing.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.air.enums.BlocksOriginStatusEnum;
+import com.air.housing.dto.HousingDefine;
 import com.air.housing.entity.Blocks;
 import com.air.housing.entity.Format;
 import com.air.housing.entity.Houses;
-import com.air.housing.dto.HousingDefine;
 import com.air.housing.entity.HousingEstates;
 import com.air.housing.mapper.HousingEstatesMapper;
+import com.air.housing.service.BlocksService;
 import com.air.housing.service.FormatService;
+import com.air.housing.service.HousesService;
 import com.air.housing.service.HousingEstatesService;
 import com.air.housing.vo.HousingEstatesDetail;
 import com.air.housing.vo.HousingEstatesName;
@@ -17,8 +20,6 @@ import com.air.origin.entity.BlocksOrigin;
 import com.air.origin.entity.HousesOrigin;
 import com.air.origin.service.BlocksOriginService;
 import com.air.origin.service.HousesOriginService;
-import com.air.housing.service.BlocksService;
-import com.air.housing.service.HousesService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -55,6 +56,7 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
     private LandListedService landListedService;
     @Autowired
     private FormatService formatService;
+
     @Override
     public IPage<HousingEstatesName> getHousingEstatesNamePage(IPage<HousingEstatesName> page, String name) {
 
@@ -96,6 +98,9 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
             format.setFormat(housingDefine.getFormat());
             formatService.save(format);
         }
+        //origin更新为已处理
+        blocksOrigin.setStatusCd(BlocksOriginStatusEnum.HANDLED.getCode());
+        blocksOrigin.updateById();
         return true;
     }
 

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

@@ -4,14 +4,18 @@ import cn.hutool.core.bean.BeanUtil;
 import com.air.land.entity.AuctionRecord;
 import com.air.land.service.AuctionRecordService;
 import com.air.land.vo.AuctionRecordVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import sun.jvm.hotspot.debugger.Page;
 
 import java.util.List;
 
@@ -24,8 +28,8 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/auctionrecord")
+@RequestMapping("/auction_record")
-@Api(value = "auctionrecord", tags = "参拍记录表管理")
+@Api(value = "auction_record", tags = "参拍记录表管理")
 public class AuctionRecordController {
 
     private final AuctionRecordService auctionRecordService;
@@ -37,12 +41,15 @@ public class AuctionRecordController {
      * @return
      */
     @ApiOperation(value = "查询参拍记录列表", notes = "查询参拍记录列表")
-    @GetMapping("/list/{landListedId}")
+    @GetMapping("/list")
-    public R<List<AuctionRecord>> getAuctionRecordPage(@PathVariable Long landListedId) {
+    public R<IPage<AuctionRecord>> getAuctionRecordPage(QueryPage page, @RequestParam(required = false) Long landListedId) {
-        List<AuctionRecord> list = auctionRecordService.list(Wrappers.<AuctionRecord>query().lambda()
+        LambdaQueryWrapper<AuctionRecord> lambda = Wrappers.<AuctionRecord>query().lambda();
-                .eq(AuctionRecord::getLandListedId, landListedId)
+        if (landListedId != null) {
-                .orderByDesc(AuctionRecord::getUpdateDate));
+            lambda.eq(AuctionRecord::getLandListedId, landListedId);
-        return R.ok(list, "查询成功");
+        }
+        IPage<AuctionRecord> recordPage = auctionRecordService.page(page.toPage(),
+                lambda.orderByDesc(AuctionRecord::getUpdateDate));
+        return R.ok(recordPage, "查询成功");
     }
 
     /**