From 7e41147372efd744a9f084df3a9f04e1aa79e304 Mon Sep 17 00:00:00 2001 From: peihao <1280253838@qq.com> Date: Thu, 17 Jun 2021 21:02:47 +0800 Subject: [PATCH] =?UTF-8?q?1.0.0=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LandListedConductEnterpriseController.java | 84 +++++++++++++++++++ .../LandListedConstructionPlanController.java | 84 +++++++++++++++++++ ...LandToListConductEnterpriseController.java | 84 +++++++++++++++++++ .../LandToListConstructionPlanController.java | 84 +++++++++++++++++++ .../land/controller/LandToListController.java | 4 +- .../LandToListLonLatController.java | 2 +- .../com/air/land/entity/AuctionRecord.java | 2 +- .../com/air/land/entity/LandAttachment.java | 4 +- .../entity/LandListedConductEnterprise.java | 39 +++++++++ .../entity/LandListedConstructionPlan.java | 39 +++++++++ .../java/com/air/land/entity/LandToList.java | 2 +- .../entity/LandToListConductEnterprise.java | 39 +++++++++ .../entity/LandToListConstructionPlan.java | 39 +++++++++ .../com/air/land/entity/LandToListLonLat.java | 2 +- .../LandListedConductEnterpriseMapper.java | 14 ++++ .../LandListedConstructionPlanMapper.java | 14 ++++ .../LandToListConductEnterpriseMapper.java | 14 ++++ .../LandToListConstructionPlanMapper.java | 14 ++++ .../LandListedConductEnterpriseService.java | 14 ++++ .../LandListedConstructionPlanService.java | 14 ++++ .../LandToListConductEnterpriseService.java | 14 ++++ .../LandToListConstructionPlanService.java | 14 ++++ .../land/service/LandToListLonLatService.java | 2 + .../air/land/service/LandToListService.java | 2 +- ...andListedConductEnterpriseServiceImpl.java | 18 ++++ ...LandListedConstructionPlanServiceImpl.java | 18 ++++ .../impl/LandListedLonLatServiceImpl.java | 4 +- ...andToListConductEnterpriseServiceImpl.java | 18 ++++ ...LandToListConstructionPlanServiceImpl.java | 18 ++++ .../impl/LandToListLonLatServiceImpl.java | 47 +++++++++++ .../service/impl/LandToListServiceImpl.java | 2 +- .../com/air/land/vo/LandToListLonLatVo.java | 2 +- .../java/com/air/land/vo/LandToListVo.java | 2 +- .../air/measuredata/entity/MeasureData.java | 2 +- .../com/air/measuredata/vo/MeasureDataVo.java | 2 +- 35 files changed, 741 insertions(+), 16 deletions(-) create mode 100644 air/src/main/java/com/air/land/controller/LandListedConductEnterpriseController.java create mode 100644 air/src/main/java/com/air/land/controller/LandListedConstructionPlanController.java create mode 100644 air/src/main/java/com/air/land/controller/LandToListConductEnterpriseController.java create mode 100644 air/src/main/java/com/air/land/controller/LandToListConstructionPlanController.java create mode 100644 air/src/main/java/com/air/land/entity/LandListedConductEnterprise.java create mode 100644 air/src/main/java/com/air/land/entity/LandListedConstructionPlan.java create mode 100644 air/src/main/java/com/air/land/entity/LandToListConductEnterprise.java create mode 100644 air/src/main/java/com/air/land/entity/LandToListConstructionPlan.java create mode 100644 air/src/main/java/com/air/land/mapper/LandListedConductEnterpriseMapper.java create mode 100644 air/src/main/java/com/air/land/mapper/LandListedConstructionPlanMapper.java create mode 100644 air/src/main/java/com/air/land/mapper/LandToListConductEnterpriseMapper.java create mode 100644 air/src/main/java/com/air/land/mapper/LandToListConstructionPlanMapper.java create mode 100644 air/src/main/java/com/air/land/service/LandListedConductEnterpriseService.java create mode 100644 air/src/main/java/com/air/land/service/LandListedConstructionPlanService.java create mode 100644 air/src/main/java/com/air/land/service/LandToListConductEnterpriseService.java create mode 100644 air/src/main/java/com/air/land/service/LandToListConstructionPlanService.java create mode 100644 air/src/main/java/com/air/land/service/impl/LandListedConductEnterpriseServiceImpl.java create mode 100644 air/src/main/java/com/air/land/service/impl/LandListedConstructionPlanServiceImpl.java create mode 100644 air/src/main/java/com/air/land/service/impl/LandToListConductEnterpriseServiceImpl.java create mode 100644 air/src/main/java/com/air/land/service/impl/LandToListConstructionPlanServiceImpl.java diff --git a/air/src/main/java/com/air/land/controller/LandListedConductEnterpriseController.java b/air/src/main/java/com/air/land/controller/LandListedConductEnterpriseController.java new file mode 100644 index 0000000..0665591 --- /dev/null +++ b/air/src/main/java/com/air/land/controller/LandListedConductEnterpriseController.java @@ -0,0 +1,84 @@ +package com.air.land.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cinderella.framework.common.core.util.R; +import com.air.land.entity.LandListedConductEnterprise; +import com.air.land.service.LandListedConductEnterpriseService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + + +/** + * 已挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:35 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/landlistedconductenterprise") +@Api(value = "landlistedconductenterprise", tags = "已挂牌地块关联经营企业管理") +public class LandListedConductEnterpriseController { + + private final LandListedConductEnterpriseService landListedConductEnterpriseService; + + /** + * 分页查询 + * @param page 分页对象 + * @param landListedConductEnterprise 已挂牌地块关联经营企业 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/page") + public R getLandListedConductEnterprisePage(Page page, LandListedConductEnterprise landListedConductEnterprise) { + return R.ok(landListedConductEnterpriseService.page(page, Wrappers.query(landListedConductEnterprise))); + } + + + /** + * 通过id查询已挂牌地块关联经营企业 + * @param conductEnterpriseId id + * @return R + */ + @ApiOperation(value = "通过id查询", notes = "通过id查询") + @GetMapping("/{conductEnterpriseId}") + public R getById(@PathVariable("conductEnterpriseId") Long conductEnterpriseId) { + return R.ok(landListedConductEnterpriseService.getById(conductEnterpriseId)); + } + + /** + * 新增已挂牌地块关联经营企业 + * @param landListedConductEnterprise 已挂牌地块关联经营企业 + * @return R + */ + @ApiOperation(value = "新增已挂牌地块关联经营企业", notes = "新增已挂牌地块关联经营企业") + @PostMapping + public R save(@RequestBody LandListedConductEnterprise landListedConductEnterprise) { + return R.ok(landListedConductEnterpriseService.save(landListedConductEnterprise)); + } + + /** + * 修改已挂牌地块关联经营企业 + * @param landListedConductEnterprise 已挂牌地块关联经营企业 + * @return R + */ + @ApiOperation(value = "修改已挂牌地块关联经营企业", notes = "修改已挂牌地块关联经营企业") + @PutMapping + public R updateById(@RequestBody LandListedConductEnterprise landListedConductEnterprise) { + return R.ok(landListedConductEnterpriseService.updateById(landListedConductEnterprise)); + } + + /** + * 通过id删除已挂牌地块关联经营企业 + * @param conductEnterpriseId id + * @return R + */ + @ApiOperation(value = "通过id删除已挂牌地块关联经营企业", notes = "通过id删除已挂牌地块关联经营企业") + @DeleteMapping("/{conductEnterpriseId}") + public R removeById(@PathVariable Long conductEnterpriseId) { + return R.ok(landListedConductEnterpriseService.removeById(conductEnterpriseId)); + } +} diff --git a/air/src/main/java/com/air/land/controller/LandListedConstructionPlanController.java b/air/src/main/java/com/air/land/controller/LandListedConstructionPlanController.java new file mode 100644 index 0000000..34030d5 --- /dev/null +++ b/air/src/main/java/com/air/land/controller/LandListedConstructionPlanController.java @@ -0,0 +1,84 @@ +package com.air.land.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cinderella.framework.common.core.util.R; +import com.air.land.entity.LandListedConstructionPlan; +import com.air.land.service.LandListedConstructionPlanService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + + +/** + * 已挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:27 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/landlistedconstructionplan") +@Api(value = "landlistedconstructionplan", tags = "已挂牌地块关联建设规划管理") +public class LandListedConstructionPlanController { + + private final LandListedConstructionPlanService landListedConstructionPlanService; + + /** + * 分页查询 + * @param page 分页对象 + * @param landListedConstructionPlan 已挂牌地块关联建设规划 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/page") + public R getLandListedConstructionPlanPage(Page page, LandListedConstructionPlan landListedConstructionPlan) { + return R.ok(landListedConstructionPlanService.page(page, Wrappers.query(landListedConstructionPlan))); + } + + + /** + * 通过id查询已挂牌地块关联建设规划 + * @param constructionPlanId id + * @return R + */ + @ApiOperation(value = "通过id查询", notes = "通过id查询") + @GetMapping("/{constructionPlanId}") + public R getById(@PathVariable("constructionPlanId") Long constructionPlanId) { + return R.ok(landListedConstructionPlanService.getById(constructionPlanId)); + } + + /** + * 新增已挂牌地块关联建设规划 + * @param landListedConstructionPlan 已挂牌地块关联建设规划 + * @return R + */ + @ApiOperation(value = "新增已挂牌地块关联建设规划", notes = "新增已挂牌地块关联建设规划") + @PostMapping + public R save(@RequestBody LandListedConstructionPlan landListedConstructionPlan) { + return R.ok(landListedConstructionPlanService.save(landListedConstructionPlan)); + } + + /** + * 修改已挂牌地块关联建设规划 + * @param landListedConstructionPlan 已挂牌地块关联建设规划 + * @return R + */ + @ApiOperation(value = "修改已挂牌地块关联建设规划", notes = "修改已挂牌地块关联建设规划") + @PutMapping + public R updateById(@RequestBody LandListedConstructionPlan landListedConstructionPlan) { + return R.ok(landListedConstructionPlanService.updateById(landListedConstructionPlan)); + } + + /** + * 通过id删除已挂牌地块关联建设规划 + * @param constructionPlanId id + * @return R + */ + @ApiOperation(value = "通过id删除已挂牌地块关联建设规划", notes = "通过id删除已挂牌地块关联建设规划") + @DeleteMapping("/{constructionPlanId}") + public R removeById(@PathVariable Long constructionPlanId) { + return R.ok(landListedConstructionPlanService.removeById(constructionPlanId)); + } +} diff --git a/air/src/main/java/com/air/land/controller/LandToListConductEnterpriseController.java b/air/src/main/java/com/air/land/controller/LandToListConductEnterpriseController.java new file mode 100644 index 0000000..3b01b68 --- /dev/null +++ b/air/src/main/java/com/air/land/controller/LandToListConductEnterpriseController.java @@ -0,0 +1,84 @@ +package com.air.land.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cinderella.framework.common.core.util.R; +import com.air.land.entity.LandToListConductEnterprise; +import com.air.land.service.LandToListConductEnterpriseService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + + +/** + * 拟挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:43 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/landtolistconductenterprise") +@Api(value = "landtolistconductenterprise", tags = "拟挂牌地块关联经营企业管理") +public class LandToListConductEnterpriseController { + + private final LandToListConductEnterpriseService landToListConductEnterpriseService; + + /** + * 分页查询 + * @param page 分页对象 + * @param landToListConductEnterprise 拟挂牌地块关联经营企业 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/page") + public R getLandToListConductEnterprisePage(Page page, LandToListConductEnterprise landToListConductEnterprise) { + return R.ok(landToListConductEnterpriseService.page(page, Wrappers.query(landToListConductEnterprise))); + } + + + /** + * 通过id查询拟挂牌地块关联经营企业 + * @param conductEnterpriseId id + * @return R + */ + @ApiOperation(value = "通过id查询", notes = "通过id查询") + @GetMapping("/{conductEnterpriseId}") + public R getById(@PathVariable("conductEnterpriseId") Long conductEnterpriseId) { + return R.ok(landToListConductEnterpriseService.getById(conductEnterpriseId)); + } + + /** + * 新增拟挂牌地块关联经营企业 + * @param landToListConductEnterprise 拟挂牌地块关联经营企业 + * @return R + */ + @ApiOperation(value = "新增拟挂牌地块关联经营企业", notes = "新增拟挂牌地块关联经营企业") + @PostMapping + public R save(@RequestBody LandToListConductEnterprise landToListConductEnterprise) { + return R.ok(landToListConductEnterpriseService.save(landToListConductEnterprise)); + } + + /** + * 修改拟挂牌地块关联经营企业 + * @param landToListConductEnterprise 拟挂牌地块关联经营企业 + * @return R + */ + @ApiOperation(value = "修改拟挂牌地块关联经营企业", notes = "修改拟挂牌地块关联经营企业") + @PutMapping + public R updateById(@RequestBody LandToListConductEnterprise landToListConductEnterprise) { + return R.ok(landToListConductEnterpriseService.updateById(landToListConductEnterprise)); + } + + /** + * 通过id删除拟挂牌地块关联经营企业 + * @param conductEnterpriseId id + * @return R + */ + @ApiOperation(value = "通过id删除拟挂牌地块关联经营企业", notes = "通过id删除拟挂牌地块关联经营企业") + @DeleteMapping("/{conductEnterpriseId}") + public R removeById(@PathVariable Long conductEnterpriseId) { + return R.ok(landToListConductEnterpriseService.removeById(conductEnterpriseId)); + } +} diff --git a/air/src/main/java/com/air/land/controller/LandToListConstructionPlanController.java b/air/src/main/java/com/air/land/controller/LandToListConstructionPlanController.java new file mode 100644 index 0000000..a276e03 --- /dev/null +++ b/air/src/main/java/com/air/land/controller/LandToListConstructionPlanController.java @@ -0,0 +1,84 @@ +package com.air.land.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cinderella.framework.common.core.util.R; +import com.air.land.entity.LandToListConstructionPlan; +import com.air.land.service.LandToListConstructionPlanService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + + +/** + * 拟挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:50 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/landtolistconstructionplan") +@Api(value = "landtolistconstructionplan", tags = "拟挂牌地块关联建设规划管理") +public class LandToListConstructionPlanController { + + private final LandToListConstructionPlanService landToListConstructionPlanService; + + /** + * 分页查询 + * @param page 分页对象 + * @param landToListConstructionPlan 拟挂牌地块关联建设规划 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/page") + public R getLandToListConstructionPlanPage(Page page, LandToListConstructionPlan landToListConstructionPlan) { + return R.ok(landToListConstructionPlanService.page(page, Wrappers.query(landToListConstructionPlan))); + } + + + /** + * 通过id查询拟挂牌地块关联建设规划 + * @param constructionPlanId id + * @return R + */ + @ApiOperation(value = "通过id查询", notes = "通过id查询") + @GetMapping("/{constructionPlanId}") + public R getById(@PathVariable("constructionPlanId") Long constructionPlanId) { + return R.ok(landToListConstructionPlanService.getById(constructionPlanId)); + } + + /** + * 新增拟挂牌地块关联建设规划 + * @param landToListConstructionPlan 拟挂牌地块关联建设规划 + * @return R + */ + @ApiOperation(value = "新增拟挂牌地块关联建设规划", notes = "新增拟挂牌地块关联建设规划") + @PostMapping + public R save(@RequestBody LandToListConstructionPlan landToListConstructionPlan) { + return R.ok(landToListConstructionPlanService.save(landToListConstructionPlan)); + } + + /** + * 修改拟挂牌地块关联建设规划 + * @param landToListConstructionPlan 拟挂牌地块关联建设规划 + * @return R + */ + @ApiOperation(value = "修改拟挂牌地块关联建设规划", notes = "修改拟挂牌地块关联建设规划") + @PutMapping + public R updateById(@RequestBody LandToListConstructionPlan landToListConstructionPlan) { + return R.ok(landToListConstructionPlanService.updateById(landToListConstructionPlan)); + } + + /** + * 通过id删除拟挂牌地块关联建设规划 + * @param constructionPlanId id + * @return R + */ + @ApiOperation(value = "通过id删除拟挂牌地块关联建设规划", notes = "通过id删除拟挂牌地块关联建设规划") + @DeleteMapping("/{constructionPlanId}") + public R removeById(@PathVariable Long constructionPlanId) { + return R.ok(landToListConstructionPlanService.removeById(constructionPlanId)); + } +} diff --git a/air/src/main/java/com/air/land/controller/LandToListController.java b/air/src/main/java/com/air/land/controller/LandToListController.java index f2760d2..4dce705 100644 --- a/air/src/main/java/com/air/land/controller/LandToListController.java +++ b/air/src/main/java/com/air/land/controller/LandToListController.java @@ -108,7 +108,7 @@ public class LandToListController { */ @ApiOperation(value = "通过id删除拟挂牌地块", notes = "通过id删除拟挂牌地块") @DeleteMapping - public R removeById(@RequestBody List proposedseriaIds) { + public R removeById(@RequestBody List proposedseriaIds) { return R.ok(landToListService.removeByIds(proposedseriaIds)); } @@ -121,7 +121,7 @@ public class LandToListController { */ @ApiOperation(value = "发送到已挂牌", notes = "发送到已挂牌") @PostMapping("/sendLandList") - public R sendLandList(@RequestParam Long proposedseriaId) { + public R sendLandList(@RequestParam String proposedseriaId) { return landToListService.sendLandList(proposedseriaId); } diff --git a/air/src/main/java/com/air/land/controller/LandToListLonLatController.java b/air/src/main/java/com/air/land/controller/LandToListLonLatController.java index e851613..cdb1ccd 100644 --- a/air/src/main/java/com/air/land/controller/LandToListLonLatController.java +++ b/air/src/main/java/com/air/land/controller/LandToListLonLatController.java @@ -106,6 +106,6 @@ public class LandToListLonLatController { @ApiOperation(value = "导入拟挂牌地块经纬度数据", notes = "导入拟挂牌地块经纬度数据") @PostMapping(value = "/importLandToListLatExcel") public R importLandToListLatExcel(@RequestParam(value="uploadFile") MultipartFile file){ - return R.ok(); + return R.ok(landToListLonLatService.importLandToListedLonLatExcel(file)); } } diff --git a/air/src/main/java/com/air/land/entity/AuctionRecord.java b/air/src/main/java/com/air/land/entity/AuctionRecord.java index 386a309..82da10f 100644 --- a/air/src/main/java/com/air/land/entity/AuctionRecord.java +++ b/air/src/main/java/com/air/land/entity/AuctionRecord.java @@ -29,7 +29,7 @@ public class AuctionRecord extends Model { private Long auctionRecordId; @ApiModelProperty(value = "已挂牌地块标识") - private Long landListedId; + private String landListedId; @ApiModelProperty(value = "公告id") private String annoId; diff --git a/air/src/main/java/com/air/land/entity/LandAttachment.java b/air/src/main/java/com/air/land/entity/LandAttachment.java index da980fc..87b00ac 100644 --- a/air/src/main/java/com/air/land/entity/LandAttachment.java +++ b/air/src/main/java/com/air/land/entity/LandAttachment.java @@ -30,9 +30,9 @@ public class LandAttachment extends Model { @ApiModelProperty(value = "主键") private Long id; - @NotNull(message = "已挂牌地块标识不能为空") + @NotBlank(message = "已挂牌地块标识不能为空") @ApiModelProperty(value = "已挂牌地块标识", required = true) - private Long landListedId; + private String landListedId; @NotBlank(message = "文件类型不能为空") @ApiModelProperty(value = "文件类型", required = true) diff --git a/air/src/main/java/com/air/land/entity/LandListedConductEnterprise.java b/air/src/main/java/com/air/land/entity/LandListedConductEnterprise.java new file mode 100644 index 0000000..ff939e8 --- /dev/null +++ b/air/src/main/java/com/air/land/entity/LandListedConductEnterprise.java @@ -0,0 +1,39 @@ +package com.air.land.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 已挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:35 + */ +@Data +@TableName("land_listed_conduct_enterprise") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "已挂牌地块关联经营企业") +public class LandListedConductEnterprise extends Model { + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "经营企业标识") + private Long conductEnterpriseId; + + @ApiModelProperty(value = "已挂牌地块标识") + private String landListedId; + + @ApiModelProperty(value = "企业名称") + private String enterpriseName; + + @ApiModelProperty(value = "股比") + private String shareRatio; + + @ApiModelProperty(value = "是否操盘") + private Integer operation; +} diff --git a/air/src/main/java/com/air/land/entity/LandListedConstructionPlan.java b/air/src/main/java/com/air/land/entity/LandListedConstructionPlan.java new file mode 100644 index 0000000..7f81e93 --- /dev/null +++ b/air/src/main/java/com/air/land/entity/LandListedConstructionPlan.java @@ -0,0 +1,39 @@ +package com.air.land.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 已挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:27 + */ +@Data +@TableName("land_listed_construction_plan") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "已挂牌地块关联建设规划") +public class LandListedConstructionPlan extends Model { + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "建设规划标识") + private Long constructionPlanId; + + @ApiModelProperty(value = "已挂牌地块标识") + private String landListedId; + + @ApiModelProperty(value = "规划类型（配建计容、配建不计容、特殊规划）") + private String planType; + + @ApiModelProperty(value = "建设类型") + private String constructionType; + + @ApiModelProperty(value = "建设面积") + private Double constructionArea; +} diff --git a/air/src/main/java/com/air/land/entity/LandToList.java b/air/src/main/java/com/air/land/entity/LandToList.java index fcc4e9d..c26e8fc 100644 --- a/air/src/main/java/com/air/land/entity/LandToList.java +++ b/air/src/main/java/com/air/land/entity/LandToList.java @@ -29,7 +29,7 @@ public class LandToList extends Model { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "拟出让序号") - private Long proposedseriaId; + private String proposedseriaId; @ApiModelProperty(value = "地块名称") private String landName; diff --git a/air/src/main/java/com/air/land/entity/LandToListConductEnterprise.java b/air/src/main/java/com/air/land/entity/LandToListConductEnterprise.java new file mode 100644 index 0000000..0f8267b --- /dev/null +++ b/air/src/main/java/com/air/land/entity/LandToListConductEnterprise.java @@ -0,0 +1,39 @@ +package com.air.land.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 拟挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:43 + */ +@Data +@TableName("land_to_list_conduct_enterprise") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "拟挂牌地块关联经营企业") +public class LandToListConductEnterprise extends Model { + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "经营企业标识") + private Long conductEnterpriseId; + + @ApiModelProperty(value = "拟挂牌地块标识") + private String proposedseriaId; + + @ApiModelProperty(value = "企业名称") + private String enterpriseName; + + @ApiModelProperty(value = "股比") + private String shareRatio; + + @ApiModelProperty(value = "是否操盘") + private Integer operation; +} diff --git a/air/src/main/java/com/air/land/entity/LandToListConstructionPlan.java b/air/src/main/java/com/air/land/entity/LandToListConstructionPlan.java new file mode 100644 index 0000000..64a6d0a --- /dev/null +++ b/air/src/main/java/com/air/land/entity/LandToListConstructionPlan.java @@ -0,0 +1,39 @@ +package com.air.land.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 拟挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:50 + */ +@Data +@TableName("land_to_list_construction_plan") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "拟挂牌地块关联建设规划") +public class LandToListConstructionPlan extends Model { + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "建设规划标识") + private Long constructionPlanId; + + @ApiModelProperty(value = "拟挂牌地块标识") + private String proposedseriaId; + + @ApiModelProperty(value = "规划类型（配建计容、配建不计容、特殊规划）") + private String planType; + + @ApiModelProperty(value = "建设类型") + private String constructionType; + + @ApiModelProperty(value = "建设面积") + private Double constructionArea; +} diff --git a/air/src/main/java/com/air/land/entity/LandToListLonLat.java b/air/src/main/java/com/air/land/entity/LandToListLonLat.java index f5139ce..0adc65f 100644 --- a/air/src/main/java/com/air/land/entity/LandToListLonLat.java +++ b/air/src/main/java/com/air/land/entity/LandToListLonLat.java @@ -29,7 +29,7 @@ public class LandToListLonLat extends Model { private Long latId; @ApiModelProperty(value = "拟出让序号") - private Long proposedseriaId; + private String proposedseriaId; @ApiModelProperty(value = "地块编号") private String landCode; diff --git a/air/src/main/java/com/air/land/mapper/LandListedConductEnterpriseMapper.java b/air/src/main/java/com/air/land/mapper/LandListedConductEnterpriseMapper.java new file mode 100644 index 0000000..8421e29 --- /dev/null +++ b/air/src/main/java/com/air/land/mapper/LandListedConductEnterpriseMapper.java @@ -0,0 +1,14 @@ +package com.air.land.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.air.land.entity.LandListedConductEnterprise; + +/** + * 已挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:35 + */ +public interface LandListedConductEnterpriseMapper extends BaseMapper { + +} diff --git a/air/src/main/java/com/air/land/mapper/LandListedConstructionPlanMapper.java b/air/src/main/java/com/air/land/mapper/LandListedConstructionPlanMapper.java new file mode 100644 index 0000000..4d8a3e2 --- /dev/null +++ b/air/src/main/java/com/air/land/mapper/LandListedConstructionPlanMapper.java @@ -0,0 +1,14 @@ +package com.air.land.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.air.land.entity.LandListedConstructionPlan; + +/** + * 已挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:27 + */ +public interface LandListedConstructionPlanMapper extends BaseMapper { + +} diff --git a/air/src/main/java/com/air/land/mapper/LandToListConductEnterpriseMapper.java b/air/src/main/java/com/air/land/mapper/LandToListConductEnterpriseMapper.java new file mode 100644 index 0000000..439d29b --- /dev/null +++ b/air/src/main/java/com/air/land/mapper/LandToListConductEnterpriseMapper.java @@ -0,0 +1,14 @@ +package com.air.land.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.air.land.entity.LandToListConductEnterprise; + +/** + * 拟挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:43 + */ +public interface LandToListConductEnterpriseMapper extends BaseMapper { + +} diff --git a/air/src/main/java/com/air/land/mapper/LandToListConstructionPlanMapper.java b/air/src/main/java/com/air/land/mapper/LandToListConstructionPlanMapper.java new file mode 100644 index 0000000..ee6c8a3 --- /dev/null +++ b/air/src/main/java/com/air/land/mapper/LandToListConstructionPlanMapper.java @@ -0,0 +1,14 @@ +package com.air.land.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.air.land.entity.LandToListConstructionPlan; + +/** + * 拟挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:50 + */ +public interface LandToListConstructionPlanMapper extends BaseMapper { + +} diff --git a/air/src/main/java/com/air/land/service/LandListedConductEnterpriseService.java b/air/src/main/java/com/air/land/service/LandListedConductEnterpriseService.java new file mode 100644 index 0000000..2a8a2c4 --- /dev/null +++ b/air/src/main/java/com/air/land/service/LandListedConductEnterpriseService.java @@ -0,0 +1,14 @@ +package com.air.land.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.air.land.entity.LandListedConductEnterprise; + +/** + * 已挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:35 + */ +public interface LandListedConductEnterpriseService extends IService { + +} diff --git a/air/src/main/java/com/air/land/service/LandListedConstructionPlanService.java b/air/src/main/java/com/air/land/service/LandListedConstructionPlanService.java new file mode 100644 index 0000000..82e7899 --- /dev/null +++ b/air/src/main/java/com/air/land/service/LandListedConstructionPlanService.java @@ -0,0 +1,14 @@ +package com.air.land.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.air.land.entity.LandListedConstructionPlan; + +/** + * 已挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:27 + */ +public interface LandListedConstructionPlanService extends IService { + +} diff --git a/air/src/main/java/com/air/land/service/LandToListConductEnterpriseService.java b/air/src/main/java/com/air/land/service/LandToListConductEnterpriseService.java new file mode 100644 index 0000000..e57d3f3 --- /dev/null +++ b/air/src/main/java/com/air/land/service/LandToListConductEnterpriseService.java @@ -0,0 +1,14 @@ +package com.air.land.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.air.land.entity.LandToListConductEnterprise; + +/** + * 拟挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:43 + */ +public interface LandToListConductEnterpriseService extends IService { + +} diff --git a/air/src/main/java/com/air/land/service/LandToListConstructionPlanService.java b/air/src/main/java/com/air/land/service/LandToListConstructionPlanService.java new file mode 100644 index 0000000..c7eecbc --- /dev/null +++ b/air/src/main/java/com/air/land/service/LandToListConstructionPlanService.java @@ -0,0 +1,14 @@ +package com.air.land.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.air.land.entity.LandToListConstructionPlan; + +/** + * 拟挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:50 + */ +public interface LandToListConstructionPlanService extends IService { + +} diff --git a/air/src/main/java/com/air/land/service/LandToListLonLatService.java b/air/src/main/java/com/air/land/service/LandToListLonLatService.java index 67769dc..fde8387 100644 --- a/air/src/main/java/com/air/land/service/LandToListLonLatService.java +++ b/air/src/main/java/com/air/land/service/LandToListLonLatService.java @@ -2,6 +2,7 @@ package com.air.land.service; import com.air.land.entity.LandToListLonLat; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; /** * 拟挂牌地块经纬度 @@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface LandToListLonLatService extends IService { + boolean importLandToListedLonLatExcel(MultipartFile file); } diff --git a/air/src/main/java/com/air/land/service/LandToListService.java b/air/src/main/java/com/air/land/service/LandToListService.java index 735b74b..3e4d697 100644 --- a/air/src/main/java/com/air/land/service/LandToListService.java +++ b/air/src/main/java/com/air/land/service/LandToListService.java @@ -15,7 +15,7 @@ import java.util.List; */ public interface LandToListService extends IService { - R sendLandList(Long proposedseriaId); + R sendLandList(String proposedseriaId); List> getLandList(List ids); diff --git a/air/src/main/java/com/air/land/service/impl/LandListedConductEnterpriseServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandListedConductEnterpriseServiceImpl.java new file mode 100644 index 0000000..c5f5c52 --- /dev/null +++ b/air/src/main/java/com/air/land/service/impl/LandListedConductEnterpriseServiceImpl.java @@ -0,0 +1,18 @@ +package com.air.land.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.air.land.entity.LandListedConductEnterprise; +import com.air.land.mapper.LandListedConductEnterpriseMapper; +import com.air.land.service.LandListedConductEnterpriseService; +import org.springframework.stereotype.Service; + +/** + * 已挂牌地块关联经营企业 + * + * @author peihao + * @date 2021-06-17 20:07:35 + */ +@Service +public class LandListedConductEnterpriseServiceImpl extends ServiceImpl implements LandListedConductEnterpriseService { + +} diff --git a/air/src/main/java/com/air/land/service/impl/LandListedConstructionPlanServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandListedConstructionPlanServiceImpl.java new file mode 100644 index 0000000..1b3e42f --- /dev/null +++ b/air/src/main/java/com/air/land/service/impl/LandListedConstructionPlanServiceImpl.java @@ -0,0 +1,18 @@ +package com.air.land.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.air.land.entity.LandListedConstructionPlan; +import com.air.land.mapper.LandListedConstructionPlanMapper; +import com.air.land.service.LandListedConstructionPlanService; +import org.springframework.stereotype.Service; + +/** + * 已挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:27 + */ +@Service +public class LandListedConstructionPlanServiceImpl extends ServiceImpl implements LandListedConstructionPlanService { + +} diff --git a/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java index cc48d47..3036686 100644 --- a/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java +++ b/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java @@ -32,7 +32,7 @@ public class LandListedLonLatServiceImpl extends ServiceImpl list = new ArrayList<>(dataList.size()); dataList.forEach(data ->{ @@ -43,7 +43,7 @@ public class LandListedLonLatServiceImpl extends ServiceImpl implements LandToListConductEnterpriseService { + +} diff --git a/air/src/main/java/com/air/land/service/impl/LandToListConstructionPlanServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandToListConstructionPlanServiceImpl.java new file mode 100644 index 0000000..07d89e5 --- /dev/null +++ b/air/src/main/java/com/air/land/service/impl/LandToListConstructionPlanServiceImpl.java @@ -0,0 +1,18 @@ +package com.air.land.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.air.land.entity.LandToListConstructionPlan; +import com.air.land.mapper.LandToListConstructionPlanMapper; +import com.air.land.service.LandToListConstructionPlanService; +import org.springframework.stereotype.Service; + +/** + * 拟挂牌地块关联建设规划 + * + * @author peihao + * @date 2021-06-17 20:07:50 + */ +@Service +public class LandToListConstructionPlanServiceImpl extends ServiceImpl implements LandToListConstructionPlanService { + +} diff --git a/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java index 16c4e4b..a07fa2c 100644 --- a/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java +++ b/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java @@ -1,10 +1,20 @@ package com.air.land.service.impl; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.air.land.entity.LandListedLonLat; import com.air.land.entity.LandToListLonLat; import com.air.land.mapper.LandToListLonLatMapper; import com.air.land.service.LandToListLonLatService; +import com.air.utils.ExcelUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cinderella.framework.common.core.exception.BusinessException; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; /** * 拟挂牌地块经纬度 @@ -15,4 +25,41 @@ import org.springframework.stereotype.Service; @Service public class LandToListLonLatServiceImpl extends ServiceImpl implements LandToListLonLatService { + @Override + public boolean importLandToListedLonLatExcel(MultipartFile file) { + List> dataList = new ArrayList<>(); + try{ + dataList = ExcelUtil.importExcel(file,0,1,0); + }catch (IOException e){ + new BusinessException("导入拟挂牌经纬度数据出错"); + } + List list = new ArrayList<>(dataList.size()); + dataList.forEach(data ->{ + try { + LandToListLonLat landListedLonLat = listToEntity(data); + if(ObjectUtil.isNotEmpty(landListedLonLat)){ + list.add(landListedLonLat); + } + }catch (Exception e){ + e.printStackTrace(); + new BusinessException("导入拟挂牌经纬度数据转换出错"); + } + }); + return this.saveBatch(list); + } + + private LandToListLonLat listToEntity(List data) { + LandToListLonLat landToListLonLat = new LandToListLonLat(); + if (StrUtil.isNotEmpty(data.get(0))) { + landToListLonLat.setProposedseriaId(data.get(0)); + landToListLonLat.setName(data.get(1)); + landToListLonLat.setLandLonLat(data.get(2)); + landToListLonLat.setLineWidth(data.get(3)); + landToListLonLat.setLineColor(data.get(4)); + landToListLonLat.setLineOpaqueness(data.get(5)); + landToListLonLat.setFillColor(data.get(6)); + landToListLonLat.setFillOpaqueness(data.get(7)); + } + return landToListLonLat; + } } diff --git a/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java index 16e0f64..5dab9f4 100644 --- a/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java +++ b/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java @@ -36,7 +36,7 @@ public class LandToListServiceImpl extends ServiceImpl sendLandList(Long proposedseriaId) { + public R sendLandList(String proposedseriaId) { LandToList landToList = this.getById(proposedseriaId); if (null == landToList) { return R.failed("未查询到数据"); diff --git a/air/src/main/java/com/air/land/vo/LandToListLonLatVo.java b/air/src/main/java/com/air/land/vo/LandToListLonLatVo.java index 89fdbe2..d797488 100644 --- a/air/src/main/java/com/air/land/vo/LandToListLonLatVo.java +++ b/air/src/main/java/com/air/land/vo/LandToListLonLatVo.java @@ -22,7 +22,7 @@ public class LandToListLonLatVo { private Long latId; @NotNull(message = "拟出让序号不能为空") @ApiModelProperty(value = "拟出让序号", required = true) - private Long proposedseriaId; + private String proposedseriaId; @NotBlank(message = "地块编号不能为空") @ApiModelProperty(value = "地块编号", required = true) diff --git a/air/src/main/java/com/air/land/vo/LandToListVo.java b/air/src/main/java/com/air/land/vo/LandToListVo.java index 0897d4b..14d9f58 100644 --- a/air/src/main/java/com/air/land/vo/LandToListVo.java +++ b/air/src/main/java/com/air/land/vo/LandToListVo.java @@ -19,7 +19,7 @@ public class LandToListVo { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "拟出让序号") - private Long proposedseriaId; + private String proposedseriaId; @NotBlank(message = "地块名称不能为空") @ApiModelProperty(value = "地块名称", required = true) diff --git a/air/src/main/java/com/air/measuredata/entity/MeasureData.java b/air/src/main/java/com/air/measuredata/entity/MeasureData.java index 3b239c4..31676d9 100644 --- a/air/src/main/java/com/air/measuredata/entity/MeasureData.java +++ b/air/src/main/java/com/air/measuredata/entity/MeasureData.java @@ -29,7 +29,7 @@ public class MeasureData extends Model { private Long measureDataId; @ApiModelProperty(value = "已挂牌地块标识") - private Long landListedId; + private String landListedId; @ApiModelProperty(value = "土地编号") private String annoId; diff --git a/air/src/main/java/com/air/measuredata/vo/MeasureDataVo.java b/air/src/main/java/com/air/measuredata/vo/MeasureDataVo.java index 4144270..4f2ac27 100644 --- a/air/src/main/java/com/air/measuredata/vo/MeasureDataVo.java +++ b/air/src/main/java/com/air/measuredata/vo/MeasureDataVo.java @@ -21,7 +21,7 @@ public class MeasureDataVo { private Long measureDataId; @ApiModelProperty(value = "已挂牌地块标识") - private Long landListedId; + private String landListedId; @ApiModelProperty(value = "土地编号") private String annoId;