Skip to content

C
cfld-postcard-service
Commit e2105d3e authored by zhouxudong's avatar zhouxudong
Browse files
Options

更新代码

parent 69ffd7cf
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 441 deletions
src/main/java/com/postcard/service/moudle/development/controller/DevelopmentInfoController.java
View file @ e2105d3e
package com.postcard.service.moudle.development.controller;
import com.postcard.service.moudle.development.service.DevelopmentInfoService;
import com.postcard.service.moudle.development.vo.DevelopmentSourceVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -10,13 +12,17 @@ import java.util.Arrays;
@RestController
@RequestMapping("/api/developmentInfo/v1.0")
@Api(tags = "开发区信息")
@Api(tags = "开发区信息和首页视频图片")
@Slf4j
public class DevelopmentInfoController {
@Autowired
DevelopmentInfoService developmentInfoSerivce;
@GetMapping("/source")
@ApiOperation(value = "首页视频和图片")
public DevelopmentSourceVo source(){
return this.developmentInfoSerivce.source();
}
}
src/main/java/com/postcard/service/moudle/development/dto/DevelopmentPagePersonDto.java deleted 100644 → 0
View file @ 69ffd7cf
package com.postcard.service.moudle.development.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.io.Serializable;
import java.util.List;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class DevelopmentPagePersonDto implements Serializable {
@ApiModelProperty(value = "来源方式(lyy_info_source)")
private Integer isSystem;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "录入起始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private String startCreateTime;
@ApiModelProperty(value = "录入结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private String endCreateTime;
@ApiModelProperty(value = "审批状态(lyy_developmentinfo_status)")
private Integer status;
@ApiModelProperty(hidden = true)
private List<Integer> statusList;
@ApiModelProperty(hidden = true)
private Integer userId;
}
src/main/java/com/postcard/service/moudle/development/mapper/DevelopmentInfoMapper.java
View file @ e2105d3e
......@@ -3,10 +3,7 @@ package com.postcard.service.moudle.development.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.postcard.service.moudle.development.dto.DevelopmentPageDto;
import com.postcard.service.moudle.development.dto.DevelopmentPagePersonDto;
import com.postcard.service.moudle.development.entity.DevelopmentInfo;
import com.postcard.service.moudle.development.vo.DevelopmentCountVo;
import com.postcard.service.moudle.development.vo.DevelopmentPagePersonVo;
import com.postcard.service.moudle.development.vo.DevelopmentPageVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -27,20 +24,6 @@ public interface DevelopmentInfoMapper extends BaseMapper<DevelopmentInfo> {
**/
Page<DevelopmentPageVo> pageList(Page pageFromEntity, @Param("param") DevelopmentPageDto developmentInfoDto);
/**
* @description: 个人中心分页查询开发区列表
* @date: 2023/11/23 9:51
* @param: paramEntity
**/
Page<DevelopmentPagePersonVo> pagePersonList(Page pageFromEntity, @Param("param") DevelopmentPagePersonDto developmentInfoDto);
/**
* 开发区 载体数量 产业园数量 土地数量
* @param id
* @return
*/
DevelopmentCountVo countById(Integer id);
/**
* @description: 该开发区的载体数目
* @date: 2023/12/12 19:31
......
src/main/java/com/postcard/service/moudle/development/service/DevelopmentInfoService.java
View file @ e2105d3e
package com.postcard.service.moudle.development.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.development.dto.DevelopmentPageDto;
import com.postcard.service.moudle.development.dto.DevelopmentPagePersonDto;
import com.postcard.service.moudle.development.entity.DevelopmentInfo;
import com.postcard.service.moudle.development.vo.DevelopmentDetailPersonVo;
import com.postcard.service.moudle.development.vo.DevelopmentDetailVo;
import com.postcard.service.moudle.development.vo.DevelopmentPagePersonVo;
import com.postcard.service.moudle.development.vo.DevelopmentPageVo;
import com.postcard.service.moudle.development.vo.DevelopmentSourceVo;
import java.util.List;
......@@ -35,4 +28,11 @@ public interface DevelopmentInfoService extends IService<DevelopmentInfo> {
* @return: java.util.List<java.lang.String>
**/
List<String> investmentDirection(Integer developmentId);
/**
* @description: 首页视频和图片
* @date: 2023/12/16 15:54
* @param: []
* @return: com.postcard.service.moudle.development.vo.DevelopmentSourceVo
**/
DevelopmentSourceVo source();
}
src/main/java/com/postcard/service/moudle/development/service/impl/DevelopmentInfoServiceImpl.java
View file @ e2105d3e
......@@ -4,38 +4,26 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
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.DevelopmentInfoEnum;
import com.postcard.service.enums.DevelopmentStatusEnum;
import com.postcard.service.enums.DictCodeEnum;
import com.postcard.service.enums.CarouselTypeEnum;
import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
import com.postcard.service.moudle.development.dto.DevelopmentPageDto;
import com.postcard.service.moudle.development.entity.DevelopmentInfo;
import com.postcard.service.moudle.development.entity.DevelopmentInvestmentDirectionInfo;
import com.postcard.service.moudle.development.entity.DevelopmentPrimaryEnterpriseInfo;
import com.postcard.service.moudle.development.mapper.DevelopmentInfoMapper;
import com.postcard.service.moudle.development.service.*;
import com.postcard.service.moudle.development.vo.DevelopmentDetailVo;
import com.postcard.service.moudle.development.vo.DevelopmentEnterpriseVo;
import com.postcard.service.moudle.development.vo.DevelopmentPageVo;
import com.postcard.service.moudle.development.vo.DevelopmentSourceVo;
import com.postcard.service.moudle.land.service.LandInfoService;
import com.postcard.service.moudle.park.service.ParkInfoService;
import com.postcard.service.moudle.system.entity.SysDictDataEntity;
import com.postcard.service.moudle.system.service.SysCarouselInfoService;
import com.postcard.service.moudle.system.service.SysDictDataService;
import com.postcard.service.util.CommonUtil;
import com.postcard.service.moudle.system.vo.ResourceVo;
import com.postcard.service.moudle.system.vo.VideoVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
......@@ -49,30 +37,24 @@ import java.util.stream.Collectors;
public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMapper, DevelopmentInfo>
implements DevelopmentInfoService {
@Autowired
ParkInfoService parkInfoService;
@Autowired ParkInfoService parkInfoService;
@Autowired
DevelopmentPrimaryEnterpriseInfoService developmentPrimaryEnterpriseInfoService;
@Autowired DevelopmentPrimaryEnterpriseInfoService developmentPrimaryEnterpriseInfoService;
@Autowired
DevelopmentIndustryPolicyInfoService developmentIndustryPolicyInfoService;
@Autowired DevelopmentIndustryPolicyInfoService developmentIndustryPolicyInfoService;
@Autowired
DevelopmentInvestmentDirectionInfoService developmentInvestmentDirectionInfoService;
@Autowired DevelopmentInvestmentDirectionInfoService developmentInvestmentDirectionInfoService;
@Autowired
DevelopmentIndustryFundInfoService developmentIndustryFundInfoService;
@Autowired DevelopmentIndustryFundInfoService developmentIndustryFundInfoService;
@Autowired
LandInfoService landInfoService;
@Autowired LandInfoService landInfoService;
@Autowired
SysCarouselInfoService sysCarouselInfoService;
@Autowired SysCarouselInfoService sysCarouselInfoService;
@Autowired
SysDictDataService sysDictDataService;
@Autowired SysDictDataService sysDictDataService;
@Value("${development.id}")
private Integer developMentId;
/**
* @description: 查询开发区的一级招商方向
......@@ -99,24 +81,40 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
}
return result;
}
/**
* @description: 首页视频和图片
* @date: 2023/12/16 15:54
* @param: []
* @return: com.postcard.service.moudle.development.vo.DevelopmentSourceVo
*/
@Override
public DevelopmentSourceVo source() {
DevelopmentSourceVo developmentSourceVo = new DevelopmentSourceVo();
ResourceVo allResource =
sysCarouselInfoService.getAllResource(CarouselTypeEnum.KAIFAQU.getType(), developMentId);
List<String> imgUrlList = allResource.getImgUrlList();
List<VideoVo> videoVoList = allResource.getVideoVoList();
developmentSourceVo.setImgUrlList(imgUrlList);
developmentSourceVo.setVideoVoList(videoVoList);
return developmentSourceVo;
}
@Override
public List<CarrierInvestmentVo> getInvestment(Integer developmentId) {
LambdaQueryWrapper<DevelopmentInvestmentDirectionInfo> investQuery = new LambdaQueryWrapper<>();
investQuery
.eq(DevelopmentInvestmentDirectionInfo::getDevelopmentId, developmentId);
investQuery.eq(DevelopmentInvestmentDirectionInfo::getDevelopmentId, developmentId);
List<DevelopmentInvestmentDirectionInfo> investmentEntityList =
developmentInvestmentDirectionInfoService.list(investQuery);
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());
investmentEntityList.stream()
.map(
e -> {
CarrierInvestmentVo carrierInvestmentVo = new CarrierInvestmentVo();
carrierInvestmentVo.setCodeName(e.getIndustryDirection());
carrierInvestmentVo.setDetails(e.getTrack());
return carrierInvestmentVo;
})
.collect(Collectors.toList());
return invests;
}
}
src/main/java/com/postcard/service/moudle/development/vo/DevelopmentCountVo.java deleted 100644 → 0
View file @ 69ffd7cf
package com.postcard.service.moudle.development.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "开发区内园区、载体、土地数量计算")
public class DevelopmentCountVo {
@ApiModelProperty(value = "园区数量")
private Long parkCount;
@ApiModelProperty(value = "载体数量")
private Long carrierCount;
@ApiModelProperty(value = "土地数量")
private Long landCount;
}
src/main/java/com/postcard/service/moudle/development/vo/DevelopmentDetailPersonVo.java deleted 100644 → 0
View file @ 69ffd7cf
package com.postcard.service.moudle.development.vo;
import cn.hutool.json.JSONArray;
import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
import com.postcard.service.moudle.land.entity.LandInfoEntity;
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.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @Author:yaobaizheng
* @version: 1.0 @Date: 2023/11/22 17:51 @Description: 个人中心开发区详情
*/
@Data
@ApiModel(value = "个人中心开发区详情", description = "个人中心开发区详情")
public class DevelopmentDetailPersonVo implements Serializable {
// -------------------头部信息-----------------------------
@ApiModelProperty(value = "主键id")
private Integer id;
@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;
@ApiModelProperty(value = "开发区类型")
private String type;
@ApiModelProperty(value = "规划面积（平方公里）")
private BigDecimal planArea;
@ApiModelProperty(value = "省code")
private String provinceCode;
@ApiModelProperty(value = "省")
private String provinceName;
@ApiModelProperty(value = "市code")
private String cityCode;
@ApiModelProperty(value = "市")
private String cityName;
@ApiModelProperty(value = "区/县code")
private String regionCode;
@ApiModelProperty(value = "区/县")
private String regionName;
@ApiModelProperty(value = "详细地址")
private String address;
//------------园区对接人------------------------------------------------
@ApiModelProperty(value = "招商对接人")
private String contactPerson;
@ApiModelProperty(value = "联系电话")
private String contactPhone;
@ApiModelProperty(value = "组织机构")
private String organization;
//------------开发区简介------------------------------------------------
@ApiModelProperty(value = "开发区简介")
private String description;
//------------产业基础------------------------------------------------
@ApiModelProperty(value = "主导产业")
private String primaryIndustry;
@ApiModelProperty(value = "招商方向")
private List<CarrierInvestmentVo> investmentDetails;
//------------要素成本------------------------------------------------
@ApiModelProperty(value = "人力成本（元/月）")
private BigDecimal laborCost;
@ApiModelProperty(value = "土地成本（万元/亩）")
private BigDecimal landCost;
@ApiModelProperty(value = "工业用电（元/㎡/天）")
private String industrialElectricity;
@ApiModelProperty(value = "变电站级别")
private String[] substationLevel;
@ApiModelProperty(value = "供电类型")
private String powerSupplyType;
@ApiModelProperty(value = "工业用水单价（元/吨）")
private String industrialWaterPrice;
@ApiModelProperty(value = "污水处理类别")
private String sewageWaterType;
@ApiModelProperty(value = "污水处理价格（元/吨）")
private BigDecimal sewageWaterPrice;
@ApiModelProperty(value = "供暖单价（元/m³）")
private String heatingPrice;
@ApiModelProperty(value = "蒸汽价格（元/m³）")
private String steamPrice;
@ApiModelProperty(value = "天然气单价（元/m³）")
private String naturalGasPrice;
//------------------重点企业---------------------------------------------
@ApiModelProperty(value = "重点企业详情")
private JSONArray enterpriseList;
//------------------产业政策---------------------------------------------
@ApiModelProperty(value = "产业政策详情")
private JSONArray policyList;
//------------------产业基金---------------------------------------------
@ApiModelProperty(value = "产业基金")
private List<DevelopmentFundVo> fundList;
//------------------入驻要求---------------------------------------------
@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 String environmentalEquirements;
@ApiModelProperty(value = "能评要求（单位：tce/万元）")
private String valueAddedEnergy;
@ApiModelProperty(value = "禁限目录")
private String prohibitedDirectory;
@ApiModelProperty(value = "禁限目录文件")
private List<String> prohibitedDirectoryUrlList;
@ApiModelProperty(value = "其他入驻要求")
private String accessOther;
@ApiModelProperty(value = "政策文件")
private List<String> policyUrlList;
@ApiModelProperty(value = "轮播图")
private List<String> imgUrlList;
@ApiModelProperty(value = "视频")
private List<VideoVo> videoUrlList;
@ApiModelProperty(value = "视频")
private List<VrVo> vrUrlList;
//--------------------开发区内所属产业园列表--------------------------------
@ApiModelProperty(value = "开发区内土地列表")
private List<LandInfoEntity> LandinfoList;
@ApiModelProperty(value = "星级开发区附加信息")
private Map<String, List<StarObjectExtensionInfoVO>> starObjectExtensionInfoMap;
}
src/main/java/com/postcard/service/moudle/development/vo/DevelopmentDetailVo.java
View file @ e2105d3e
......@@ -188,12 +188,6 @@ public class DevelopmentDetailVo implements Serializable {
@ApiModelProperty(value = "VR")
private List<VrVo> vrUrlList;
@ApiModelProperty(value = "星级开发区附加信息")
private Map<String, List<StarObjectExtensionInfoVO>> starObjectExtensionInfoMap;
@ApiModelProperty(value = "开发区内园区、载体、土地数量计算")
private DevelopmentCountVo developmentCountVo;
@ApiModelProperty(value = "载体数目")
private Integer carrierNum;
}
src/main/java/com/postcard/service/moudle/development/vo/DevelopmentEnterpriseVo.java deleted 100644 → 0
View file @ 69ffd7cf
package com.postcard.service.moudle.development.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "开发区重点企业信息", description = "开发区重点企业信息")
public class DevelopmentEnterpriseVo{
@ApiModelProperty(value = "产业方向")
private String industryDirection;
@ApiModelProperty(value = "企业名称")
private String enterpriseName;
@ApiModelProperty(value = "所属赛道")
private String track;
}
src/main/java/com/postcard/service/moudle/development/vo/DevelopmentPagePersonVo.java deleted 100644 → 0
View file @ 69ffd7cf
package com.postcard.service.moudle.development.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 DevelopmentPagePersonVo implements Serializable {
@ApiModelProperty(value = "主键id")
private Integer id;
@ApiModelProperty(value = "开发区名称")
private String name;
@ApiModelProperty(value = "来源方式(lyy_info_source)")
private Integer isSystem;
@ApiModelProperty(value = "来源方式")
private String isSystemName;
@ApiModelProperty(value = "录入时间")
private Date createTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(hidden = true)
private Integer status;
@ApiModelProperty(value = "审核状态")
private String statusName;
}
src/main/java/com/postcard/service/moudle/development/vo/DevelopmentPolicyVo.java deleted 100644 → 0
View file @ 69ffd7cf
package com.postcard.service.moudle.development.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "开发区产业政策信息")
public class DevelopmentPolicyVo {
@ApiModelProperty(value = "政策类型")
private String type;
@ApiModelProperty(value = "政策名称")
private String name;
@ApiModelProperty(value = "政策类型")
private String content;
}
src/main/java/com/postcard/service/moudle/development/vo/DevelopmentSourceVo.java 0 → 100644
View file @ e2105d3e
package com.postcard.service.moudle.development.vo;
import com.postcard.service.moudle.system.vo.VideoVo;
import lombok.*;
import java.util.ArrayList;
import java.util.List;
/**
* @Author:zhouxudong
* @version: 1.0
* @Date: 2023/12/16 15:50
* @Description: 舒城 首页 的视频和区位信息
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class DevelopmentSourceVo {
private List<String> imgUrlList = new ArrayList<>();
private List<VideoVo> videoVoList = new ArrayList<>();
}
src/main/java/com/postcard/service/moudle/development/vo/StarObjectExtensionInfoVO.java deleted 100644 → 0
View file @ 69ffd7cf
package com.postcard.service.moudle.development.vo;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName star_object_extension_info
*/
@Data
public class StarObjectExtensionInfoVO implements Serializable {
/**
*
*/
private String title;
/**
*
*/
private String coverUrl;
/**
* 介绍
*/
private String titleIntroduce;
}
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