立业人接口

src/main/java/com/lyy/admin/DTO/LandPageDto.java

+package com.lyy.admin.DTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @Author:zhouxudong
+ * @version: 1.0
+ * @Date: 2023/11/22 14:36
+ * @Description: 土地分页查询参数
+ */
+@Data
+@ApiModel(value = "土地分页查询参数", description = "")
+public class LandPageDto {
+    /** 地块名称 */
+    @ApiModelProperty(value = "地块名称")
+    private String name;
+    /** 省份 */
+    @ApiModelProperty(value = "省份", notes = "")
+    private String provinceName;
+    /** 省份编码 */
+    @ApiModelProperty(value = "省份编码", notes = "")
+    private String provinceCode;
+    /** 城市编码 */
+    @ApiModelProperty(value = "城市编码", notes = "")
+    private String cityCode;
+    /** 城市名称 */
+    @ApiModelProperty(value = "城市名称", notes = "")
+    private String cityName;
+    /** 区县编码 */
+    @ApiModelProperty(value = "区县编码", notes = "")
+    private String regionCode;
+    /** 区县名称 */
+    @ApiModelProperty(value = "区县名称", notes = "")
+    private String regionName;
+    /** 土地类型（1：工业土地 2：商业土地） */
+    @ApiModelProperty(value = "土地类型", notes = "")
+    private String landType;
+
+    @ApiModelProperty(value = "价格")
+    private String price;
+    @ApiModelProperty(value = "面积")
+    private String area;
+
+    @ApiModelProperty(value = "招商方向产业分类")
+    private String investmentDirection;
+
+    @ApiModelProperty("所属开发区id")
+    private Integer developmentId;
+
+    @ApiModelProperty(hidden = true)
+    private Double lowPrice;
+
+    @ApiModelProperty(hidden = true)
+    private Double highPrice;
+
+    @ApiModelProperty(hidden = true)
+    private Double lowArea;
+
+    @ApiModelProperty(hidden = true)
+    private Double highArea;
+}

src/main/java/com/lyy/admin/VO/DevelopmentInfoAllSaveVO.java

