by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除不必要的字段

Browse Source
This commit is contained in:
dy
2025-09-05 22:57:30 +08:00
parent 6538635e6d
commit e70e245cdd
10 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteFloorVo.java
View File

@@ -33,10 +33,10 @@ public class RemoteFloorVo implements Serializable {
*/
private String floorName;
/**
* 楼层号
*/
private Long floorNumber;
// /**
// * 楼层号
// */
// private Long floorNumber;
/**
* 楼层类型

16
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java
View File

@@ -34,10 +34,10 @@ public class TbCommunity extends TenantEntity {
*/
private String communityName;
/**
* 社区类型 1：园区，2：小区
*/
private Integer communityType;
// /**
// * 社区类型 1：园区，2：小区
// */
// private Integer communityType;
private String cityFullCode;
@@ -58,10 +58,10 @@ public class TbCommunity extends TenantEntity {
*/
private String district;
/**
* 地址
*/
private String addr;
// /**
// * 地址
// */
// private String addr;
/**
* 经度

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFloor.java
View File

@@ -47,10 +47,10 @@ public class TbFloor extends TenantEntity {
*/
private String floorName;
/**
* 楼层号
*/
private Integer floorNumber;
// /**
// * 楼层号
// */
// private Integer floorNumber;
/**
* 楼层类型

20
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java
View File

@@ -35,11 +35,11 @@ public class TbCommunityBo extends BaseEntity {
@NotBlank(message = "社区名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String communityName;
/**
* 社区类型 1：园区，2：小区
*/
@NotNull(message = "社区类型 1：园区，2：小区不能为空", groups = {AddGroup.class, EditGroup.class})
private Integer communityType;
// /**
// * 社区类型 1：园区，2：小区
// */
// @NotNull(message = "社区类型 1：园区，2：小区不能为空", groups = {AddGroup.class, EditGroup.class})
// private Integer communityType;
@NotBlank(message = "城市不能为null", groups = {AddGroup.class, EditGroup.class})
private String cityFullCode;
@@ -61,11 +61,11 @@ public class TbCommunityBo extends BaseEntity {
*/
private String district;
/**
* 地址
*/
@NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String addr;
// /**
// * 地址
// */
// @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
// private String addr;
/**
* 经度

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFloorBo.java
View File

@@ -37,11 +37,11 @@ public class TbFloorBo extends BaseEntity {
@NotBlank(message = "楼层数名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String floorName;
/**
* 楼层号
*/
@NotNull(message = "楼层号不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer floorNumber;
// /**
// * 楼层号
// */
// @NotNull(message = "楼层号不能为空", groups = { AddGroup.class, EditGroup.class })
// private Integer floorNumber;
/**
* 建筑面积(平方米)
*/

20
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java
View File

@@ -37,11 +37,11 @@ public class TbCommunityVo implements Serializable {
@ExcelProperty(value = "社区名称")
private String communityName;
/**
* 社区类型 1：园区，2：小区
*/
@ExcelProperty(value = "社区类型 1：园区，2：小区")
private Long communityType;
// /**
// * 社区类型 1：园区，2：小区
// */
// @ExcelProperty(value = "社区类型 1：园区，2：小区")
// private Long communityType;
private String cityFullCode;
@@ -65,11 +65,11 @@ public class TbCommunityVo implements Serializable {
@ExcelProperty(value = "区")
private String district;
/**
* 地址
*/
@ExcelProperty(value = "地址")
private String addr;
// /**
// * 地址
// */
// @ExcelProperty(value = "地址")
// private String addr;
/**
* 经度

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java
View File

@@ -68,11 +68,11 @@ public class TbFloorVo implements Serializable {
@ExcelProperty(value = "楼层数名称")
private String floorName;
/**
* 楼层号
*/
@ExcelProperty(value = "楼层号")
private Long floorNumber;
// /**
// * 楼层号
// */
// @ExcelProperty(value = "楼层号")
// private Long floorNumber;
/**
* 楼层类型

2
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java
View File

@@ -99,7 +99,7 @@ public class RemoteFloorServiceImpl implements RemoteFloorService {
RemoteFloorVo remoteFloorVo = new RemoteFloorVo();
remoteFloorVo.setId(item.getId());
remoteFloorVo.setFloorName(item.getFloorName());
remoteFloorVo.setFloorNumber(item.getFloorNumber());
// remoteFloorVo.setFloorNumber(item.getFloorNumber());
remoteFloorVos.add(remoteFloorVo);
});

4
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java
View File

@@ -174,11 +174,11 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
lqw.orderByDesc(TbCommunity::getCreateTime)
.orderByDesc(TbCommunity::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), TbCommunity::getCommunityName, bo.getCommunityName());
lqw.eq(bo.getCommunityType() != null, TbCommunity::getCommunityType, bo.getCommunityType());
// lqw.eq(bo.getCommunityType() != null, TbCommunity::getCommunityType, bo.getCommunityType());
lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince());
lqw.eq(StringUtils.isNotBlank(bo.getCity()), TbCommunity::getCity, bo.getCity());
lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), TbCommunity::getDistrict, bo.getDistrict());
lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbCommunity::getAddr, bo.getAddr());
// lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbCommunity::getAddr, bo.getAddr());
lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbCommunity::getLon, bo.getLon());
lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbCommunity::getLat, bo.getLat());
lqw.eq(bo.getArea() != null, TbCommunity::getArea, bo.getArea());

12
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java
View File

@@ -116,7 +116,7 @@ public class TbFloorServiceImpl implements ITbFloorService {
lqw.orderByDesc(TbFloor::getCreateTime)
.orderByDesc(TbFloor::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getFloorName()), TbFloor::getFloorName, bo.getFloorName());
lqw.eq(bo.getFloorNumber() != null, TbFloor::getFloorNumber, bo.getFloorNumber());
// lqw.eq(bo.getFloorNumber() != null, TbFloor::getFloorNumber, bo.getFloorNumber());
lqw.eq(bo.getBuildingId() != null, TbFloor::getUnitId, bo.getBuildingId());
lqw.eq(bo.getFloorType() != null, TbFloor::getFloorType, bo.getFloorType());
lqw.eq(bo.getRoomCount() != null, TbFloor::getRoomCount, bo.getRoomCount());
@@ -139,10 +139,10 @@ public class TbFloorServiceImpl implements ITbFloorService {
// 验证同一单元楼层是否已经存在
LambdaQueryWrapper<TbFloor> lqw = Wrappers.lambdaQuery();
lqw.eq(TbFloor::getBuildingId, bo.getBuildingId())
.eq(TbFloor::getFloorNumber, bo.getFloorNumber());
lqw.eq(TbFloor::getBuildingId, bo.getBuildingId());
// .eq(TbFloor::getFloorNumber, bo.getFloorNumber());
boolean numberExists = baseMapper.selectCount(lqw) > 0;
Assert.isFalse(numberExists, "单元:{},建筑:{}已存在。", bo.getBuildingId(), bo.getFloorNumber());
Assert.isFalse(numberExists, "建筑:{}已存在。", bo.getBuildingId());
TbFloor add = MapstructUtils.convert(bo, TbFloor.class);
add.setCommunityId(tbBuildingVo.getCommunityId());
@@ -202,8 +202,8 @@ public class TbFloorServiceImpl implements ITbFloorService {
@Override
public List<TbFloorVo> queryByBuildingId(Long buildingId) {
LambdaQueryWrapper<TbFloor> lqw = Wrappers.lambdaQuery();
lqw.eq(TbFloor::getBuildingId, buildingId)
.orderByAsc(TbFloor::getFloorNumber);
lqw.eq(TbFloor::getBuildingId, buildingId);
// .orderByAsc(TbFloor::getFloorNumber);
return baseMapper.selectVoList(lqw);
}
}