1.0.0 修改代码

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));
+    }
+}

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));
+    }
+}

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));
+    }
+}

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));
+    }
+}

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<Long> proposedseriaIds) {
+    public R removeById(@RequestBody List<String> proposedseriaIds) {
         return R.ok(landToListService.removeByIds(proposedseriaIds));
     }
 
@@ -121,7 +121,7 @@ public class LandToListController {
      */
     @ApiOperation(value = "发送到已挂牌", notes = "发送到已挂牌")
     @PostMapping("/sendLandList")
-    public R<Boolean> sendLandList(@RequestParam Long proposedseriaId) {
+    public R<Boolean> sendLandList(@RequestParam String proposedseriaId) {
         return landToListService.sendLandList(proposedseriaId);
     }
 

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));
     }
 }

air/src/main/java/com/air/land/entity/AuctionRecord.java

@@ -29,7 +29,7 @@ public class AuctionRecord extends Model<AuctionRecord> {
     private Long auctionRecordId;
 
     @ApiModelProperty(value = "已挂牌地块标识")
-    private Long landListedId;
+    private String landListedId;
 
     @ApiModelProperty(value = "公告id")
     private String annoId;

air/src/main/java/com/air/land/entity/LandAttachment.java

@@ -30,9 +30,9 @@ public class LandAttachment extends Model<LandAttachment> {
     @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)

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<LandListedConductEnterprise> {
+    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;
+}

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<LandListedConstructionPlan> {
+    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;
+}

air/src/main/java/com/air/land/entity/LandToList.java

@@ -29,7 +29,7 @@ public class LandToList extends Model<LandToList> {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "拟出让序号")
-    private Long proposedseriaId;
+    private String proposedseriaId;
 
     @ApiModelProperty(value = "地块名称")
     private String landName;

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<LandToListConductEnterprise> {
+    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;
+}

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<LandToListConstructionPlan> {
+    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;
+}

air/src/main/java/com/air/land/entity/LandToListLonLat.java

@@ -29,7 +29,7 @@ public class LandToListLonLat extends Model<LandToListLonLat> {
     private Long latId;
 
     @ApiModelProperty(value = "拟出让序号")
-    private Long proposedseriaId;
+    private String proposedseriaId;
 
     @ApiModelProperty(value = "地块编号")
     private String landCode;

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<LandListedConductEnterprise> {
+
+}

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<LandListedConstructionPlan> {
+
+}

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<LandToListConductEnterprise> {
+
+}

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<LandToListConstructionPlan> {
+
+}

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<LandListedConductEnterprise> {
+
+}

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<LandListedConstructionPlan> {
+
+}

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<LandToListConductEnterprise> {
+
+}

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<LandToListConstructionPlan> {
+
+}

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<LandToListLonLat> {
 
+    boolean importLandToListedLonLatExcel(MultipartFile file);
 }

air/src/main/java/com/air/land/service/LandToListService.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface LandToListService extends IService<LandToList> {
 
-    R<Boolean> sendLandList(Long proposedseriaId);
+    R<Boolean> sendLandList(String proposedseriaId);
 
     List<List<String>> getLandList(List<Long> ids);
 

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<LandListedConductEnterpriseMapper, LandListedConductEnterprise> implements LandListedConductEnterpriseService {
+
+}

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<LandListedConstructionPlanMapper, LandListedConstructionPlan> implements LandListedConstructionPlanService {
+
+}

air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java

@@ -32,7 +32,7 @@ public class LandListedLonLatServiceImpl extends ServiceImpl<LandListedLonLatMap
         try{
             dataList = ExcelUtil.importExcel(file,0,1,0);
         }catch (IOException e){
-            new BusinessException("导入已挂牌地块数据出错");
+            new BusinessException("导入已挂牌经纬度数据出错");
         }
         List<LandListedLonLat> list = new ArrayList<>(dataList.size());
         dataList.forEach(data ->{
@@ -43,7 +43,7 @@ public class LandListedLonLatServiceImpl extends ServiceImpl<LandListedLonLatMap
                 }
             }catch (Exception e){
                 e.printStackTrace();
-                new BusinessException("导入已挂牌地块数据转换出错");
+                new BusinessException("导入已挂牌经纬度数据转换出错");
             }
         });
         return this.saveBatch(list);

air/src/main/java/com/air/land/service/impl/LandToListConductEnterpriseServiceImpl.java

@@ -0,0 +1,18 @@
+package com.air.land.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.air.land.entity.LandToListConductEnterprise;
+import com.air.land.mapper.LandToListConductEnterpriseMapper;
+import com.air.land.service.LandToListConductEnterpriseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 拟挂牌地块关联经营企业
+ *
+ * @author peihao
+ * @date 2021-06-17 20:07:43
+ */
+@Service
+public class LandToListConductEnterpriseServiceImpl extends ServiceImpl<LandToListConductEnterpriseMapper, LandToListConductEnterprise> implements LandToListConductEnterpriseService {
+
+}

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<LandToListConstructionPlanMapper, LandToListConstructionPlan> implements LandToListConstructionPlanService {
+
+}

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<LandToListLonLatMapper, LandToListLonLat> implements LandToListLonLatService {
 
+    @Override
+    public boolean importLandToListedLonLatExcel(MultipartFile file) {
+        List<List<String>> dataList = new ArrayList<>();
+        try{
+            dataList = ExcelUtil.importExcel(file,0,1,0);
+        }catch (IOException e){
+            new BusinessException("导入拟挂牌经纬度数据出错");
+        }
+        List<LandToListLonLat> 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<String> 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;
+    }
 }

air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java

@@ -36,7 +36,7 @@ public class LandToListServiceImpl extends ServiceImpl<LandToListMapper, LandToL
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public R<Boolean> sendLandList(Long proposedseriaId) {
+    public R<Boolean> sendLandList(String proposedseriaId) {
         LandToList landToList = this.getById(proposedseriaId);
         if (null == landToList) {
             return R.failed("未查询到数据");

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)

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)

air/src/main/java/com/air/measuredata/entity/MeasureData.java

@@ -29,7 +29,7 @@ public class MeasureData extends Model<MeasureData> {
     private Long measureDataId;
 
     @ApiModelProperty(value = "已挂牌地块标识")
-    private Long landListedId;
+    private String landListedId;
 
     @ApiModelProperty(value = "土地编号")
     private String annoId;

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;