Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/base/BaseQuery.java

@@ -0,0 +1,15 @@
+package com.example.nngkxxdp.base;
+
+import lombok.Data;
+
+@Data
+public class BaseQuery {
+    private Integer currentPage = 1;
+    private Integer pageSize = 10;
+
+
+    public Integer getBegin(){
+        return (this.currentPage-1)*this.pageSize;
+    }
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/ParkActivityController.java

@@ -0,0 +1,54 @@
+package com.example.nngkxxdp.controller;
+
+import com.example.nngkxxdp.entity.ParkActivity;
+import com.example.nngkxxdp.query.ParkActivityQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.ParkActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/parkActivity")
+public class ParkActivityController {
+    @Autowired
+    private ParkActivityService parkActivityService;
+
+    @GetMapping
+    public List<ParkActivity> findAll() {
+        return parkActivityService.findAll();
+    }
+
+    //根据id查询
+    @GetMapping("/{id}")
+    public ParkActivity findById(@PathVariable("id")Long id) {
+        return parkActivityService.findById(id);
+    }
+
+    //添加或修改
+    @PutMapping
+    public void addOrUpdate(@RequestBody ParkActivity parkActivity) {
+        if( parkActivity.getId()==null){
+            parkActivityService.insert(parkActivity);
+        }else{
+            parkActivityService.update(parkActivity);
+        }
+    }
+
+    //根据id删除数据
+    @DeleteMapping("/{id}")
+    public String deleteById(@PathVariable("id")Long id) {
+        parkActivityService.deleteById(id);
+        return "删除成功";
+    }
+
+    //分页
+    @PostMapping
+    public pageResult<ParkActivity> queryPage(@RequestBody ParkActivityQuery query){
+        return parkActivityService.queryPage(query);
+    }
+
+
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/SellBuildController.java

@@ -0,0 +1,51 @@
+package com.example.nngkxxdp.controller;
+
+import com.example.nngkxxdp.entity.SellBuild;
+import com.example.nngkxxdp.query.SellBuildQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.SellBuildService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/sellBuild")
+public class SellBuildController {
+    @Autowired
+    private SellBuildService sellBuildService;
+
+    @GetMapping
+    public List<SellBuild> findAll() {
+        return sellBuildService.findAll();
+    }
+
+    //根据id查询
+    @GetMapping("/{id}")
+    public SellBuild findById(@PathVariable("id")Long id) {
+        return sellBuildService.findById(id);
+    }
+
+    //添加或修改
+    @PutMapping
+    public void addOrUpdate(@RequestBody SellBuild sellBuild) {
+        if( sellBuild.getId()==null){
+            sellBuildService.insert(sellBuild);
+        }else{
+            sellBuildService.update(sellBuild);
+        }
+    }
+
+    //根据id删除数据
+    @DeleteMapping("/{id}")
+    public String deleteById(@PathVariable("id")Long id) {
+        sellBuildService.deleteById(id);
+        return "删除成功";
+    }
+    //分页查询
+    @PostMapping
+    public pageResult<SellBuild> queryPage(@RequestBody SellBuildQuery query){
+        return sellBuildService.queryPage(query);
+    }
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/sellLandController.java

@@ -0,0 +1,68 @@
+package com.example.nngkxxdp.controller;
+
+import cn.hutool.db.PageResult;
+import com.example.nngkxxdp.entity.SellLand;
+import com.example.nngkxxdp.query.SellLandQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.SellLandService;
+import com.example.nngkxxdp.util.BaseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/sellLand")
+public class sellLandController {
+    @Autowired
+    private SellLandService sellLandService;
+
+    @GetMapping
+    public List<SellLand> findAll() {
+        return sellLandService.findAll();
+    }
+
+    //根据id查询
+    @GetMapping("/{id}")
+    public BaseResult findById(@PathVariable("id")Long id) {
+        try {
+            return BaseResult.ok(sellLandService.findById(id));
+        }catch (Exception e){
+            //返回空数组   TODO
+            //return BaseResult.returnArray();
+            return BaseResult.notOk();
+        }
+    }
+
+    //添加或修改
+    @PutMapping
+    public void addOrUpdate(@RequestBody SellLand sellLand) {
+        if( sellLand.getId()==null){
+            sellLandService.insert(sellLand);
+        }else{
+            sellLandService.update(sellLand);
+        }
+    }
+
+    //根据id删除数据
+    @DeleteMapping("/{id}")
+    public String deleteById(@PathVariable("id")Long id) {
+        sellLandService.deleteById(id);
+        return "删除成功";
+    }
+
+    //分页查询
+    @PostMapping
+    public pageResult<SellLand> queryPage(@RequestBody SellLandQuery query){
+        return sellLandService.queryPage(query);
+    }
+
+
+    @GetMapping("/queryPage")
+    public PageResult getEntitiesWithPaging(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        return sellLandService.getEntitiesWithPaging(pageNum, pageSize);
+    }
+
+
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/ParkActivityDao.java

@@ -0,0 +1,40 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.ParkActivity;
+import com.example.nngkxxdp.query.ParkActivityQuery;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_park_activity】的数据库操作Mapper
+* @createDate 2024-09-14 15:51:37
+* @Entity com.example.nngkxxdp.entity.ParkActivity
+*/
+public interface ParkActivityDao {
+    List<ParkActivity> findAll();
+
+    //根据id查询
+    ParkActivity findById(Long id);
+
+    //添加
+    void insert(ParkActivity parkActivity);
+
+    //修改
+    void update(ParkActivity parkActivity);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+    List<ParkActivity> findByParkId(Long parkId);
+
+    Integer queryCount(ParkActivityQuery query);
+
+    List<ParkActivity> queryData(ParkActivityQuery query);
+
+
+}
+
+
+
+

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/SellBuildDao.java

@@ -0,0 +1,36 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.SellBuild;
+import com.example.nngkxxdp.query.SellBuildQuery;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_sell_build】的数据库操作Mapper
+* @createDate 2024-09-14 10:17:20
+* @Entity com.example.nngkxxdp.entity.SellBuild
+*/
+public interface SellBuildDao {
+    //查询全部
+    List<SellBuild> findAll();
+
+    //根据id查询
+    SellBuild findById(Long id);
+
+    //添加
+    void insert(SellBuild sellBuild);
+
+    //修改
+    void update(SellBuild sellBuild);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+    Integer queryCount(SellBuildQuery query);
+    List<SellBuild> queryData(SellBuildQuery query);
+}
+
+
+
+

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/SellLandDao.java

@@ -0,0 +1,41 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.SellLand;
+import com.example.nngkxxdp.query.SellLandQuery;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_sell_land】的数据库操作Mapper
+* @createDate 2024-09-14 10:38:38
+* @Entity com.example.nngkxxdp.entity.SellLand
+*/
+public interface SellLandDao {
+    //查询全部
+    List<SellLand> findAll();
+
+    //根据id查询
+    SellLand findById(Long id);
+
+    //添加
+    void insert(SellLand sellLand);
+
+    //修改
+    void update(SellLand sellLand);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+    Integer queryCount(SellLandQuery query);
+
+    List<SellLand> queryData(SellLandQuery query);
+
+    List<SellLand> findPagedEntities(int offset, int pageSize);
+
+    long countAll();
+}
+
+
+
+

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/ParkActivity.java

@@ -0,0 +1,45 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_park_activity
+ */
+@Data
+public class ParkActivity implements Serializable {
+    /**
+     * 园区活动表id
+     */
+    private Integer id;
+
+    /**
+     * 大标题
+     */
+    private String title;
+
+    /**
+     * 小标题
+     */
+    private String subtitle;
+
+    /**
+     * 所属园区
+     */
+    private Integer belongPark;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/ParkDataDetails.java

@@ -12,8 +12,6 @@ public class ParkDataDetails implements Serializable {
     private String subtitle;
     private String link;
     private String logo;
-    private Integer officeSpace;
-    private Double floorArea;
     private String moduleType;
     private Date creatTime;
     private Long parkdataId;

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/SellBuild.java

@@ -0,0 +1,127 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+* 
+* @TableName t_sell_build
+*/
+@Data
+public class SellBuild implements Serializable {
+    private ParkData parkData;
+    /**
+    * 载体出让Id
+    */
+
+    private Long id;
+    /**
+    * 片区
+    */
+
+    private String area;
+    /**
+    * 面积(平方米)
+    */
+
+    private String space;
+    /**
+    * 用途
+    */
+
+    private String application;
+    /**
+    * 载体名称
+    */
+
+    private String carrierName;
+    /**
+    * 副标题
+    */
+
+    private String subtitle;
+    /**
+    * 可用情况
+    */
+
+    private String situationState;
+    /**
+    * 产业模块
+    */
+
+    private String productModule;
+    /**
+    * 所属园区
+    */
+
+    private Long belong;
+    /**
+    * 经纬度
+    */
+
+    private String point;
+    /**
+    * 图片
+    */
+
+    private String imgUrl;
+    /**
+    * 卖点框
+    */
+
+    private String tag;
+    /**
+    * 基础配套设施
+    */
+
+    private String basicConfiguration;
+    /**
+    * 可招商面积(平方米)
+    */
+
+    private String usableArea;
+    /**
+    * 详细地址
+    */
+
+    private String addr;
+    /**
+    * 联系人
+    */
+
+    private String contactName;
+    /**
+    * 联系人电话
+    */
+
+    private String contactPhone;
+    /**
+    * 概况
+    */
+
+    private String introduce;
+    /**
+    * 要素成本
+    */
+
+    private String cost;
+    /**
+    * 入住要求
+    */
+
+    private String checkin;
+    /**
+    * 备注
+    */
+
+    private String remark;
+    /**
+    * 创建时间
+    */
+
+    private Date createTime;
+
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/SellLand.java

@@ -0,0 +1,106 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_sell_land
+ */
+@Data
+public class SellLand implements Serializable {
+    /**
+     * 土地出让表Id
+     */
+    private Integer id;
+
+    /**
+     * 土地标号
+     */
+    private String landName;
+
+    /**
+     * 占地面积(亩)
+     */
+    private String landArea;
+
+    /**
+     * 土地用途
+     */
+    private String landFunction;
+
+    /**
+     * 基础配套设施
+     */
+    private String basicConfiguration;
+
+    /**
+     * 可招商面积(平方米)
+     */
+    private String usableArea;
+
+    /**
+     * 详细地址
+     */
+    private String addr;
+
+    /**
+     * 联系人
+     */
+    private String contactName;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 地块概况
+     */
+    private String introduce;
+
+    /**
+     * 水价
+     */
+    private String water;
+
+    /**
+     * 电价
+     */
+    private String electricity;
+
+    /**
+     * 天然气价
+     */
+    private String naturalGas;
+
+    /**
+     * 土地成本
+     */
+    private String cost;
+
+    /**
+     * 劳动力成本
+     */
+    private String labour;
+
+    /**
+     * 土地图片
+     */
+    private String imgUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    //备注
+    private String remark;
+    //经纬度
+    private String point;
+
+    private ParkData parkData;
+    private static final long serialVersionUID = 1L;
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/mapper/ParkActivityMapper.java

@@ -0,0 +1,15 @@
+//package com.example.nngkxxdp.mapper;
+//
+///**
+//* @author zhao
+//* @description 针对表【t_park_activity】的数据库操作Mapper
+//* @createDate 2024-09-14 15:51:37
+//* @Entity com.example.nngkxxdp.entity.ParkActivity
+//*/
+//public interface ParkActivityMapper {
+//
+//}
+//
+//
+//
+//

nngkxxdp/src/main/java/com/example/nngkxxdp/query/ParkActivityQuery.java

@@ -0,0 +1,9 @@
+package com.example.nngkxxdp.query;
+
+import com.example.nngkxxdp.base.BaseQuery;
+import lombok.Data;
+
+@Data
+public class ParkActivityQuery extends BaseQuery {
+    private Long parkId;
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/query/SellBuildQuery.java

@@ -0,0 +1,9 @@
+package com.example.nngkxxdp.query;
+
+import com.example.nngkxxdp.base.BaseQuery;
+import lombok.Data;
+
+@Data
+public class SellBuildQuery extends BaseQuery {
+    private Long parkId;
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/query/SellLandQuery.java

@@ -0,0 +1,9 @@
+package com.example.nngkxxdp.query;
+
+import com.example.nngkxxdp.base.BaseQuery;
+import lombok.Data;
+
+@Data
+public class SellLandQuery extends BaseQuery {
+    private Long parkId;
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/query/pageResult.java

@@ -0,0 +1,19 @@
+package com.example.nngkxxdp.query;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class pageResult<T>{
+    private Integer totals;
+    private List<T> list;
+
+
+
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/ParkActivityService.java

@@ -0,0 +1,35 @@
+package com.example.nngkxxdp.service;
+
+import com.example.nngkxxdp.entity.ParkActivity;
+import com.example.nngkxxdp.query.ParkActivityQuery;
+import com.example.nngkxxdp.query.pageResult;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_park_activity】的数据库操作Service
+* @createDate 2024-09-14 15:51:37
+*/
+public interface ParkActivityService {
+    List<ParkActivity> findAll();
+
+    //根据id查询
+    ParkActivity findById(Long id);
+
+    //添加
+    void insert(ParkActivity parkActivity);
+
+    //修改
+    void update(ParkActivity parkActivity);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+    //根据园区ID查询
+    List<ParkActivity> findByParkId(Long parkId);
+
+    pageResult<ParkActivity> queryPage(ParkActivityQuery query);
+
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/SellBuildService.java

@@ -0,0 +1,31 @@
+package com.example.nngkxxdp.service;
+
+import com.example.nngkxxdp.entity.SellBuild;
+import com.example.nngkxxdp.query.SellBuildQuery;
+import com.example.nngkxxdp.query.pageResult;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_sell_build】的数据库操作Service
+* @createDate 2024-09-14 10:17:20
+*/
+public interface SellBuildService {
+    //查询全部
+    List<SellBuild> findAll();
+
+    //根据id查询
+    SellBuild findById(Long id);
+
+    //添加
+    void insert(SellBuild sellBuild);
+
+    //修改
+    void update(SellBuild sellBuild);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+    pageResult<SellBuild>queryPage(SellBuildQuery query);
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/SellLandService.java

@@ -0,0 +1,35 @@
+package com.example.nngkxxdp.service;
+
+import cn.hutool.db.PageResult;
+import com.example.nngkxxdp.entity.SellLand;
+import com.example.nngkxxdp.query.SellLandQuery;
+import com.example.nngkxxdp.query.pageResult;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_sell_land】的数据库操作Service
+* @createDate 2024-09-14 10:38:38
+*/
+public interface SellLandService{
+    //查询全部
+    List<SellLand> findAll();
+
+    //根据id查询
+    SellLand findById(Long id);
+
+    //添加
+    void insert(SellLand sellLand);
+
+    //修改
+    void update(SellLand sellLand);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+    pageResult<SellLand> queryPage(SellLandQuery query);
+
+    PageResult getEntitiesWithPaging(int pageNum, int pageSize);
+
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/ParkActivityServiceImpl.java

@@ -0,0 +1,66 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.ParkActivityDao;
+import com.example.nngkxxdp.entity.ParkActivity;
+import com.example.nngkxxdp.query.ParkActivityQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.ParkActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_park_activity】的数据库操作Service实现
+* @createDate 2024-09-14 15:51:37
+*/
+@Service
+public class ParkActivityServiceImpl implements ParkActivityService{
+    @Autowired
+    private ParkActivityDao parkActivityDao;
+
+    @Override
+    public List<ParkActivity> findAll() {
+        return parkActivityDao.findAll();
+    }
+
+    @Override
+    public ParkActivity findById(Long id) {
+        return parkActivityDao.findById(id);
+    }
+
+    @Override
+    public void insert(ParkActivity parkActivity) {
+        parkActivityDao.insert(parkActivity);
+    }
+
+    @Override
+    public void update(ParkActivity parkActivity) {
+        parkActivityDao.update(parkActivity);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        parkActivityDao.deleteById(id);
+    }
+
+    //根据园区id查询活动信息
+    @Override
+    public List<ParkActivity> findByParkId(Long parkId) {
+        return parkActivityDao.findByParkId(parkId);
+    }
+
+    @Override
+    public pageResult<ParkActivity> queryPage(ParkActivityQuery query) {
+        Integer totals = parkActivityDao.queryCount(query);
+        List<ParkActivity> list = parkActivityDao.queryData(query);
+        return new pageResult<>(totals,list);
+    }
+
+
+}
+
+
+
+

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/SellBuildServiceImpl.java

@@ -0,0 +1,60 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.SellBuildDao;
+import com.example.nngkxxdp.entity.SellBuild;
+import com.example.nngkxxdp.query.SellBuildQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.SellBuildService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_sell_build】的数据库操作Service实现
+* @createDate 2024-09-14 10:17:20
+*/
+@Service
+public class SellBuildServiceImpl implements SellBuildService{
+    @Autowired
+    private SellBuildDao sellBuildDao;
+
+    @Override
+    public List<SellBuild> findAll() {
+        return sellBuildDao.findAll();
+    }
+
+    @Override
+    public SellBuild findById(Long id) {
+        return sellBuildDao.findById(id);
+    }
+
+    @Override
+    public void insert(SellBuild sellBuild) {
+        sellBuild.setCreateTime(new Date());
+         sellBuildDao.insert(sellBuild);
+    }
+
+    @Override
+    public void update(SellBuild sellBuild) {
+        sellBuildDao.update(sellBuild);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        sellBuildDao.deleteById(id);
+    }
+
+    @Override
+    public pageResult<SellBuild> queryPage(SellBuildQuery query) {
+        Integer totals = sellBuildDao.queryCount(query);
+        List<SellBuild> list = sellBuildDao.queryData(query);
+        return new pageResult<>(totals,list);
+    }
+}
+
+
+
+

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/SellLandServiceImpl.java

@@ -0,0 +1,73 @@
+package com.example.nngkxxdp.service.impl;
+
+import cn.hutool.db.PageResult;
+import com.example.nngkxxdp.dao.SellLandDao;
+import com.example.nngkxxdp.entity.SellLand;
+import com.example.nngkxxdp.query.SellLandQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.SellLandService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_sell_land】的数据库操作Service实现
+* @createDate 2024-09-14 10:38:38
+*/
+@Service
+public class SellLandServiceImpl implements SellLandService{
+    @Autowired
+    private SellLandDao sellLandDao;
+
+    @Override
+    public List<SellLand> findAll() {
+        return sellLandDao.findAll();
+    }
+
+    @Override
+    public SellLand findById(Long id) {
+        return sellLandDao.findById(id);
+    }
+
+    @Override
+    public void insert(SellLand sellLand) {
+        sellLand.setCreateTime(new Date());
+        sellLandDao.insert(sellLand);
+    }
+
+    @Override
+    public void update(SellLand sellLand) {
+        sellLandDao.update(sellLand);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        sellLandDao.deleteById(id);
+    }
+
+
+
+    @Override
+    public pageResult<SellLand> queryPage(SellLandQuery query) {
+        Integer totals = sellLandDao.queryCount(query);
+        List<SellLand> list = sellLandDao.queryData(query);
+        return new pageResult<>(totals,list);
+    }
+
+    @Override
+    public PageResult getEntitiesWithPaging(int pageNum, int pageSize) {
+        int offset = (pageNum - 1) * pageSize;
+        List<SellLand> list = sellLandDao.findPagedEntities(offset, pageSize);
+        long total = sellLandDao.countAll();
+        return new PageResult();
+    }
+
+
+}
+
+
+
+

nngkxxdp/src/main/java/com/example/nngkxxdp/util/BaseResult.java

@@ -70,6 +70,8 @@ public class BaseResult implements Serializable {
         return createResult("not_ok", null, success);
     }
 
+
+
     private static BaseResult createResult(String result, Object data, String success) {
         BaseResult baseResult = new BaseResult();
         baseResult.setResult(result);

nngkxxdp/src/main/resources/mapper/ParkActivityMapper.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.nngkxxdp.dao.ParkActivityDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.ParkActivity">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="title" column="title" jdbcType="VARCHAR"/>
+            <result property="subtitle" column="subtitle" jdbcType="VARCHAR"/>
+            <result property="belongPark" column="belong_park" jdbcType="INTEGER"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,title,subtitle,
+        belong_park,remark,create_time
+    </sql>
+    <insert id="insert">
+        insert into t_park_activity(title,subtitle,belong_park,remark,create_time)
+        values(#{title},#{subtitle},#{belongPark},#{remark},#{createTime})
+    </insert>
+    <update id="update">
+        update t_park_activity
+        set title = #{title},
+            subtitle = #{subtitle},
+            belong_park = #{belongPark},
+            remark = #{remark},
+            create_time = #{createTime}
+        where id = #{id}
+    </update>
+    <delete id="deleteById">
+        delete from t_park_activity where id = #{id}
+    </delete>
+    <select id="findAll" resultType="com.example.nngkxxdp.entity.ParkActivity">
+        select * from t_park_activity
+    </select>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.ParkActivity">
+        select * from t_park_activity where id = #{id}
+    </select>
+    <select id="findByParkId" resultType="com.example.nngkxxdp.entity.ParkActivity">
+        select * from t_park_activity where belong_park = #{parkId}
+    </select>
+    <select id="queryCount" resultType="java.lang.Integer">
+        select count(*) from t_park_activity
+            <if test="parkId != null">
+                where belong_park = #{parkId}
+            </if>
+    </select>
+    <select id="queryData" resultType="com.example.nngkxxdp.entity.ParkActivity">
+        select * from t_park_activity
+         <if test="parkId != null">
+            where belong_park = #{parkId}
+        </if>
+        limit #{begin},#{pageSize}
+    </select>
+
+</mapper>

nngkxxdp/src/main/resources/mapper/ParkDataDetailsDao.xml

@@ -14,8 +14,8 @@
 
     <!-- 添加首页展示数据 -->
     <insert id="insert" parameterType="com.example.nngkxxdp.entity.ParkDataDetails" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-        insert into t_park_data_details (title, subtitle, link, logo, office_space, floor_area, module_type, creat_time, parkdataId, remarks)
-        values (#{title}, #{subtitle}, #{link}, #{logo}, #{officeSpace}, #{floorArea}, #{moduleType}, #{creatTime}, #{parkdataId}, #{remarks})
+        insert into t_park_data_details (title, subtitle, link, logo, module_type, creat_time, parkdataId, remarks)
+        values (#{title}, #{subtitle}, #{link}, #{logo},  #{moduleType}, #{creatTime}, #{parkdataId}, #{remarks})
     </insert>
 
     <!-- 更新首页展示数据 -->
@@ -25,8 +25,6 @@
             subtitle = #{subtitle},
             link = #{link},
             logo = #{logo},
-            office_space = #{officeSpace},
-            floor_area = #{floorArea},
             module_type = #{moduleType},
             parkdataId = #{parkdataId},
             remarks = #{remarks}

nngkxxdp/src/main/resources/mapper/SellBuildDao.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.nngkxxdp.dao.SellBuildDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.SellBuild">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="area" column="area" jdbcType="VARCHAR"/>
+            <result property="space" column="space" jdbcType="VARCHAR"/>
+            <result property="application" column="application" jdbcType="VARCHAR"/>
+            <result property="carrierName" column="carrier_name" jdbcType="VARCHAR"/>
+            <result property="subtitle" column="subtitle" jdbcType="VARCHAR"/>
+            <result property="situationState" column="situation_state" jdbcType="VARCHAR"/>
+            <result property="productModule" column="product_module" jdbcType="VARCHAR"/>
+            <result property="belong" column="belong" jdbcType="INTEGER"/>
+            <result property="point" column="point" jdbcType="VARCHAR"/>
+            <result property="imgUrl" column="img_url" jdbcType="VARCHAR"/>
+            <result property="tag" column="tag" jdbcType="VARCHAR"/>
+            <result property="basicConfiguration" column="basic_configuration" jdbcType="VARCHAR"/>
+            <result property="usableArea" column="usable_area" jdbcType="VARCHAR"/>
+            <result property="addr" column="addr" jdbcType="VARCHAR"/>
+            <result property="contactName" column="contact_name" jdbcType="VARCHAR"/>
+            <result property="contactPhone" column="contact_phone" jdbcType="VARCHAR"/>
+            <result property="introduce" column="introduce" jdbcType="VARCHAR"/>
+            <result property="cost" column="cost" jdbcType="VARCHAR"/>
+            <result property="checkin" column="checkin" jdbcType="VARCHAR"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="VARCHAR"/>
+         <association property="parkData" javaType="com.example.nngkxxdp.entity.ParkData">
+            <result column="title" property="title"/>
+            <result column="id" property="id"/>
+             <result column="industry" property="industry"/>
+            <result column="parkAddr" property="addr"/>
+           </association>
+    </resultMap>
+
+
+
+    <insert id="insert" parameterType="com.example.nngkxxdp.entity.SellBuild" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+        insert into t_sell_build (area,space,application,carrier_name,subtitle,situation_state,product_module,belong,point,img_url,tag,basic_configuration,usable_area,addr,contact_name,contact_phone,introduce,cost,checkin,remark,create_time)
+        values(#{area},#{space},#{application},#{carrierName},#{subtitle},#{situationState},#{productModule},#{belong},#{point},#{imgUrl},#{tag},#{basicConfiguration},#{usableArea},#{addr},#{contactName},#{contactPhone},#{introduce},#{cost},#{checkin},#{remark},#{createTime})
+    </insert>
+    <update id="update">
+        update t_sell_build
+        set area = #{area},
+             space = #{space},
+             application = #{application},
+             carrier_name = #{carrierName},
+             subtitle = #{subtitle},
+             situation_state = #{situationState},
+             product_module = #{productModule},
+             belong = #{belong},
+             point = #{point},
+             img_url = #{imgUrl},
+             tag = #{tag},
+             basic_configuration = #{basicConfiguration},
+             usable_area = #{usableArea},
+             addr = #{addr},
+            contact_name = #{contactName},
+            contact_phone = #{contactPhone},
+             introduce = #{introduce},
+             cost = #{cost},
+             checkin = #{checkin},
+             remark = #{remark}
+        where id = #{id}
+    </update>
+    <delete id="deleteById">
+        delete from t_sell_build where id = #{id}
+    </delete>
+    <select id="findAll" resultType="com.example.nngkxxdp.entity.SellBuild">
+        select * from t_sell_build
+    </select>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.SellBuild" resultMap="BaseResultMap">
+        select sb.*, sb.addr as landAddr,pd.title,pd.industry, pd.addr as parkAddr
+        from t_sell_build  sb
+        left join t_park_data pd on pd.id=sb.belong
+        where sb.id =#{id}
+    </select>
+    <select id="queryCount" resultType="java.lang.Integer">
+        select count(*) from t_sell_build
+        <if test="parkId != null">
+            where belong = #{parkId}
+        </if>
+    </select>
+    <select id="queryData" resultType="com.example.nngkxxdp.entity.SellBuild">
+        select * from t_sell_build
+        <if test="parkId != null">
+            where belong = #{parkId}
+        </if>
+        limit #{begin},#{pageSize}
+    </select>
+</mapper>

nngkxxdp/src/main/resources/mapper/SellLandDao.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.nngkxxdp.dao.SellLandDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.SellLand">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="landName" column="land_name" jdbcType="VARCHAR"/>
+            <result property="landArea" column="land_area" jdbcType="VARCHAR"/>
+            <result property="landFunction" column="land_function" jdbcType="VARCHAR"/>
+            <result property="basicConfiguration" column="basic_configuration" jdbcType="VARCHAR"/>
+            <result property="usableArea" column="usable_area" jdbcType="VARCHAR"/>
+            <result property="addr" column="addr" jdbcType="VARCHAR"/>
+            <result property="contactName" column="contact_name" jdbcType="VARCHAR"/>
+            <result property="contactPhone" column="contact_phone" jdbcType="VARCHAR"/>
+            <result property="introduce" column="introduce" jdbcType="VARCHAR"/>
+            <result property="cost" column="cost" jdbcType="VARCHAR"/>
+            <result property="imgUrl" column="img_url" jdbcType="VARCHAR"/>
+           <result property="point" column="point" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="VARCHAR"/>
+           <association property="parkData" javaType="com.example.nngkxxdp.entity.ParkData">
+            <result column="title" property="title"/>
+            <result column="id" property="id"/>
+            <result column="parkAddr" property="addr"/>
+           </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,land_name,land_area,
+        land_function,basic_configuration,usable_area,
+        addr,contact_name,contact_phone,
+        introduce,water,electricity,
+        natural_gas,cost,labour,
+        img_url,create_time
+    </sql>
+    <insert id="insert" parameterType="com.example.nngkxxdp.entity.SellLand" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+        insert into t_sell_land(land_name,land_area,land_function,basic_configuration,usable_area,addr,contact_name,contact_phone,introduce,water,electricity,natural_gas,cost,labour,img_url,remark,belong_park,point,create_time)
+        values(#{landName},#{landArea},#{landFunction},#{basicConfiguration},#{usableArea},#{addr},#{contactName},#{contactPhone},#{introduce},#{water},#{electricity},#{naturalGas},#{cost},#{labour},#{imgUrl},#{remark},#{belongPark},#{point},#{createTime})
+    </insert>
+    <insert id="countAll">
+        select count(*) from t_sell_land
+    </insert>
+    <update id="update">
+        update t_sell_land
+        set land_name = #{landName},
+            land_area = #{landArea},
+            land_function = #{landFunction},
+            basic_configuration = #{basicConfiguration},
+            usable_area = #{usableArea},
+            addr = #{addr},
+            contact_name = #{contactName},
+            contact_phone = #{contactPhone},
+            introduce = #{introduce},
+            water = #{water},
+            electricity = #{electricity},
+            natural_gas = #{naturalGas},
+            cost = #{cost},
+            labour = #{labour},
+            img_url = #{imgUrl},
+            remark = #{remark},
+            point = #{point},
+            belong_park=#{belongPark}
+        where id = #{id}
+    </update>
+    <delete id="deleteById">
+        delete from t_sell_land where id = #{id}
+    </delete>
+    <select id="findAll" resultType="com.example.nngkxxdp.entity.SellLand">
+        select * from t_sell_land
+    </select>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.SellLand" resultMap="BaseResultMap">
+        select ts.*, ts.addr as landAddr,pd.title,pd.id,pd.addr as parkAddr
+        from t_sell_land ts
+        left join t_park_data pd on pd.id=ts.belong_park
+        where ts.id = #{id}
+    </select>
+    <select id="queryCount" resultType="java.lang.Integer">
+        select count(*) from t_sell_land
+        <if test="parkId != null">
+            where belong_park = #{parkId}
+        </if>
+    </select>
+    <select id="queryData" resultType="com.example.nngkxxdp.entity.SellLand">
+        select * from t_sell_land
+        <if test="parkId != null">
+            where belong_park = #{parkId}
+        </if>
+        limit #{begin},#{pageSize}
+    </select>
+    <select id="findPagedEntities" resultType="com.example.nngkxxdp.entity.SellLand">
+        SELECT *
+        FROM t_sell_land
+        LIMIT ${offset}, ${limit}
+    </select>
+</mapper>