@@ -30,7 +30,7 @@ public class DevelopmentInfoAllSaveVO {
     private List<DevelopmentIndustryFundInfo> industryFundInfos = new ArrayList<>();
 
     @ApiModelProperty(value = "土地信息")
-    private List<DevelopmentIndustrialLandInfo> industryLandInfos = new ArrayList<>();
+    private List<LandInfoEntity> industryLandInfos = new ArrayList<>();
 
     @ApiModelProperty(value = "开发区图片上传")
     private List<String> carouselUrls = new ArrayList<>();

src/main/java/com/lyy/admin/VO/DevelopmentInfoAllVO.java

@@ -22,6 +22,6 @@ public class DevelopmentInfoAllVO {
 //    private List<DevelopmentIndustryPolicyInfo> developmentIndustryPolicyInfoList = new ArrayList<>();
     private JSONArray developmentIndustryPolicyInfoList = new JSONArray();
     private List<DevelopmentIndustryFundInfo> developmentIndustryFundInfoList = new ArrayList<>();
-    private List<DevelopmentIndustrialLandInfo> developmentIndustrialLandInfoList = new ArrayList<>();
+    private List<LandInfoEntity> developmentIndustrialLandInfoList = new ArrayList<>();
     private List<DevelopmentInvestmentDirectionInfo> developmentInvestmentDirectionInfoList = new ArrayList<>();
 }

src/main/java/com/lyy/admin/VO/LandDetailDevelopment.java

+package com.lyy.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author:zhouxudong
+ *
+ * @version: 1.0 @Date: 2023/11/22 15:52 @Description: 土地详情中的开发区信息
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@ApiModel(value = "土地详情中的开发区信息")
+public class LandDetailDevelopment {
+
+
+  /** id */
+  @ApiModelProperty(name = "id", notes = "")
+  private Integer id;
+  /** 省份 */
+  @ApiModelProperty(name = "省份", notes = "")
+  private String provinceName;
+  /** 省份编码 */
+  @ApiModelProperty(name = "省份编码", notes = "")
+  private String provinceCode;
+  /** 城市编码 */
+  @ApiModelProperty(name = "城市编码", notes = "")
+  private String cityCode;
+  /** 城市名称 */
+  @ApiModelProperty(name = "城市名称", notes = "")
+  private String cityName;
+  /** 区县编码 */
+  @ApiModelProperty(name = "区县编码", notes = "")
+  private String regionCode;
+  /** 区县名称 */
+  @ApiModelProperty(name = "区县名称", notes = "")
+  private String regionName;
+  //------------------------------------------
+  /** 片区名称 */
+  @ApiModelProperty(value = "片区名称")
+  private String name;
+  // 图片链接
+  @ApiModelProperty(value = "图片链接")
+  private String imgUrl;
+
+  /** 片区级别 */
+  @ApiModelProperty(value = "片区级别")
+  private String levelCode;
+
+  /** 片区级别 */
+  @ApiModelProperty(value = "片区级别名称")
+  private String levelName;
+
+  // 类型
+  @ApiModelProperty(value = "类型")
+  private String type;
+
+  /** 规划面积（平方公里） */
+  @ApiModelProperty(value = "规划面积")
+  private BigDecimal planArea;
+
+  @ApiModelProperty(value = "产业方向")
+  private List<String> developmentInvestment=new ArrayList<>();
+
+  @ApiModelProperty(value = "经度（坐标系gcj02）")
+  private BigDecimal longitude;
+
+  @ApiModelProperty(value = "纬度（坐标系gcj02）")
+  private BigDecimal latitude;
+}

src/main/java/com/lyy/admin/VO/LandDetailVo.java

+package com.lyy.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author:zhouxudong
+ * @version: 1.0
+ * @Date: 2023/11/22 15:42
+ * @Description: 土地详情查询
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@ApiModel(value = "土地详情查询")
+public class LandDetailVo {
+    @ApiModelProperty(value = "主键")
+    private int id;
+    @ApiModelProperty(value = "联系人")
+    private String contacterName;
+    /** 地块名称 */
+    @ApiModelProperty(value = "地块名称")
+    private String name;
+    /** 详细地址 */
+    @ApiModelProperty(name = "详细地址", notes = "")
+    private String address;
+
+    /** 面积（亩） */
+    @ApiModelProperty(value = "面积（亩）")
+    private BigDecimal area;
+
+    @ApiModelProperty(value = "产业方向")
+    private String industryDirection;
+
+    /** 土地现状 */
+    @ApiModelProperty(value = "土地现状")
+    private String landStatus;
+
+    /** 所属片区 */
+    @ApiModelProperty(hidden = true)
+    private Integer developmentId;
+
+
+//    @ApiModelProperty(value = "联系电话")
+//    private String contacterPhone;
+
+    @ApiModelProperty(value = "价格")
+    private Double price;
+
+    @ApiModelProperty(value = "首屏图片")
+    private String imgUrl;
+
+    /** 土地类型（1：工业土地 2：商业土地） */
+    @ApiModelProperty(name = "土地类型（工业土地 商业土地）", notes = "")
+    private String type;
+    /** 容积率 */
+    @ApiModelProperty(name = "容积率", notes = "")
+    private String ratio;
+    /** 土地证价格 */
+    @ApiModelProperty(name = "土地证价格", notes = "")
+    private String landDeed;
+    /** 出让年限 */
+    @ApiModelProperty(name = "出让年限", notes = "")
+    private String ageLimit;
+    /** 开发程度 */
+    @ApiModelProperty(name = "开发程度", notes = "")
+    private String developLevel;
+    /** 出让状态 */
+    @ApiModelProperty(name = "出让状态", notes = "")
+    private String shellState;
+    /** 持有方类别 */
+    @ApiModelProperty(name = "持有方类别", notes = "")
+    private String holderType;
+    /** 总投资额 */
+    @ApiModelProperty(name = "总投资额", notes = "")
+    private String totalInvestment;
+    /** 亩均年产值 */
+    @ApiModelProperty(name = "亩均年产值", notes = "")
+    private String outputValue;
+    /** 亩均投资强度 */
+    @ApiModelProperty(name = "亩均投资强度", notes = "")
+    private String investNum;
+    /** 亩均税收 */
+    @ApiModelProperty(name = "亩均税收", notes = "")
+    private String taxRevenue;
+    /** 建设周期 */
+    @ApiModelProperty(name = "建设周期", notes = "")
+    private String constructionCycle;
+    /** 能评要求 */
+    @ApiModelProperty(name = "能评要求", notes = "")
+    private String energyRequire;
+
+    //----------------招商方向---------------------
+    @ApiModelProperty(value = "招商方向")
+    private List<CarrierInvestmentVo> investmentDetails;
+
+    @ApiModelProperty(value = "轮播图")
+    private List<String> imgUrlList;
+
+
+    @ApiModelProperty(value = "土地开发区信息")
+    private LandDetailDevelopment development;
+}

src/main/java/com/lyy/admin/VO/LandPageVo.java

+package com.lyy.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author:zhouxudong
+ *
+ * @version: 1.0 @Date: 2023/11/22 14:28 @Description: 土地分页信息
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@ApiModel(value = "")
+public class LandPageVo {
+  /** 主键id */
+  @ApiModelProperty(value = "id")
+  private Integer id;
+  /** 地块名称 */
+  @ApiModelProperty(value = "地块名称")
+  private String name;
+  /** 面积（亩） */
+  @ApiModelProperty(value = "面积（亩）")
+  private BigDecimal area;
+  /** 省份 */
+  @ApiModelProperty(name = "省份", notes = "")
+  private String provinceName;
+  /** 省份编码 */
+  @ApiModelProperty(name = "省份编码", notes = "")
+  private String provinceCode;
+  /** 城市编码 */
+  @ApiModelProperty(name = "城市编码", notes = "")
+  private String cityCode;
+  /** 城市名称 */
+  @ApiModelProperty(name = "城市名称", notes = "")
+  private String cityName;
+  /** 区县编码 */
+  @ApiModelProperty(name = "区县编码", notes = "")
+  private String regionCode;
+  /** 区县名称 */
+  @ApiModelProperty(name = "区县名称", notes = "")
+  private String regionName;
+
+  @ApiModelProperty(name = "土地类型名称", notes = "")
+  private String type;
+
+  @ApiModelProperty(value = "价格")
+  private Double price;
+
+  @ApiModelProperty(value = "首屏图片")
+  private String imgUrl;
+
+  // 开发区名称
+  @ApiModelProperty(hidden = true)
+  private String developmentName;
+}

src/main/java/com/lyy/admin/common/interceptor/LoginInterceptor.java

@@ -42,10 +42,10 @@ public class LoginInterceptor implements HandlerInterceptor {
         if(requestURI.contains("/api/liyeren")){
             //立业人请求接口
             //查询白名单
-//            String ip = IpUtils.getIpAddr(request);
-//            if(StringUtils.isEmpty(ip)||!whiteIp.contains(ip)){
-//                throw new LiyerenException("没有请求权限");
-//            }
+            String ip = IpUtils.getIpAddr(request);
+            if(StringUtils.isEmpty(ip)||!whiteIp.contains(ip)){
+                throw new LiyerenException("没有请求权限");
+            }
             return true;
         }
 

src/main/java/com/lyy/admin/common/page/TableDataInfo.java

@@ -31,6 +31,7 @@ public class TableDataInfo implements Serializable
     {
     }
 
+
     /**
      * 分页
      * 

src/main/java/com/lyy/admin/controller/api/ApiController.java

@@ -4,8 +4,10 @@ import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.AES;
 import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 import com.lyy.admin.DTO.CarrierPageDto;
+import com.lyy.admin.DTO.LandPageDto;
 import com.lyy.admin.VO.*;
 import com.lyy.admin.VO.sms.SendPhoneVo;
 import com.lyy.admin.common.anno.Decrypt;
@@ -140,7 +142,7 @@ public class ApiController extends BaseController {
 
 
     @PostMapping("/carrier/pageList")
-    @ApiOperation(value = "分页获取载体信息")
+    @ApiOperation(value = "载体分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "第几页（可为空，后台默认值：1）", type = "String"),
             @ApiImplicitParam(name = "pageSize", value = "每页展示数据量（可为空，后台默认值：10）", type = "String"),
@@ -159,6 +161,28 @@ public class ApiController extends BaseController {
     public CarrierDetailVo carrierDetail(@PathVariable Integer id) {
         return carrierInfoService.detail(id);
     }
+
+    @PostMapping("/land/pageList")
+    @ApiOperation(value = "土地分页信息", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "第几页（可为空，后台默认值：1）", type = "String"),
+            @ApiImplicitParam(name = "pageSize", value = "每页展示数据量（可为空，后台默认值：10）", type = "String"),
+            @ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
+            @ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
+    })
+    public TableDataInfo landPageList(LandPageDto landPageDto) {
+        startPage();
+        List<LandPageVo> carrierPageVos =  landInfoService.pageList(landPageDto);
+        return getDataTable(carrierPageVos);
+    }
+
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "土地详情信息", notes = "rest风格传参，将参数拼接在url上")
+    @ApiImplicitParam(name = "id", value = "土地id", type = "Integer")
+    public LandDetailVo detail(@PathVariable Integer id) {
+        return landInfoService.detail(id);
+    }
+
     @GetMapping("/getHomePage")
     @ApiOperation(value = "园区总数、开发区总数、土地总数、载体总数、、热点园区", notes = "")
     @ApiImplicitParam(name = "area", value = "所选区域名称", type = "String", readOnly = true)

src/main/java/com/lyy/admin/controller/developmentinfo/LandInfoController.java

@@ -6,8 +6,8 @@ import com.lyy.admin.VO.LandInfoVO;
 import com.lyy.admin.common.page.TableDataInfo;
 import com.lyy.admin.controller.BaseController;
 import com.lyy.admin.domain.SysCollection;
-import com.lyy.admin.domain.developmentinfo.DevelopmentIndustrialLandInfo;
 import com.lyy.admin.domain.developmentinfo.DevelopmentInfo;
+import com.lyy.admin.domain.developmentinfo.LandInfoEntity;
 import com.lyy.admin.domain.developmentinfo.LandInfoParam;
 import com.lyy.admin.enumerate.SysCollectionTypeEnum;
 import com.lyy.admin.enumerate.YesOrNoEnum;
@@ -58,7 +58,7 @@ public class LandInfoController extends BaseController {
     private TableDataInfo getTableDataInfo(LandInfoParam landInfoParam) {
         boolean login = isLogin();
         startPage();
-        List<DevelopmentIndustrialLandInfo> landInfos = developmentIndustrialLandInfoService.listByParam(landInfoParam);
+        List<LandInfoEntity> landInfos = developmentIndustrialLandInfoService.listByParam(landInfoParam);
         List<Integer> developIdList = landInfos.stream().map(land -> {
             return land.getDevelopmentId();
         }).collect(Collectors.toList());
@@ -67,7 +67,7 @@ public class LandInfoController extends BaseController {
         Map<Integer, Integer> developmentIdAndStatus = developmentInfos1.stream().collect(Collectors.toMap(DevelopmentInfo::getId, developmentInfo -> developmentInfo.getStatus()));
 
         List<LandInfoVO> landInfoVOS = new ArrayList<>();
-        for (DevelopmentIndustrialLandInfo landInfo : landInfos) {
+        for (LandInfoEntity landInfo : landInfos) {
             LandInfoVO landInfoVO = new LandInfoVO();
             BeanUtils.copyProperties(landInfo, landInfoVO);
             Integer developmentId = landInfo.getDevelopmentId();
@@ -93,7 +93,7 @@ public class LandInfoController extends BaseController {
     @ApiOperation(value = "某个土地信息", notes = "rest风格传参，将参数拼接在url上")
     @ApiImplicitParam(name = "id", value = "土地id", type = "Integer")
     public LandInfoVO get(@PathVariable Integer id) {
-        DevelopmentIndustrialLandInfo landInfo = developmentIndustrialLandInfoService.getById(id);
+        LandInfoEntity landInfo = developmentIndustrialLandInfoService.getById(id);
         Integer developmentId = landInfo.getDevelopmentId();
         Integer landId = landInfo.getId();
         DevelopmentInfo developmentInfo = developmentInfoSerivce.getById(developmentId);
@@ -109,5 +109,9 @@ public class LandInfoController extends BaseController {
 
         return landInfoVO;
     }
+
+
+
+
 }
 

src/main/java/com/lyy/admin/controller/personalfunction/PersonalFunctionsController.java

@@ -79,7 +79,7 @@ public class PersonalFunctionsController extends BaseController {
     @PostMapping("/getParkSaveAuthentication")
     @ResponseBody
     @ApiOperation(value = "园区-我的录入",notes = "rest风格传参，将参数拼接在url上")
-    public List<ParkInfoListVO> getParkSaveAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
+    public TableDataInfo getParkSaveAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
         parkInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
         parkInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
         if(ObjectUtils.isNotEmpty(parkInfoAuthenticationParam.getStatus())){
@@ -92,7 +92,7 @@ public class PersonalFunctionsController extends BaseController {
         }
 //        PageUtils.startPage();
         List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList(parkInfoAuthenticationParam);
-        return parkInfoListVOS;
+        return getDataTable(parkInfoListVOS);
     }
 
     /**
@@ -102,7 +102,7 @@ public class PersonalFunctionsController extends BaseController {
     @PostMapping("/getParkEditAuthentication")
     @ResponseBody
     @ApiOperation(value = "园区-我的完善",notes = "")
-    public List<ParkInfoListVO> getParkEditAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
+    public TableDataInfo getParkEditAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
         parkInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
         parkInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
         if(ObjectUtils.isNotEmpty(parkInfoAuthenticationParam.getStatus())){
@@ -116,7 +116,7 @@ public class PersonalFunctionsController extends BaseController {
         }
 //        PageUtils.startPage();
         List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList( parkInfoAuthenticationParam);
-        return parkInfoListVOS;
+        return getDataTable(parkInfoListVOS);
     }
 
 
@@ -127,7 +127,7 @@ public class PersonalFunctionsController extends BaseController {
     @PostMapping("/getDevelopmentSaveAuthentication")
     @ResponseBody
     @ApiOperation(value = "开发区-我的录入",notes = "rest风格传参，将参数拼接在url上")
-    public List<DevelopmentInfoListVO> getDevelopmentSaveAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
+    public TableDataInfo getDevelopmentSaveAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
         developmentInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
         developmentInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
         if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationParam.getStatus())){
@@ -140,7 +140,7 @@ public class PersonalFunctionsController extends BaseController {
         }
 //        PageUtils.startPage();
         List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationParam);
-        return parkInfoListVOS;
+        return getDataTable(parkInfoListVOS);
     }
 
     /**
@@ -150,7 +150,7 @@ public class PersonalFunctionsController extends BaseController {
     @PostMapping("/getDevelopmentEditAuthentication")
     @ResponseBody
     @ApiOperation(value = "开发区-我的完善",notes = "rest风格传参，将参数拼接在url上")
-    public List<DevelopmentInfoListVO> getDevelopmentEditAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
+    public TableDataInfo getDevelopmentEditAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
         developmentInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
         developmentInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
         if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationParam.getStatus())){
@@ -164,7 +164,7 @@ public class PersonalFunctionsController extends BaseController {
         }
 //        PageUtils.startPage();
         List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationParam);
-        return parkInfoListVOS;
+        return getDataTable(parkInfoListVOS) ;
     }
 
 //    /**

src/main/java/com/lyy/admin/domain/developmentinfo/DevelopmentIndustrialLandInfo.java → src/main/java/com/lyy/admin/domain/developmentinfo/LandInfoEntity.java

@@ -10,6 +10,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * @TableName development_industrial_land_info
@@ -17,47 +18,33 @@ import java.math.BigDecimal;
 @TableName(value = "development_industrial_land_info")
 @Data
 @ApiModel(value = "土地信息")
-public class DevelopmentIndustrialLandInfo implements Serializable {
-    /**
-     * 主键id
-     */
+public class LandInfoEntity implements Serializable {
+    /** 主键id */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Integer id;
 
-    /**
-     * 持有方类别
-     */
-    @ApiModelProperty(value = "持有方类别")
+    /** 持有方类别 */
+    @ApiModelProperty(value = "土地类型（工业土地 商业土地）")
     private String type;
 
-    /**
-     * 地块名称
-     */
+    /** 地块名称 */
     @ApiModelProperty(value = "地块名称")
     private String name;
 
-    /**
-     * 位置信息（四至信息）
-     */
+    /** 位置信息（四至信息） */
     @ApiModelProperty(value = "位置信息（四至信息）")
     private String address;
 
-    /**
-     * 面积（亩）
-     */
+    /** 面积（亩） */
     @ApiModelProperty(value = "面积（亩）")
     private BigDecimal area;
 
-    /**
-     * 土地现状
-     */
+    /** 土地现状 */
     @ApiModelProperty(value = "土地现状")
     private String landStatus;
 
-    /**
-     * 所属片区
-     */
+    /** 所属片区 */
     @ApiModelProperty(hidden = true)
     private Integer developmentId;
 
@@ -73,6 +60,87 @@ public class DevelopmentIndustrialLandInfo implements Serializable {
     @ApiModelProperty(value = "价格")
     private Double price;
 
+    @ApiModelProperty(value = "首屏图片")
+    private String imgUrl;
+ /*
+ * // 省份
+  @ApiModelProperty(name = "省份", notes = "")
+  private String provinceName;
+  *//** 省份编码 *//*
+  @ApiModelProperty(name = "省份编码", notes = "")
+  private String provinceCode;
+  *//** 城市编码 *//*
+  @ApiModelProperty(name = "城市编码", notes = "")
+  private String cityCode;
+  *//** 城市名称 *//*
+  @ApiModelProperty(name = "城市名称", notes = "")
+  private String cityName;
+  *//** 区县编码 *//*
+  @ApiModelProperty(name = "区县编码", notes = "")
+  private String regionCode;
+  *//** 区县名称 *//*
+  @ApiModelProperty(name = "区县名称", notes = "")
+  private String regionName;
+  *//** 详细地址 *//*
+  @ApiModelProperty(name = "详细地址", notes = "")
+  private String addressDetails;
+  *//** 土地类型（1：工业土地 2：商业土地） *//*
+  @ApiModelProperty(name = "土地类型（1：工业土地 2：商业土地）", notes = "")
+  private String landType;
+  *//** 联系方式（新） *//*
+  @ApiModelProperty(name = "联系方式（新）", notes = "")
+  private String contactInformation;*/
+    /** 容积率 */
+    @ApiModelProperty(name = "容积率", notes = "")
+    private String ratio;
+    /** 土地证价格 */
+    @ApiModelProperty(name = "土地证价格", notes = "")
+    private String landDeed;
+    /** 出让年限 */
+    @ApiModelProperty(name = "出让年限", notes = "")
+    private String ageLimit;
+    /** 开发程度 */
+    @ApiModelProperty(name = "开发程度", notes = "")
+    private String developLevel;
+    /** 出让状态 */
+    @ApiModelProperty(name = "出让状态", notes = "")
+    private String shellState;
+    /** 持有方类别 */
+    @ApiModelProperty(name = "持有方类别", notes = "")
+    private String holderType;
+    /** 总投资额 */
+    @ApiModelProperty(name = "总投资额", notes = "")
+    private String totalInvestment;
+    /** 亩均年产值 */
+    @ApiModelProperty(name = "亩均年产值", notes = "")
+    private String outputValue;
+    /** 亩均投资强度 */
+    @ApiModelProperty(name = "亩均投资强度", notes = "")
+    private String investNum;
+    /** 亩均税收 */
+    @ApiModelProperty(name = "亩均税收", notes = "")
+    private String taxRevenue;
+    /** 建设周期 */
+    @ApiModelProperty(name = "建设周期", notes = "")
+    private String constructionCycle;
+    /** 能评要求 */
+    @ApiModelProperty(name = "能评要求", notes = "")
+    private String energyRequire;
+    /** 乐观锁 */
+    @ApiModelProperty(name = "乐观锁", notes = "")
+    private Integer version;
+    /** 创建人 */
+    @ApiModelProperty(name = "创建人", notes = "")
+    private String createBy;
+    /** 创建时间 */
+    @ApiModelProperty(name = "创建时间", notes = "")
+    private LocalDateTime createTime;
+    /** 更新人 */
+    @ApiModelProperty(name = "更新人", notes = "")
+    private String updateBy;
+    /** 更新时间 */
+    @ApiModelProperty(name = "更新时间", notes = "")
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/lyy/admin/mapper/developmentinfo/DevelopmentIndustrialLandInfoMapper.java

 package com.lyy.admin.mapper.developmentinfo;
 
-import com.lyy.admin.domain.developmentinfo.DevelopmentIndustrialLandInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lyy.admin.DTO.LandPageDto;
+import com.lyy.admin.VO.LandPageVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lyy.admin.domain.developmentinfo.LandInfoEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author 26996
@@ -9,9 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2023-09-19 17:24:27
 * @Entity com.lyy.admin.domain.developmentinfo.DevelopmentIndustrialLandInfo
 */
-public interface DevelopmentIndustrialLandInfoMapper extends BaseMapper<DevelopmentIndustrialLandInfo> {
+public interface DevelopmentIndustrialLandInfoMapper extends BaseMapper<LandInfoEntity> {
 
     Long count(String areaName);
+
+    List<LandPageVo> pageList( @Param("param") LandPageDto condition);
 }
 
 

src/main/java/com/lyy/admin/service/carrierinfo/impl/CarrierInfoServiceImpl.java

@@ -43,7 +43,6 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     SysDictDataService sysDictDataService;
 
     @Autowired
-    @Lazy
     ParkInfoService parkInfoService;
 
     @Autowired

src/main/java/com/lyy/admin/service/developmentinfo/DevelopmentIndustrialLandInfoService.java

 package com.lyy.admin.service.developmentinfo;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.lyy.admin.domain.developmentinfo.DevelopmentIndustrialLandInfo;
+import com.lyy.admin.DTO.LandPageDto;
+import com.lyy.admin.VO.LandDetailVo;
+import com.lyy.admin.VO.LandPageVo;
+import com.lyy.admin.domain.developmentinfo.LandInfoEntity;
 import com.lyy.admin.domain.developmentinfo.LandInfoParam;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -11,9 +15,13 @@ import java.util.List;
  * @description 针对表【development_industrial_land_info】的数据库操作Service
  * @createDate 2023-09-19 17:24:27
  */
-public interface DevelopmentIndustrialLandInfoService extends IService<DevelopmentIndustrialLandInfo> {
+public interface DevelopmentIndustrialLandInfoService extends IService<LandInfoEntity> {
 
-    List<DevelopmentIndustrialLandInfo> listByParam(LandInfoParam landInfoParam);
+    List<LandInfoEntity> listByParam(LandInfoParam landInfoParam);
 
     Long count(String areaName);
+
+    public List<LandPageVo> pageList(LandPageDto landPageDto);
+
+    LandDetailVo detail(Integer id);
 }

src/main/java/com/lyy/admin/service/developmentinfo/DevelopmentInfoService.java

 package com.lyy.admin.service.developmentinfo;
 
-import com.lyy.admin.VO.DevelopmentInfoAllSaveVO;
-import com.lyy.admin.VO.ParkInfoListVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.lyy.admin.VO.*;
 import com.lyy.admin.common.page.TableDataInfo;
 import com.lyy.admin.domain.developmentinfo.DevelopmentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.lyy.admin.VO.DevelopmentInfoAllVO;
-import com.lyy.admin.VO.DevelopmentInfoListVO;
 import com.lyy.admin.domain.developmentinfo.DevelopmentInfoAuthenticationParam;
 import com.lyy.admin.domain.developmentinfo.DevelopmentInfoCollectionParam;
 import com.lyy.admin.domain.developmentinfo.DevelopmentInfoParam;
 import com.lyy.admin.domain.parkinfo.ParkInfoAuthenticationParam;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 * @author 26996
@@ -38,4 +39,14 @@ public interface DevelopmentInfoService extends IService<DevelopmentInfo> {
     public boolean isAlreadyAuthentication(Integer id);
 
     public DevelopmentInfoAllSaveVO getDevelopmentSaveInfo(Integer id, Integer userId);
+
+    public List<CarrierInvestmentVo> getInvestment(Integer developmentId);
+
+    /**
+     * @description: 查询开发区的一级招商方向
+     * @date: 2023/11/28 11:23
+     * @param: [parkId]
+     * @return: java.util.List<java.lang.String>
+     */
+    public List<String> investmentDirection(Integer developmentId);
 }

src/main/java/com/lyy/admin/service/developmentinfo/impl/DevelopmentIndustrialLandInfoServiceImpl.java

 package com.lyy.admin.service.developmentinfo.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lyy.admin.domain.developmentinfo.DevelopmentIndustrialLandInfo;
+import com.lyy.admin.DTO.LandPageDto;
+import com.lyy.admin.VO.CarrierInvestmentVo;
+import com.lyy.admin.VO.LandDetailDevelopment;
+import com.lyy.admin.VO.LandDetailVo;
+import com.lyy.admin.VO.LandPageVo;
+import com.lyy.admin.common.utils.DataUtil;
+import com.lyy.admin.common.utils.StringUtils;
+import com.lyy.admin.domain.developmentinfo.DevelopmentInfo;
+import com.lyy.admin.domain.developmentinfo.LandInfoEntity;
 import com.lyy.admin.domain.developmentinfo.LandInfoParam;
+import com.lyy.admin.enumerate.CarouselTypeEnum;
 import com.lyy.admin.mapper.developmentinfo.DevelopmentIndustrialLandInfoMapper;
 import com.lyy.admin.service.developmentinfo.DevelopmentIndustrialLandInfoService;
+import com.lyy.admin.service.developmentinfo.DevelopmentInfoService;
+import com.lyy.admin.service.system.SysCarouselInfoService;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.StringJoiner;
 
 /**
  * @author 26996
@@ -18,24 +37,30 @@ import java.util.List;
  * @createDate 2023-09-19 17:24:27
  */
 @Service
-public class DevelopmentIndustrialLandInfoServiceImpl extends ServiceImpl<DevelopmentIndustrialLandInfoMapper, DevelopmentIndustrialLandInfo>
+public class DevelopmentIndustrialLandInfoServiceImpl extends ServiceImpl<DevelopmentIndustrialLandInfoMapper, LandInfoEntity>
         implements DevelopmentIndustrialLandInfoService {
 
     @Resource
     private DevelopmentIndustrialLandInfoMapper developmentIndustrialLandInfoMapper;
 
+    @Resource
+    private DevelopmentInfoService developmentInfoService;
+
+    @Resource
+    private SysCarouselInfoService sysCarouselInfoService;
+
     @Override
-    public List<DevelopmentIndustrialLandInfo> listByParam(LandInfoParam landInfoParam) {
+    public List<LandInfoEntity> listByParam(LandInfoParam landInfoParam) {
         String type = landInfoParam.getType();
         Double areaMax = landInfoParam.getAreaMax();
         Double areaMin = landInfoParam.getAreaMin();
         Double priceMin = landInfoParam.getPriceMin();
         Double priceMax = landInfoParam.getPriceMax();
-        LambdaQueryWrapper<DevelopmentIndustrialLandInfo> developmentIndustrialLandInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        developmentIndustrialLandInfoLambdaQueryWrapper.eq(!ObjectUtils.isEmpty(type), DevelopmentIndustrialLandInfo::getType, type);
-        developmentIndustrialLandInfoLambdaQueryWrapper.between(!ObjectUtils.isEmpty(areaMin) && !ObjectUtils.isEmpty(areaMax), DevelopmentIndustrialLandInfo::getArea, areaMin, areaMax);
-        developmentIndustrialLandInfoLambdaQueryWrapper.between(!ObjectUtils.isEmpty(priceMin) && !ObjectUtils.isEmpty(priceMax), DevelopmentIndustrialLandInfo::getPrice, priceMin, priceMax);
-        List<DevelopmentIndustrialLandInfo> landInfos = developmentIndustrialLandInfoMapper.selectList(developmentIndustrialLandInfoLambdaQueryWrapper);
+        LambdaQueryWrapper<LandInfoEntity> developmentIndustrialLandInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        developmentIndustrialLandInfoLambdaQueryWrapper.eq(!ObjectUtils.isEmpty(type), LandInfoEntity::getType, type);
+        developmentIndustrialLandInfoLambdaQueryWrapper.between(!ObjectUtils.isEmpty(areaMin) && !ObjectUtils.isEmpty(areaMax), LandInfoEntity::getArea, areaMin, areaMax);
+        developmentIndustrialLandInfoLambdaQueryWrapper.between(!ObjectUtils.isEmpty(priceMin) && !ObjectUtils.isEmpty(priceMax), LandInfoEntity::getPrice, priceMin, priceMax);
+        List<LandInfoEntity> landInfos = developmentIndustrialLandInfoMapper.selectList(developmentIndustrialLandInfoLambdaQueryWrapper);
         return landInfos;
     }
 
@@ -43,6 +68,110 @@ public class DevelopmentIndustrialLandInfoServiceImpl extends ServiceImpl<Develo
     public Long count(String areaName) {
         return this.baseMapper.count(areaName);
     }
+
+
+    @Override
+    public List<LandPageVo> pageList(LandPageDto condition){
+
+        String price = condition.getPrice();
+        String area = condition.getArea();
+        if (!StringUtils.isEmpty(price)) {
+            String[] split = price.split("-");
+            condition.setLowPrice(Double.valueOf(split[0]));
+            if (split.length > 1) {
+                condition.setHighPrice(Double.valueOf(split[1]));
+            }
+        }
+        if (!StringUtils.isEmpty(area)) {
+            String[] split = area.split("-");
+            condition.setLowArea(Double.valueOf(split[0]));
+            if (split.length > 1) {
+                condition.setHighArea(Double.valueOf(split[1]));
+            }
+        }
+        List<LandPageVo> records = this.baseMapper.pageList(condition);
+        records.forEach(
+                data -> {
+                    StringJoiner sj = new StringJoiner("");
+                    String provinceName = data.getProvinceName();
+                    String cityName = data.getCityName();
+                    String regionName = data.getRegionName();
+                    String developmentName = data.getDevelopmentName();
+                    BigDecimal area1 = data.getArea();
+                    String type = data.getType();
+                    String address = DataUtil.dealProvince(provinceName, cityName);
+                    data.setName(
+                            sj.add(address)
+                                    .add(org.springframework.util.ObjectUtils.isEmpty(regionName)?"":regionName)
+                                    .add(org.springframework.util.ObjectUtils.isEmpty(developmentName)?"":developmentName)
+                                    .add(org.springframework.util.ObjectUtils.isEmpty(area1) ? "" : NumberUtil.roundStr(area1.doubleValue(),0)  + "亩")
+                                    .add(type)
+                                    .toString());
+                });
+        return records;
+    }
+
+    @Override
+    public LandDetailVo detail(Integer id){
+        LandInfoEntity landInfoEntity = this.getById(id);
+        LandDetailVo landDetailVo = BeanUtil.toBean(landInfoEntity, LandDetailVo.class);
+        // 招商方向
+        List<CarrierInvestmentVo> investment = new ArrayList<>();
+        if(!org.springframework.util.ObjectUtils.isEmpty(landInfoEntity.getDevelopmentId())){
+            investment = developmentInfoService.getInvestment(landInfoEntity.getDevelopmentId());
+        }
+        landDetailVo.setInvestmentDetails(investment);
+
+        // 轮播图
+        List<String> imgUrls = sysCarouselInfoService.getImgUrls(CarouselTypeEnum.LAND, id);
+        landDetailVo.setImgUrlList(imgUrls);
+
+
+        // 土地开发区信息
+        Integer developmentId = landInfoEntity.getDevelopmentId();
+        if (!org.springframework.util.ObjectUtils.isEmpty(developmentId)) {
+            DevelopmentInfo developmentInfo = this.developmentInfoService.getById(developmentId);
+            LandDetailDevelopment landDetailDevelopment = BeanUtil.toBean(developmentInfo, LandDetailDevelopment.class);
+            // 开发区产业方向,最多展示3个
+            List<String> investmentDirection = this.developmentInfoService.investmentDirection(developmentId);
+            List<String> strings = investmentDirection != null && investmentDirection.size() >= 3 ?
+                    investmentDirection.subList(0, 3) : investmentDirection;
+            landDetailDevelopment.setDevelopmentInvestment(strings);
+            landDetailVo.setDevelopment(landDetailDevelopment);
+
+
+            //开发区入住要求-总投资额
+            landDetailVo.setTotalInvestment(developmentInfo.getInvestmentAmountTotal()==null?"":String.valueOf(developmentInfo.getInvestmentAmountTotal()));
+            //开发区入住要求-亩均年产值
+            landDetailVo.setOutputValue(developmentInfo.getAverageOutputValue());
+            //开发区入住要求-亩均投资强度
+            landDetailVo.setInvestNum(developmentInfo.getInvestmentStrength());
+            //开发区入住要求-亩均税收
+            landDetailVo.setTaxRevenue(developmentInfo.getTaxationStrength());
+            //开发区入住要求-建设周期
+            landDetailVo.setConstructionCycle(developmentInfo.getBuildingPeriod()==null?"":String.valueOf(developmentInfo.getBuildingPeriod()));
+            //开发区入住要求-能评要求
+            landDetailVo.setEnergyRequire(developmentInfo.getValueAddedEnergy());
+
+            StringJoiner sj = new StringJoiner("");
+            String provinceName = landDetailDevelopment.getProvinceName();
+            String cityName = landDetailDevelopment.getCityName();
+            String regionName = landDetailDevelopment.getRegionName();
+            String developmentName = landDetailDevelopment.getName();
+            BigDecimal area1 = landDetailVo.getArea();
+            String type = landDetailVo.getType();
+            String address = DataUtil.dealProvince(provinceName, cityName);
+            landDetailVo.setName(
+                    sj.add(address)
+                            .add(org.springframework.util.ObjectUtils.isEmpty(regionName)?"":regionName)
+                            .add(org.springframework.util.ObjectUtils.isEmpty(developmentName)?"":developmentName)
+                            .add(org.springframework.util.ObjectUtils.isEmpty(area1) ? "" : NumberUtil.roundStr(area1.doubleValue(),0) + "亩")
+                            .add(type)
+                            .toString());
+        }
+        return landDetailVo;
+    }
+
 }
 
 

src/main/java/com/lyy/admin/service/developmentinfo/impl/DevelopmentInfoServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -303,9 +304,9 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
             List<DevelopmentIndustryFundInfo> developmentIndustryFundInfoList = developmentIndustryFundInfoService.list(developmentIndustryFundInfoQW);
 
             //土地信息
-            QueryWrapper<DevelopmentIndustrialLandInfo> developmentIndustrialLandInfoQW = new QueryWrapper<>();
+            QueryWrapper<LandInfoEntity> developmentIndustrialLandInfoQW = new QueryWrapper<>();
             developmentIndustrialLandInfoQW.eq("development_id", id);
-            List<DevelopmentIndustrialLandInfo> developmentIndustrialLandInfoList = developmentIndustrialLandInfoService.list(developmentIndustrialLandInfoQW);
+            List<LandInfoEntity> developmentIndustrialLandInfoList = developmentIndustrialLandInfoService.list(developmentIndustrialLandInfoQW);
 
             //所属园区信息
             ParkInfoParam parkInfoParam = new ParkInfoParam();
@@ -477,7 +478,7 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
         developmentIndustryPolicyInfoService.remove(dipiQW);
 
         //土地详情
-        QueryWrapper<DevelopmentIndustrialLandInfo> diliQW = new QueryWrapper<>();
+        QueryWrapper<LandInfoEntity> diliQW = new QueryWrapper<>();
         diliQW.eq("development_id", id);
         developmentIndustrialLandInfoService.remove(diliQW);
         //开发区图片
@@ -566,9 +567,9 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
         List<DevelopmentIndustryPolicyInfo> list3 = developmentIndustryPolicyInfoService.list(dipiQW);
         developmentInfoAllSaveVO.setIndustryPolicyInfos(list3);
         //土地详情
-        QueryWrapper<DevelopmentIndustrialLandInfo> diliQW = new QueryWrapper<>();
+        QueryWrapper<LandInfoEntity> diliQW = new QueryWrapper<>();
         diliQW.eq("development_id", id);
-        List<DevelopmentIndustrialLandInfo> list4 = developmentIndustrialLandInfoService.list(diliQW);
+        List<LandInfoEntity> list4 = developmentIndustrialLandInfoService.list(diliQW);
         developmentInfoAllSaveVO.setIndustryLandInfos(list4);
         //开发区图片
 //        QueryWrapper<SysCarouselInfo> sciQW = new QueryWrapper<>();
@@ -634,7 +635,46 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
     }
 
 
+    public List<CarrierInvestmentVo> getInvestment(Integer developmentId) {
+        LambdaQueryWrapper<DevelopmentInvestmentDirectionInfo> investQuery = new LambdaQueryWrapper<>();
+        investQuery.eq(DevelopmentInvestmentDirectionInfo::getDevelopmentId, developmentId);
+        List<DevelopmentInvestmentDirectionInfo> investmentEntityList =
+                developmentInvestmentDirectionInfoService.list(investQuery);
+        List<CarrierInvestmentVo> invests =
+                investmentEntityList.stream()
+                        .map(
+                                e -> {
+                                    CarrierInvestmentVo carrierInvestmentVo = new CarrierInvestmentVo();
+                                    carrierInvestmentVo.setCodeName(e.getIndustryDirection());
+                                    carrierInvestmentVo.setDetails(e.getTrack());
+                                    return carrierInvestmentVo;
+                                })
+                        .collect(Collectors.toList());
+        return invests;
+    }
 
+    /**
+     * @description: 查询开发区的一级招商方向
+     * @date: 2023/11/28 11:23
+     * @param: [parkId]
+     * @return: java.util.List<java.lang.String>
+     */
+    @Override
+    public List<String> investmentDirection(Integer developmentId) {
+        List<String> result = new ArrayList<>();
+        LambdaQueryWrapper<DevelopmentInvestmentDirectionInfo> lambdaQueryWrapper =
+                new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(DevelopmentInvestmentDirectionInfo::getDevelopmentId, developmentId);
+        List<DevelopmentInvestmentDirectionInfo> directionList =
+                this.developmentInvestmentDirectionInfoService.list(lambdaQueryWrapper);
+        if (!CollectionUtils.isEmpty(directionList)) {
+            result =
+                    directionList.stream()
+                            .map(DevelopmentInvestmentDirectionInfo::getIndustryDirection).distinct()
+                            .collect(Collectors.toList());
+        }
+        return result;
+    }
 }
 
 

src/main/resources/application.yml

@@ -45,6 +45,8 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
+  main:
+    allow-circular-references: true
 
 
 mybatis-plus:

src/main/resources/mapper/developmentinfo/DevelopmentIndustrialLandInfoMapper.xml

@@ -4,20 +4,46 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lyy.admin.mapper.developmentinfo.DevelopmentIndustrialLandInfoMapper">
 
-    <resultMap id="BaseResultMap" type="com.lyy.admin.domain.developmentinfo.DevelopmentIndustrialLandInfo">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="type" column="type" jdbcType="VARCHAR"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="address" column="address" jdbcType="VARCHAR"/>
-            <result property="area" column="area" jdbcType="DECIMAL"/>
-            <result property="landStatus" column="land_status" jdbcType="VARCHAR"/>
-            <result property="developmentId" column="development_id" jdbcType="INTEGER"/>
+
+    <resultMap id="BaseResultMap" type="com.lyy.admin.domain.developmentinfo.LandInfoEntity">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="address" column="address" jdbcType="VARCHAR"/>
+        <result property="area" column="area" jdbcType="DECIMAL"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="landStatus" column="land_status" jdbcType="VARCHAR"/>
+        <result property="developmentId" column="development_id" jdbcType="INTEGER"/>
+        <result property="industryDirection" column="industry_direction" jdbcType="VARCHAR"/>
+        <result property="contacterName" column="contacter_name" jdbcType="VARCHAR"/>
+        <result property="contacterPhone" column="contacter_phone" jdbcType="VARCHAR"/>
+        <result property="price" column="price" jdbcType="DECIMAL"/>
+        <result property="ratio" column="ratio" jdbcType="VARCHAR"/>
+        <result property="imgUrl" column="img_url" jdbcType="VARCHAR"/>
+        <result property="landDeed" column="land_deed" jdbcType="VARCHAR"/>
+        <result property="ageLimit" column="age_limit" jdbcType="VARCHAR"/>
+        <result property="developLevel" column="develop_level" jdbcType="VARCHAR"/>
+        <result property="shellState" column="shell_state" jdbcType="VARCHAR"/>
+        <result property="holderType" column="holder_type" jdbcType="VARCHAR"/>
+        <result property="totalInvestment" column="total_investment" jdbcType="VARCHAR"/>
+        <result property="outputValue" column="output_value" jdbcType="VARCHAR"/>
+        <result property="investNum" column="invest_num" jdbcType="VARCHAR"/>
+        <result property="taxRevenue" column="tax_revenue" jdbcType="VARCHAR"/>
+        <result property="constructionCycle" column="construction_cycle" jdbcType="VARCHAR"/>
+        <result property="energyRequire" column="energy_require" jdbcType="VARCHAR"/>
+        <result property="version" column="version" jdbcType="INTEGER"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,type,name,
-        address,area,land_status,
-        development_id
+        id
+        ,name,address,area,type,land_status,img_url,
+        development_id,industry_direction,contacter_name,contacter_phone,price,province_name,
+        province_code,city_code,city_name,region_code,region_name,address_details,land_type,
+        contact_information,ratio,land_deed,age_limit,develop_level,shell_state,holder_type,total_investment,
+        output_value,invest_num,tax_revenue,construction_cycle,energy_require,version,create_by,create_time,update_by,update_time
     </sql>
 
     <select id="count" resultType="Long">
@@ -30,4 +56,70 @@
             </if>
         </where>
     </select>
+
+    <select id="pageList" resultType="com.lyy.admin.VO.LandPageVo"
+            parameterType="com.lyy.admin.DTO.LandPageDto">
+        select
+        dili.id,
+        dili.name,
+        dili.area,
+        di.name as developmentName,
+        di.province_name,
+        di.province_code,
+        di.city_code,
+        di.city_name,
+        di.region_code,
+        di.region_name,
+        dili.type,
+        dili.price,
+        dili.img_url
+        from development_industrial_land_info dili
+        left join development_info di on di.id = dili.development_id
+        <where>
+            1 = 1
+            <if test="param.name != null and param.name != ''">
+                AND CONCAT( REPLACE(di.province_name,'省',''),
+                REPLACE(di.city_name,'市','') ,
+                di.region_name,
+                di.name,
+                case when dili.area is null then '' else CONCAT(ROUND(dili.area,0),'亩') end ,
+                dili.type) LIKE concat('%', #{param.name}, '%')
+            </if>
+            <if test="param.provinceName != null and param.provinceName != ''">
+                and di.province_name =#{param.provinceName}
+            </if>
+            <if test="param.cityName != null and param.cityName != ''">
+                and di.city_name =#{param.cityName}
+            </if>
+            <!--<if test="param.investmentDirection != null and param.investmentDirection != ''">
+                and (SELECT GROUP_CONCAT(c.industry_direction) from development_investment_direction_info c where c.development_id=dili.development_id) like concat('%',#{param.investmentDirection}, '%')
+            </if>-->
+            <if test="param.regionName != null and param.regionName != ''">
+                and di.region_name =#{param.regionName}
+            </if>
+            <if test="param.investmentDirection != null and param.investmentDirection != ''">
+                AND di.id in (SELECT b.development_id FROM development_investment_direction_info b WHERE b.industry_direction = #{param.investmentDirection} and b.development_id=di.id)
+            </if>
+            <if test="param.lowPrice != null and param.lowPrice != ''">
+                and dili.price &gt;=#{param.lowPrice}
+            </if>
+            <if test="param.highPrice != null and param.highPrice != ''">
+                and dili.price &lt;= #{param.highPrice}
+            </if>
+            <if test="param.lowArea != null and param.lowArea != ''">
+                and dili.area &gt;= #{param.lowArea}
+            </if>
+            <if test="param.highArea != null and param.highArea != ''">
+                and dili.area &lt;= #{param.highArea}
+            </if>
+            <if test="param.landType != null and param.landType != ''">
+                and dili.type=#{param.landType}
+            </if>
+            <if test="param.developmentId != null and param.developmentId != ''">
+                and dili.development_id=#{param.developmentId}
+            </if>
+        </where>
+        order by dili.create_time desc
+    </select>
+
 </mapper>