Skip to content

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

更改类名称

parent 03f749c0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 65 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/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/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