guolong
/
back-end
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

初始化数据

feature/v.2.0.0
caoyizhong 3 years ago
parent
e59b96f3cd
commit
8917a79c74
5 changed files with 41 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      air/pom.xml
  2. 40
      air/src/main/java/com/air/land/controller/LandListedController.java
  3. 4
      air/src/main/java/com/air/land/entity/LandListed.java
  4. 10
      air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
  5. 18
      air/src/main/resources/application.yml

2
air/pom.xml
Unescape View File

@ -31,7 +31,7 @@
<!--阿里云私服-->
<repository>
<id>maven-public</id>
<url>http://125.64.9.108:10086/repository/maven-public/</url>
<url>http://121.37.221.239:48081/repository/maven-public/</url>
<!--能下载正式版本-->
<releases>
<enabled>true</enabled>

40
air/src/main/java/com/air/land/controller/LandListedController.java
Unescape View File

@ -61,47 +61,47 @@ public class LandListedController {
public R<Page<LandListed>> getLandListedPage(QueryPage page, LandListedPageVo pageVo) {
Page<LandListed> result = landListedService.page(page.toPage(), Wrappers.<LandListed>query().lambda()
//公告序号
.like(StringUtils.isNotEmpty(pageVo.getAnnoId()), LandListed::getAnnoId, pageVo.getAnnoId())
.like(StringUtils.isNotBlank(pageVo.getAnnoId()), LandListed::getAnnoId, pageVo.getAnnoId())
//地块编号
.like(StringUtils.isNotEmpty(pageVo.getLandCode()), LandListed::getLandCode, pageVo.getLandCode())
.like(StringUtils.isNotBlank(pageVo.getLandCode()), LandListed::getLandCode, pageVo.getLandCode())
//土地用途
.eq(StringUtils.isNotEmpty(pageVo.getLandUsage()), LandListed::getLandUsage, pageVo.getLandUsage())
.eq(StringUtils.isNotBlank(pageVo.getLandUsage()), LandListed::getLandUsage, pageVo.getLandUsage())
//公告日期
.eq(ObjectUtil.isNotEmpty(pageVo.getAnnoDate()), LandListed::getAnnoDate, pageVo.getAnnoDate())
.eq(StringUtils.isNotBlank(pageVo.getAnnoDate()), LandListed::getAnnoDate, pageVo.getAnnoDate())
//拍卖日期
.eq(ObjectUtil.isNotEmpty(pageVo.getAuctionDate()), LandListed::getAuctionDate, pageVo.getAuctionDate())
.eq(StringUtils.isNotBlank(pageVo.getAuctionDate()), LandListed::getAuctionDate, pageVo.getAuctionDate())
//地质灾害
.eq(StringUtils.isNotEmpty(pageVo.getGeologicHazard()), LandListed::getGeologicHazard, pageVo.getGeologicHazard())
.eq(StringUtils.isNotBlank(pageVo.getGeologicHazard()), LandListed::getGeologicHazard, pageVo.getGeologicHazard())
//人防还建
.eq(ObjectUtil.isNotEmpty(pageVo.getCivilAirDefence()), LandListed::getCivilAirDefence, pageVo.getCivilAirDefence())
//特殊规划
.eq(ObjectUtil.isNotEmpty(pageVo.getSpecialPlan()), LandListed::getSpecialPlan, pageVo.getSpecialPlan())
.eq(StringUtils.isNotBlank(pageVo.getSpecialPlan()), LandListed::getSpecialPlan, pageVo.getSpecialPlan())
//勾地形式
.eq(StringUtils.isNotEmpty(pageVo.getHookForm()), LandListed::getHookForm, pageVo.getHookForm())
.eq(StringUtils.isNotBlank(pageVo.getHookForm()), LandListed::getHookForm, pageVo.getHookForm())
//勾地企业
.eq(ObjectUtil.isNotEmpty(pageVo.getLandEnterprises()), LandListed::getLandEnterprises, pageVo.getLandEnterprises())
.eq(StringUtils.isNotBlank(pageVo.getLandEnterprises()), LandListed::getLandEnterprises, pageVo.getLandEnterprises())
//城市
.eq(ObjectUtil.isNotEmpty(pageVo.getCity()), LandListed::getCity, pageVo.getCity())
.eq(StringUtils.isNotBlank(pageVo.getCity()), LandListed::getCity, pageVo.getCity())
//行政区
.eq(StringUtils.isNotEmpty(pageVo.getCanton()), LandListed::getCanton, pageVo.getCanton())
.eq(StringUtils.isNotBlank(pageVo.getCanton()), LandListed::getCanton, pageVo.getCanton())
//大组团
.like(StringUtils.isNotEmpty(pageVo.getBigGroup()), LandListed::getBigGroup, pageVo.getBigGroup())
.like(StringUtils.isNotBlank(pageVo.getBigGroup()), LandListed::getBigGroup, pageVo.getBigGroup())
//小组团
.like(StringUtils.isNotEmpty(pageVo.getSmallGroup()), LandListed::getSmallGroup, pageVo.getSmallGroup())
.like(StringUtils.isNotBlank(pageVo.getSmallGroup()), LandListed::getSmallGroup, pageVo.getSmallGroup())
//受让单位
.eq(StringUtils.isNotEmpty(pageVo.getAssignee()), LandListed::getAssignee, pageVo.getAssignee())
.eq(StringUtils.isNotBlank(pageVo.getAssignee()), LandListed::getAssignee, pageVo.getAssignee())
//拿地企业
.eq(ObjectUtil.isNotEmpty(pageVo.getLandEnterpriseShort()), LandListed::getLandEnterpriseShort, pageVo.getLandEnterpriseShort())
.eq(StringUtils.isNotBlank(pageVo.getLandEnterpriseShort()), LandListed::getLandEnterpriseShort, pageVo.getLandEnterpriseShort())
//参拍企业
.eq(ObjectUtil.isNotEmpty(pageVo.getParticipatingEnterprises()), LandListed::getParticipatingEnterprises, pageVo.getParticipatingEnterprises())
.eq(StringUtils.isNotBlank(pageVo.getParticipatingEnterprises()), LandListed::getParticipatingEnterprises, pageVo.getParticipatingEnterprises())
//项目状态
.eq(StringUtils.isNotEmpty(pageVo.getProjectStatus()), LandListed::getProjectStatus, pageVo.getProjectStatus())
.eq(StringUtils.isNotBlank(pageVo.getProjectStatus()), LandListed::getProjectStatus, pageVo.getProjectStatus())
//楼盘名称
.eq(ObjectUtil.isNotEmpty(pageVo.getBuildingName()), LandListed::getBuildingName, pageVo.getBuildingName())
.eq(StringUtils.isNotBlank(pageVo.getBuildingName()), LandListed::getBuildingName, pageVo.getBuildingName())
//操盘企业
.eq(ObjectUtil.isNotEmpty(pageVo.getTradingEnterprises()), LandListed::getTradingEnterprises, pageVo.getTradingEnterprises())
.eq(StringUtils.isNotBlank(pageVo.getTradingEnterprises()), LandListed::getTradingEnterprises, pageVo.getTradingEnterprises())
//经营企业
.eq(StringUtils.isNotEmpty(pageVo.getConductEnterprise()), LandListed::getConductEnterprise, pageVo.getConductEnterprise())
.eq(StringUtils.isNotBlank(pageVo.getConductEnterprise()), LandListed::getConductEnterprise, pageVo.getConductEnterprise())
.orderByDesc(LandListed::getLandListedId));
return R.ok(result, "查询成功");
}

4
air/src/main/java/com/air/land/entity/LandListed.java
Unescape View File

@ -49,9 +49,9 @@ public class LandListed extends Model<LandListed> {
@ApiModelProperty(value = "容积率")
private BigDecimal plotRatio;
@ApiModelProperty(value = "建筑密度(%)")
private BigDecimal buildingDensity;
private String buildingDensity;
@ApiModelProperty(value = "绿地率(%)")
private BigDecimal greenSpaceRatio;
private String greenSpaceRatio;
@ApiModelProperty(value = "限高")
private String heighPermitted;
@ApiModelProperty(value = "出让年限")

10
air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
Unescape View File

@ -261,8 +261,8 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
landListed.setLandTransferMu(numberFormat(getCellValue(sheetRow.getCell(5)), 0));
landListed.setTotalConsArea(numberFormat(getCellValue(sheetRow.getCell(6)), 0));
landListed.setPlotRatio(numberFormat(getCellValue(sheetRow.getCell(7)), 2));
landListed.setBuildingDensity(numberFormat(getCellStrValue(sheetRow.getCell(8)), 100, 0));
landListed.setGreenSpaceRatio(numberFormat(getCellStrValue(sheetRow.getCell(9)), 100, 0));
//landListed.setBuildingDensity(numberFormat(getCellStrValue(sheetRow.getCell(8)), 100, 0));
//landListed.setGreenSpaceRatio(numberFormat(getCellStrValue(sheetRow.getCell(9)), 100, 0));
landListed.setHeighPermitted(getCellStrValue(sheetRow.getCell(10)));
landListed.setRemiseYears(getCellStrValue(sheetRow.getCell(11)));
landListed.setTransferPrice(numberFormat(getCellStrValue(sheetRow.getCell(12)), 0));
@ -380,8 +380,10 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
list.add(stringFormat(data.getLandTransferMu(), 0));
list.add(stringFormat(data.getTotalConsArea(), 0));
list.add(stringFormat(data.getPlotRatio(), 2));
list.add(strRateFormat(data.getBuildingDensity(), 0));
list.add(strRateFormat(data.getGreenSpaceRatio(), 0));
list.add(data.getBuildingDensity());
// list.add(strRateFormat(data.getBuildingDensity(), 0));
// list.add(strRateFormat(data.getGreenSpaceRatio(), 0));
list.add(data.getGreenSpaceRatio());
list.add(data.getHeighPermitted());
list.add(data.getRemiseYears());
list.add(stringFormat(data.getTransferPrice(), 0));

18
air/src/main/resources/application.yml
Unescape View File

@ -8,10 +8,12 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
username: air
password: air123456
# url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# username: air
# password: air123456
username: root
password: root
url: jdbc:mysql://127.0.0.1:3306/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# url: jdbc:mysql://127.0.0.1:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
stat-view-servlet:
enabled: true
@ -28,10 +30,14 @@ spring:
config:
multi-statement-allow: true
only-show-slow-sql: false
# redis:
# key-prefix: 'at:'
# host: 192.168.40.102
# password: 1qaz2wsx
redis:
key-prefix: 'at:'
host: 192.168.40.102
password: 1qaz2wsx
host: 127.0.0.1
password:
servlet:
multipart:
max-file-size: 100MB

Write Preview
Loading…
Cancel
Save