Skip to content

C
cfld-postcard-service
Commit 903a1f84 authored by yaobaizheng's avatar yaobaizheng
Browse files
Options

园区列表和详情

parent dec3ddb2
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 887 deletions
src/main/java/com/postcard/service/config/exception/GlobalResponseBodyAdvice.java
View file @ 903a1f84
......@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
* @createTime: 2023/12/1 16:56
* @description:
*/
@RestControllerAdvice(basePackages = "com.lyy.user.moudle")
@RestControllerAdvice(basePackages = "com.postcard.service.moudle")
@Slf4j
public class GlobalResponseBodyAdvice implements ResponseBodyAdvice {
@Override
......
src/main/java/com/postcard/service/config/swagger/SwaggerConfig.java
View file @ 903a1f84
......@@ -26,7 +26,7 @@ public class SwaggerConfig {
return new Docket(DocumentationType.OAS_30)
// 是否启用Swagger
// 分组设置
.groupName("区域大纲基本接口")
.groupName("明信片模块基本接口")
// 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
.apiInfo(apiInfo())
// 设置哪些接口暴露给Swagger展示
......
src/main/java/com/postcard/service/moudle/park/controller/ParkInfoController.java
View file @ 903a1f84
package com.postcard.service.moudle.park.controller;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.TimeInterval;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.postcard.service.domain.ParamEntity;
import com.postcard.service.enums.ParkStatusEnum;
import com.postcard.service.moudle.park.dto.ParkPageDto;
import com.postcard.service.moudle.park.service.ParkInfoService;
import com.postcard.service.moudle.park.vo.ParkDetailVo;
import com.postcard.service.moudle.park.vo.ParkIndustryVo;
import com.postcard.service.moudle.park.vo.ParkInfoListVO;
import com.postcard.service.moudle.park.vo.ParkPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
......@@ -14,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
......@@ -28,8 +32,14 @@ public class ParkInfoController {
@PostMapping("/page")
@ApiOperation(value = "园区列表信息")
public Page<ParkInfoListVO> page(@RequestBody ParamEntity<ParkPageDto> param){
return null;
public Page<ParkPageVo> page(@RequestBody ParamEntity<ParkPageDto> param){
TimeInterval timer = DateUtil.timer();
ParkPageDto parkInfoParam = param.getCondition();
parkInfoParam.setStatusList(
Arrays.asList(ParkStatusEnum.STATUS_YRZ.getCode(), ParkStatusEnum.STATUS_DRZ.getCode()));
Page<ParkPageVo> parkPageVoPage = parkInfoService.pageList(param);
log.info("park时间消耗：{}",timer.intervalRestart());
return parkPageVoPage;
}
@GetMapping("/industryList")
......@@ -42,7 +52,7 @@ public class ParkInfoController {
@ApiOperation(value = "园区详情")
@ApiImplicitParam(name = "id", value = "园区详情id", type = "Integer")
public ParkDetailVo detail(@PathVariable Integer id){
return null;
return parkInfoService.detail(id);
}
}
src/main/java/com/postcard/service/moudle/park/dto/ParkPageDto.java
View file @ 903a1f84
......@@ -35,10 +35,15 @@ public class ParkPageDto {
@ApiModelProperty(hidden = true)
private Double coverAreaUp;
/**
* 主导产业
*/
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
/** 认证状态（1-未认证；2-认证中；3-已认证；4-未通过；5-待认证；9-已作废） */
@ApiModelProperty(hidden = true)
private List<Integer> statusList;
/** 所属开发区id */
@ApiModelProperty(value = "所属开发区id")
private Integer developmentId;
}
src/main/java/com/postcard/service/moudle/park/mapper/ParkInfoMapper.java
View file @ 903a1f84
......@@ -2,7 +2,9 @@ package com.postcard.service.moudle.park.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.postcard.service.moudle.park.dto.ParkPageDto;
import com.postcard.service.moudle.park.entity.ParkInfo;
import com.postcard.service.moudle.park.vo.ParkPageVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -15,6 +17,7 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface ParkInfoMapper extends BaseMapper<ParkInfo> {
Page<ParkPageVo> pageList(Page pageFromEntity, @Param("param") ParkPageDto parkInfoParam);
}
......
src/main/java/com/postcard/service/moudle/park/service/ParkInfoService.java
View file @ 903a1f84
package com.postcard.service.moudle.park.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.postcard.service.domain.ParamEntity;
import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
import com.postcard.service.moudle.park.dto.ParkPageDto;
import com.postcard.service.moudle.park.entity.ParkInfo;
import com.postcard.service.moudle.park.vo.ParkDetailVo;
import com.postcard.service.moudle.park.vo.ParkPageVo;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List;
......@@ -14,6 +20,22 @@ import java.util.List;
*/
public interface ParkInfoService extends IService<ParkInfo> {
/**
* @description: 分页查询园区列表
* @date: 2023/11/21 9:51
* @param: [param]
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.VO.ParkInfoListVO>
**/
Page<ParkPageVo> pageList(ParamEntity<ParkPageDto> param);
/**
* @description: 园区详情
* @date: 2023/11/21 17:40
* @param: [id]
* @return: com.lyy.admin.moudle.park.vo.ParkInfoAllVO
**/
ParkDetailVo detail(Integer id);
/**
* @description: 查询园区的一级招商方向
* @date: 2023/11/28 11:23
......
src/main/java/com/postcard/service/moudle/park/service/impl/ParkInfoServiceImpl.java
View file @ 903a1f84
package com.postcard.service.moudle.park.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.TimeInterval;
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.postcard.service.domain.ParamEntity;
import com.postcard.service.enums.CarouselTypeEnum;
import com.postcard.service.enums.FacilityEnum;
import com.postcard.service.enums.ParkStatusEnum;
import com.postcard.service.moudle.carrier.entity.CarrierInfo;
import com.postcard.service.moudle.carrier.service.CarrierInfoService;
import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
import com.postcard.service.moudle.park.dto.ParkPageDto;
import com.postcard.service.moudle.park.entity.ParkInfo;
import com.postcard.service.moudle.park.entity.ParkInvestmentDirectionInfo;
import com.postcard.service.moudle.park.mapper.ParkInfoMapper;
import com.postcard.service.moudle.park.service.ParkInfoService;
import com.postcard.service.moudle.park.service.ParkInvestmentDirectionInfoService;
import com.postcard.service.moudle.park.vo.ParkCarrierVo;
import com.postcard.service.moudle.park.vo.ParkDetailVo;
import com.postcard.service.moudle.park.vo.ParkPageVo;
import com.postcard.service.moudle.system.service.SysCarouselInfoService;
import com.postcard.service.util.CommonUtil;
import com.postcard.service.util.DataUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -34,6 +54,163 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
@Autowired
ParkInvestmentDirectionInfoService parkInvestmentDirectionInfoService;
@Autowired
SysCarouselInfoService sysCarouselInfoService;
@Autowired
CarrierInfoService carrierInfoService;
/**
* @description: 分页查询园区列表
* @date: 2023/11/21 9:51
* @param: [param]
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.VO.ParkInfoListVO>
**/
@Override
public Page<ParkPageVo> pageList(ParamEntity<ParkPageDto> param) {
TimeInterval timer = DateUtil.timer();
ParkPageDto parkInfoParam = param.getCondition();
String coverArea = parkInfoParam.getCoverArea();
if (ObjectUtils.isNotEmpty(coverArea)) {
String[] split = coverArea.split("-");
parkInfoParam.setCoverAreaUp(Double.valueOf(split[0]));
if (split.length > 1) {
parkInfoParam.setCoverAreaUnder(Double.valueOf(split[1]));
}
}
Page page = CommonUtil.getPageFromEntity(param);
Page<ParkPageVo> pageInfo = this.baseMapper.pageList(page, parkInfoParam);
log.info("park时间消耗：{}", timer.intervalRestart());
return pageInfo;
}
/**
* @description: 园区详情
* @date: 2023/11/21 17:40
* @param: [id]
* @return: com.lyy.admin.moudle.park.vo.ParkInfoAllVO
**/
@Override
public ParkDetailVo detail(Integer id) {
// 获取园区基本信息
ParkInfo parkInfo = this.getById(id);
ParkDetailVo parkDetailVo = BeanUtil.copyProperties(parkInfo, ParkDetailVo.class);
// 轮播图
parkDetailVo.setImgUrlList(sysCarouselInfoService.getImgUrls(CarouselTypeEnum.YUANQU.getType(), id));
// 招商方向
parkDetailVo.setInvestmentDetails(listInvestDetail(id));
// 产业支持
String industryResources = parkInfo.getIndustryResources();
String specialIndicators = parkInfo.getSpecialIndicators();
List<String> resources = new ArrayList<>();
if (StringUtils.isNotBlank(industryResources)) {
resources.addAll(Arrays.asList(industryResources.split(",")));
}
if (StringUtils.isNotBlank(specialIndicators)) {
resources.addAll(Arrays.asList(specialIndicators.split(",")));
}
parkDetailVo.setResources(resources);
// 配套设置
parkDetailVo.setSetUp(getFacility(parkInfo));
// 载体信息
LambdaQueryWrapper<CarrierInfo> carrierQuery = new LambdaQueryWrapper<>();
carrierQuery.eq(CarrierInfo::getParkId, id);
List<CarrierInfo> carrierInfos = this.carrierInfoService.list(carrierQuery);
List<ParkCarrierVo> parkCarrierVoList = new ArrayList<>();
if (!CollectionUtils.isEmpty(carrierInfos)) {
StringJoiner sj = new StringJoiner("");
String addre = DataUtil.dealProvince(parkInfo.getProvinceName(), parkInfo.getCityName());
StringJoiner address = sj.add(addre).add(parkInfo.getRegionName()).add(parkInfo.getName());
carrierInfos.forEach(
carrier -> {
ParkCarrierVo parkCarrierVo = BeanUtil.toBean(carrier, ParkCarrierVo.class);
parkCarrierVo.setName(
address
+ (ObjectUtils.isNotEmpty(carrier.getArea())
? NumberUtil.roundStr(carrier.getArea().doubleValue(), 0) + "㎡"
: "")
+ carrier.getType());
parkCarrierVoList.add(parkCarrierVo);
});
}
parkDetailVo.setParkCarrier(parkCarrierVoList);
return parkDetailVo;
}
/**
* @description: 获取配套设施
* @date: 2023/11/22 10:33
* @param: [parkInfo]
* @return: java.util.List<java.lang.String>
*/
private List<String> getFacility(ParkInfo parkInfo) {
List<String> setUp = new ArrayList<>();
String name =
FacilityEnum.getName(
parkInfo.getRestaurant() != null && parkInfo.getRestaurant() == 1,
FacilityEnum.RESTAURANT);
if (StringUtils.isNotBlank(name)) {
setUp.add(name);
}
String name1 =
FacilityEnum.getName(
parkInfo.getApartment() != null && parkInfo.getApartment() == 1,
FacilityEnum.APARTMENT);
if (StringUtils.isNotBlank(name1)) {
setUp.add(name1);
}
String name2 =
FacilityEnum.getName(
parkInfo.getConvenienceStore() != null && parkInfo.getConvenienceStore() == 1,
FacilityEnum.CONVENIENCE);
if (StringUtils.isNotBlank(name2)) {
setUp.add(name2);
}
String name3 =
FacilityEnum.getName(
parkInfo.getPublicSpace() != null && parkInfo.getPublicSpace() == 1,
FacilityEnum.PUBLICSPACE);
if (StringUtils.isNotBlank(name3)) {
setUp.add(name3);
}
String name4 =
FacilityEnum.getName(
parkInfo.getPublicTransit() != null && parkInfo.getPublicTransit() == 1,
FacilityEnum.TRANSIT);
if (StringUtils.isNotBlank(name4)) {
setUp.add(name4);
}
String name5 =
FacilityEnum.getName(
parkInfo.getParkingSpace() != null && parkInfo.getParkingSpace() == 1,
FacilityEnum.PARKINGSPACE);
if (StringUtils.isNotBlank(name5)) {
setUp.add(name5);
}
String name6 =
FacilityEnum.getName(
parkInfo.getChargingStation() != null && parkInfo.getChargingStation() == 1,
FacilityEnum.CHARGING);
if (StringUtils.isNotBlank(name6)) {
setUp.add(name6);
}
String name7 =
FacilityEnum.getName(
parkInfo.getGuildMeetingRoom() != null && parkInfo.getGuildMeetingRoom() == 1,
FacilityEnum.GUILDMEETING);
if (StringUtils.isNotBlank(name7)) {
setUp.add(name7);
}
String name8 =
FacilityEnum.getName(
parkInfo.getLectureHall() != null && parkInfo.getLectureHall() == 1,
FacilityEnum.LECTUREHALL);
if (StringUtils.isNotBlank(name8)) {
setUp.add(name8);
}
return setUp;
}
/**
* @description: 查询园区的一级招商方向
......
src/main/java/com/postcard/service/moudle/park/vo/ParkDetailVo.java
View file @ 903a1f84
......@@ -66,11 +66,11 @@ public class ParkDetailVo {
private String cityName;
/** 区/县code */
@ApiModelProperty(value = "区/县code")
@ApiModelProperty(value = "区县code")
private String regionCode;
/** 区/县 */
@ApiModelProperty(value = "区/县")
@ApiModelProperty(value = "区县")
private String regionName;
/** 详细地址 */
......@@ -87,11 +87,11 @@ public class ParkDetailVo {
/** 联系人（区域负责人姓名） */
@ApiModelProperty(value = "联系人（区域负责人姓名）")
private String contactPerson;
@ApiModelProperty(value = "联系人电话")
private String phone;
// /** 联系人（区域负责人姓名） */
// @ApiModelProperty(value = "联系人（区域负责人姓名）")
// private String contactPerson;
// @ApiModelProperty(value = "联系人电话")
// private String phone;
......
src/main/java/com/postcard/service/moudle/park/vo/ParkInfoDraftListVO.java deleted 100644 → 0
View file @ dec3ddb2
package com.postcard.service.moudle.park.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@ApiModel(value = "园区列表信息", description = "园区列表信息")
public class ParkInfoDraftListVO implements Serializable {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 园区名称
*/
@ApiModelProperty(value = "园区名称")
private String name;
/**
* 所属集团id
*/
@ApiModelProperty(value = "所属集团id")
private Integer groupId;
/**
* 所属集团
*/
@ApiModelProperty(value = "所属集团")
private String groupName;
/**
* 所属片区id
*/
@ApiModelProperty(value = "所属片区id")
private Integer zoneId;
/**
* 所属片区
*/
@ApiModelProperty(value = "所属片区")
private String zoneName;
/**
* 园区级别
*/
@ApiModelProperty(value = "园区级别")
private String levelCode;
@ApiModelProperty(value = "园区级别名称")
private String levelName;
/**
* 园区简介
*/
@ApiModelProperty(value = "园区简介")
private String description;
/**
* 省份code
*/
@ApiModelProperty(value = "省份code")
private String provinceCode;
/**
* 省份
*/
@ApiModelProperty(value = "省份")
private String provinceName;
/**
* 城市code
*/
@ApiModelProperty(value = "城市code")
private String cityCode;
/**
* 城市
*/
@ApiModelProperty(value = "城市")
private String cityName;
/**
* 区/县code
*/
@ApiModelProperty(value = "区/县code")
private String regionCode;
/**
* 区/县
*/
@ApiModelProperty(value = "区/县")
private String regionName;
/**
* 详细地址
*/
@ApiModelProperty(value = "详细地址")
private String address;
/**
* 认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝）
*/
@ApiModelProperty(value = "认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝；9-已回退）")
private Integer status;
/**
* 占地面积（单位：亩）
*/
@ApiModelProperty(value = "占地面积（单位：亩）")
private Double coverArea;
/**
* 主导产业
*/
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
@ApiModelProperty(value = "列表展示图片")
private String imgUrl;
@ApiModelProperty(value = "保存时间")
private Date updateTime;
private static final long serialVersionUID = 1L;
}
src/main/java/com/postcard/service/moudle/park/vo/ParkInfoListVO.java deleted 100644 → 0
View file @ dec3ddb2
package com.postcard.service.moudle.park.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
@ApiModel(value = "园区列表信息", description = "园区列表信息")
public class ParkInfoListVO implements Serializable {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 园区名称
*/
@ApiModelProperty(value = "园区名称")
private String name;
@ApiModelProperty(value = "经度（坐标系gcj02）")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度（坐标系gcj02）")
private BigDecimal latitude;
@ApiModelProperty(value = "列表展示图片")
private String imgUrl;
/**
* 园区级别
*/
@ApiModelProperty(value = "园区级别")
private String levelCode;
@ApiModelProperty(value = "园区级别名称")
private String levelName;
/**
* 占地面积（单位：亩）
*/
@ApiModelProperty(value = "占地面积（单位：亩）")
private Double coverArea;
/**
* 主导产业
*/
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
private static final long serialVersionUID = 1L;
}
src/main/java/com/postcard/service/moudle/park/vo/ParkInfoSaveVO.java deleted 100644 → 0
View file @ dec3ddb2
package com.postcard.service.moudle.park.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
@Data
@ApiModel(value = "园区基本信息", description = "园区基本信息")
public class ParkInfoSaveVO implements Serializable {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 园区名称
*/
@ApiModelProperty(value = "园区名称")
@NotNull
private String name;
/**
* 园区级别
*/
@ApiModelProperty(value = "园区级别名称")
private String levelName;
/**
* 园区简介
*/
@ApiModelProperty(value = "园区简介")
private String description;
/**
* 省份
*/
@ApiModelProperty(value = "省份")
private String provinceName;
/**
* 城市
*/
@ApiModelProperty(value = "城市")
private String cityName;
/**
* 区/县
*/
@ApiModelProperty(value = "区/县")
private String regionName;
/**
* 详细地址
*/
@ApiModelProperty(value = "详细地址")
private String address;
/**
* 占地面积（单位：亩）
*/
@ApiModelProperty(value = "占地面积（单位：亩）")
private Double coverArea;
/**
* 建筑面积（单位：㎡）
*/
@ApiModelProperty(value = "建筑面积（单位：亩）")
private BigDecimal floorArea;
/**
* 产权性质
*/
@ApiModelProperty(value = "产权归属")
private String ownershipProperty;
/**
* 出租率（单位：％）
*/
@ApiModelProperty(value = "出租率（单位：％）")
private BigDecimal rentalRate;
/**
* 产业园亮点
*/
@ApiModelProperty(value = "产业园亮点")
private String highlights;
/**
* 联系人（区域负责人姓名）
*/
@ApiModelProperty(value = "联系人（区域负责人姓名）")
private String contactPerson;
/**
* 联系电话（区域负责人电话）
*/
@ApiModelProperty(value = "联系电话（区域负责人电话）")
private String phone;
/**
* 所属机构
*/
@ApiModelProperty(value = "所属机构")
private String organization;
/**
* 主导产业
*/
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
/**
* 代表企业
*/
@ApiModelProperty(value = "代表企业")
private String enterprise;
/**
* 总投资额（亿元）
*/
@ApiModelProperty(value = "总投资额（亿元）")
private BigDecimal investmentAmountTotal;
/**
* 亩均投资强度（单位：万/亩）
*/
@ApiModelProperty(value = "亩均投资强度（单位：万/亩）")
private String investmentStrength;
/**
* 亩均税收（单位：万/亩）
*/
@ApiModelProperty(value = "亩均税收（单位：万/亩）")
private String taxationStrength;
/**
* 亩均年产值（单位：万/亩）
*/
@ApiModelProperty(value = "亩均年产值（单位：万/亩）")
private String averageOutputValue;
/**
* 投资周期（月）
*/
@ApiModelProperty(value = "投资周期（月）")
private Integer buildingPeriod;
/**
* 其他要求
*/
@ApiModelProperty(value = "其他要求")
private Integer isOtherRequirements;
/**
* 其他入驻要求
*/
@ApiModelProperty(value = "其他入驻要求")
private String accessOther;
/**
* 租售类型
*/
@ApiModelProperty(value = "租售类型")
private String rentSaleType;
/**
* 出售单价（元/天/㎡）
*/
@ApiModelProperty(value = "出售单价（元/天/㎡）")
private BigDecimal salePrice;
/**
* 出租单价（元/天/㎡）
*/
@ApiModelProperty(value = "出租单价（元/天/㎡）")
private String rentPrice;
/**
* 物业费单价（单位：元/㎡/月）
*/
@ApiModelProperty(value = "物业费单价（单位：元/㎡/月）")
private BigDecimal propertyPrice;
/**
* 工业用电（单位：元/度）
*/
@ApiModelProperty(value = "工业用电（单位：元/度）")
private String electricityPrice;
/**
* 供电类型
*/
@ApiModelProperty(value = "供电类型")
private String powerSupplyType;
/**
* 变电站级别
*/
@ApiModelProperty(value = "变电站级别")
private String[] substationLevel;
/**
* 工业用水单价（单位：元/吨）
*/
@ApiModelProperty(value = "工业用水单价（单位：元/吨）")
private BigDecimal industrialWater;
/**
* 天然气（单位：元/m³）
*/
@ApiModelProperty(value = "天然气（单位：元/m³）")
private String gas;
/**
* 蒸汽（单位：元/m³）
*/
@ApiModelProperty(value = "蒸汽（单位：元/m³）")
private BigDecimal steam;
/**
* 非居民用暖价格（单位：元/㎡）
*/
@ApiModelProperty(value = "非居民用暖价格（单位：元/㎡）")
private BigDecimal nresidentsHeating;
@ApiModelProperty(value = "是否有供暖（0-无；1-有）")
private Integer isHeating;
@ApiModelProperty(value = "是否有蒸汽（0-无；1-有）")
private Integer isSteam;
@ApiModelProperty(value = "是否有天然气（0-无；1-有）")
private Integer isNaturalGas;
@ApiModelProperty(value = "产业资源")
private String[] industryResources;
@ApiModelProperty(value = "特殊指标")
private String[] specialIndicators;
/**
* 餐厅（0-无；1-有）
*/
@ApiModelProperty(value = "餐厅（0-无；1-有）")
private Integer restaurant;
/**
* 公寓（0-无；1-有）
*/
@ApiModelProperty(value = "公寓（0-无；1-有）")
private Integer apartment;
/**
* 便利店（0-无；1-有）
*/
@ApiModelProperty(value = "便利店（0-无；1-有）")
private Integer convenienceStore;
/**
* 公共空间（0-无；1-有）
*/
@ApiModelProperty(value = "公共空间（0-无；1-有）")
private Integer publicSpace;
/**
* 公共交通（0-无；1-有）
*/
@ApiModelProperty(value = "公共交通（0-无；1-有）")
private Integer publicTransit;
/**
* 车位（0-无；1-有）
*/
@ApiModelProperty(value = "车位（0-无；1-有）")
private Integer parkingSpace;
/**
* 充电桩（0-无；1-有）
*/
@ApiModelProperty(value = "充电桩（0-无；1-有）")
private Integer chargingStation;
@ApiModelProperty(value = "公共会议室（0-无；1-有）")
private Integer guildMeetingRoom;
@ApiModelProperty(value = "报告厅（0-无；1-有）")
private Integer lectureHall;
@ApiModelProperty(value = "污水处理类别")
private String sewageWaterType;
@ApiModelProperty(value = "污水处理价格（元/吨）")
private BigDecimal sewageWaterPrice;
@NotNull
@ApiModelProperty(value = "认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝；9-作废）")
private Integer status;
@ApiModelProperty(value = "是否为系统提前预录入（0-否;1-是;）")
private Integer isSystem;
private static final long serialVersionUID = 1L;
}
src/main/java/com/postcard/service/moudle/park/vo/ParkPagePersonVo.java deleted 100644 → 0
View file @ dec3ddb2
package com.postcard.service.moudle.park.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class ParkPagePersonVo {
@ApiModelProperty(value = "主键id")
private Integer id;
@ApiModelProperty(value = "园区名称")
private String name;
@ApiModelProperty(value = "来源方式code")
private Integer isSystem;
@ApiModelProperty(value = "来源方式(lyy_info_source)")
private String isSystemName;
@ApiModelProperty(value = "录入时间")
private String createTime;
@ApiModelProperty(value = "更新时间")
private String updateTime;
@ApiModelProperty(value = "审核状态code")
private Integer status;
@ApiModelProperty(value = "审核状态(lyy_parkinfo_status)")
private String statusName;
}
src/main/java/com/postcard/service/moudle/park/vo/ParkPageVo.java
View file @ 903a1f84
......@@ -3,6 +3,7 @@ package com.postcard.service.moudle.park.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.List;
/**
......@@ -17,75 +18,40 @@ import java.util.List;
@NoArgsConstructor
@ToString
public class ParkPageVo {
@ApiModelProperty(value = "主键id")
private Integer id;
@ApiModelProperty(value = "园区名称")
private String name;
/**
* 省份code
*/
@ApiModelProperty(value = "省份code")
private String provinceCode;
/**
* 省份
*/
@ApiModelProperty(value = "省份")
private String provinceName;
/**
* 城市code
*/
@ApiModelProperty(value = "城市code")
private String cityCode;
/**
* 城市
*/
@ApiModelProperty(value = "城市")
private String cityName;
/**
* 区/县code
*/
@ApiModelProperty(value = "区/县code")
private String regionCode;
/**
* 区/县
*/
@ApiModelProperty(value = "区/县")
private String regionName;
/**
* 认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝）
*/
@ApiModelProperty(value = "认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝）")
private Integer status;
@ApiModelProperty(value = "认证状态名称（1-未认证；2-认证中；3-已认证；4-已拒绝）")
private String statusName;
/**
* 园区级别
*/
@ApiModelProperty(value = "经度（坐标系gcj02）")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度（坐标系gcj02）")
private BigDecimal latitude;
@ApiModelProperty(value = "列表展示图片")
private String imgUrl;
@ApiModelProperty(value = "园区级别")
private String levelCode;
/**
* 园区级别名称
*/
@ApiModelProperty(value = "园区级别名称")
private String levelName;
/**
* 占地面积（单位：亩）
*/
@ApiModelProperty(value = "占地面积（单位：亩）")
private Double coverArea;
@ApiModelProperty(value = "招商方向")
private List<String> investmentDirection;
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
@ApiModelProperty(value = "图片链接")
private String imgUrl;
@ApiModelProperty(value = "认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝）")
private Integer status;
@ApiModelProperty(value = "认证状态名称（1-未认证；2-认证中；3-已认证；4-已拒绝）")
private String statusName;
private static final long serialVersionUID = 1L;
}
src/main/java/com/postcard/service/moudle/park/vo/ParkPersonDetailVo.java deleted 100644 → 0
View file @ dec3ddb2
package com.postcard.service.moudle.park.vo;
import cn.hutool.json.JSONArray;
import com.postcard.service.moudle.carrier.entity.CarrierInfo;
import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
import com.postcard.service.moudle.system.vo.VideoVo;
import com.postcard.service.moudle.system.vo.VrVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @Author:yaobaizheng
*
* @version: 1.0 @Date: 2023/11/21 17:51 @Description: 园区详情
*/
@ApiModel(value = "个人园区信息")
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class ParkPersonDetailVo {
// -------------------基本信息-----------------------------
/** 园区名称 */
@ApiModelProperty(value = "园区名称")
private String name;
@ApiModelProperty(value = "发布时间")
private Date createTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/** 园区级别 */
@ApiModelProperty(value = "园区级别")
private String levelCode;
/** 园区级别 */
@ApiModelProperty(value = "园区级别名称")
private String levelName;
/** 省份code */
@ApiModelProperty(value = "省份code")
private String provinceCode;
/** 省份 */
@ApiModelProperty(value = "省份")
private String provinceName;
/** 城市code */
@ApiModelProperty(value = "城市code")
private String cityCode;
/** 城市 */
@ApiModelProperty(value = "城市")
private String cityName;
/** 区/县code */
@ApiModelProperty(value = "区/县code")
private String regionCode;
/** 区/县 */
@ApiModelProperty(value = "区/县")
private String regionName;
/** 详细地址 */
@ApiModelProperty(value = "详细地址")
private String address;
/** 占地面积（单位：亩） */
@ApiModelProperty(value = "占地面积（单位：亩）")
private Double coverArea;
/** 占地面积（单位：亩） */
@ApiModelProperty(value = "建筑面积（单位：㎡）")
private Double floorArea;
@ApiModelProperty(value = "产权性质")
private String ownershipProperty;
@ApiModelProperty(value = "出租率")
private Double rentalRate;
@ApiModelProperty(value = "产业园亮点")
private String highlights;
/** 园区简介 */
@ApiModelProperty(value = "园区简介")
private String description;
//----------------产业园图片---------------
@ApiModelProperty(value = "产业园图片")
private List<String> imgUrlList;
@ApiModelProperty(value = "轮播视频")
private List<VideoVo> videoUrlList;
@ApiModelProperty(value = "VR")
private List<VrVo> vrUrlList;
// ---------------联系人------------------
/** 联系人（区域负责人姓名） */
@ApiModelProperty(value = "招商对接人")
private String contactPerson;
@ApiModelProperty(value = "联系方式")
private String phone;
@ApiModelProperty(value = "所属机构")
private String organization;
// ---------------产业基础------------
/** 主导产业 */
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
/** 招商方向 park_investment_direction_info */
@ApiModelProperty(value = "招商方向")
private List<CarrierInvestmentVo> InvestmentDetails;
@ApiModelProperty(value = "代表企业")
private String enterprise;
// ---------------入驻要求----------------------
@ApiModelProperty(value = "总投资额（亿元）")
private BigDecimal investmentAmountTotal;
/** 亩均产值（单位：万/亩） */
@ApiModelProperty(value = "亩均产值（单位：万/亩）")
private String averageOutputValue;
/** 投资强度（单位：万/亩） */
@ApiModelProperty(value = "投资强度（单位：万/亩）")
private String investmentStrength;
/** 税收强度（单位：万/亩） */
@ApiModelProperty(value = "税收强度（单位：万/亩）")
private String taxationStrength;
@ApiModelProperty(value = "建设周期（月）")
private Integer buildingPeriod;
/** 单位工业增加值能耗（单位：tce/万元） */
@ApiModelProperty(value = "能评要求（单位：tce/万元）")
private String valueAddedEnergy;
/** 环评要求 */
@ApiModelProperty(value = "环评要求（单位：万/亩）")
private String environmentalEquirements;
/** 禁限目录 */
@ApiModelProperty(value = "禁限目录")
private String prohibitDirectory;
// -------------要素成本-------------------
@ApiModelProperty(value = "租售类别")
private String rentSaleType;
/** 租金单价（单位：元/㎡/月） */
@ApiModelProperty(value = "出租单价（单位：元/㎡/月）")
private String rentPrice;
@ApiModelProperty(value = "出售单价（元/天/㎡）")
private BigDecimal salePrice;
/** 物业费单价（单位：元/㎡/月） */
@ApiModelProperty(value = "物业费单价（单位：元/㎡/月）")
private BigDecimal propertyPrice;
/** 电价（单位：元/度） */
@ApiModelProperty(value = "工业电价（单位：元/度）")
private String electricityPrice;
/** 工业用水（单位：元/吨） */
@ApiModelProperty(value = "工业用水（单位：元/吨）")
private BigDecimal industrialWater;
@ApiModelProperty(value = "供电类型")
private String powerSupplyType;
@ApiModelProperty(value = "变电站级别（工业用电）")
private String substationLevel;
@ApiModelProperty(value = "污水处理级别")
private String sewageLevel;
// park_sewage_info 表中数据
@ApiModelProperty(value = "污水处理价格")
private BigDecimal sewagePrice;
/** 天然气（单位：元/m³） */
@ApiModelProperty(value = "天然气（单位：元/m³）")
private String gas;
/** 蒸汽（单位：元/m³） */
@ApiModelProperty(value = "蒸汽（单位：元/m³）")
private BigDecimal steam;
/** 非居民用暖价格（单位：元/㎡） */
@ApiModelProperty(value = "非居民用暖价格（单位：元/㎡）")
private BigDecimal nresidentsHeating;
// ---------------产业支持---------------------
// industry_resources special_indicators
@ApiModelProperty(value = "产业资源")
private String industryResources;
@ApiModelProperty(value = "特殊指标")
private String specialIndicators;
// ------------产业政策-----------------
@ApiModelProperty(value = "产业政策 park_policy_info表中")
private JSONArray parkPolicy;
private List<String> policyUrlList;
// ---------------园内配套信息------------------------
@ApiModelProperty(value = "配套设施")
private List<String> setUp;
/* */
/** 餐厅（0-无；1-有） */
/*
@ApiModelProperty(value = "餐厅（0-无；1-有）")
private Integer restaurant;
*/
/** 公寓（0-无；1-有） */
/*
@ApiModelProperty(value = "公寓（0-无；1-有）")
private Integer apartment;
*/
/** 便利店（0-无；1-有） */
/*
@ApiModelProperty(value = "便利店（0-无；1-有）")
private Integer convenienceStore;
*/
/** 公共空间（0-无；1-有） */
/*
@ApiModelProperty(value = "公共空间（0-无；1-有）")
private Integer publicSpace;
*/
/** 公共交通（0-无；1-有） */
/*
@ApiModelProperty(value = "公共交通（0-无；1-有）")
private Integer publicTransit;
*/
/** 车位（0-无；1-有） */
/*
@ApiModelProperty(value = "车位（0-无；1-有）")
private Integer parkingSpace;
*/
/** 充电桩（0-无；1-有） */
/*
@ApiModelProperty(value = "充电桩（0-无；1-有）")
private Integer chargingStation;
@ApiModelProperty(value = "公共会议室（0-无；1-有）")
private Integer guildMeetingRoom;
@ApiModelProperty(value = "报告厅（0-无；1-有）")
private Integer lectureHall;*/
// ----------周边配套---------------
// -------------载体------------------
List<CarrierInfo> carrierInfoList;
}
src/main/java/com/postcard/service/moudle/system/dto/InvestCluePageDto.java
View file @ 903a1f84
package com.postcard.service.moudle.system.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
/**
......@@ -16,4 +17,7 @@ import lombok.*;
@ToString
@ApiModel(value = "咨询列表分页查询条件", description = "")
public class InvestCluePageDto {
@ApiModelProperty(value = "主键id")
private Integer id;
}
src/main/resources/application.yml
View file @ 903a1f84
......@@ -6,6 +6,7 @@
main:
#允许定义相同的bean对象 去覆盖原有的
allow-bean-definition-overriding: true
allow-circular-references: true
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
......
src/main/resources/mapper/park/ParkInfoMapper.xml
View file @ 903a1f84
......@@ -99,4 +99,66 @@
</sql>
<select id="pageList" resultType="com.postcard.service.moudle.park.vo.ParkPageVo"
parameterType="com.postcard.service.moudle.park.dto.ParkPageDto">
select id ,name,
-- province_code, province_name,city_code,
-- city_name,region_code,region_name,
status,primary_industry,level_code,
level_name,cover_area,img_url,longitude,latitude
from park_info pi
<where>
1 = 1
<if test="param.statusList != null and param.statusList.size() > 0 ">
AND `status` IN
<foreach item="status" collection="param.statusList" open="(" separator="," close=")">
#{status}
</foreach>
</if>
<!-- <if test="param.provinceName != null and param.provinceName != ''">-->
<!-- AND province_name=#{param.provinceName}-->
<!-- </if>-->
<!-- <if test="param.cityName != null and param.cityName != ''">-->
<!-- AND city_name=#{param.cityName}-->
<!-- </if>-->
<!-- <if test="param.regionName != null and param.regionName != ''">-->
<!-- AND region_name=#{param.regionName}-->
<!-- </if>-->
<!-- <if test="param.levelName != null and param.levelName != ''">-->
<!-- AND level_name=#{param.levelName}-->
<!-- </if>-->
<!-- <if test="param.investmentDirection != null and param.investmentDirection != ''">-->
<!-- /*招商方向*/-->
<!-- AND id in (SELECT b.park_id FROM park_investment_direction_info b WHERE b.industrial_track =-->
<!-- #{param.investmentDirection})-->
<!-- </if>-->
<if test="param.name != null and param.name != ''">
AND name like concat('%', #{param.name}, '%')
</if>
<if test="param.coverAreaUp != null and param.coverAreaUp != ''">
AND cover_area &gt;= #{param.coverAreaUp}
</if>
<if test="param.coverAreaUnder != null and param.coverAreaUnder != ''">
AND cover_area &lt;= #{param.coverAreaUnder}
</if>
<!-- <if test="param.parkResourcesList != null and param.parkResourcesList.size() > 0 ">-->
<!-- <foreach item="parkResources" collection="param.parkResourcesList" open=" and ( " separator="or" close=")">-->
<!-- CONCAT(industry_resources,special_indicators,power_supply_type) like concat('%', #{parkResources}, '%')-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="param.industryPolicyList != null and param.industryPolicyList.size() > 0 ">-->
<!-- AND id in (SELECT b.park_id FROM park_policy_info b WHERE b.type IN-->
<!-- <foreach item="industryPolicy" collection="param.industryPolicyList" open="(" separator="," close=")">-->
<!-- #{industryPolicy}-->
<!-- </foreach>-->
<!-- )-->
<!-- </if>-->
<if test="param.developmentId != null and param.developmentId != ''">
AND zone_id = #{param.developmentId}
</if>
</where>
order by status asc,create_time desc
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment