Commit 8e791ebe authored by zhouxudong's avatar zhouxudong

更新代码

parent 4850fbf3
......@@ -16,6 +16,7 @@ public enum DictCodeEnum {
CARRIER_TYPE("carrier_type", "载体类型 映射"),
DEVELOPMENT_LEVEL("development_level", "开发区级别 映射"),
CAROUSEL_TYPE("carousel_type", "轮播图 映射"),
INVEST_TYPE("invest_type", "投资舒城-投资类型 映射"),
DEVELOPMENT_TYPE("development_type", "开发区类型 映射");
private final String code;
......
......@@ -38,8 +38,8 @@ public class CarrierController {
@GetMapping("/detail/{id}")
@ApiOperation(value = "详情")
@ApiImplicitParam(name = "id", value = "载体信息id", type = "Integer")
public CarrierDetailVo detail(@PathVariable("id") Integer id, HttpServletRequest request){
String token = request.getHeader(Constants.TOKEN_HEADER);
return this.carrierInfoService.detail(id,token);
public CarrierDetailVo detail(@PathVariable("id") Integer id){
return this.carrierInfoService.detail(id);
}
}
......@@ -21,42 +21,9 @@ import java.util.List;
@ApiModel(value = "分页查询条件", description = "分页查询条件")
public class CarrierPageDto {
@ApiModelProperty(value = "所属开发区id")
private Integer developmentId;
@ApiModelProperty(value = "所属产业园id")
private Integer parkId;
@ApiModelProperty(value = "招商方向/产业分类")
private String investmentDirection;
@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;
@ApiModelProperty(value = "载体面积")
private String carrierArea;
......@@ -66,40 +33,12 @@ public class CarrierPageDto {
@ApiModelProperty(value = "建筑结构")
private String carrierConstruction;
@ApiModelProperty(value = "标准层高")
private String floorHeight;
@ApiModelProperty(value = "标准承重")
private String loadBearing;
@ApiModelProperty(value = "柱距")
private String pillarDistance;
@ApiModelProperty(hidden = true)
private Double lowCarrierArea;
@ApiModelProperty(hidden = true)
private Double highCarrierArea;
@ApiModelProperty(hidden = true)
private Double lowFloorHeight;
@ApiModelProperty(hidden = true)
private Double highFloorHeight;
@ApiModelProperty(hidden = true)
private Double lowLoadBearing;
@ApiModelProperty(hidden = true)
private Double highLoadBearing;
@ApiModelProperty(hidden = true)
private Double lowPillarDistance;
@ApiModelProperty(hidden = true)
private Double highPillarDistance;
//数据库映射字段
@ApiModelProperty(hidden = true)
private List<String> carrierType;
......
......@@ -29,5 +29,5 @@ public interface CarrierInfoService extends IService<CarrierInfo> {
* @param: [id]
* @return: com.lyy.admin.moudle.carrier.vo.CarrierDetailVo
**/
CarrierDetailVo detail(Integer id, String token);
CarrierDetailVo detail(Integer id);
}
......@@ -55,129 +55,14 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
*/
@Override
public Page<CarrierPageVo> pageList(ParamEntity<CarrierPageDto> paramEntity) {
CarrierPageDto carrierPageDto = paramEntity.getCondition();
String carrierArea = carrierPageDto.getCarrierArea();
String floorHeight = carrierPageDto.getFloorHeight();
String loadBearing = carrierPageDto.getLoadBearing();
String pillarDistance = carrierPageDto.getPillarDistance();
if (StringUtils.isNotBlank(carrierArea)) {
String[] split = carrierArea.split("-");
carrierPageDto.setLowCarrierArea(Double.valueOf(split[0]));
if (split.length > 1) {
carrierPageDto.setHighCarrierArea(Double.valueOf(split[1]));
}
}
if (StringUtils.isNotBlank(floorHeight)) {
String[] split = floorHeight.split("-");
carrierPageDto.setLowFloorHeight(Double.valueOf(split[0]));
if (split.length > 1) {
carrierPageDto.setHighFloorHeight(Double.valueOf(split[1]));
}
}
if (StringUtils.isNotBlank(loadBearing)) {
String[] split = loadBearing.split("-");
carrierPageDto.setLowLoadBearing(Double.valueOf(split[0]));
if (split.length > 1) {
carrierPageDto.setHighLoadBearing(Double.valueOf(split[1]));
}
}
if (StringUtils.isNotBlank(pillarDistance)) {
String[] split = pillarDistance.split("-");
carrierPageDto.setLowPillarDistance(Double.valueOf(split[0]));
if (split.length > 1) {
carrierPageDto.setHighPillarDistance(Double.valueOf(split[1]));
}
}
// 映射字段
String carrierType = carrierPageDto.getTypeInfo();
if (StringUtils.isNotBlank(carrierType)) {
Map<String, SysDictDataEntity> dictDataEntityMap =
this.sysDictDataService.listByCode(DictCodeEnum.CARRIER_TYPE.getCode());
SysDictDataEntity sysDictDataEntity = dictDataEntityMap.get(carrierType);
if (ObjectUtils.isNotEmpty(sysDictDataEntity)) {
String detail = sysDictDataEntity.getDetail();
carrierPageDto.setCarrierType(Arrays.asList(detail.split(",")));
}
}
Page page = CommonUtil.getPageFromEntity(paramEntity);
Page<CarrierPageVo> carrierPageVoPage = this.baseMapper.pageList(page, carrierPageDto);
List<CarrierPageVo> records = carrierPageVoPage.getRecords();
if (!CollectionUtils.isEmpty(records)) {
records.forEach(
data -> {
StringJoiner sj = new StringJoiner("");
String provinceName = data.getProvinceName();
String cityName = data.getCityName();
Double area = data.getArea();
String name =
sj.add(DataUtil.dealProvince(provinceName, cityName))
.add(data.getRegionName())
.add(data.getParkName())
.add(ObjectUtils.isEmpty(area) ? "" : NumberUtil.roundStr(area, 0) + "㎡")
.add(data.getType())
.toString();
data.setName(name);
});
}
return carrierPageVoPage;
return null;
}
/**
* @description: 详情
* @date: 2023/11/23 17:58
* @param: [id]
* @return: com.lyy.admin.moudle.carrier.vo.CarrierDetailVo
*/
@Override
public CarrierDetailVo detail(Integer id, String token) {
CarrierInfo carrierInfo = this.getById(id);
CarrierDetailVo carrierDetailVo = BeanUtil.copyProperties(carrierInfo, CarrierDetailVo.class);
// 招商方向
List<CarrierInvestmentVo> investmentVos = new ArrayList<>();
Integer parkId = carrierInfo.getParkId();
if (ObjectUtils.isNotEmpty(parkId)) {
investmentVos = parkInfoService.listInvestDetail(carrierInfo.getParkId());
}
carrierDetailVo.setInvestmentDetails(investmentVos);
// 入住要求
if (ObjectUtils.isNotEmpty(parkId)) {
ParkInfo parkInfo = parkInfoService.getById(parkId);
Optional.ofNullable(parkInfo)
.ifPresent(
data -> {
// ---产业园信息--
CarrierParkVo carrierParkVo = BeanUtil.copyProperties(data, CarrierParkVo.class);
List<String> list = this.parkInfoService.investmentDirection(data.getId());
carrierParkVo.setInvestmentDetails(list);
carrierDetailVo.setCarrierParkVo(carrierParkVo);
});
}
// 轮播图
ResourceVo allResource = sysCarouselInfoService.getAllResource(CarouselTypeEnum.CARRIER.getType(), id);
// 轮播图
carrierDetailVo.setImgUrls(allResource.getImgUrlList());
// 视频
carrierDetailVo.setVideoUrlList(allResource.getVideoVoList());
// VR
carrierDetailVo.setVrUrlList(allResource.getVrVoList());
if (carrierDetailVo.getCarrierParkVo() != null) {
StringJoiner sj = new StringJoiner("");
String provinceName = carrierDetailVo.getCarrierParkVo().getProvinceName();
String cityName = carrierDetailVo.getCarrierParkVo().getCityName();
Double area = carrierDetailVo.getArea();
String name =
sj.add(DataUtil.dealProvince(provinceName, cityName))
.add(carrierDetailVo.getCarrierParkVo().getRegionName())
.add(carrierDetailVo.getCarrierParkVo().getName())
.add(ObjectUtils.isEmpty(area) ? "" : NumberUtil.roundStr(area, 0) + "㎡")
.add(carrierDetailVo.getType())
.toString();
carrierDetailVo.setName(name);
}
return carrierDetailVo;
public CarrierDetailVo detail(Integer id) {
return null;
}
}
package com.postcard.service.moudle.carrier.vo;
import com.postcard.service.moudle.park.vo.ParkDetailVo;
import com.postcard.service.moudle.system.vo.VideoVo;
import com.postcard.service.moudle.system.vo.VrVo;
import io.swagger.annotations.ApiModel;
......@@ -35,12 +36,6 @@ public class CarrierDetailVo {
@ApiModelProperty(value = "建筑结构")
private String structure;
// ------------park表取数据 start---------
@ApiModelProperty(value = "招商信息 /")
private List<CarrierInvestmentVo> investmentDetails;
// ------------park表取数据 end---------
// -------------载体详情-------------------
@ApiModelProperty(value = "层数")
private Integer floorNumber;
......@@ -68,26 +63,19 @@ public class CarrierDetailVo {
@ApiModelProperty(value = "耐火等级")
private String fireResistant;
// ----------------所属产业园-----入住要求------》park 园区表中数据-----------------------
@ApiModelProperty(value = "产业园信息 / 入住要求")
private CarrierParkVo carrierParkVo;
//----------轮播图-------------------
@ApiModelProperty(value = "轮播图")
private List<String> imgUrls;
@ApiModelProperty(value = "轮播视频")
private List<VideoVo> videoUrlList;
/** 联系人(区域负责人姓名) 园区的联系人 */
@ApiModelProperty(value = "联系人(区域负责人姓名)")
private String contactPerson;
@ApiModelProperty(value = "联系人电话")
private String phone;
@ApiModelProperty(value = "VR")
private List<VrVo> vrUrlList;
@ApiModelProperty(value = "产业园信息")
private ParkDetailVo carrierParkVo;
@ApiModelProperty(value = "用户解锁额度剩余次数")
private Integer limitNum;
//---------是否可以查看 ---------
@ApiModelProperty(value = "是否可以查看")
private Boolean isView;
@ApiModelProperty(value = "载体详情是否有数据")
private Boolean seeDetails;
}
......@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
/**
* @Author:zhouxudong
* @version: 1.0
......@@ -22,32 +24,6 @@ public class CarrierPageVo {
@ApiModelProperty(value = "载体名称")
private String name;
//园区名称
@ApiModelProperty(hidden=true)
private String parkName;
/** 省份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 Double area;
......@@ -55,4 +31,13 @@ public class CarrierPageVo {
private String type;
@ApiModelProperty(value = "图片")
private String imgUrl;
@ApiModelProperty(value = "建筑结构")
private String carrierConstruction;
@ApiModelProperty(value = "经度(坐标系gcj02)")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度(坐标系gcj02)")
private BigDecimal latitude;
}
package com.postcard.service.moudle.land.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.postcard.service.domain.ParamEntity;
import com.postcard.service.moudle.land.dto.LandPageDto;
import com.postcard.service.moudle.land.service.LandInfoService;
import com.postcard.service.moudle.land.vo.LandDetailVo;
import com.postcard.service.moudle.land.vo.LandPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @author: zhouxudong
......@@ -17,8 +24,19 @@ import javax.annotation.Resource;
@Api(tags = "土地信息")
public class LandInfoController {
@Resource
@Autowired
LandInfoService landInfoService;
@PostMapping("/page")
@ApiOperation(value = "土地分页信息")
public Page<LandPageVo> page(@RequestBody ParamEntity<LandPageDto> param){
return null;
}
@GetMapping("/detail/{id}")
@ApiImplicitParam(name = "id", value = "土地详情id", type = "Integer")
public LandDetailVo detail(@PathVariable Integer id){
return null;
}
}
......@@ -22,44 +22,4 @@ 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;
}
......@@ -15,7 +15,6 @@ import org.apache.ibatis.annotations.Param;
*/
public interface LandInfoMapper extends BaseMapper<LandInfoEntity> {
Page<LandPageVo> pageList(Page page, @Param("param") LandPageDto condition);
}
......
......@@ -27,9 +27,14 @@ public class LandDetailVo {
private int id;
@ApiModelProperty(value = "联系人")
private String contacterName;
@ApiModelProperty(value = "联系电话")
private String contacterPhone;
/** 地块名称 */
@ApiModelProperty(value = "地块名称")
private String name;
/** 详细地址 */
@ApiModelProperty(name = "详细地址", notes = "")
private String address;
......@@ -45,73 +50,11 @@ public class LandDetailVo {
@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;
@ApiModelProperty(value = "轮播图")
private List<String> imgUrlList;
/** 土地类型(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 List<VideoVo> videoUrlList;
@ApiModelProperty(value = "VR")
private List<VrVo> vrUrlList;
@ApiModelProperty(value = "土地开发区信息")
private LandDetailDevelopment development;
}
......@@ -49,13 +49,12 @@ public class LandPageVo {
@ApiModelProperty(name = "土地类型名称(工业土地 商业土地)", notes = "")
private String type;
@ApiModelProperty(value = "价格")
private Double price;
@ApiModelProperty(value = "首屏图片")
private String imgUrl;
// 开发区名称
@ApiModelProperty(hidden = true)
private String developmentName;
@ApiModelProperty(value = "经度(坐标系gcj02)")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度(坐标系gcj02)")
private BigDecimal latitude;
}
package com.postcard.service.moudle.park.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.postcard.service.domain.ParamEntity;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/api/parkInfo/v1.0")
......@@ -16,7 +26,23 @@ public class ParkInfoController {
@Autowired
ParkInfoService parkInfoService;
@PostMapping("/page")
@ApiOperation(value = "园区列表信息")
public Page<ParkInfoListVO> page(@RequestBody ParamEntity<ParkPageDto> param){
return null;
}
@GetMapping("/industryList")
@ApiOperation(value = "主导产业查询条件")
public List<ParkIndustryVo> industryList(){
return null;
}
@GetMapping("/detail/{id}")
@ApiOperation(value = "园区详情")
@ApiImplicitParam(name = "id", value = "园区详情id", type = "Integer")
public ParkDetailVo detail(@PathVariable Integer id){
return null;
}
}
......@@ -16,39 +16,12 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ApiModel(value = "园区分页查询,排序字段:1-status:认证状态 ASC;2-create_time:录入时间 DESC;", description = "")
@ApiModel(value = "园区列表查询", description = "")
public class ParkPageDto {
/** 所属开发区id */
@ApiModelProperty(value = "所属开发区id")
private Integer developmentId;
/** 园区名称 */
@ApiModelProperty(value = "园区名称")
private String name;
/** 园区级别 */
@ApiModelProperty(value = "园区级别")
private String levelCode;
/** 园区级别名称 */
@ApiModelProperty(value = "园区级别名称")
private String levelName;
@ApiModelProperty(hidden = true)
private String provinceCode;
@ApiModelProperty(value = "省份")
private String provinceName;
@ApiModelProperty(hidden = true)
private String cityCode;
@ApiModelProperty(value = "城市")
private String cityName;
@ApiModelProperty(hidden = true)
private String regionCode;
@ApiModelProperty(value = "区/县")
private String regionName;
/** 占地面积(单位:亩) */
@ApiModelProperty(value = "面积")
......@@ -62,21 +35,10 @@ public class ParkPageDto {
@ApiModelProperty(hidden = true)
private Double coverAreaUp;
/** 认证状态(1-未认证;2-认证中;3-已认证;4-未通过;5-待认证;9-已作废) */
@ApiModelProperty(hidden = true)
private List<Integer> statusList;
// 招商方向
@ApiModelProperty(value = "招商方向")
private String investmentDirection;
// 产业资源
@ApiModelProperty(value = "产业资源")
private List<String> parkResourcesList;
// 产业政策
@ApiModelProperty(value = "产业政策")
private List<String> industryPolicyList;
/**
* 主导产业
*/
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
}
package com.postcard.service.moudle.park.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.util.List;
/**
* @Author:zhouxudong
*
* @version: 1.0 @Date: 2023/11/21 15:05 @Description: 园区分页查询
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class ParkPagePersonDto {
@ApiModelProperty(value = "来源方式(lyy_info_source)")
private Integer isSystem;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "录入起始时间")
private String startCreateTime;
@ApiModelProperty(value = "录入结束时间")
private String endCreateTime;
@ApiModelProperty(value = "审批状态(lyy_parkinfo_status)")
private Integer status;
@ApiModelProperty(hidden = true)
private List<Integer> statusList;
@ApiModelProperty(hidden = true)
private Integer userId;
}
......@@ -39,6 +39,7 @@ public class ParkDetailVo {
@NotNull
private String name;
/** 园区级别 */
@ApiModelProperty(value = "园区级别")
private String levelCode;
......@@ -47,6 +48,7 @@ public class ParkDetailVo {
@ApiModelProperty(value = "园区级别名称")
private String levelName;
/** 省份code */
@ApiModelProperty(value = "省份code")
private String provinceCode;
......@@ -79,164 +81,42 @@ public class ParkDetailVo {
@ApiModelProperty(value = "占地面积(单位:亩)")
private Double coverArea;
/** 招商方向 park_investment_direction_info */
@ApiModelProperty(value = "招商方向")
private List<CarrierInvestmentVo> investmentDetails;
/** 联系人(区域负责人姓名) */
@ApiModelProperty(value = "联系人(区域负责人姓名)")
private String contactPerson;
@ApiModelProperty(value = "轮播图")
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 description;
//-------------产业基础--------------------
// -----------基础信息----------------
/** 主导产业 */
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
/** 招商方向 park_investment_direction_info */
@ApiModelProperty(value = "招商方向")
private List<CarrierInvestmentVo> investmentDetails;
// ---------------入筑要求----------------------
@ApiModelProperty(value = "总投资额(亿元)")
@JsonSerialize(using = BigDecimal2String.class)
private BigDecimal investmentAmountTotal;
/** 亩均产值(单位:万/亩) */
@ApiModelProperty(value = "亩均产值(单位:万/亩)")
@JsonSerialize(using = String2String.class)
private String averageOutputValue;
/** 投资强度(单位:万/亩) */
@ApiModelProperty(value = "投资强度(单位:万/亩)")
@JsonSerialize(using = String2String.class)
private String investmentStrength;
/** 税收强度(单位:万/亩) */
@ApiModelProperty(value = "税收强度(单位:万/亩)")
@JsonSerialize(using = String2String.class)
private String taxationStrength;
@ApiModelProperty(value = "建设周期(月)")
private Integer buildingPeriod;
/** 单位工业增加值能耗(单位:tce/万元) */
@ApiModelProperty(value = "能评要求(单位:tce/万元)")
@JsonSerialize(using = String2String.class)
private String valueAddedEnergy;
/** 环评要求 */
@ApiModelProperty(value = "环评要求(单位:万/亩)")
private String environmentalEquirements;
/** 禁限目录 */
@ApiModelProperty(value = "禁限目录")
private String prohibitDirectory;
@ApiModelProperty(value = "其他要求")
private String accessOther;
@ApiModelProperty(value = "是否有其他要求")
private Integer isOtherRequirements;
// -------------要素成本-------------------
/** 租金单价(单位:元/㎡/月) */
@ApiModelProperty(value = "租金单价(单位:元/㎡/月)")
@JsonSerialize(using = String2String.class)
private String rentPrice;
@ApiModelProperty(value = "出售单价(元/天/㎡)")
@JsonSerialize(using = BigDecimal2String.class)
private BigDecimal salePrice;
/** 物业费单价(单位:元/㎡/月) */
@ApiModelProperty(value = "物业费单价(单位:元/㎡/月)")
@JsonSerialize(using = BigDecimal2String.class)
private BigDecimal propertyPrice;
/** 电价(单位:元/度) */
@ApiModelProperty(value = "工业电价(单位:元/度)")
@JsonSerialize(using = String2String.class)
private String electricityPrice;
/**
* 供电类型
*/
@ApiModelProperty(value = "供电类型")
private String powerSupplyType;
/** 工业用水(单位:元/吨) */
@ApiModelProperty(value = "工业用水(单位:元/吨)")
@JsonSerialize(using = BigDecimal2String.class)
private BigDecimal industrialWater;
@ApiModelProperty(value = "变电站级别(工业用电)")
private String substationLevel;
// park_sewage_info 表中数据
@ApiModelProperty(value = "生活级污水价格")
@JsonSerialize(using = String2String.class)
private String lifeSewagePrice;
/** 天然气(单位:元/m³) */
@ApiModelProperty(value = "天然气(单位:元/m³)")
@JsonSerialize(using = String2String.class)
private String gas;
/** 蒸汽(单位:元/m³) */
@ApiModelProperty(value = "蒸汽(单位:元/m³)")
@JsonSerialize(using = BigDecimal2String.class)
private BigDecimal steam;
/** 非居民用暖价格(单位:元/㎡) */
@ApiModelProperty(value = "非居民用暖价格(单位:元/㎡)")
@JsonSerialize(using = BigDecimal2String.class)
private BigDecimal nresidentsHeating;
// ---------------产业支持---------------------
// -----------产业支持----------------
// industry_resources special_indicators
@ApiModelProperty(value = "产业支持")
private List<String> resources;
// ------------产业政策-----------------
@ApiModelProperty(value = "产业政策 park_policy_info表中")
private JSONArray parkPolicy;
// ---------------代表企业------------------------
/** 代表企业 */
@ApiModelProperty(value = "代表企业")
private String enterprise;
// ---------------园内配套信息------------------------
// -----------配套设施----------------
@ApiModelProperty(value = "配套设施")
private List<String> setUp;
//----------------周边配套------------------------
@ApiModelProperty(value = "经度(坐标系gcj02)")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度(坐标系gcj02)")
private BigDecimal latitude;
// -------------载体------------------
// -----------载体----------------
@ApiModelProperty(value = "载体")
List<ParkCarrierVo> parkCarrier;
//---------是否可以查看 ---------
@ApiModelProperty(value = "是否可以查看")
private Boolean isView;
@ApiModelProperty(value = "用户解锁额度剩余次数")
private Integer limitNum;
@ApiModelProperty(value = "是否展示要素成本")
private Boolean seeYaosu;
@ApiModelProperty(value = "是否展示产业支持")
private Boolean seeResource;
}
package com.postcard.service.moudle.park.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author:zhouxudong
* @version: 1.0
* @Date: 2023/12/16 10:35
* @Description: 主导产业列表
*/
@Data
@ApiModel(value = "主导产业列表", description = "主导产业列表")
public class ParkIndustryVo {
@ApiModelProperty(value = "名称")
private String name;
}
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
......@@ -23,29 +24,15 @@ public class ParkInfoListVO implements Serializable {
@ApiModelProperty(value = "园区名称")
private String name;
/**
* 所属集团id
*/
@ApiModelProperty(value = "所属集团id")
private Integer groupId;
/**
* 所属集团
*/
@ApiModelProperty(value = "所属集团")
private String groupName;
@ApiModelProperty(value = "经度(坐标系gcj02)")
private BigDecimal longitude;
/**
* 所属片区id
*/
@ApiModelProperty(value = "所属片区id")
private Integer zoneId;
@ApiModelProperty(value = "纬度(坐标系gcj02)")
private BigDecimal latitude;
/**
* 所属片区
*/
@ApiModelProperty(value = "所属片区")
private String zoneName;
@ApiModelProperty(value = "列表展示图片")
private String imgUrl;
/**
* 园区级别
......@@ -56,59 +43,6 @@ public class ParkInfoListVO implements Serializable {
@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;
/**
* 占地面积(单位:亩)
......@@ -122,21 +56,6 @@ public class ParkInfoListVO implements Serializable {
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
/**
* 是否热点园区(0-否;1-是;)
*/
@ApiModelProperty(value = "是否热点园区(0-否;1-是;)")
private Integer isHotPark;
@ApiModelProperty(value = "列表展示图片")
private String imgUrl;
@ApiModelProperty(value = "收藏时间")
private Date createTime;
@ApiModelProperty(value = "是否收藏")
private Integer isCollection;
private static final long serialVersionUID = 1L;
}
package com.postcard.service.moudle.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.postcard.service.config.auth.BaseContextHandler;
import com.postcard.service.domain.ParamEntity;
import com.postcard.service.moudle.system.dto.InvestCluePageDto;
import com.postcard.service.moudle.system.entity.InvestClueInfoEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.postcard.service.moudle.system.service.InvestClueInfoService;
/**
* @author: zhouxudong
* @version: 1.0
* @createTime: 2023/12/16 11:47
* @description: 投资舒城 投资线索表
*/
@Api(tags = "投资舒城 投资线索表对象功能接口")
@RestController
@RequestMapping("/api/investClueInfo")
public class InvestClueInfoController {
@Autowired private InvestClueInfoService investClueInfoService;
@PostMapping("/save")
@ApiOperation(value = "投资线索保存")
public boolean save(@RequestBody InvestClueInfoEntity investClueInfo) {
investClueInfo.setUserId(BaseContextHandler.getCurrentUserInfo().getUserId());
return this.investClueInfoService.save(investClueInfo);
}
@PostMapping("/page")
@ApiOperation(value = "投资线索分页查询")
public Page<InvestClueInfoEntity> page(@RequestBody ParamEntity<InvestCluePageDto> param) {
return investClueInfoService.pageList(param);
}
}
package com.postcard.service.moudle.system.dto;
import io.swagger.annotations.ApiModel;
import lombok.*;
/**
* @Author:zhouxudong
* @version: 1.0
* @Date: 2023/12/16 11:54
* @Description: 咨询列表分页查询条件
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ApiModel(value = "咨询列表分页查询条件", description = "")
public class InvestCluePageDto {
}
package com.postcard.service.moudle.system.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.postcard.service.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.*;
import java.io.Serializable;
import java.util.Date;
/**
* @author: zhouxudong
* @version: 1.0
* @createTime: 2023/12/16 11:44
* @description: 投资舒城 投资线索表
*/
@ApiModel(value = "投资舒城 投资线索表", description = "")
@TableName("invest_clue_info")
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class InvestClueInfoEntity extends BaseEntity implements Serializable {
/** 用户id */
@ApiModelProperty(name = "用户id", notes = "")
private Long userId;
/** 咨询类型 */
@ApiModelProperty(name = "咨询类型", notes = "")
private Integer consultType;
/** 所属企业 */
@ApiModelProperty(name = "所属企业", notes = "")
private String company;
/** 姓名 */
@ApiModelProperty(name = "姓名", notes = "")
private String name;
/** 邮箱 */
@ApiModelProperty(name = "邮箱", notes = "")
private String email;
/** 需求描述 */
@ApiModelProperty(name = "需求描述", notes = "")
private String details;
/** 手机号 */
@ApiModelProperty(name = "手机号", notes = "")
private String phone;
@ApiModelProperty(name = "咨询类型名称", notes = "")
@TableField(exist = false)
private String consultTypeName;
}
package com.postcard.service.moudle.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.postcard.service.moudle.system.entity.InvestClueInfoEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @author: zhouxudong
* @version: 1.0
* @createTime: 2023/12/16 11:43
* @description: 投资舒城 投资线索表
*/
@Mapper
public interface InvestClueInfoMapper extends BaseMapper<InvestClueInfoEntity>{
}
package com.postcard.service.moudle.system.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.system.dto.InvestCluePageDto;
import com.postcard.service.moudle.system.entity.InvestClueInfoEntity;
/**
* 投资舒城 投资线索表;(invest_clue_info)表服务接口
* @author : http://www.chiner.pro
* @date : 2023-12-16
*/
public interface InvestClueInfoService extends IService<InvestClueInfoEntity> {
/**
* @description: 投资线索分页查询
* @date: 2023/12/16 11:56
* @param: [param]
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.postcard.service.moudle.system.vo.InvestCluePageVo>
**/
Page<InvestClueInfoEntity> pageList(ParamEntity<InvestCluePageDto> param);
}
package com.postcard.service.moudle.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
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.DictCodeEnum;
import com.postcard.service.moudle.system.dto.InvestCluePageDto;
import com.postcard.service.moudle.system.entity.InvestClueInfoEntity;
import com.postcard.service.moudle.system.entity.SysDictDataEntity;
import com.postcard.service.moudle.system.service.SysDictDataService;
import com.postcard.service.util.CommonUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.postcard.service.moudle.system.mapper.InvestClueInfoMapper;
import com.postcard.service.moudle.system.service.InvestClueInfoService;
import java.util.List;
import java.util.Map;
/**
* @author: zhouxudong
* @version: 1.0
* @createTime: 2023/12/16 11:45
* @description:
*/
@Service
@RequiredArgsConstructor
public class InvestClueInfoServiceImpl
extends ServiceImpl<InvestClueInfoMapper, InvestClueInfoEntity>
implements InvestClueInfoService {
private final SysDictDataService sysDictDataService;
/**
* @description: 投资线索分页查询
* @date: 2023/12/16 11:56
* @param: [param]
* @return:
* com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.postcard.service.moudle.system.vo.InvestCluePageVo>
*/
@Override
public Page<InvestClueInfoEntity> pageList(ParamEntity<InvestCluePageDto> param) {
Page page = CommonUtil.getPageFromEntity(param);
Page<InvestClueInfoEntity> pageInfo = this.page(page);
List<InvestClueInfoEntity> records = pageInfo.getRecords();
Map<String, SysDictDataEntity> stringSysDictDataEntityMap =
sysDictDataService.listByCode(DictCodeEnum.INVEST_TYPE.getCode());
records.forEach(
data -> {
data.setConsultTypeName(
stringSysDictDataEntityMap.get(data.getConsultType()).getDetail());
});
return pageInfo;
}
}
......@@ -45,69 +45,5 @@
output_value,invest_num,tax_revenue,construction_cycle,energy_require,version,create_by,create_time,update_by,update_time
</sql>
<select id="pageList" resultType="com.postcard.service.moudle.land.vo.LandPageVo"
parameterType="com.postcard.service.moudle.land.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>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.postcard.service.moudle.system.mapper.InvestClueInfoMapper">
</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