Skip to content

cfld-region-outline
cfld-region-outline
Commit 57139597 authored by yaobaizheng's avatar yaobaizheng
Browse files
Options

立业人接口

parent 1f30947b
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 82 deletions
src/main/java/com/lyy/admin/VO/CarrierDetailVo.java
View file @ 57139597
......@@ -69,8 +69,8 @@ public class CarrierDetailVo {
// ----------------所属产业园-----入住要求------》park 园区表中数据-----------------------
// @ApiModelProperty(value = "产业园信息 / 入住要求")
// private CarrierParkVo carrierParkVo;
@ApiModelProperty(value = "产业园信息 / 入住要求")
private CarrierParkVo carrierParkVo;
//----------轮播图-------------------
@ApiModelProperty(value = "轮播图")
private List<String> imgUrls=new ArrayList<>();
......
src/main/java/com/lyy/admin/VO/CarrierParkVo.java 0 → 100644
View file @ 57139597
package com.lyy.admin.VO;
import com.baomidou.mybatisplus.annotation.TableId;
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/23 15:23
* @Description:
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ApiModel(value = "载体详情中的产业园")
public class CarrierParkVo {
@TableId
@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;
@ApiModelProperty(value = "经度（坐标系gcj02）")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度（坐标系gcj02）")
private BigDecimal latitude;
/**
* 占地面积（单位：亩）
*/
@ApiModelProperty(value = "占地面积（单位：亩）")
private Double coverArea;
/**
* 园区级别名称
*/
@ApiModelProperty(value = "园区级别名称")
private String levelName;
@ApiModelProperty(value = "招商方向")
private List<String> investmentDetails;
@ApiModelProperty(value = "图片")
private String imgUrl;
//-------------入驻要求-------------
@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 address;
@ApiModelProperty(value = "联系人")
private String contactPerson;
}
src/main/java/com/lyy/admin/common/interceptor/LoginInterceptor.java
View file @ 57139597
......@@ -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/controller/carrier/CarrierController.java
View file @ 57139597
......@@ -31,32 +31,21 @@ import static com.lyy.admin.common.utils.PageUtils.startPage;
@RequiredArgsConstructor
public class CarrierController extends BaseController {
private final CarrierInfoService carrierInfoService;
@PostMapping("/page")
@ApiOperation(value = "分页获取载体信息")
@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 page(CarrierPageDto carrierPageDto) {
startPage();
List<CarrierPageVo> carrierPageVos = carrierInfoService.pageList(carrierPageDto);
return getDataTable(carrierPageVos);
}
// public Page<CarrierPageVo> page(@RequestBody ParamEntity<CarrierPageDto> carrierPageDto){
// return this.carrierInfoService.pageList(carrierPageDto);
// private final CarrierInfoService carrierInfoService;
//
// @PostMapping("/page")
// @ApiOperation(value = "分页获取载体信息")
// @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 page(CarrierPageDto carrierPageDto) {
// startPage();
// List<CarrierPageVo> carrierPageVos = carrierInfoService.pageList(carrierPageDto);
// return getDataTable(carrierPageVos);
// }
// @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);
// }
}
src/main/java/com/lyy/admin/controller/personalfunction/PersonalFunctionsController.java
View file @ 57139597
......@@ -79,7 +79,7 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getParkSaveAuthentication")
@ResponseBody
@ApiOperation(value = "园区-我的录入",notes = "rest风格传参，将参数拼接在url上")
public TableDataInfo getParkSaveAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
public List<ParkInfoListVO> getParkSaveAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
parkInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
parkInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(parkInfoAuthenticationParam.getStatus())){
......@@ -90,9 +90,9 @@ public class PersonalFunctionsController extends BaseController {
ParkInfoEnum.STATUS_YRZ.getCode(),
ParkInfoEnum.STATUS_YJJ.getCode()));
}
PageUtils.startPage();
// PageUtils.startPage();
List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList(parkInfoAuthenticationParam);
return getDataTable(parkInfoListVOS);
return parkInfoListVOS;
}
/**
......@@ -102,7 +102,7 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getParkEditAuthentication")
@ResponseBody
@ApiOperation(value = "园区-我的完善",notes = "")
public TableDataInfo getParkEditAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
public List<ParkInfoListVO> getParkEditAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
parkInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
parkInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(parkInfoAuthenticationParam.getStatus())){
......@@ -114,9 +114,9 @@ public class PersonalFunctionsController extends BaseController {
ParkInfoEnum.STATUS_YJJ.getCode(),
ParkInfoEnum.STATUS_ZF.getCode()));
}
PageUtils.startPage();
// PageUtils.startPage();
List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList( parkInfoAuthenticationParam);
return getDataTable(parkInfoListVOS);
return parkInfoListVOS;
}
......@@ -127,7 +127,7 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getDevelopmentSaveAuthentication")
@ResponseBody
@ApiOperation(value = "开发区-我的录入",notes = "rest风格传参，将参数拼接在url上")
public TableDataInfo getDevelopmentSaveAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
public List<DevelopmentInfoListVO> getDevelopmentSaveAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
developmentInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
developmentInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationParam.getStatus())){
......@@ -138,9 +138,9 @@ public class PersonalFunctionsController extends BaseController {
DevelopmentStatusEnum.STATUS_YRZ.getCode(),
DevelopmentStatusEnum.STATUS_YJJ.getCode()));
}
PageUtils.startPage();
// PageUtils.startPage();
List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationParam);
return getDataTable(parkInfoListVOS);
return parkInfoListVOS;
}
/**
......@@ -150,7 +150,7 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getDevelopmentEditAuthentication")
@ResponseBody
@ApiOperation(value = "开发区-我的完善",notes = "rest风格传参，将参数拼接在url上")
public TableDataInfo getDevelopmentEditAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
public List<DevelopmentInfoListVO> getDevelopmentEditAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
developmentInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
developmentInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationParam.getStatus())){
......@@ -162,9 +162,9 @@ public class PersonalFunctionsController extends BaseController {
DevelopmentStatusEnum.STATUS_YJJ.getCode(),
DevelopmentStatusEnum.STATUS_ZF.getCode()));
}
PageUtils.startPage();
// PageUtils.startPage();
List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationParam);
return getDataTable(parkInfoListVOS);
return parkInfoListVOS;
}
// /**
......
src/main/java/com/lyy/admin/enumerate/CarouselTypeEnum.java
View file @ 57139597
......@@ -4,7 +4,10 @@ public enum CarouselTypeEnum {
DUSHIQUAN(0,"都市圈"),
KAIFAQU(1,"开发区"),
YUANQU(2,"园区"),
SHOUYE(3,"首页");
LAND(4, "土地轮播图"),
CARRIER(5, "载体轮播图"),
SHOUYE(3, "园区字典首页"),
LYYSHOUYE(6, "立业云首页");
private Integer type;
private String typeName;
......
src/main/java/com/lyy/admin/service/carrierinfo/impl/CarrierInfoServiceImpl.java
View file @ 57139597
......@@ -6,24 +6,25 @@ 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.DTO.CarrierPageDto;
import com.lyy.admin.VO.CarrierDetailVo;
import com.lyy.admin.VO.CarrierInvestmentVo;
import com.lyy.admin.VO.CarrierPageVo;
import com.lyy.admin.VO.*;
import com.lyy.admin.common.constant.RedisConstants;
import com.lyy.admin.common.utils.DataUtil;
import com.lyy.admin.common.utils.MethodUtils;
import com.lyy.admin.common.utils.StringUtils;
import com.lyy.admin.common.utils.redis.RedisUtil;
import com.lyy.admin.domain.carrierinfo.CarrierInfo;
import com.lyy.admin.VO.CarrierInfoListVO;
import com.lyy.admin.domain.parkinfo.ParkInfo;
import com.lyy.admin.domain.system.SysDictDataEntity;
import com.lyy.admin.enumerate.CarouselTypeEnum;
import com.lyy.admin.enumerate.DictCodeEnum;
import com.lyy.admin.service.carrierinfo.CarrierInfoService;
import com.lyy.admin.mapper.carrierinfo.CarrierInfoMapper;
import com.lyy.admin.service.parkinfo.ParkInfoService;
import com.lyy.admin.service.system.SysCarouselInfoService;
import com.lyy.admin.service.system.SysDictDataService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -41,8 +42,12 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
@Autowired
SysDictDataService sysDictDataService;
// @Autowired
// ParkInfoService parkInfoService;
@Autowired
@Lazy
ParkInfoService parkInfoService;
@Autowired
SysCarouselInfoService sysCarouselInfoService;
@Override
public List<CarrierInfoListVO> selectCarrierInfoVOList(Integer id) {
List<CarrierInfoListVO> carrierInfoVOS = this.baseMapper.selectCarrierInfoVOList(id);
......@@ -119,38 +124,35 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
// 招商方向
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);
// });
// }
// // 轮播图
// carrierDetailVo.setImgUrls(this.sysCarouselInfoService.getImgUrls(CarouselTypeEnum.CARRIER.getType(),id));
//// //视频
//// carrierDetailVo.setVideoUrlList(this.sysCarouselInfoService.getVideos(CarouselTypeEnum.CARRIER.getType(), id));
//
// 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);
// }
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);
});
}
// 轮播图
carrierDetailVo.setImgUrls(this.sysCarouselInfoService.getImgUrls(CarouselTypeEnum.CARRIER,id));
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;
}
......
src/main/java/com/lyy/admin/service/parkinfo/ParkInfoService.java
View file @ 57139597
package com.lyy.admin.service.parkinfo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.lyy.admin.VO.CarrierInvestmentVo;
import com.lyy.admin.VO.ParkInfoAllSaveVO;
import com.lyy.admin.VO.ParkInfoAllVO;
import com.lyy.admin.VO.ParkInfoListVO;
import com.lyy.admin.common.page.TableDataInfo;
import com.lyy.admin.domain.parkinfo.*;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author 26996
......@@ -30,4 +35,14 @@ public interface ParkInfoService extends IService<ParkInfo> {
public Boolean isAlreadyAuthentication(Integer id);
public ParkInfoAllSaveVO getParkSaveInfo(Integer id);
public List<CarrierInvestmentVo> listInvestDetail(int parkId);
/**
* @description: 查询园区的一级招商方向
* @date: 2023/11/28 11:23
* @param: [parkId]
* @return: java.util.List<java.lang.String>
*/
public List<String> investmentDirection(Integer parkId);
}
src/main/java/com/lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java
View file @ 57139597
......@@ -38,6 +38,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.math.BigDecimal;
import java.util.*;
......@@ -666,6 +667,48 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
return flag;
}
@Override
public List<CarrierInvestmentVo> listInvestDetail(int parkId) {
List<CarrierInvestmentVo> investmentVos = new ArrayList<>();
LambdaQueryWrapper<ParkInvestmentDirectionInfo> investmentQuery = new LambdaQueryWrapper<>();
investmentQuery.eq(ParkInvestmentDirectionInfo::getParkId, parkId);
List<ParkInvestmentDirectionInfo> investmentList =
this.parkInvestmentDirectionInfoService.list(investmentQuery);
if (!CollectionUtils.isEmpty(investmentList)) {
investmentList.forEach(
data -> {
CarrierInvestmentVo investmentVo = new CarrierInvestmentVo();
investmentVo.setCodeName(data.getIndustrialTrack());
investmentVo.setDetails(data.getSegmentedTrack());
investmentVos.add(investmentVo);
});
}
return investmentVos;
}
/**
* @description: 查询园区的一级招商方向
* @date: 2023/11/28 11:23
* @param: [parkId]
* @return: java.util.List<java.lang.String>
*/
@Override
public List<String> investmentDirection(Integer parkId) {
List<String> investmentDirection = new ArrayList<>();
LambdaQueryWrapper<ParkInvestmentDirectionInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ParkInvestmentDirectionInfo::getParkId, parkId);
List<ParkInvestmentDirectionInfo> list =
this.parkInvestmentDirectionInfoService.list(lambdaQueryWrapper);
if (!CollectionUtils.isEmpty(list)) {
investmentDirection =
list.stream()
.map(ParkInvestmentDirectionInfo::getIndustrialTrack)
.distinct()
.collect(Collectors.toList());
}
return investmentDirection;
}
}
......
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