Skip to content

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

更改类名称

parent 03f749c0
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 241 deletions
src/main/java/com/lyy/admin/moudle/api/controller/ApiController.java
View file @ d66096c1
......@@ -18,9 +18,9 @@ import com.lyy.admin.moudle.sms.vo.SendPhoneVo;
import com.lyy.admin.common.page.TableDataInfo;
import com.lyy.admin.moudle.other.controller.BaseController;
import com.lyy.admin.moudle.development.entity.DevelopmentInfo;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoParam;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoDto;
import com.lyy.admin.moudle.park.entity.ParkInfo;
import com.lyy.admin.moudle.park.entity.ParkInfoParam;
import com.lyy.admin.moudle.park.dto.ParkInfoDto;
import com.lyy.admin.enumerate.DevelopmentStatusEnum;
import com.lyy.admin.enumerate.ExamineStatusEnum;
import com.lyy.admin.enumerate.OrganizationEnum;
......@@ -87,11 +87,11 @@ public class ApiController extends BaseController {
@ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
public TableDataInfo parkPageList(ParkInfoParam parkInfoParam) {
public TableDataInfo parkPageList(ParkInfoDto parkInfoDto) {
String status = ParkInfoEnum.STATUS_YRZ.getCode()+","+ParkInfoEnum.STATUS_DRZ.getCode();
parkInfoParam.setStatus(status);
parkInfoDto.setStatus(status);
startPage();
List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoParam);
List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoDto);
List<ParkInfoListVO> parkInfoListVOs = lists.stream().map(parkInfo -> {
ParkInfoListVO parkInfoListVO = new ParkInfoListVO();
BeanUtils.copyProperties(parkInfo, parkInfoListVO);
......@@ -120,11 +120,11 @@ public class ApiController extends BaseController {
@ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
public TableDataInfo developmentPageList(DevelopmentInfoParam developmentInfoParam) {
public TableDataInfo developmentPageList(DevelopmentInfoDto developmentInfoDto) {
String status = DevelopmentStatusEnum.STATUS_YRZ.getCode()+","+DevelopmentStatusEnum.STATUS_DRZ.getCode();
developmentInfoParam.setStatus(status);
developmentInfoDto.setStatus(status);
startPage();
List<DevelopmentInfo> developmentInfos = developmentInfoService.selectDevelopmentInfoVOList(developmentInfoParam);
List<DevelopmentInfo> developmentInfos = developmentInfoService.selectDevelopmentInfoVOList(developmentInfoDto);
List<DevelopmentInfoListVO> developmentInfoVOs = developmentInfos.stream().map(developmentInfo -> {
DevelopmentInfoListVO developmentInfoVO = new DevelopmentInfoListVO();
BeanUtils.copyProperties(developmentInfo, developmentInfoVO);
......
src/main/java/com/lyy/admin/moudle/development/controller/DevelopmentInfoController.java
View file @ d66096c1
......@@ -10,7 +10,7 @@ import com.lyy.admin.moudle.other.controller.BaseController;
import com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO;
import com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO;
import com.lyy.admin.moudle.development.entity.DevelopmentInfo;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoParam;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoDto;
import com.lyy.admin.enumerate.DevelopmentStatusEnum;
import com.lyy.admin.moudle.development.service.DevelopmentInfoService;
import io.swagger.annotations.Api;
......@@ -44,12 +44,12 @@ public class DevelopmentInfoController extends BaseController {
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
@EncryptBusiness
public TableDataInfo list(DevelopmentInfoParam developmentInfoParam) {
public TableDataInfo list(DevelopmentInfoDto developmentInfoDto) {
boolean login = isLogin();
String status = DevelopmentStatusEnum.STATUS_YRZ.getCode()+","+DevelopmentStatusEnum.STATUS_DRZ.getCode();
developmentInfoParam.setStatus(status);
developmentInfoDto.setStatus(status);
startPage();
List<DevelopmentInfo> developmentInfos = developmentInfoSerivce.selectDevelopmentInfoVOList(developmentInfoParam);
List<DevelopmentInfo> developmentInfos = developmentInfoSerivce.selectDevelopmentInfoVOList(developmentInfoDto);
List<DevelopmentInfoListVO> developmentInfoVOs = developmentInfos.stream().map(developmentInfo -> {
DevelopmentInfoListVO developmentInfoVO = new DevelopmentInfoListVO();
BeanUtils.copyProperties(developmentInfo, developmentInfoVO);
......
src/main/java/com/lyy/admin/moudle/development/entity/DevelopmentInfoAuthenticationParam.java → src/main/java/com/lyy/admin/moudle/development/dto/DevelopmentInfoAuthenticationDto.java
View file @ d66096c1
package com.lyy.admin.moudle.development.entity;
package com.lyy.admin.moudle.development.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -8,7 +8,7 @@ import java.util.List;
@Data
public class DevelopmentInfoAuthenticationParam implements Serializable {
public class DevelopmentInfoAuthenticationDto implements Serializable {
@ApiModelProperty(hidden = true)
private Integer userId;
......
src/main/java/com/lyy/admin/moudle/development/entity/DevelopmentInfoCollectionParam.java → src/main/java/com/lyy/admin/moudle/development/dto/DevelopmentInfoCollectionDto.java
View file @ d66096c1
package com.lyy.admin.moudle.development.entity;
package com.lyy.admin.moudle.development.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class DevelopmentInfoCollectionParam implements Serializable {
public class DevelopmentInfoCollectionDto implements Serializable {
// /**
// * 开发区名称
......
src/main/java/com/lyy/admin/moudle/development/entity/DevelopmentInfoParam.java → src/main/java/com/lyy/admin/moudle/development/dto/DevelopmentInfoDto.java
View file @ d66096c1
package com.lyy.admin.moudle.development.entity;
package com.lyy.admin.moudle.development.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
@Data
public class DevelopmentInfoParam implements Serializable {
public class DevelopmentInfoDto implements Serializable {
@ApiModelProperty(value = "主键id传参，支持多个，用英文逗号分割")
private String id;
......
src/main/java/com/lyy/admin/moudle/development/mapper/DevelopmentInfoMapper.java
View file @ d66096c1
......@@ -3,8 +3,8 @@ package com.lyy.admin.moudle.development.mapper;
import com.lyy.admin.moudle.development.entity.DevelopmentInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoAuthenticationParam;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoCollectionParam;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoAuthenticationDto;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoCollectionDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -20,10 +20,10 @@ public interface DevelopmentInfoMapper extends BaseMapper<DevelopmentInfo> {
public List<DevelopmentInfoListVO> selectDevelopmentInfoVOList(Integer id);
public List<DevelopmentInfoListVO> selectDevelopmentInfoAuthenticationList(@Param("param") DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam);
public List<DevelopmentInfoListVO> selectDevelopmentInfoAuthenticationList(@Param("param") DevelopmentInfoAuthenticationDto developmentInfoAuthenticationDto);
public List<DevelopmentInfoListVO> selectDevelopmentInfoCollectionList(DevelopmentInfoCollectionParam developmentInfoParam);
public List<DevelopmentInfoListVO> selectDevelopmentInfoCollectionList(DevelopmentInfoCollectionDto developmentInfoParam);
}
......
src/main/java/com/lyy/admin/moudle/development/service/DevelopmentInfoService.java
View file @ d66096c1
......@@ -4,9 +4,9 @@ import com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo;
import com.lyy.admin.moudle.development.dto.DevelopmentMapDto;
import com.lyy.admin.moudle.development.entity.DevelopmentInfo;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoAuthenticationParam;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoCollectionParam;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoParam;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoAuthenticationDto;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoCollectionDto;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoDto;
import com.lyy.admin.moudle.development.vo.DevelopmentInfoAllSaveVO;
import com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO;
import com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO;
......@@ -20,15 +20,15 @@ import java.util.List;
* @createDate 2023-09-19 17:24:27
*/
public interface DevelopmentInfoService extends IService<DevelopmentInfo> {
public List<DevelopmentInfo> selectDevelopmentInfoVOList(DevelopmentInfoParam developmentInfoParam);
public List<DevelopmentInfo> selectDevelopmentInfoVOList(DevelopmentInfoDto developmentInfoDto);
public List<DevelopmentInfo> selectDevelopmentInfoDraftList(DevelopmentInfoParam developmentInfoParam);
public List<DevelopmentInfo> selectDevelopmentInfoDraftList(DevelopmentInfoDto developmentInfoDto);
public DevelopmentInfoAllVO getDevelopmentInfo(Long businessId, Integer userId, Boolean isMembership);
public List<DevelopmentInfoListVO> selectDevelopmentInfoCollectionList(DevelopmentInfoCollectionParam developmentInfoParam);
public List<DevelopmentInfoListVO> selectDevelopmentInfoCollectionList(DevelopmentInfoCollectionDto developmentInfoParam);
public List<DevelopmentInfoListVO> selectDevelopmentInfoAuthenticationList(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam);
public List<DevelopmentInfoListVO> selectDevelopmentInfoAuthenticationList(DevelopmentInfoAuthenticationDto developmentInfoAuthenticationDto);
public Boolean saveDevelopmentInfo(DevelopmentInfoAllSaveVO developmentInfoSaveVO, Integer userId, String userName);
public Boolean updateDevelopmentInfo(DevelopmentInfoAllSaveVO developmentInfoSaveVO, Integer userId, String userName);
......
src/main/java/com/lyy/admin/moudle/development/service/impl/DevelopmentInfoServiceImpl.java
View file @ d66096c1
......@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lyy.admin.common.utils.BusinessService;
import com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoAuthenticationDto;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoCollectionDto;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoDto;
import com.lyy.admin.moudle.development.dto.DevelopmentMapDto;
import com.lyy.admin.moudle.development.vo.*;
import com.lyy.admin.moudle.other.entity.FileSource;
......@@ -19,7 +22,7 @@ import com.lyy.admin.moudle.system.entity.SysCollection;
import com.lyy.admin.moudle.land.entity.LandInfoEntity;
import com.lyy.admin.moudle.land.service.DevelopmentIndustrialLandInfoService;
import com.lyy.admin.moudle.park.entity.ParkInfo;
import com.lyy.admin.moudle.park.entity.ParkInfoParam;
import com.lyy.admin.moudle.park.dto.ParkInfoDto;
import com.lyy.admin.moudle.system.entity.SysCarouselInfo;
import com.lyy.admin.moudle.system.mapper.SysCollectionMapper;
import com.lyy.admin.moudle.system.mapper.SysMembershipInfoMapper;
......@@ -94,29 +97,29 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
FileSourceService fileSourceService;
@Override
public List<DevelopmentInfo> selectDevelopmentInfoVOList(DevelopmentInfoParam developmentInfoParam) {
String planArea = developmentInfoParam.getPlanArea();
public List<DevelopmentInfo> selectDevelopmentInfoVOList(DevelopmentInfoDto developmentInfoDto) {
String planArea = developmentInfoDto.getPlanArea();
if (ObjectUtils.isNotEmpty(planArea)) {
if (planArea.contains("-")) {
String[] split = planArea.split("-");
String start = split[0];
String end = split[1];
developmentInfoParam.setPlanAreaUp(Double.valueOf(start));
developmentInfoParam.setPlanAreaUnder(Double.valueOf(end));
developmentInfoDto.setPlanAreaUp(Double.valueOf(start));
developmentInfoDto.setPlanAreaUnder(Double.valueOf(end));
} else if (planArea.endsWith("+")) {
String substring = planArea.substring(0, planArea.length() - 1);
developmentInfoParam.setPlanAreaUp(Double.valueOf(substring));
developmentInfoParam.setPlanAreaUnder(Double.MAX_VALUE);
developmentInfoDto.setPlanAreaUp(Double.valueOf(substring));
developmentInfoDto.setPlanAreaUnder(Double.MAX_VALUE);
}
}
QueryWrapper<DevelopmentInfo> developmentInfoQW = new QueryWrapper();
if(ObjectUtils.isNotEmpty(developmentInfoParam.getPlanAreaUnder()) && ObjectUtils.isNotEmpty(developmentInfoParam.getPlanAreaUp())){
developmentInfoQW.ge("plan_area", developmentInfoParam.getPlanAreaUp()).lt("plan_area", developmentInfoParam.getPlanAreaUnder());
if(ObjectUtils.isNotEmpty(developmentInfoDto.getPlanAreaUnder()) && ObjectUtils.isNotEmpty(developmentInfoDto.getPlanAreaUp())){
developmentInfoQW.ge("plan_area", developmentInfoDto.getPlanAreaUp()).lt("plan_area", developmentInfoDto.getPlanAreaUnder());
}
if(ObjectUtils.isNotEmpty(developmentInfoParam.getId())){
developmentInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoParam.getId()));
if(ObjectUtils.isNotEmpty(developmentInfoDto.getId())){
developmentInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoDto.getId()));
}
String name = developmentInfoParam.getName();
String name = developmentInfoDto.getName();
if(StringUtils.isNotBlank(name)){
developmentInfoQW.and(w -> w.like("name", name).or().like("description", name));
}
......@@ -128,11 +131,11 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
// .or().eq("region_code" , developmentInfoParam.getAreaCode())
// );
// }
if (StringUtils.isNotBlank(developmentInfoParam.getAreaName())) {
if (StringUtils.isNotBlank(developmentInfoDto.getAreaName())) {
developmentInfoQW.and(
w-> w.eq("city_name" , developmentInfoParam.getAreaName())
.or().eq("region_name" , developmentInfoParam.getAreaName())
.or().eq("province_name", developmentInfoParam.getAreaName())
w-> w.eq("city_name" , developmentInfoDto.getAreaName())
.or().eq("region_name" , developmentInfoDto.getAreaName())
.or().eq("province_name", developmentInfoDto.getAreaName())
);
}
// if(StringUtils.isNotBlank(developmentInfoParam.getProvinceCode())){
......@@ -144,30 +147,30 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
// if(StringUtils.isNotBlank(developmentInfoParam.getRegionCode())){
// developmentInfoQW.eq("region_code", developmentInfoParam.getRegionCode());
// }
if(StringUtils.isNotBlank(developmentInfoParam.getPrimaryIndustry())){
developmentInfoQW.like("primary_industry", developmentInfoParam.getPrimaryIndustry());
if(StringUtils.isNotBlank(developmentInfoDto.getPrimaryIndustry())){
developmentInfoQW.like("primary_industry", developmentInfoDto.getPrimaryIndustry());
}
if(StringUtils.isNotBlank(developmentInfoParam.getLevelCode())){
developmentInfoQW.eq("level_code", developmentInfoParam.getLevelCode());
if(StringUtils.isNotBlank(developmentInfoDto.getLevelCode())){
developmentInfoQW.eq("level_code", developmentInfoDto.getLevelCode());
}
if(StringUtils.isNotBlank(developmentInfoParam.getLevelName())){
developmentInfoQW.like("level_name", developmentInfoParam.getLevelName());
if(StringUtils.isNotBlank(developmentInfoDto.getLevelName())){
developmentInfoQW.like("level_name", developmentInfoDto.getLevelName());
}
if(StringUtils.isNotBlank(developmentInfoParam.getType())){
developmentInfoQW.eq("type", developmentInfoParam.getType());
if(StringUtils.isNotBlank(developmentInfoDto.getType())){
developmentInfoQW.eq("type", developmentInfoDto.getType());
}
if(ObjectUtils.isNotEmpty(developmentInfoParam.getMegalopolisId())){
developmentInfoQW.eq("megalopolis_id", developmentInfoParam.getMegalopolisId());
if(ObjectUtils.isNotEmpty(developmentInfoDto.getMegalopolisId())){
developmentInfoQW.eq("megalopolis_id", developmentInfoDto.getMegalopolisId());
}
if(StringUtils.isNotBlank(developmentInfoParam.getStatus())){
developmentInfoQW.in("status",com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoParam.getStatus()));
if(StringUtils.isNotBlank(developmentInfoDto.getStatus())){
developmentInfoQW.in("status",com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoDto.getStatus()));
}
if (ObjectUtils.isNotEmpty(developmentInfoParam.getUserId())) {
developmentInfoQW.in("user_id", developmentInfoParam.getUserId());
if (ObjectUtils.isNotEmpty(developmentInfoDto.getUserId())) {
developmentInfoQW.in("user_id", developmentInfoDto.getUserId());
}
if (StringUtils.isNotEmpty(developmentInfoParam.getOrganization())) {
String nameByCode = OrganizationEnum.getNameByCode(developmentInfoParam.getOrganization());
if(developmentInfoParam.getOrganization().equals(OrganizationEnum.SCF.getCode())){
if (StringUtils.isNotEmpty(developmentInfoDto.getOrganization())) {
String nameByCode = OrganizationEnum.getNameByCode(developmentInfoDto.getOrganization());
if(developmentInfoDto.getOrganization().equals(OrganizationEnum.SCF.getCode())){
developmentInfoQW.in("organization", nameByCode.split(";"));
}
}
......@@ -179,59 +182,59 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
@Override
public List<DevelopmentInfo> selectDevelopmentInfoDraftList(DevelopmentInfoParam developmentInfoParam) {
String planArea = developmentInfoParam.getPlanArea();
public List<DevelopmentInfo> selectDevelopmentInfoDraftList(DevelopmentInfoDto developmentInfoDto) {
String planArea = developmentInfoDto.getPlanArea();
if (ObjectUtils.isNotEmpty(planArea)) {
if (planArea.contains("-")) {
String[] split = planArea.split("-");
String start = split[0];
String end = split[1];
developmentInfoParam.setPlanAreaUp(Double.valueOf(start));
developmentInfoParam.setPlanAreaUnder(Double.valueOf(end));
developmentInfoDto.setPlanAreaUp(Double.valueOf(start));
developmentInfoDto.setPlanAreaUnder(Double.valueOf(end));
} else if (planArea.endsWith("+")) {
String substring = planArea.substring(0, planArea.length() - 1);
developmentInfoParam.setPlanAreaUp(Double.valueOf(substring));
developmentInfoParam.setPlanAreaUnder(Double.MAX_VALUE);
developmentInfoDto.setPlanAreaUp(Double.valueOf(substring));
developmentInfoDto.setPlanAreaUnder(Double.MAX_VALUE);
}
}
QueryWrapper<DevelopmentInfo> developmentInfoQW = new QueryWrapper();
if(ObjectUtils.isNotEmpty(developmentInfoParam.getPlanAreaUnder()) && ObjectUtils.isNotEmpty(developmentInfoParam.getPlanAreaUp())){
developmentInfoQW.ge("plan_area", developmentInfoParam.getPlanAreaUp()).lt("plan_area", developmentInfoParam.getPlanAreaUnder());
if(ObjectUtils.isNotEmpty(developmentInfoDto.getPlanAreaUnder()) && ObjectUtils.isNotEmpty(developmentInfoDto.getPlanAreaUp())){
developmentInfoQW.ge("plan_area", developmentInfoDto.getPlanAreaUp()).lt("plan_area", developmentInfoDto.getPlanAreaUnder());
}
if(ObjectUtils.isNotEmpty(developmentInfoParam.getId())){
developmentInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoParam.getId()));
if(ObjectUtils.isNotEmpty(developmentInfoDto.getId())){
developmentInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoDto.getId()));
}
String name = developmentInfoParam.getName();
String name = developmentInfoDto.getName();
if(StringUtils.isNotBlank(name)){
developmentInfoQW.and(w -> w.like("name", name).or().like("description", name));
}
if (StringUtils.isNotBlank(developmentInfoParam.getAreaName())) {
if (StringUtils.isNotBlank(developmentInfoDto.getAreaName())) {
developmentInfoQW.and(
w-> w.eq("city_name" , developmentInfoParam.getAreaName())
.or().eq("region_name" , developmentInfoParam.getAreaName())
.or().eq("province_name", developmentInfoParam.getAreaName())
w-> w.eq("city_name" , developmentInfoDto.getAreaName())
.or().eq("region_name" , developmentInfoDto.getAreaName())
.or().eq("province_name", developmentInfoDto.getAreaName())
);
}
if(StringUtils.isNotBlank(developmentInfoParam.getPrimaryIndustry())){
developmentInfoQW.like("primary_industry", developmentInfoParam.getPrimaryIndustry());
if(StringUtils.isNotBlank(developmentInfoDto.getPrimaryIndustry())){
developmentInfoQW.like("primary_industry", developmentInfoDto.getPrimaryIndustry());
}
if(StringUtils.isNotBlank(developmentInfoParam.getLevelCode())){
developmentInfoQW.eq("level_code", developmentInfoParam.getLevelCode());
if(StringUtils.isNotBlank(developmentInfoDto.getLevelCode())){
developmentInfoQW.eq("level_code", developmentInfoDto.getLevelCode());
}
if(StringUtils.isNotBlank(developmentInfoParam.getLevelName())){
developmentInfoQW.like("level_name", developmentInfoParam.getLevelName());
if(StringUtils.isNotBlank(developmentInfoDto.getLevelName())){
developmentInfoQW.like("level_name", developmentInfoDto.getLevelName());
}
if(StringUtils.isNotBlank(developmentInfoParam.getType())){
developmentInfoQW.eq("type", developmentInfoParam.getType());
if(StringUtils.isNotBlank(developmentInfoDto.getType())){
developmentInfoQW.eq("type", developmentInfoDto.getType());
}
if(ObjectUtils.isNotEmpty(developmentInfoParam.getMegalopolisId())){
developmentInfoQW.eq("megalopolis_id", developmentInfoParam.getMegalopolisId());
if(ObjectUtils.isNotEmpty(developmentInfoDto.getMegalopolisId())){
developmentInfoQW.eq("megalopolis_id", developmentInfoDto.getMegalopolisId());
}
if(StringUtils.isNotBlank(developmentInfoParam.getStatus())){
developmentInfoQW.in("status",com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoParam.getStatus()));
if(StringUtils.isNotBlank(developmentInfoDto.getStatus())){
developmentInfoQW.in("status",com.lyy.admin.common.utils.StringUtils.typeList(developmentInfoDto.getStatus()));
}
if (ObjectUtils.isNotEmpty(developmentInfoParam.getUserId())) {
developmentInfoQW.in("user_id", developmentInfoParam.getUserId());
if (ObjectUtils.isNotEmpty(developmentInfoDto.getUserId())) {
developmentInfoQW.in("user_id", developmentInfoDto.getUserId());
}
developmentInfoQW.orderByDesc("update_time");
......@@ -328,10 +331,10 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
List<LandInfoEntity> developmentIndustrialLandInfoList = developmentIndustrialLandInfoService.list(developmentIndustrialLandInfoQW);
//所属园区信息
ParkInfoParam parkInfoParam = new ParkInfoParam();
parkInfoParam.setZoneId(id);
parkInfoParam.setStatus(ParkInfoEnum.STATUS_YRZ.getCode()+","+ParkInfoEnum.STATUS_DRZ.getCode());
List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoParam);
ParkInfoDto parkInfoDto = new ParkInfoDto();
parkInfoDto.setZoneId(id);
parkInfoDto.setStatus(ParkInfoEnum.STATUS_YRZ.getCode()+","+ParkInfoEnum.STATUS_DRZ.getCode());
List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoDto);
List<ParkInfoListVO> parkInfoListVOS = lists.stream().map(parkInfo -> {
ParkInfoListVO parkInfoListVO = new ParkInfoListVO();
BeanUtils.copyProperties(parkInfo, parkInfoListVO);
......@@ -397,7 +400,7 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
}
@Override
public List<DevelopmentInfoListVO> selectDevelopmentInfoCollectionList(DevelopmentInfoCollectionParam developmentInfoParam) {
public List<DevelopmentInfoListVO> selectDevelopmentInfoCollectionList(DevelopmentInfoCollectionDto developmentInfoParam) {
return developmentInfoMapper.selectDevelopmentInfoCollectionList(developmentInfoParam);
}
......@@ -652,8 +655,8 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
}
public List<DevelopmentInfoListVO> selectDevelopmentInfoAuthenticationList(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam){
return developmentInfoMapper.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationParam);
public List<DevelopmentInfoListVO> selectDevelopmentInfoAuthenticationList(DevelopmentInfoAuthenticationDto developmentInfoAuthenticationDto){
return developmentInfoMapper.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationDto);
}
......
src/main/java/com/lyy/admin/moudle/megalopolis/service/impl/MegalopolisInfoServiceImpl.java
View file @ d66096c1
......@@ -14,7 +14,7 @@ import com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO;
import com.lyy.admin.moudle.megalopolis.entity.MegalopolisCoreCityInfo;
import com.lyy.admin.moudle.system.entity.SysCollection;
import com.lyy.admin.moudle.development.entity.DevelopmentInfo;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoParam;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoDto;
import com.lyy.admin.moudle.system.entity.SysCarouselInfo;
import com.lyy.admin.moudle.megalopolis.mapper.MegalopolisCoreCityInfoMapper;
import com.lyy.admin.moudle.megalopolis.mapper.MegalopolisIndustryInfoMapper;
......@@ -134,9 +134,9 @@ public class MegalopolisInfoServiceImpl extends ServiceImpl<MegalopolisInfoMappe
BeanUtils.copyProperties(megalopolisInfo, megalopolisInfoVO);
//开发区信息
DevelopmentInfoParam developmentInfoParam = new DevelopmentInfoParam();
developmentInfoParam.setMegalopolisId(id);
List<DevelopmentInfo> developmentInfos = developmentInfoService.selectDevelopmentInfoVOList(developmentInfoParam);
DevelopmentInfoDto developmentInfoDto = new DevelopmentInfoDto();
developmentInfoDto.setMegalopolisId(id);
List<DevelopmentInfo> developmentInfos = developmentInfoService.selectDevelopmentInfoVOList(developmentInfoDto);
List<DevelopmentInfoListVO> developmentInfoVOs = developmentInfos.stream().map(developmentInfo -> {
DevelopmentInfoListVO developmentInfoVO = new DevelopmentInfoListVO();
BeanUtils.copyProperties(developmentInfo, developmentInfoVO);
......
src/main/java/com/lyy/admin/moudle/park/controller/ParkInfoController.java
View file @ d66096c1
......@@ -9,7 +9,7 @@ import com.lyy.admin.common.page.TableDataInfo;
import com.lyy.admin.moudle.other.controller.BaseController;
import com.lyy.admin.enumerate.ParkInfoEnum;
import com.lyy.admin.moudle.park.entity.ParkInfo;
import com.lyy.admin.moudle.park.entity.ParkInfoParam;
import com.lyy.admin.moudle.park.dto.ParkInfoDto;
import com.lyy.admin.moudle.park.service.ParkInfoService;
import com.lyy.admin.moudle.system.service.SysCollectionService;
import io.swagger.annotations.Api;
......@@ -47,12 +47,12 @@ public class ParkInfoController extends BaseController {
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
@EncryptBusiness
public TableDataInfo list(ParkInfoParam parkInfoParam) {
public TableDataInfo list(ParkInfoDto parkInfoDto) {
boolean login = isLogin();
String status = ParkInfoEnum.STATUS_YRZ.getCode()+","+ParkInfoEnum.STATUS_DRZ.getCode();
parkInfoParam.setStatus(status);
parkInfoDto.setStatus(status);
startPage();
List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoParam);
List<ParkInfo> lists = parkInfoService.selectParkInfoListVO(parkInfoDto);
List<ParkInfoListVO> parkInfoListVOs = lists.stream().map(parkInfo -> {
ParkInfoListVO parkInfoListVO = new ParkInfoListVO();
BeanUtils.copyProperties(parkInfo, parkInfoListVO);
......
src/main/java/com/lyy/admin/moudle/park/entity/ParkInfoAuthenticationParam.java → src/main/java/com/lyy/admin/moudle/park/dto/ParkInfoAuthenticationDto.java
View file @ d66096c1
package com.lyy.admin.moudle.park.entity;
package com.lyy.admin.moudle.park.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -8,7 +8,7 @@ import java.util.List;
@Data
public class ParkInfoAuthenticationParam implements Serializable {
public class ParkInfoAuthenticationDto implements Serializable {
@ApiModelProperty(hidden = true)
private Integer userId;
......
src/main/java/com/lyy/admin/moudle/park/entity/ParkInfoCollectionParam.java → src/main/java/com/lyy/admin/moudle/park/dto/ParkInfoCollectionDto.java
View file @ d66096c1
package com.lyy.admin.moudle.park.entity;
package com.lyy.admin.moudle.park.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class ParkInfoCollectionParam implements Serializable {
public class ParkInfoCollectionDto implements Serializable {
......
src/main/java/com/lyy/admin/moudle/park/entity/ParkInfoParam.java → src/main/java/com/lyy/admin/moudle/park/dto/ParkInfoDto.java
View file @ d66096c1
package com.lyy.admin.moudle.park.entity;
package com.lyy.admin.moudle.park.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
......@@ -6,11 +6,10 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class ParkInfoParam implements Serializable {
public class ParkInfoDto implements Serializable {
/**
......
src/main/java/com/lyy/admin/moudle/park/mapper/ParkInfoMapper.java
View file @ d66096c1
......@@ -3,8 +3,8 @@ package com.lyy.admin.moudle.park.mapper;
import com.lyy.admin.moudle.park.entity.ParkInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lyy.admin.moudle.park.vo.ParkInfoListVO;
import com.lyy.admin.moudle.park.entity.ParkInfoAuthenticationParam;
import com.lyy.admin.moudle.park.entity.ParkInfoCollectionParam;
import com.lyy.admin.moudle.park.dto.ParkInfoAuthenticationDto;
import com.lyy.admin.moudle.park.dto.ParkInfoCollectionDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -21,8 +21,8 @@ public interface ParkInfoMapper extends BaseMapper<ParkInfo> {
public List<ParkInfoListVO> selectParkInfoVOByIdList(Integer id);
public List<ParkInfoListVO> selectParkInfoAuthenticationList(@Param("param") ParkInfoAuthenticationParam parkInfoAuthenticationParam);
public List<ParkInfoListVO> selectParkInfoCollectionList(ParkInfoCollectionParam parkInfoParam);
public List<ParkInfoListVO> selectParkInfoAuthenticationList(@Param("param") ParkInfoAuthenticationDto parkInfoAuthenticationDto);
public List<ParkInfoListVO> selectParkInfoCollectionList(ParkInfoCollectionDto parkInfoParam);
}
......
src/main/java/com/lyy/admin/moudle/park/service/ParkInfoService.java
View file @ d66096c1
......@@ -6,9 +6,9 @@ import com.lyy.admin.moudle.park.vo.ParkInfoAllVO;
import com.lyy.admin.moudle.park.vo.ParkInfoListVO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lyy.admin.moudle.park.entity.ParkInfo;
import com.lyy.admin.moudle.park.entity.ParkInfoAuthenticationParam;
import com.lyy.admin.moudle.park.entity.ParkInfoCollectionParam;
import com.lyy.admin.moudle.park.entity.ParkInfoParam;
import com.lyy.admin.moudle.park.dto.ParkInfoAuthenticationDto;
import com.lyy.admin.moudle.park.dto.ParkInfoCollectionDto;
import com.lyy.admin.moudle.park.dto.ParkInfoDto;
import java.util.List;
......@@ -18,12 +18,12 @@ import java.util.List;
* @createDate 2023-09-08 11:31:50
*/
public interface ParkInfoService extends IService<ParkInfo> {
public List<ParkInfo> selectParkInfoListVO(ParkInfoParam parkInfoParam);
public List<ParkInfo> selectParkInfoDraftListVO(ParkInfoParam parkInfoParam);
public List<ParkInfo> selectParkInfoListVO(ParkInfoDto parkInfoDto);
public List<ParkInfo> selectParkInfoDraftListVO(ParkInfoDto parkInfoDto);
public List<ParkInfo> selectHotParkInfoListVO();
public ParkInfoAllVO getParkInfo(Long businessId, Integer userId, Boolean isMemberShip);
public List<ParkInfoListVO> selectParkInfoAuthenticationList(ParkInfoAuthenticationParam parkInfoAuthenticationParam);
public List<ParkInfoListVO> selectParkInfoCollectionList(ParkInfoCollectionParam parkInfoParam);
public List<ParkInfoListVO> selectParkInfoAuthenticationList(ParkInfoAuthenticationDto parkInfoAuthenticationDto);
public List<ParkInfoListVO> selectParkInfoCollectionList(ParkInfoCollectionDto parkInfoParam);
public Boolean saveParkInfo(ParkInfoAllSaveVO parkInfoAllVO, Integer userId,String userName);
public Boolean updateParkInfo(ParkInfoAllSaveVO parkInfoAllVO, Integer userId,String userName);
public Boolean isExistInfo(Integer userId, Integer collectionId);
......
src/main/java/com/lyy/admin/moudle/park/service/impl/ParkInfoServiceImpl.java
View file @ d66096c1
......@@ -16,6 +16,9 @@ import com.lyy.admin.enumerate.*;
import com.lyy.admin.common.exception.APIException;
import com.lyy.admin.common.exception.APIExceptionEnum;
import com.lyy.admin.moudle.other.vo.FileSourceVO;
import com.lyy.admin.moudle.park.dto.ParkInfoAuthenticationDto;
import com.lyy.admin.moudle.park.dto.ParkInfoCollectionDto;
import com.lyy.admin.moudle.park.dto.ParkInfoDto;
import com.lyy.admin.moudle.park.vo.*;
import com.lyy.admin.moudle.system.entity.SysCollection;
import com.lyy.admin.moudle.system.entity.SysCarouselInfo;
......@@ -122,32 +125,32 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
FileSourceService fileSourceService;
// @Cache(cacheByUser = false)
public List<ParkInfo> selectParkInfoListVO(ParkInfoParam parkInfoParam) {
String coverArea = parkInfoParam.getCoverArea();
public List<ParkInfo> selectParkInfoListVO(ParkInfoDto parkInfoDto) {
String coverArea = parkInfoDto.getCoverArea();
if (ObjectUtils.isNotEmpty(coverArea)) {
if (coverArea.contains("-")) {
String[] split = coverArea.split("-");
String start = split[0];
String end = split[1];
parkInfoParam.setCoverAreaUp(Double.valueOf(start));
parkInfoParam.setCoverAreaUnder(Double.valueOf(end));
parkInfoDto.setCoverAreaUp(Double.valueOf(start));
parkInfoDto.setCoverAreaUnder(Double.valueOf(end));
} else if (coverArea.endsWith("+")) {
String substring = coverArea.substring(0, coverArea.length() - 1);
parkInfoParam.setCoverAreaUp(Double.valueOf(substring));
parkInfoParam.setCoverAreaUnder(Double.MAX_VALUE);
parkInfoDto.setCoverAreaUp(Double.valueOf(substring));
parkInfoDto.setCoverAreaUnder(Double.MAX_VALUE);
}
}
QueryWrapper<ParkInfo> ParkInfoQW = new QueryWrapper<>();
Double coverAreaUp = parkInfoParam.getCoverAreaUp();
Double coverAreaUnder = parkInfoParam.getCoverAreaUnder();
Double coverAreaUp = parkInfoDto.getCoverAreaUp();
Double coverAreaUnder = parkInfoDto.getCoverAreaUnder();
if (ObjectUtils.isNotEmpty(coverAreaUp) && ObjectUtils.isNotEmpty(coverAreaUnder)) {
ParkInfoQW.ge("cover_area", coverAreaUp).lt("cover_area", coverAreaUnder);
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getId())) {
ParkInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoParam.getId()));
if (ObjectUtils.isNotEmpty(parkInfoDto.getId())) {
ParkInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoDto.getId()));
}
String name = parkInfoParam.getName();
String name = parkInfoDto.getName();
if (StringUtils.isNotBlank(name)) {
ParkInfoQW.and(w -> w.like("name", name).or().like("description", name));
}
......@@ -158,39 +161,39 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
// .or().eq("region_code" , parkInfoParam.getAreaCode())
// );
// }
if (StringUtils.isNotBlank(parkInfoParam.getAreaName())) {
if (StringUtils.isNotBlank(parkInfoDto.getAreaName())) {
ParkInfoQW.and(
w -> w.eq("city_name", parkInfoParam.getAreaName())
.or().eq("region_name", parkInfoParam.getAreaName())
.or().eq("province_name", parkInfoParam.getAreaName())
w -> w.eq("city_name", parkInfoDto.getAreaName())
.or().eq("region_name", parkInfoDto.getAreaName())
.or().eq("province_name", parkInfoDto.getAreaName())
);
}
if (StringUtils.isNotBlank(parkInfoParam.getPrimaryIndustry())) {
ParkInfoQW.like("primary_industry", parkInfoParam.getPrimaryIndustry());
if (StringUtils.isNotBlank(parkInfoDto.getPrimaryIndustry())) {
ParkInfoQW.like("primary_industry", parkInfoDto.getPrimaryIndustry());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getIsSystem())) {
ParkInfoQW.eq("is_system", parkInfoParam.getIsSystem());
if (ObjectUtils.isNotEmpty(parkInfoDto.getIsSystem())) {
ParkInfoQW.eq("is_system", parkInfoDto.getIsSystem());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getIsHotPark())) {
ParkInfoQW.eq("is_hot_park", parkInfoParam.getIsHotPark());
if (ObjectUtils.isNotEmpty(parkInfoDto.getIsHotPark())) {
ParkInfoQW.eq("is_hot_park", parkInfoDto.getIsHotPark());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getStatus())) {
ParkInfoQW.in("status", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoParam.getStatus()));
if (ObjectUtils.isNotEmpty(parkInfoDto.getStatus())) {
ParkInfoQW.in("status", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoDto.getStatus()));
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getUserId())) {
ParkInfoQW.in("user_id", parkInfoParam.getUserId());
if (ObjectUtils.isNotEmpty(parkInfoDto.getUserId())) {
ParkInfoQW.in("user_id", parkInfoDto.getUserId());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getLevelName())) {
ParkInfoQW.like("level_name", parkInfoParam.getLevelName());
if (ObjectUtils.isNotEmpty(parkInfoDto.getLevelName())) {
ParkInfoQW.like("level_name", parkInfoDto.getLevelName());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getZoneId())) {
ParkInfoQW.eq("zone_id", parkInfoParam.getZoneId());
if (ObjectUtils.isNotEmpty(parkInfoDto.getZoneId())) {
ParkInfoQW.eq("zone_id", parkInfoDto.getZoneId());
}
if (StringUtils.isNotEmpty(parkInfoParam.getOrganization())) {
String nameByCode = OrganizationEnum.getNameByCode(parkInfoParam.getOrganization());
if(parkInfoParam.getOrganization().equals(OrganizationEnum.SCF.getCode())){
if (StringUtils.isNotEmpty(parkInfoDto.getOrganization())) {
String nameByCode = OrganizationEnum.getNameByCode(parkInfoDto.getOrganization());
if(parkInfoDto.getOrganization().equals(OrganizationEnum.SCF.getCode())){
ParkInfoQW.in("organization", nameByCode.split(";"));
}
}
......@@ -202,64 +205,64 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
public List<ParkInfo> selectParkInfoDraftListVO(ParkInfoParam parkInfoParam) {
String coverArea = parkInfoParam.getCoverArea();
public List<ParkInfo> selectParkInfoDraftListVO(ParkInfoDto parkInfoDto) {
String coverArea = parkInfoDto.getCoverArea();
if (ObjectUtils.isNotEmpty(coverArea)) {
if (coverArea.contains("-")) {
String[] split = coverArea.split("-");
String start = split[0];
String end = split[1];
parkInfoParam.setCoverAreaUp(Double.valueOf(start));
parkInfoParam.setCoverAreaUnder(Double.valueOf(end));
parkInfoDto.setCoverAreaUp(Double.valueOf(start));
parkInfoDto.setCoverAreaUnder(Double.valueOf(end));
} else if (coverArea.endsWith("+")) {
String substring = coverArea.substring(0, coverArea.length() - 1);
parkInfoParam.setCoverAreaUp(Double.valueOf(substring));
parkInfoParam.setCoverAreaUnder(Double.MAX_VALUE);
parkInfoDto.setCoverAreaUp(Double.valueOf(substring));
parkInfoDto.setCoverAreaUnder(Double.MAX_VALUE);
}
}
QueryWrapper<ParkInfo> ParkInfoQW = new QueryWrapper<>();
Double coverAreaUp = parkInfoParam.getCoverAreaUp();
Double coverAreaUnder = parkInfoParam.getCoverAreaUnder();
Double coverAreaUp = parkInfoDto.getCoverAreaUp();
Double coverAreaUnder = parkInfoDto.getCoverAreaUnder();
if (ObjectUtils.isNotEmpty(coverAreaUp) && ObjectUtils.isNotEmpty(coverAreaUnder)) {
ParkInfoQW.ge("cover_area", coverAreaUp).lt("cover_area", coverAreaUnder);
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getId())) {
ParkInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoParam.getId()));
if (ObjectUtils.isNotEmpty(parkInfoDto.getId())) {
ParkInfoQW.in("id", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoDto.getId()));
}
String name = parkInfoParam.getName();
String name = parkInfoDto.getName();
if (StringUtils.isNotBlank(name)) {
ParkInfoQW.and(w -> w.like("name", name).or().like("description", name));
}
if (StringUtils.isNotBlank(parkInfoParam.getAreaName())) {
if (StringUtils.isNotBlank(parkInfoDto.getAreaName())) {
ParkInfoQW.and(
w -> w.eq("city_name", parkInfoParam.getAreaName())
.or().eq("region_name", parkInfoParam.getAreaName())
.or().eq("province_name", parkInfoParam.getAreaName())
w -> w.eq("city_name", parkInfoDto.getAreaName())
.or().eq("region_name", parkInfoDto.getAreaName())
.or().eq("province_name", parkInfoDto.getAreaName())
);
}
if (StringUtils.isNotBlank(parkInfoParam.getPrimaryIndustry())) {
ParkInfoQW.like("primary_industry", parkInfoParam.getPrimaryIndustry());
if (StringUtils.isNotBlank(parkInfoDto.getPrimaryIndustry())) {
ParkInfoQW.like("primary_industry", parkInfoDto.getPrimaryIndustry());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getIsSystem())) {
ParkInfoQW.eq("is_system", parkInfoParam.getIsSystem());
if (ObjectUtils.isNotEmpty(parkInfoDto.getIsSystem())) {
ParkInfoQW.eq("is_system", parkInfoDto.getIsSystem());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getIsHotPark())) {
ParkInfoQW.eq("is_hot_park", parkInfoParam.getIsHotPark());
if (ObjectUtils.isNotEmpty(parkInfoDto.getIsHotPark())) {
ParkInfoQW.eq("is_hot_park", parkInfoDto.getIsHotPark());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getStatus())) {
ParkInfoQW.in("status", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoParam.getStatus()));
if (ObjectUtils.isNotEmpty(parkInfoDto.getStatus())) {
ParkInfoQW.in("status", com.lyy.admin.common.utils.StringUtils.typeList(parkInfoDto.getStatus()));
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getUserId())) {
ParkInfoQW.in("user_id", parkInfoParam.getUserId());
if (ObjectUtils.isNotEmpty(parkInfoDto.getUserId())) {
ParkInfoQW.in("user_id", parkInfoDto.getUserId());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getLevelName())) {
ParkInfoQW.like("level_name", parkInfoParam.getLevelName());
if (ObjectUtils.isNotEmpty(parkInfoDto.getLevelName())) {
ParkInfoQW.like("level_name", parkInfoDto.getLevelName());
}
if (ObjectUtils.isNotEmpty(parkInfoParam.getZoneId())) {
ParkInfoQW.eq("zone_id", parkInfoParam.getZoneId());
if (ObjectUtils.isNotEmpty(parkInfoDto.getZoneId())) {
ParkInfoQW.eq("zone_id", parkInfoDto.getZoneId());
}
ParkInfoQW.orderByDesc("update_time");
......@@ -406,13 +409,13 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
@Override
public List<ParkInfoListVO> selectParkInfoAuthenticationList(ParkInfoAuthenticationParam arkInfoAuthenticationParam) {
public List<ParkInfoListVO> selectParkInfoAuthenticationList(ParkInfoAuthenticationDto arkInfoAuthenticationParam) {
List<ParkInfoListVO> parkInfoVOs = parkInfoMapper.selectParkInfoAuthenticationList(arkInfoAuthenticationParam);
return parkInfoVOs;
}
@Override
public List<ParkInfoListVO> selectParkInfoCollectionList(ParkInfoCollectionParam parkInfoParam) {
public List<ParkInfoListVO> selectParkInfoCollectionList(ParkInfoCollectionDto parkInfoParam) {
List<ParkInfoListVO> parkInfoVOs = parkInfoMapper.selectParkInfoCollectionList(parkInfoParam);
return parkInfoVOs;
}
......
src/main/java/com/lyy/admin/moudle/personal/controller/PersonalFunctionsController.java
View file @ d66096c1
......@@ -10,14 +10,14 @@ import com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO;
import com.lyy.admin.moudle.megalopolis.vo.MegalopolisInfoListVO;
import com.lyy.admin.moudle.other.controller.BaseController;
import com.lyy.admin.moudle.development.entity.DevelopmentInfo;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoAuthenticationParam;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoCollectionParam;
import com.lyy.admin.moudle.development.entity.DevelopmentInfoParam;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoAuthenticationDto;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoCollectionDto;
import com.lyy.admin.moudle.development.dto.DevelopmentInfoDto;
import com.lyy.admin.moudle.megalopolis.entity.MegalopolisInfoCollectionParam;
import com.lyy.admin.moudle.park.entity.ParkInfo;
import com.lyy.admin.moudle.park.entity.ParkInfoAuthenticationParam;
import com.lyy.admin.moudle.park.entity.ParkInfoCollectionParam;
import com.lyy.admin.moudle.park.entity.ParkInfoParam;
import com.lyy.admin.moudle.park.dto.ParkInfoAuthenticationDto;
import com.lyy.admin.moudle.park.dto.ParkInfoCollectionDto;
import com.lyy.admin.moudle.park.dto.ParkInfoDto;
import com.lyy.admin.enumerate.DevelopmentStatusEnum;
import com.lyy.admin.enumerate.ParkInfoEnum;
import com.lyy.admin.moudle.park.vo.ParkInfoDraftListVO;
......@@ -81,19 +81,19 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getParkSaveAuthentication")
@ResponseBody
@ApiOperation(value = "园区-我的录入",notes = "rest风格传参，将参数拼接在url上")
public TableDataInfo getParkSaveAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
parkInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
parkInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(parkInfoAuthenticationParam.getStatus())){
parkInfoAuthenticationParam.setStatusList(Arrays.asList(parkInfoAuthenticationParam.getStatus()));
public TableDataInfo getParkSaveAuthentication(ParkInfoAuthenticationDto parkInfoAuthenticationDto) {
parkInfoAuthenticationDto.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
parkInfoAuthenticationDto.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(parkInfoAuthenticationDto.getStatus())){
parkInfoAuthenticationDto.setStatusList(Arrays.asList(parkInfoAuthenticationDto.getStatus()));
}else{
parkInfoAuthenticationParam.setStatusList( Arrays.asList(
parkInfoAuthenticationDto.setStatusList( Arrays.asList(
ParkInfoEnum.STATUS_RZZ.getCode(),
ParkInfoEnum.STATUS_YRZ.getCode(),
ParkInfoEnum.STATUS_YJJ.getCode()));
}
// PageUtils.startPage();
List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList(parkInfoAuthenticationParam);
List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList(parkInfoAuthenticationDto);
return getDataTable(parkInfoListVOS);
}
......@@ -104,20 +104,20 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getParkEditAuthentication")
@ResponseBody
@ApiOperation(value = "园区-我的完善",notes = "")
public TableDataInfo getParkEditAuthentication(ParkInfoAuthenticationParam parkInfoAuthenticationParam) {
parkInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
parkInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(parkInfoAuthenticationParam.getStatus())){
parkInfoAuthenticationParam.setStatusList(Arrays.asList(parkInfoAuthenticationParam.getStatus()));
public TableDataInfo getParkEditAuthentication(ParkInfoAuthenticationDto parkInfoAuthenticationDto) {
parkInfoAuthenticationDto.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
parkInfoAuthenticationDto.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(parkInfoAuthenticationDto.getStatus())){
parkInfoAuthenticationDto.setStatusList(Arrays.asList(parkInfoAuthenticationDto.getStatus()));
}else{
parkInfoAuthenticationParam.setStatusList( Arrays.asList(
parkInfoAuthenticationDto.setStatusList( Arrays.asList(
ParkInfoEnum.STATUS_RZZ.getCode(),
ParkInfoEnum.STATUS_YRZ.getCode(),
ParkInfoEnum.STATUS_YJJ.getCode(),
ParkInfoEnum.STATUS_ZF.getCode()));
}
// PageUtils.startPage();
List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList( parkInfoAuthenticationParam);
List<ParkInfoListVO> parkInfoListVOS = parkInfoService.selectParkInfoAuthenticationList(parkInfoAuthenticationDto);
return getDataTable(parkInfoListVOS);
}
......@@ -129,19 +129,19 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getDevelopmentSaveAuthentication")
@ResponseBody
@ApiOperation(value = "开发区-我的录入",notes = "rest风格传参，将参数拼接在url上")
public TableDataInfo getDevelopmentSaveAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
developmentInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
developmentInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationParam.getStatus())){
developmentInfoAuthenticationParam.setStatusList(Arrays.asList(developmentInfoAuthenticationParam.getStatus()));
public TableDataInfo getDevelopmentSaveAuthentication(DevelopmentInfoAuthenticationDto developmentInfoAuthenticationDto) {
developmentInfoAuthenticationDto.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_0.getCode());
developmentInfoAuthenticationDto.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationDto.getStatus())){
developmentInfoAuthenticationDto.setStatusList(Arrays.asList(developmentInfoAuthenticationDto.getStatus()));
}else{
developmentInfoAuthenticationParam.setStatusList( Arrays.asList(
developmentInfoAuthenticationDto.setStatusList( Arrays.asList(
DevelopmentStatusEnum.STATUS_RZZ.getCode(),
DevelopmentStatusEnum.STATUS_YRZ.getCode(),
DevelopmentStatusEnum.STATUS_YJJ.getCode()));
}
// PageUtils.startPage();
List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationParam);
List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationDto);
return getDataTable(parkInfoListVOS);
}
......@@ -152,20 +152,20 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping("/getDevelopmentEditAuthentication")
@ResponseBody
@ApiOperation(value = "开发区-我的完善",notes = "rest风格传参，将参数拼接在url上")
public TableDataInfo getDevelopmentEditAuthentication(DevelopmentInfoAuthenticationParam developmentInfoAuthenticationParam) {
developmentInfoAuthenticationParam.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
developmentInfoAuthenticationParam.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationParam.getStatus())){
developmentInfoAuthenticationParam.setStatusList(Arrays.asList(developmentInfoAuthenticationParam.getStatus()));
public TableDataInfo getDevelopmentEditAuthentication(DevelopmentInfoAuthenticationDto developmentInfoAuthenticationDto) {
developmentInfoAuthenticationDto.setIsSystem(DevelopmentStatusEnum.IS_SYSTEM_1.getCode());
developmentInfoAuthenticationDto.setUserId(getUserInfo().getUserId());
if(ObjectUtils.isNotEmpty(developmentInfoAuthenticationDto.getStatus())){
developmentInfoAuthenticationDto.setStatusList(Arrays.asList(developmentInfoAuthenticationDto.getStatus()));
}else{
developmentInfoAuthenticationParam.setStatusList( Arrays.asList(
developmentInfoAuthenticationDto.setStatusList( Arrays.asList(
DevelopmentStatusEnum.STATUS_RZZ.getCode(),
DevelopmentStatusEnum.STATUS_YRZ.getCode(),
DevelopmentStatusEnum.STATUS_YJJ.getCode(),
DevelopmentStatusEnum.STATUS_ZF.getCode()));
}
// PageUtils.startPage();
List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationParam);
List<DevelopmentInfoListVO> parkInfoListVOS = developmentInfoService.selectDevelopmentInfoAuthenticationList(developmentInfoAuthenticationDto);
return getDataTable(parkInfoListVOS) ;
}
......@@ -223,7 +223,7 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
public SysCollectionListVO getDevelopmentInfoCollection(DevelopmentInfoCollectionParam developmentInfoParam) {
public SysCollectionListVO getDevelopmentInfoCollection(DevelopmentInfoCollectionDto developmentInfoParam) {
String planArea = developmentInfoParam.getPlanArea();
if (ObjectUtils.isNotEmpty(planArea)) {
if (planArea.contains("-")) {
......@@ -260,7 +260,7 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
public SysCollectionListVO getParkInfoCollection(ParkInfoCollectionParam parkInfoParam) {
public SysCollectionListVO getParkInfoCollection(ParkInfoCollectionDto parkInfoParam) {
String coverArea = parkInfoParam.getCoverArea();
if (ObjectUtils.isNotEmpty(coverArea)) {
if (coverArea.contains("-")) {
......@@ -345,11 +345,11 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
public TableDataInfo parkList() {
ParkInfoParam parkInfoParam = new ParkInfoParam();
parkInfoParam.setUserId(getUserInfo().getUserId());
parkInfoParam.setStatus(String.valueOf(ParkInfoEnum.STATUS_WRZ.getCode()));
ParkInfoDto parkInfoDto = new ParkInfoDto();
parkInfoDto.setUserId(getUserInfo().getUserId());
parkInfoDto.setStatus(String.valueOf(ParkInfoEnum.STATUS_WRZ.getCode()));
startPage();
List<ParkInfo> lists = parkInfoService.selectParkInfoDraftListVO(parkInfoParam);
List<ParkInfo> lists = parkInfoService.selectParkInfoDraftListVO(parkInfoDto);
List<ParkInfoDraftListVO> parkInfoListVOs = lists.stream().map(parkInfo -> {
ParkInfoDraftListVO parkInfoListVO = new ParkInfoDraftListVO();
BeanUtils.copyProperties(parkInfo, parkInfoListVO);
......@@ -371,11 +371,11 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
})
public TableDataInfo developmentList() {
DevelopmentInfoParam developmentInfoParam = new DevelopmentInfoParam();
developmentInfoParam.setUserId(getUserInfo().getUserId());
developmentInfoParam.setStatus(String.valueOf(DevelopmentStatusEnum.STATUS_WRZ.getCode()));
DevelopmentInfoDto developmentInfoDto = new DevelopmentInfoDto();
developmentInfoDto.setUserId(getUserInfo().getUserId());
developmentInfoDto.setStatus(String.valueOf(DevelopmentStatusEnum.STATUS_WRZ.getCode()));
startPage();
List<DevelopmentInfo> lists = developmentInfoService.selectDevelopmentInfoDraftList(developmentInfoParam);
List<DevelopmentInfo> lists = developmentInfoService.selectDevelopmentInfoDraftList(developmentInfoDto);
List<DevelopmentInfoDraftListVO> developmentInfoListVOs = lists.stream().map(developmentInfo -> {
DevelopmentInfoDraftListVO developmentInfoVO = new DevelopmentInfoDraftListVO();
......
src/main/resources/application.yml
View file @ d66096c1
......@@ -59,7 +59,7 @@ mybatis-plus:
# 是否开启二级缓存。
cache-enabled: false
# 指定实体类的包路径，用于自动扫描并注册类型别名。
type-aliases-package: com.lyy.admin.moudle.**.entity,com.lyy.admin.moudle.**.vo
type-aliases-package: com.lyy.admin.moudle.**.entity,com.lyy.admin.moudle.**.vo,com.lyy.admin.moudle.**.dto
#处理自增id异常
global-config:
db-config:
......
src/main/resources/mapper/developmentinfo/DevelopmentInfoMapper.xml
View file @ d66096c1
......@@ -162,7 +162,7 @@
</where>
</select>
<select id="selectDevelopmentInfoCollectionList" parameterType="DevelopmentInfoCollectionParam" resultType="com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO">
<select id="selectDevelopmentInfoCollectionList" parameterType="DevelopmentInfoCollectionDto" resultType="com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO">
select <include refid="DevelopmentInfoVOList"/> from development_info sc,sys_collection d
<where>
sc.id = d.collect_id and d.user_id = #{userId} and d.type = 1
......@@ -195,7 +195,7 @@
</select>
<select id="selectDevelopmentInfoAuthenticationList" parameterType="ParkInfoAuthenticationParam" resultType="DevelopmentInfoListVO">
<select id="selectDevelopmentInfoAuthenticationList" parameterType="ParkInfoAuthenticationDto" resultType="DevelopmentInfoListVO">
select <include refid="DevelopmentInfoVOList1"/> from development_info
<where>
user_id = #{param.userId}
......
src/main/resources/mapper/parkinfo/ParkInfoMapper.xml
View file @ d66096c1
......@@ -177,7 +177,7 @@
</where>
</select>
<select id="selectParkInfoAuthenticationList" parameterType="ParkInfoAuthenticationParam" resultType="ParkInfoListVO">
<select id="selectParkInfoAuthenticationList" parameterType="ParkInfoAuthenticationDto" resultType="ParkInfoListVO">
select <include refid="ParkInfoVOList"/> from park_info
<where>
user_id = #{param.userId}
......@@ -207,7 +207,7 @@
</select>
<select id="selectParkInfoCollectionList" parameterType="ParkInfoCollectionParam" resultType="ParkInfoListVO">
<select id="selectParkInfoCollectionList" parameterType="ParkInfoCollectionDto" resultType="ParkInfoListVO">
select <include refid="ParkInfoVOList1"/> from park_info sc, sys_collection p
<where>
sc.id = p.collect_id and p.user_id = #{userId} and p.type = 2
......
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