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

nngkxxdp/pom.xml

@@ -237,6 +237,7 @@
             <artifactId>javase</artifactId>
             <version>3.3.0</version>
         </dependency>
+
     </dependencies>
     <profiles>
         <profile>

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

@@ -0,0 +1,65 @@
+package com.example.nngkxxdp.controller;
+
+import com.example.nngkxxdp.base.BusinessException;
+import com.example.nngkxxdp.entity.HandleBusiness;
+import com.example.nngkxxdp.query.HandleMattersQuery;
+import com.example.nngkxxdp.service.HandleBusinessService;
+import com.example.nngkxxdp.util.BaseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@RequestMapping("/handleBusiness")
+public class HandleBusinessController {
+    @Autowired
+    private HandleBusinessService handleBusinessService;
+
+    @PutMapping()
+    public void Update(@RequestBody HandleBusiness handleBusiness) {
+        handleBusinessService.update(handleBusiness);
+    }
+
+    //添加数据
+    @PostMapping
+    public BaseResult insert(@RequestBody HandleBusiness handleBusiness) {
+        try {
+            handleBusinessService.insert(handleBusiness);
+            return BaseResult.ok();
+        } catch (BusinessException e) {
+            return BaseResult.notOk(e.getMessage());
+        }
+    }
+
+    //查询全部
+    @GetMapping
+    public List<HandleBusiness> findAll() {
+        return handleBusinessService.findAll();
+    }
+
+    //查询单条数据
+    @GetMapping("/{id}")
+    public BaseResult findById(@PathVariable("id")Long id){
+        HashMap<Object, Object> byId = handleBusinessService.findById(id);
+        return BaseResult.ok(byId);
+    }
+
+    //查询分页matters数据
+    @PostMapping("/query")
+    public BaseResult findById(@RequestBody HandleMattersQuery query){
+        HashMap<Object, Object> byId = handleBusinessService.findByIds(query.getBusinessId(), query.getCurrentPage(), query.getPageSize());
+        return BaseResult.ok(byId);
+    }
+
+
+    //删除
+    @DeleteMapping("/{id}")
+    public String deleteById(@PathVariable("id")Long id){
+        handleBusinessService.deleteById(id);
+        return "删除成功";
+    }
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.example.nngkxxdp.controller;
+
+import com.example.nngkxxdp.entity.PartyService;
+import com.example.nngkxxdp.service.PartyServiceService;
+import com.example.nngkxxdp.util.BaseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@RequestMapping("/partyService")
+public class PartyServiceController {
+    @Autowired
+    private PartyServiceService partyServiceService;
+
+    //查询全部
+    @GetMapping
+    public List<PartyService> findAll() {
+        return partyServiceService.findAll();
+    }
+
+    @GetMapping("/listAll/{pid}")
+    public BaseResult findByParkId(@PathVariable("pid")Long id) {
+        HashMap<String, Object> byParkId = partyServiceService.findByParkId(id);
+        return BaseResult.ok(byParkId);
+    }
+
+    //根据id查询
+    @GetMapping("/{id}")
+    public PartyService findById(@PathVariable("id")Long id) {
+        return partyServiceService.findById(id);
+    }
+
+    //添加或修改
+    @PutMapping
+    public void addOrUpdate(@RequestBody PartyService partyService) {
+        if( partyService.getId()==null){
+            partyServiceService.insert(partyService);
+        }else{
+            partyServiceService.update(partyService);
+        }
+    }
+
+    //根据id删除数据
+    @DeleteMapping("/{id}")
+    public String deleteById(@PathVariable("id")Long id) {
+        partyServiceService.deleteById(id);
+        return "删除成功";
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.example.nngkxxdp.controller;
+
+import com.example.nngkxxdp.entity.SelectionAddr;
+import com.example.nngkxxdp.query.SelectionAddrQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.SelectionAddrService;
+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("/selectionAddr")
+public class SelectionAddrController {
+    @Autowired
+    private SelectionAddrService selectionAddrService;
+
+    @GetMapping
+    public List<SelectionAddr> findAll() {
+        return selectionAddrService.findAll();
+    }
+
+
+    //根据园区id查询
+    @GetMapping("/listAll/{pid}")
+    public BaseResult findByParkId(@PathVariable("pid")Long id) {
+        List<SelectionAddr> byParkId = selectionAddrService.findByParkId(id);
+        return BaseResult.ok(byParkId);
+    }
+
+    //根据id查询
+    @GetMapping("/{id}")
+    public BaseResult findById(@PathVariable("id")Long id) {
+        try {
+            return BaseResult.ok(selectionAddrService.findById(id));
+        }catch (Exception e){
+            //返回空数组
+            return BaseResult.emptyArray();
+        }
+    }
+
+    //添加或修改
+    @PutMapping
+    public void addOrUpdate(@RequestBody SelectionAddr selectionAddr) {
+        if( selectionAddr.getId()==null){
+            selectionAddrService.insert(selectionAddr);
+        }else{
+            selectionAddrService.update(selectionAddr);
+        }
+    }
+
+    //根据id删除数据
+    @DeleteMapping("/{id}")
+    public BaseResult deleteById(@PathVariable("id")Long id) {
+        selectionAddrService.deleteById(id);
+        return new BaseResult();
+    }
+
+    //分页
+    @PostMapping
+    public pageResult<SelectionAddr> queryPage(@RequestBody SelectionAddrQuery query){
+        return selectionAddrService.queryPage(query);
+    }
+}

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

@@ -4,6 +4,7 @@ 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 com.example.nngkxxdp.util.BaseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,8 +23,13 @@ public class SellBuildController {
 
     //根据id查询
     @GetMapping("/{id}")
-    public SellBuild findById(@PathVariable("id")Long id) {
-        return sellBuildService.findById(id);
+    public BaseResult findById(@PathVariable("id")Long id) {
+        try {
+            return BaseResult.ok(sellBuildService.findById(id));
+        }catch (Exception e){
+            //返回空数组
+            return BaseResult.emptyArray();
+        }
     }
 
     //添加或修改

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

@@ -0,0 +1,61 @@
+package com.example.nngkxxdp.controller;
+
+import com.example.nngkxxdp.entity.SpecialService;
+import com.example.nngkxxdp.service.SpecialServiceService;
+import com.example.nngkxxdp.util.BaseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("/specialService")
+public class SpecialServiceController {
+    @Autowired
+    private SpecialServiceService specialServiceService;
+
+    //查询全部
+    @GetMapping
+    public BaseResult findAll() {
+        return BaseResult.ok(specialServiceService.findAll());
+    }
+
+
+    @GetMapping("/listAll/{pid}")
+    public BaseResult findByParkId(@PathVariable("pid")Long id) {
+        HashMap<String, Object> byParkId = specialServiceService.findByParkId(id);
+        return BaseResult.ok(byParkId);
+    }
+
+
+    //不调用parkdata数据 查询所有
+    @GetMapping("/list/{pid}")
+    public BaseResult findByParkIds(@PathVariable("pid")Long id) {
+        return BaseResult.ok(specialServiceService.findByParkIds(id));
+    }
+
+
+
+    //根据id查询
+    @GetMapping("/{id}")
+    public SpecialService findById(@PathVariable("id")Long id) {
+        return specialServiceService.findById(id);
+    }
+
+    //添加或修改
+    @PutMapping
+    public void addOrUpdate(@RequestBody SpecialService specialService) {
+        if( specialService.getId()==null){
+            specialServiceService.insert(specialService);
+        }else{
+            specialServiceService.update(specialService);
+        }
+    }
+
+    //根据id删除数据
+    @DeleteMapping("/{id}")
+    public String deleteById(@PathVariable("id")Long id) {
+        specialServiceService.deleteById(id);
+        return "删除成功";
+    }
+}

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

@@ -1,6 +1,5 @@
 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;
@@ -22,15 +21,15 @@ public class sellLandController {
         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();
+            //返回空数组
+            return BaseResult.emptyArray();
         }
     }
 
@@ -57,12 +56,4 @@ public class sellLandController {
         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/HandleBusinessDao.java

@@ -0,0 +1,33 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.HandleBusiness;
+import com.example.nngkxxdp.util.BaseResult;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_business】的数据库操作Mapper
+* @createDate 2024-09-25 16:47:04
+* @Entity com.example.nngkxxdp.entity.HandleBusiness
+*/
+public interface HandleBusinessDao {
+    List<HandleBusiness> findAll();
+
+    //根据id查询
+    HandleBusiness findById(Long id);
+
+    //添加
+    BaseResult insert(HandleBusiness handleBusiness);
+
+    //修改
+    void update(HandleBusiness HandleBusiness);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+}
+
+
+
+

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

@@ -0,0 +1,31 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.HandleDept;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_dept】的数据库操作Mapper
+* @createDate 2024-09-25 16:55:07
+* @Entity com.example.nngkxxdp.entity.HandleDept
+*/
+public interface HandleDeptDao {
+   // List<HandleDept> findAll();
+
+    //根据id查询
+    List<HandleDept> findById(Long id);
+
+    //添加
+   // BaseResult insert(HandleDept handleDept);
+
+    //修改
+   // void update(HandleDept HandleDept);
+
+    //根据Id删除一条数据
+   // void deleteById(Long id);
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.HandleMatters;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_matters】的数据库操作Mapper
+* @createDate 2024-09-25 16:55:10
+* @Entity com.example.nngkxxdp.entity.HandleMatters
+*/
+public interface HandleMattersDao {
+   // List<HandleMatters> findById(Long id);
+    int queryCount(@Param("deptId") long deptId);
+    List<HandleMatters> findById(long deptId);
+}
+
+
+
+

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

@@ -0,0 +1,38 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.ParkData;
+import com.example.nngkxxdp.entity.PartyService;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_party_service】的数据库操作Mapper
+* @createDate 2024-09-19 10:25:11
+* @Entity com.example.nngkxxdp.entity.PartyService
+*/
+public interface PartyServiceDao {
+
+    //查询全部
+    List<PartyService> findAll();
+
+    //根据id查询
+    PartyService findById(Long id);
+
+    //添加
+    void insert(PartyService partyService);
+
+    //修改
+    void update(PartyService partyService);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+    List<PartyService> findByParkId(Long id);
+
+    ParkData findParkData(Long id);
+}
+
+
+
+

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

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

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

@@ -31,9 +31,6 @@ public interface SellLandDao {
 
     List<SellLand> queryData(SellLandQuery query);
 
-    List<SellLand> findPagedEntities(int offset, int pageSize);
-
-    long countAll();
 }
 
 

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

@@ -0,0 +1,37 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.ParkData;
+import com.example.nngkxxdp.entity.SpecialService;
+
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_special_service】的数据库操作Mapper
+* @createDate 2024-09-19 10:16:30
+* @Entity com.example.nngkxxdp.entity.SpecialService
+*/
+public interface SpecialServiceDao {
+    //查询全部
+    List<SpecialService> findAll();
+
+    //根据id查询
+    SpecialService findById(Long id);
+
+    //添加
+    void insert(SpecialService specialService);
+
+    //修改
+    void update(SpecialService specialService);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+    List<SpecialService> findByParkId(Long id);
+
+    ParkData findParkData(Long id);
+}
+
+
+
+

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

@@ -25,7 +25,7 @@ public class ExperienceApply implements Serializable {
     /**
      * 体验员年龄
      */
-    private String experienceAge;
+    private Integer experienceAge;
 
     /**
      * 体验员单位

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

@@ -0,0 +1,32 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_handle_business
+ */
+
+@Data
+public class HandleBusiness implements Serializable {
+    /**
+     * 办理区表id
+     */
+
+    private long id;
+
+    /**
+     * 办理区名字
+     */
+    private String handleName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,38 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_handle_dept
+ */
+
+@Data
+public class HandleDept implements Serializable {
+    /**
+     * 办理部门表id
+     */
+
+    private long id;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 办理区id
+     */
+    private Integer businessid;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,44 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_handle_matters
+ */
+
+@Data
+public class HandleMatters implements Serializable {
+
+    /**
+     * 事项清单表id
+     */
+
+    private long id;
+
+    /**
+     * 事项名称
+     */
+    private String mattersName;
+
+    /**
+     * 窗口号
+     */
+    private String windowNum;
+
+    /**
+     * 部门表id
+     */
+    private Integer deptId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -13,6 +13,10 @@ public class ParkData implements Serializable {
     private String totalArea;
     private String buildArea;
     private String industry;
+    private String desc;
     private String addr;
+    private String contacts;
+    private String contactsPhone;
+    private String contactsAddr;
     private Date creatTime;
 }

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

@@ -0,0 +1,64 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_party_service
+ */
+
+@Data
+public class PartyService implements Serializable {
+    /**
+     * 党群服务表id
+     */
+
+    private Integer id;
+
+    /**
+     * 1.党建服务事项  2.工会服务事项  3.统战服务事项
+     */
+    private String partyForm;
+
+    /**
+     * 表格内容
+     */
+    private String information;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系人电话
+     */
+    private String contactsPhone;
+
+    /**
+     * 联系人地址
+     */
+    private String contactsAddr;
+
+    /**
+     * 联系人职能
+     */
+    private String contactsFunction;
+
+    /**
+     * 建会工作
+     */
+    private String createWork;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private Long parkId;
+    private ParkData parkData;
+    private static final long serialVersionUID = 1L;
+}

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

@@ -24,7 +24,7 @@ public class ReserveOvertime implements Serializable {
     /**
      * 加班表年龄
      */
-    private String overtimeAge;
+    private Integer overtimeAge;
 
     /**
      * 加班表手机号

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

@@ -0,0 +1,79 @@
+package com.example.nngkxxdp.entity;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_selection_addr
+ */
+
+@Data
+public class SelectionAddr implements Serializable {
+    /**
+     * 智能选址id
+     */
+    private Long id;
+
+    /**
+     * 载体名称
+     */
+    private String carrierName;
+
+    /**
+     * 可用状态
+     */
+    private Integer state;
+
+    /**
+     * 产业板块
+     */
+    private String industryPlate;
+
+    /**
+     * 所属园区
+     */
+    private Long belong;
+
+    /**
+     * 联系地址
+     */
+    private String addr;
+
+    /**
+     * 联系人
+     */
+    private String contactsName;
+
+    /**
+     * 联系电话
+     */
+    private String contactsPhone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    //可招商面积
+    private Float investmentArea;
+    //推荐指数
+    private Float recommend;
+
+    /**
+     * 图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date creatTime;
+
+    private ParkData parkData;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -11,6 +11,19 @@ import java.util.Date;
 */
 @Data
 public class SellBuild implements Serializable {
+    //载体名称在地图中的经纬度
+    private String namePoint;
+    //载体详细信息中心经纬度
+    private String centerPoint;
+    //出租价格
+    private String rentalPrice;
+    //出售价格
+    private String sellingPrice;
+    //厂房级别
+    private String workLevel;
+
+    private Float spaceMax;
+    private Float spaceMin;
     private ParkData parkData;
     /**
     * 载体出让Id

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

@@ -11,6 +11,15 @@ import java.util.Date;
  */
 @Data
 public class SellLand implements Serializable {
+    //土地名称在地图中的经纬度
+    private String namePoint;
+    //土地详细信息中心经纬度
+    private String centerPoint;
+    private String ownerUnit;   //业主单位
+    private Integer landState;  //可用地状态
+    private String businessIndustry;   //可招商产业
+
+    private Integer belongPark;
     /**
      * 土地出让表Id
      */
@@ -61,30 +70,15 @@ public class SellLand implements Serializable {
      */
     private String introduce;
 
-    /**
-     * 水价
-     */
-    private String water;
 
-    /**
-     * 电价
-     */
-    private String electricity;
 
-    /**
-     * 天然气价
-     */
-    private String naturalGas;
 
     /**
      * 土地成本
      */
     private String cost;
 
-    /**
-     * 劳动力成本
-     */
-    private String labour;
+
 
     /**
      * 土地图片

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

@@ -0,0 +1,43 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName t_special_service
+ */
+
+@Data
+public class SpecialService implements Serializable {
+    /**
+     * 茶园工业园区特色服务id
+     */
+
+    private Integer id;
+
+    /**
+     * 1.载体服务  2.政策申报服务 3.市场服务  4.企业人才服务  5.投融资服务 
+     */
+    private String parkForm;
+
+    /**
+     * 表格内容
+     */
+    private String information;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private Long parkId;
+    private ParkData parkData;
+    private static final long serialVersionUID = 1L;
+
+    private String contacts;
+    private String contactsPhone;
+    private String contactsAddr;
+}

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

@@ -1,15 +0,0 @@
-//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/HandleMattersQuery.java

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

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

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

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

@@ -5,5 +5,13 @@ import lombok.Data;
 
 @Data
 public class SellBuildQuery extends BaseQuery {
+    //所属园区
     private Long parkId;
+    //用途
+    private String application;
+    //面积
+   // private Float space;
+    private Float spaceMax;
+    private Float spaceMin;
+    private String space1;
 }

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

@@ -6,4 +6,5 @@ import lombok.Data;
 @Data
 public class SellLandQuery extends BaseQuery {
     private Long parkId;
+    private String keyword;
 }

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

@@ -13,7 +13,4 @@ public class pageResult<T>{
     private Integer totals;
     private List<T> list;
 
-
-
-
 }

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

@@ -0,0 +1,32 @@
+package com.example.nngkxxdp.service;
+
+import com.example.nngkxxdp.entity.HandleBusiness;
+import com.example.nngkxxdp.util.BaseResult;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_business】的数据库操作Service
+* @createDate 2024-09-25 16:47:04
+*/
+public interface HandleBusinessService {
+    List<HandleBusiness> findAll();
+
+    //根据id查询
+    //HashMap<Object, Object> findById(Long id, int page, int pageSize);
+
+    HashMap<Object, Object> findById(Long id);
+    //添加
+    BaseResult insert(HandleBusiness handleBusiness);
+
+    //修改
+    void update(HandleBusiness HandleBusiness);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+
+    HashMap<Object, Object> findByIds(Long businessId, Integer currentPage, Integer pageSize);
+}

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

@@ -0,0 +1,10 @@
+package com.example.nngkxxdp.service;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_dept】的数据库操作Service
+* @createDate 2024-09-25 16:55:07
+*/
+public interface HandleDeptService{
+
+}

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

@@ -0,0 +1,10 @@
+package com.example.nngkxxdp.service;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_matters】的数据库操作Service
+* @createDate 2024-09-25 16:55:10
+*/
+public interface HandleMattersService {
+
+}

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

@@ -0,0 +1,31 @@
+package com.example.nngkxxdp.service;
+
+import com.example.nngkxxdp.entity.PartyService;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_party_service】的数据库操作Service
+* @createDate 2024-09-19 10:25:11
+*/
+public interface PartyServiceService{
+    //查询全部
+    List<PartyService> findAll();
+
+    //根据id查询
+    PartyService findById(Long id);
+
+    //添加
+    void insert(PartyService partyService);
+
+    //修改
+    void update(PartyService partyService);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+
+    HashMap<String,Object> findByParkId(Long id);
+}

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

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

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

@@ -1,6 +1,5 @@
 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;
@@ -29,7 +28,4 @@ public interface SellLandService{
     void deleteById(Long id);
     pageResult<SellLand> queryPage(SellLandQuery query);
 
-    PageResult getEntitiesWithPaging(int pageNum, int pageSize);
-
-
 }

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

@@ -0,0 +1,33 @@
+package com.example.nngkxxdp.service;
+
+import com.example.nngkxxdp.entity.SpecialService;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_special_service】的数据库操作Service
+* @createDate 2024-09-19 10:16:30
+*/
+public interface SpecialServiceService{
+    //查询全部
+    List<SpecialService> findAll();
+
+    //根据id查询
+    SpecialService findById(Long id);
+
+    //添加
+    void insert(SpecialService specialService);
+
+    //修改
+    void update(SpecialService specialService);
+
+    //根据Id删除一条数据
+    void deleteById(Long id);
+
+
+    HashMap<String,Object> findByParkId(Long id);
+
+    List<SpecialService> findByParkIds(Long id);
+}

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

@@ -0,0 +1,106 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.HandleBusinessDao;
+import com.example.nngkxxdp.dao.HandleDeptDao;
+import com.example.nngkxxdp.dao.HandleMattersDao;
+import com.example.nngkxxdp.entity.HandleBusiness;
+import com.example.nngkxxdp.entity.HandleDept;
+import com.example.nngkxxdp.entity.HandleMatters;
+import com.example.nngkxxdp.service.HandleBusinessService;
+import com.example.nngkxxdp.util.BaseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_business】的数据库操作Service实现
+* @createDate 2024-09-25 16:47:04
+*/
+@Service
+public class HandleBusinessServiceImpl implements HandleBusinessService{
+    @Autowired
+    private HandleBusinessDao handleBusinessDao;
+    @Autowired
+    private HandleDeptDao handleDeptDao;
+    @Autowired
+    private HandleMattersDao handleMattersDao;
+
+    @Override
+    public List<HandleBusiness> findAll() {
+        return handleBusinessDao.findAll();
+    }
+
+    @Override
+    public HashMap<Object, Object> findById(Long id) {
+        HashMap<Object, Object> map = new HashMap<>();
+        HandleBusiness handleBusiness = handleBusinessDao.findById(id);
+        List<HandleDept> handleDepts = handleDeptDao.findById(handleBusiness.getId());
+        List<HandleMatters> allHandleMatters = new ArrayList<>();
+        for (HandleDept handleDept : handleDepts) {
+            long deptId = handleDept.getId();
+            List<HandleMatters> handleMattersList = handleMattersDao.findById(deptId);
+            allHandleMatters.addAll(handleMattersList);
+        }
+        map.put("handleBusiness", handleBusiness);
+        map.put("handleDepts", handleDepts);
+        map.put("handleMatters", allHandleMatters);
+        return map;
+    }
+
+    @Override
+    public BaseResult insert(HandleBusiness handleBusiness) {
+        return handleBusinessDao.insert(handleBusiness);
+    }
+
+    @Override
+    public void update(HandleBusiness HandleBusiness) {
+        handleBusinessDao.update(HandleBusiness);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        handleBusinessDao.deleteById(id);
+    }
+
+    @Override
+    public HashMap<Object, Object> findByIds(Long businessId, Integer currentPage, Integer pageSize) {
+        HashMap<Object, Object> map = new HashMap<>();
+        HandleBusiness handleBusiness = handleBusinessDao.findById(businessId);
+        List<HandleDept> handleDepts = handleDeptDao.findById(handleBusiness.getId());
+        // 获取分页后的 HandleMatters 对象
+        List<HandleMatters> allHandleMatters = new ArrayList<>();
+        int total = 0;
+        for (HandleDept handleDept : handleDepts) {
+            long deptId = handleDept.getId();
+            List<HandleMatters> handleMattersList = handleMattersDao.findById(deptId);
+            allHandleMatters.addAll(handleMattersList);
+            total += handleMattersDao.queryCount(deptId);
+        }
+        // 计算分页参数
+        int offset = (currentPage - 1) * pageSize;
+        List<HandleMatters> ss = new ArrayList<>();
+        if (offset < allHandleMatters.size()) {
+            int toIndex = Math.min(offset + pageSize, allHandleMatters.size());
+            ss = allHandleMatters.subList(offset, toIndex);
+        }
+        // 计算总页数
+        int totalPages = (int) Math.ceil((double) total / pageSize);
+        // 将数据放入 map 中
+        map.put("handleBusiness", handleBusiness);
+        map.put("handleDepts", handleDepts);
+        map.put("handleMatters", ss);
+        map.put("totalPages", totalPages);
+        map.put("total", total);
+        return map;
+    }
+
+
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.HandleDeptDao;
+import com.example.nngkxxdp.service.HandleDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_dept】的数据库操作Service实现
+* @createDate 2024-09-25 16:55:07
+*/
+@Service
+public class HandleDeptServiceImpl implements HandleDeptService{
+    @Autowired
+    private HandleDeptDao handleDeptDao;
+
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.HandleMattersDao;
+import com.example.nngkxxdp.service.HandleMattersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+* @author zhao
+* @description 针对表【t_handle_matters】的数据库操作Service实现
+* @createDate 2024-09-25 16:55:10
+*/
+@Service
+public class HandleMattersServiceImpl implements HandleMattersService{
+    @Autowired
+    private HandleMattersDao handleMattersDao;
+
+}
+
+
+
+

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

@@ -0,0 +1,65 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.PartyServiceDao;
+import com.example.nngkxxdp.entity.ParkData;
+import com.example.nngkxxdp.entity.PartyService;
+import com.example.nngkxxdp.service.PartyServiceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_party_service】的数据库操作Service实现
+* @createDate 2024-09-19 10:25:11
+*/
+@Service
+public class PartyServiceServiceImpl implements PartyServiceService{
+    @Autowired
+    private PartyServiceDao  partyServiceDao;
+
+    @Override
+    public List<PartyService> findAll() {
+        return partyServiceDao.findAll();
+    }
+
+    @Override
+    public PartyService findById(Long id) {
+        return partyServiceDao.findById(id);
+    }
+
+    @Override
+    public void insert(PartyService partyService) {
+        partyService.setCreateTime(new Date());
+        partyServiceDao.insert(partyService);
+    }
+
+    @Override
+    public void update(PartyService partyService) {
+        partyServiceDao.update(partyService);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        partyServiceDao.deleteById(id);
+    }
+
+    @Override
+    public HashMap<String, Object> findByParkId(Long id) {
+        List<PartyService> list = partyServiceDao.findByParkId(id);
+        ParkData parkData = partyServiceDao.findParkData(id);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("PartyServiceList",list);
+        map.put("parkData",parkData);
+        return map;
+    }
+
+
+}
+
+
+
+

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

@@ -0,0 +1,70 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.base.BusinessException;
+import com.example.nngkxxdp.dao.SelectionAddrDao;
+import com.example.nngkxxdp.entity.SelectionAddr;
+import com.example.nngkxxdp.query.SelectionAddrQuery;
+import com.example.nngkxxdp.query.pageResult;
+import com.example.nngkxxdp.service.SelectionAddrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_selection_addr】的数据库操作Service实现
+* @createDate 2024-09-18 09:18:14
+*/
+@Service
+public class SelectionAddrServiceImpl implements SelectionAddrService{
+    @Autowired
+    private SelectionAddrDao selectionAddrDao;
+
+    @Override
+    public List<SelectionAddr> findAll() {
+        return selectionAddrDao.findAll();
+    }
+
+    @Override
+    public SelectionAddr findById(Long id) {
+        SelectionAddr byId = selectionAddrDao.findById(id);
+        if(byId==null){
+            throw new BusinessException("no data");
+        }
+        return byId;
+    }
+
+    @Override
+    public void insert(SelectionAddr selectionAddr) {
+        selectionAddr.setCreatTime(new Date());
+        selectionAddrDao.insert(selectionAddr);
+    }
+
+    @Override
+    public void update(SelectionAddr selectionAddr) {
+        selectionAddrDao.update(selectionAddr);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        selectionAddrDao.deleteById(id);
+    }
+
+    @Override
+    public pageResult<SelectionAddr> queryPage(SelectionAddrQuery query) {
+        Integer totals = selectionAddrDao.queryCount(query);
+        List<SelectionAddr> list = selectionAddrDao.queryData(query);
+        return new pageResult<>(totals,list);
+    }
+
+    @Override
+    public List<SelectionAddr> findByParkId(Long id) {
+        return selectionAddrDao.findByParkId(id);
+    }
+}
+
+
+
+

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

@@ -1,5 +1,6 @@
 package com.example.nngkxxdp.service.impl;
 
+import com.example.nngkxxdp.base.BusinessException;
 import com.example.nngkxxdp.dao.SellBuildDao;
 import com.example.nngkxxdp.entity.SellBuild;
 import com.example.nngkxxdp.query.SellBuildQuery;
@@ -28,7 +29,11 @@ public class SellBuildServiceImpl implements SellBuildService{
 
     @Override
     public SellBuild findById(Long id) {
-        return sellBuildDao.findById(id);
+        SellBuild byId = sellBuildDao.findById(id);
+        if(byId==null){
+            throw new BusinessException("no data");
+        }
+        return byId;
     }
 
     @Override
@@ -49,6 +54,35 @@ public class SellBuildServiceImpl implements SellBuildService{
 
     @Override
     public pageResult<SellBuild> queryPage(SellBuildQuery query) {
+        //没传递参数 查询所有
+        if(query.getSpace1() == null && (query.getApplication() == null || query.getApplication().trim().isEmpty()) && query.getParkId() == null){
+            List<SellBuild> all = sellBuildDao.findAll();
+            return new pageResult<>(all.size(),all);
+        }
+
+        if (query.getSpace1() != null && !query.getSpace1().trim().isEmpty()) {
+            String[] parts = query.getSpace1().split(",");
+            if (parts.length == 2) {
+                try {
+                    float spaceMin = Float.parseFloat(parts[0].trim());
+                    float spaceMax = Float.parseFloat(parts[1].trim());
+                    query.setSpaceMin(spaceMin);
+                    query.setSpaceMax(spaceMax);
+                } catch (NumberFormatException e) {
+                    throw new BusinessException("参数异常");
+                }
+            }else if (parts.length == 1){
+                try {
+                    float spaceMin = Float.parseFloat(parts[0].trim());
+                    query.setSpaceMin(spaceMin);
+                    query.setSpaceMax(Float.MAX_VALUE); // 设置最大值为浮点数的最大值
+                } catch (NumberFormatException e) {
+                    throw new BusinessException("参数异常");
+                }
+            } else {
+                throw new BusinessException("参数格式错误");
+            }
+        }
         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

@@ -1,6 +1,6 @@
 package com.example.nngkxxdp.service.impl;
 
-import cn.hutool.db.PageResult;
+import com.example.nngkxxdp.base.BusinessException;
 import com.example.nngkxxdp.dao.SellLandDao;
 import com.example.nngkxxdp.entity.SellLand;
 import com.example.nngkxxdp.query.SellLandQuery;
@@ -29,7 +29,11 @@ public class SellLandServiceImpl implements SellLandService{
 
     @Override
     public SellLand findById(Long id) {
-        return sellLandDao.findById(id);
+        SellLand byId = sellLandDao.findById(id);
+        if(byId==null){
+            throw new BusinessException("no data");
+        }
+        return byId;
     }
 
     @Override
@@ -57,13 +61,6 @@ public class SellLandServiceImpl implements SellLandService{
         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/service/impl/SpecialServiceServiceImpl.java

@@ -0,0 +1,70 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.SpecialServiceDao;
+import com.example.nngkxxdp.entity.ParkData;
+import com.example.nngkxxdp.entity.SpecialService;
+import com.example.nngkxxdp.service.SpecialServiceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+* @author zhao
+* @description 针对表【t_special_service】的数据库操作Service实现
+* @createDate 2024-09-19 10:16:30
+*/
+@Service
+public class SpecialServiceServiceImpl implements SpecialServiceService{
+    @Autowired
+    private SpecialServiceDao specialServiceDao;
+
+    @Override
+    public List<SpecialService> findAll() {
+        return specialServiceDao.findAll();
+    }
+
+    @Override
+    public SpecialService findById(Long id) {
+        return specialServiceDao.findById(id);
+    }
+
+    @Override
+    public void insert(SpecialService specialService) {
+        specialService.setCreateTime(new Date());
+        specialServiceDao.insert(specialService);
+    }
+
+    @Override
+    public void update(SpecialService specialService) {
+        specialServiceDao.update(specialService);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        specialServiceDao.deleteById(id);
+    }
+
+    @Override
+    public HashMap<String, Object> findByParkId(Long id) {
+        List<SpecialService> list= specialServiceDao.findByParkId(id);
+        ParkData parkData = specialServiceDao.findParkData(id);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("specialServicelist",list);
+        map.put("parkData",parkData);
+        return map;
+    }
+
+    @Override
+    public List<SpecialService> findByParkIds(Long id) {
+        List<SpecialService> byParkId = specialServiceDao.findByParkId(id);
+        return byParkId;
+    }
+
+}
+
+
+
+

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

@@ -1,6 +1,7 @@
 package com.example.nngkxxdp.util;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 
 /**
  * @author zhoupeng
@@ -26,6 +27,7 @@ public class BaseResult implements Serializable {
         return "成功操作";
     }
 
+
     public String getResult() {
         return this.result;
     }
@@ -62,6 +64,7 @@ public class BaseResult implements Serializable {
         return createResult("ok", data, "成功操作");
     }
 
+
     public static BaseResult notOk() {
         return createResult("not_ok", null, "");
     }
@@ -70,6 +73,12 @@ public class BaseResult implements Serializable {
         return createResult("not_ok", null, success);
     }
 
+    //返回空数组
+    public static BaseResult emptyArray() {
+        ArrayList<Object> list = new ArrayList<>();
+        list.add(null);
+        return createResult("not_ok", list, "操作失败");
+    }
 
 
     private static BaseResult createResult(String result, Object data, String success) {
@@ -79,4 +88,5 @@ public class BaseResult implements Serializable {
         baseResult.setSuccess(success);
         return baseResult;
     }
+
 }

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

@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.ExperienceApply">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="experienceName" column="experience_name" jdbcType="VARCHAR"/>
-            <result property="experienceAge" column="experience_age" jdbcType="VARCHAR"/>
+            <result property="experienceAge" column="experience_age" jdbcType="INTEGER"/>
             <result property="workunit" column="workunit" jdbcType="VARCHAR"/>
             <result property="duty" column="duty" jdbcType="VARCHAR"/>
             <result property="experiencePhone" column="experience_phone" jdbcType="VARCHAR"/>

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

@@ -0,0 +1,43 @@
+<?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.HandleBusinessDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.HandleBusiness">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="handleName" column="handle_name" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <association property="handleDept" javaType="com.example.nngkxxdp.entity.HandleDept">
+            <result property="id" column="id" jdbcType="INTEGER"/>
+            <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
+        </association>
+        <association property="handleMatters" javaType="com.example.nngkxxdp.entity.HandleMatters">
+            <result property="id" column="id" jdbcType="INTEGER"/>
+            <result property="mattersName" column="matters_name" jdbcType="VARCHAR"/>
+            <result property="windowNum" column="window_num" jdbcType="VARCHAR"/>
+        </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,handle_name,create_time
+    </sql>
+    <insert id="insert">
+        insert into t_handle_business(handle_name,create_time) values(#{handleName},#{createTime})
+    </insert>
+    <update id="update">
+        update t_handle_business
+        set
+            handle_name = #{handleName}
+        where id = #{id}
+    </update>
+    <delete id="deleteById">
+        delete from t_handle_business where id = #{id}
+    </delete>
+    <select id="findAll" resultType="com.example.nngkxxdp.entity.HandleBusiness">
+        select * from t_handle_business
+    </select>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.HandleBusiness">
+        select * from t_handle_business where id=#{id}
+    </select>
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.HandleDeptDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.HandleDept">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
+            <result property="businessid" column="businessId" jdbcType="INTEGER"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,dept_name,businessId,
+        create_time
+    </sql>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.HandleDept">
+        select * from t_handle_dept where businessid=#{id}
+    </select>
+</mapper>

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

@@ -0,0 +1,36 @@
+<?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.HandleMattersDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.HandleMatters">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="mattersName" column="matters_name" jdbcType="VARCHAR"/>
+            <result property="windowNum" column="window_num" jdbcType="VARCHAR"/>
+            <result property="deptId" column="deptId" jdbcType="INTEGER"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <association property="handleDept" javaType="com.example.nngkxxdp.entity.HandleDept">
+            <result column="id" property="id"/>
+            <result column="dept_name" property="deptName"/>
+        </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,matters_name,window_num,
+        deptId,create_time
+    </sql>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.HandleMatters">
+        select hm.id,hm.matters_name,hm.window_num from t_handle_matters hm
+        where hm.deptId=#{deptId}
+    </select>
+    <select id="queryCount" resultType="int">
+        select count(*) from t_handle_matters hm
+        where hm.deptId=#{deptId}
+    </select>
+    <select id="queryData" resultType="com.example.nngkxxdp.entity.HandleMatters">
+        select hm.id,hm.matters_name,hm.window_num from t_handle_matters hm
+        where hm.deptId=#{deptId}
+        limit #{offset}, #{limit}
+    </select>
+</mapper>

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

@@ -20,8 +20,8 @@
 
     <!-- 添加首页展示数据 -->
     <insert id="insert" parameterType="com.example.nngkxxdp.entity.ParkData" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-        insert into t_park_data(title, subtitle, total_area, build_area, industry, addr, creat_time)
-        values (#{title}, #{subtitle}, #{totalArea}, #{buildArea}, #{industry}, #{addr}, #{creatTime})
+        insert into t_park_data(title, subtitle, total_area, build_area, industry,desc, addr,contacts, contacts_phone, contacts_addr, creat_time)
+        values (#{title}, #{subtitle}, #{totalArea}, #{buildArea}, #{industry},#{desc}, #{addr},#{contacts},#{contactsPhone},#{contactsAddr}, #{creatTime})
     </insert>
 
     <!-- 更新首页展示数据 -->
@@ -32,6 +32,10 @@
             total_area = #{totalArea},
             build_area = #{buildArea},
             industry = #{industry},
+            desc = #{desc},
+            contacts_addr = #{contactsAddr},
+            contacts = #{contacts},
+            contacts_phone = #{contactsPhone},
             addr = #{addr}
         where id = #{id}
     </update>

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

@@ -0,0 +1,70 @@
+<?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.PartyServiceDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.PartyService">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="partyForm" column="party_form" jdbcType="VARCHAR"/>
+            <result property="information" column="information" jdbcType="VARCHAR"/>
+            <result property="contacts" column="contacts" jdbcType="VARCHAR"/>
+            <result property="contactsPhone" column="contacts_phone" jdbcType="VARCHAR"/>
+            <result property="contactsAddr" column="contacts_addr" jdbcType="VARCHAR"/>
+            <result property="contactsFunction" column="contacts_function" jdbcType="VARCHAR"/>
+            <result property="createWork" column="create_work" jdbcType="VARCHAR"/>
+            <result property="parkId" column="parkId" jdbcType="INTEGER"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <association property="parkData" javaType="com.example.nngkxxdp.entity.ParkData">
+            <result column="title" property="title"/>
+            <result column="id" property="id"/>
+            <result column="subtitle" property="subtitle"/>
+            <result column="industry" property="industry"/>
+            <result column="contacts" property="contacts"/>
+            <result column="contacts_phone" property="contactsPhone"/>
+            <result column="contacts_addr" property="contactsAddr"/>
+            <result column="parkAddr" property="addr"/>
+        </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,party_form,information,
+        contacts,contacts_phone,contacts_addr,
+        contacts_function,create_work,parkId,create_time
+    </sql>
+    <insert id="insert">
+        insert into t_party_service(party_form,information,contacts,contacts_phone,contacts_addr,contacts_function,create_work,parkId,create_time)
+        values(#{partyForm},#{information},#{contacts},#{contactsPhone},#{contactsAddr},#{contactsFunction},#{createWork},#{parkId},#{createTime})
+    </insert>
+    <update id="update">
+        update t_party_service
+        set party_form = #{partyForm},
+            information = #{information},
+            contacts = #{contacts},
+            contacts_phone = #{contactsPhone},
+            contacts_addr = #{contactsAddr},
+            contacts_function = #{contactsFunction},
+            parkId = #{parkId},
+            create_work = #{createWork}
+        where id = #{id}
+    </update>
+    <delete id="deleteById">
+        delete from t_party_service where id = #{id}
+    </delete>
+    <select id="findAll" resultType="com.example.nngkxxdp.entity.PartyService">
+        select ps.*,pd.contacts,pd.contacts_phone,pd.contacts_addr,pd.title
+        from t_party_service ps
+        left join t_park_data pd on pd.id=ps.parkId
+    </select>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.PartyService" resultMap="BaseResultMap">
+        select ps.*,pd.* from t_party_service ps
+        left join  t_park_data pd on pd.id=ps.parkId
+        where ps.id = #{id}
+    </select>
+    <select id="findByParkId" resultType="com.example.nngkxxdp.entity.PartyService">
+        select * from t_party_service where parkId = #{id}
+    </select>
+    <select id="findParkData" resultType="com.example.nngkxxdp.entity.ParkData">
+        select pd.contacts,pd.contacts_phone,pd.contacts_addr from t_park_data pd where id = #{id}
+    </select>
+</mapper>

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

@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.ReserveOvertime">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="overtimeName" column="overtime_name" jdbcType="VARCHAR"/>
-            <result property="overtimeAge" column="overtime_age" jdbcType="VARCHAR"/>
+            <result property="overtimeAge" column="overtime_age" jdbcType="INTEGER"/>
             <result property="overtimePhone" column="overtime_phone" jdbcType="VARCHAR"/>
             <result property="business" column="business" jdbcType="VARCHAR"/>
             <result property="creatTime" column="creat_time" jdbcType="TIMESTAMP"/>

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

@@ -0,0 +1,81 @@
+<?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.SelectionAddrDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.SelectionAddr">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="carrierName" column="carrier_name" jdbcType="VARCHAR"/>
+            <result property="state" column="state" jdbcType="INTEGER"/>
+            <result property="industryPlate" column="industry_plate" jdbcType="VARCHAR"/>
+            <result property="belong" column="belong" jdbcType="INTEGER"/>
+            <result property="addr" column="addr" jdbcType="VARCHAR"/>
+            <result property="contactsName" column="contacts_name" jdbcType="VARCHAR"/>
+            <result property="contactsPhone" column="contacts_phone" jdbcType="VARCHAR"/>
+            <result property="investmentArea" column="investment_area" jdbcType="FLOAT"/>
+           <result property="recommend" column="recommend" jdbcType="FLOAT"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="imgUrl" column="img_url" jdbcType="VARCHAR"/>
+            <result property="creatTime" column="creat_time" jdbcType="TIMESTAMP"/>
+        <association property="parkData" javaType="com.example.nngkxxdp.entity.ParkData">
+            <result column="title" property="title"/>
+            <result column="id" property="id"/>
+        </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,carrier_name,state,
+        industry_plate,belong,addr,
+        contacts_name,contacts_phone,investment_area,remark,
+        img_url,creat_time
+    </sql>
+    <insert id="insert" parameterType="com.example.nngkxxdp.entity.SelectionAddr" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+        insert into t_selection_addr(carrier_name,state,industry_plate,belong,addr,contacts_name,contacts_phone,investment_area,recommend,remark,img_url,creat_time)
+        values(#{carrierName},#{state},#{industryPlate},#{belong},#{addr},#{contactsName},#{contactsPhone},#{investmentArea},#{recommend},#{remark},#{imgUrl},#{creatTime})
+    </insert>
+    <update id="update">
+        update t_selection_addr
+        set carrier_name = #{carrierName},
+            state = #{state},
+            industry_plate = #{industryPlate},
+            belong = #{belong},
+            addr = #{addr},
+            contacts_name = #{contactsName},
+            contacts_phone = #{contactsPhone},
+            investment_area = #{investmentArea},
+            recommend=#{recommend},
+            remark = #{remark},
+            img_url = #{imgUrl}
+        where id = #{id}
+    </update>
+    <delete id="deleteById">
+        delete from t_selection_addr where id = #{id}
+    </delete>
+    <select id="findAll" resultType="com.example.nngkxxdp.entity.SelectionAddr" resultMap="BaseResultMap">
+        select sa.*,pd.title from t_selection_addr sa left join t_park_data pd on pd.id=sa.belong
+    </select>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.SelectionAddr">
+        select * from t_selection_addr where id = #{id}
+    </select>
+    <select id="queryCount" resultType="java.lang.Integer">
+        select count(*) from t_selection_addr
+        <if test="parkId != null">
+            where belong = #{parkId}
+        </if>
+    </select>
+    <select id="queryData" resultType="com.example.nngkxxdp.entity.SelectionAddr" resultMap="BaseResultMap">
+        select sa.*,pd.title from
+        t_selection_addr sa
+        left join t_park_data pd on pd.id=sa.belong
+        <if test="parkId != null">
+            where belong = #{parkId}
+        </if>
+        limit #{begin},#{pageSize}
+    </select>
+    <select id="findByParkId" resultType="com.example.nngkxxdp.entity.SelectionAddr" resultMap="BaseResultMap">
+        select sa.*,pd.title from t_selection_addr sa left join t_park_data pd on pd.id=sa.belong where sa.belong = #{parkId}
+    </select>
+
+
+</mapper>

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

@@ -27,6 +27,13 @@
             <result property="checkin" column="checkin" jdbcType="VARCHAR"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="VARCHAR"/>
+            <result property="spaceMin" column="spaceMin" jdbcType="FLOAT"/>
+            <result property="spaceMax" column="spaceMax" jdbcType="FLOAT"/>
+            <result property="workLevel" column="work_level" jdbcType="VARCHAR"/>
+            <result property="sellingPrice" column="selling_price" jdbcType="VARCHAR"/>
+            <result property="rentalPrice" column="rental_price" jdbcType="VARCHAR"/>
+            <result property="namePoint" column="name_point" jdbcType="VARCHAR"/>
+            <result property="centerPoint" column="center_point" jdbcType="VARCHAR"/>
          <association property="parkData" javaType="com.example.nngkxxdp.entity.ParkData">
             <result column="title" property="title"/>
             <result column="id" property="id"/>
@@ -35,16 +42,14 @@
            </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 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,work_level,selling_price,rental_price,introduce,cost,checkin,remark,create_time)
+        values(#{area},#{space},#{application},#{carrierName},#{subtitle},#{situationState},#{productModule},#{belong},#{point},#{imgUrl},#{tag},#{basicConfiguration},#{usableArea},#{addr},#{contactName},#{contactPhone},#{introduce},#{workLevel},#{sellingPrice},#{rentalPrice},#{cost},#{checkin},#{remark},#{createTime})
     </insert>
     <update id="update">
         update t_sell_build
         set area = #{area},
-             space = #{space},
+            space = #{space},
              application = #{application},
              carrier_name = #{carrierName},
              subtitle = #{subtitle},
@@ -54,6 +59,9 @@
              point = #{point},
              img_url = #{imgUrl},
              tag = #{tag},
+            work_level = #{workLevel},
+            selling_price = #{rentalPrice},
+            rental_price = #{rentalPrice},
              basic_configuration = #{basicConfiguration},
              usable_area = #{usableArea},
              addr = #{addr},
@@ -68,8 +76,10 @@
     <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 id="findAll" 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
     </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
@@ -78,16 +88,37 @@
         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 count(*) from t_sell_build*/
+        select count(*)
+        from t_sell_build sb
+        left join t_park_data pd on pd.id = sb.belong
+        <where>
+            <if test="parkId != null">
+                and sb.belong = #{parkId}
+            </if>
+            <if test="application != null and application != ''">
+                and sb.application like  concat('%', #{application}, '%')
+            </if>
+            <if test="spaceMin != null and spaceMin != '' and spaceMax != null and spaceMax != ''">
+                and sb.space &gt;= #{spaceMin} and sb.space &lt;= #{spaceMax}
+            </if>
+        </where>
     </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 id="queryData" 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>
+            <if test="parkId != null">
+                and sb.belong = #{parkId}
+            </if>
+            <if test="application != null and application != ''">
+                and sb.application like  concat('%', #{application}, '%')
+            </if>
+            <if test="spaceMin != null and spaceMin != '' and spaceMax != null and spaceMax != ''">
+                and sb.space &gt;= #{spaceMin} and sb.space &lt;= #{spaceMax}
+            </if>
+        </where>
+        limit #{begin}, #{pageSize}
     </select>
 </mapper>

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

@@ -9,6 +9,7 @@
             <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="ownerUnit" column="owner_unit" 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"/>
@@ -17,7 +18,13 @@
             <result property="introduce" column="introduce" jdbcType="VARCHAR"/>
             <result property="cost" column="cost" jdbcType="VARCHAR"/>
             <result property="imgUrl" column="img_url" jdbcType="VARCHAR"/>
+          <result property="remark" column="remark" jdbcType="VARCHAR"/>
+         <result property="businessIndustry" column="business_industry" jdbcType="VARCHAR"/>
+         <result property="landState" column="land_state" jdbcType="INTEGER"/>
            <result property="point" column="point" jdbcType="VARCHAR"/>
+           <result property="belongPark" column="belong_park" jdbcType="INTEGER"/>
+        <result property="namePoint" column="name_point" jdbcType="VARCHAR"/>
+        <result property="centerPoint" column="center_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"/>
@@ -29,34 +36,31 @@
     <sql id="Base_Column_List">
         id,land_name,land_area,
         land_function,basic_configuration,usable_area,
-        addr,contact_name,contact_phone,
-        introduce,water,electricity,
+        addr,contact_name,contact_phone,owner_unit,
+        introduce,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 into t_sell_land(land_name,land_area,land_function,owner_unit,basic_configuration,usable_area,addr,contact_name,contact_phone,introduce,cost,img_url,business_industry,land_state,remark,belong_park,point,create_time)
+        values(#{landName},#{landArea},#{landFunction},#{ownerUnit},#{basicConfiguration},#{usableArea},#{addr},#{contactName},#{contactPhone},#{introduce},#{cost},#{imgUrl},#{businessIndustry},#{landState},#{remark},#{belongPark},#{point},#{createTime})
     </insert>
+
     <update id="update">
         update t_sell_land
         set land_name = #{landName},
             land_area = #{landArea},
             land_function = #{landFunction},
+            owner_unit = #{ownerUnit},
             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},
+            business_industry=#{businessIndustry},
+            land_state=#{landState},
             img_url = #{imgUrl},
             remark = #{remark},
             point = #{point},
@@ -78,19 +82,20 @@
     <select id="queryCount" resultType="java.lang.Integer">
         select count(*) from t_sell_land
         <if test="parkId != null">
-            where belong_park = #{parkId}
+            where belong_park = #{parkId} and land_name like concat('%', #{keyword}, '%')
         </if>
     </select>
-    <select id="queryData" resultType="com.example.nngkxxdp.entity.SellLand">
+    <select id="queryData" resultType="com.example.nngkxxdp.entity.SellLand" >
         select * from t_sell_land
-        <if test="parkId != null">
-            where belong_park = #{parkId}
-        </if>
+        <where>
+            belong_park = #{parkId}
+            <if test="keyword != null and keyword != ''">
+                and land_name like CONCAT('%', #{keyword}, '%')
+            </if>
+        </where>
         limit #{begin},#{pageSize}
     </select>
-    <select id="findPagedEntities" resultType="com.example.nngkxxdp.entity.SellLand">
-        SELECT *
-        FROM t_sell_land
-        LIMIT ${offset}, ${limit}
-    </select>
+
+
+
 </mapper>

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

@@ -0,0 +1,69 @@
+<?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.SpecialServiceDao">
+
+    <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.SpecialService">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="parkForm" column="park_form" jdbcType="VARCHAR"/>
+            <result property="information" column="information" jdbcType="VARCHAR"/>
+            <result property="parkId" column="parkId" jdbcType="INTEGER"/>
+           <result property="contacts" column="contacts" jdbcType="VARCHAR"/>
+            <result property="contactsAddr" column="contacts_addr" jdbcType="VARCHAR"/>
+            <result property="contactsPhone" column="contacts_phone" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <association property="parkData" javaType="com.example.nngkxxdp.entity.ParkData">
+            <result column="title" property="title"/>
+            <result column="id" property="id"/>
+            <result column="subtitle" property="subtitle"/>
+            <result column="total_area" property="totalArea"/>
+            <result column="build_area" property="buildArea"/>
+            <result column="desc" property="desc"/>
+            <result column="creat_time" property="creatTime"/>
+            <result column="industry" property="industry"/>
+            <result column="contacts" property="contacts"/>
+            <result column="contacts_phone" property="contactsPhone"/>
+            <result column="contacts_addr" property="contactsAddr"/>
+            <result column="addr" property="addr"/>
+        </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,park_form,information,parkId,
+        create_time
+    </sql>
+    <insert id="insert">
+        insert into t_special_service(park_form,information,parkId,create_time)
+        values(#{parkForm},#{information},#{parkId},#{createTime})
+    </insert>
+    <update id="update">
+        update t_special_service
+        set park_form = #{parkForm},
+            information = #{information},
+            parkId = #{parkId}
+        where id = #{id}
+    </update>
+    <delete id="deleteById">
+        delete from t_special_service where id = #{id}
+    </delete>
+    <select id="findAll" resultType="com.example.nngkxxdp.entity.SpecialService" resultMap="BaseResultMap">
+        /*select * from t_special_service*/
+        select ss.*,pd.contacts,pd.contacts_phone,pd.contacts_addr,pd.title from
+        t_special_service ss
+        left join t_park_data pd on pd.id=ss.parkId
+    </select>
+    <select id="findById" resultType="com.example.nngkxxdp.entity.SpecialService" resultMap="BaseResultMap">
+        select ss.*,pd.* from t_special_service ss
+        left join t_park_data pd on pd.id=ss.parkId
+        where ss.id = #{id}
+    </select>
+
+
+    <select id="findByParkId" resultType="com.example.nngkxxdp.entity.SpecialService">
+        select * from t_special_service where parkId = #{parkId}
+    </select>
+    <select id="findParkData" resultType="com.example.nngkxxdp.entity.ParkData">
+        select * from t_park_data  where id = #{parkId}
+    </select>
+</mapper>

nngkxxdp/src/main/resources/static/naxsb/css/conmon.css

@@ -2,13 +2,18 @@
     padding: 0;
     margin: 0;
 }
-body {
+
+body,
+html {
     margin: 0;
     padding: 0;
+    min-width: 1400px;
 }
+
 ul {
     list-style-type: none;
 }
+
 li {
     list-style: none;
 }
@@ -19,6 +24,7 @@ li {
     font-weight: normal;
     font-style: normal;
 }
+
 .topBg {
     width: 100%;
     height: 697px;
@@ -36,11 +42,12 @@ li {
     font-weight: normal;
     font-size: 50px;
     color: #FFFFFF;
-    line-height: 167px;
+    line-height: 184px;
     text-shadow: 0px 2px 1px #1A70D5;
     text-align: center;
     letter-spacing: 5px;
     cursor: pointer;
+    margin-bottom: 40px;
 }
 
 .content {
@@ -49,14 +56,17 @@ li {
     background-size: 100% 100%;
     font-family: Microsoft YaHei;
 }
+
 .content>div {
     width: 75%;
+    min-width: 1400px;
     margin: auto;
     margin-bottom: 20px;
 }
 
 .content>ul {
     width: 75%;
+    min-width: 1400px;
     margin: auto;
     display: flex;
     flex-wrap: wrap;
@@ -71,7 +81,7 @@ li {
     font-size: 26px;
     color: #FFFFFF;
     line-height: 36px;
-    text-shadow: 0px 3px 13px rgba(15,51,130,0.46);
+    text-shadow: 0px 3px 13px rgba(15, 51, 130, 0.46);
     display: flex;
     align-items: center;
     justify-content: center;

nngkxxdp/src/main/resources/static/naxsb/css/floorcon.css

@@ -1,11 +1,15 @@
-
 * {
     padding: 0;
     margin: 0;
 }
-body {
+
+body,
+html {
     margin: 0;
     padding: 0;
+    min-width: 1500px;
+    height: 100vh;
+    min-height: 900px;
 }
 
 @font-face {
@@ -14,6 +18,14 @@ body {
     font-weight: normal;
     font-style: normal;
 }
+
+@font-face {
+    font-family: 'Source Han Sans SC';
+    src: url('../fonts/SOURCEHANSANSSC-LIGHT-2.OTF');
+    font-weight: normal;
+    font-style: normal;
+}
+
 .detailDiv {
     width: 45%;
     max-width: 836px;
@@ -21,13 +33,19 @@ body {
     height: 60%;
     background-image: url(../images/floorbg.png);
     background-size: 100% 100%;
-    font-family: Source Han Sans SC;
+    font-family: "Source Han Sans SC";
     color: #2895FF;
     padding: 30px;
     box-sizing: border-box;
     position: absolute;
-    right: 0;
+    right: 10px;
     top: 5%;
+    z-index: 11;
+}
+
+.detailDiv>div {
+    width: 100%;
+    height: 100%;
 }
 
 .detailDiv .top {
@@ -43,12 +61,16 @@ body {
 
 }
 
+.detailDiv .right>span {
+    white-space: nowrap;
+}
+
 .detailDiv .el-tabs {
     margin-top: 15px;
 }
 
 .detailDiv .el-tabs__item {
-    font-size: 24px;
+    font-size: 1.5rem;
     color: #2895FF;
     padding: 0 5px;
     height: 43px;
@@ -69,6 +91,29 @@ body {
     display: none;
 }
 
+.moxing {
+    font-weight: 600;
+    position: absolute;
+    bottom: 27%;
+    width: 750px;
+    left: 16%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-family: Source Han Sans SC;
+    z-index: 10;
+}
+
+
+.moxing img {
+    width: 100%;
+}
+
+.moxing .imgDiv {
+    position: relative;
+    width: 100%;
+}
+
 .zxfw {
     font-weight: bold;
     font-size: 26px;
@@ -76,7 +121,7 @@ body {
     width: 45%;
     max-width: 836px;
     position: absolute;
-    top: 63%;
+    top: 64%;
     right: 0;
     padding-left: 180px;
     box-sizing: border-box;
@@ -85,7 +130,7 @@ body {
 .zxfw .buttonList {
     display: flex;
     flex-wrap: wrap;
-    width: 450px;
+    width: 500px;
 }
 
 .zxfw .button {
@@ -98,8 +143,10 @@ body {
     box-sizing: border-box;
     letter-spacing: 3px;
     margin-bottom: 15px;
+    margin-right: 20px;
     cursor: pointer;
 }
+
 .ysqgk {
     width: 100%;
     background-color: #fff;
@@ -112,6 +159,7 @@ body {
     top: 60px;
     display: flex;
     flex-direction: column;
+    z-index: 11;
 }
 
 .floorTabs .list {
@@ -135,21 +183,28 @@ body {
     padding-left: 25px;
     display: flex;
     flex-direction: column;
-    justify-content: space-evenly;
 }
-.sxqd ul{
+
+.sxqd ul {
     padding-top: 0;
     margin-top: 0;
 }
 
 .sxqd li {
     cursor: pointer;
+    margin-top: 10px;
 }
 
 .sxqd li span {
     line-height: 30px;
     border-bottom: 1px solid #2895FF;
     padding-bottom: 5px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-break: break-all;
+    display: block;
+    font-size: 18px;
 }
 
 .bottomBtn {
@@ -174,12 +229,15 @@ body {
 .bottomBtn .active {
     background: #0D74F2;
 }
-.el-tabs{
+
+.el-tabs {
     height: calc(100% - 42px);
 }
-.el-tabs__content{
+
+.el-tabs__content {
     height: calc(100% - 58px);
 }
-.el-tabs__content>div{
+
+.el-tabs__content>div {
     height: 95%;
 }

nngkxxdp/src/main/resources/static/naxsb/css/mapcon.css

@@ -1,4 +1,3 @@
-
 ul {
     list-style-type: none;
 }
@@ -7,6 +6,13 @@ li {
     list-style: none;
 }
 
+body,
+html {
+    margin: 0;
+    padding: 0;
+    min-width: 1500px;
+}
+
 @font-face {
     font-family: 'DOUYU';
     src: url('../fonts/DOUYUFONT-2.OTF');
@@ -23,10 +29,33 @@ li {
     color: #186FF0;
     height: 66px;
     border-bottom: 1px solid #B7C7DC;
+    cursor: pointer;
 }
 
 .toplogo img {
     margin: 0 20px;
+    margin-bottom: 17px;
+}
+
+
+.backbutton {
+    width: 117px;
+    height: 42px;
+    background: #DEEDFF;
+    border-radius: 10px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+    color: #2474F1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 10px;
+    cursor: pointer;
+}
+
+.backbutton img {
+    margin-right: 0.625rem;
 }
 
 .title {
@@ -43,6 +72,10 @@ li {
     height: 1384px;
 }
 
+.contentleft>.title img {
+    margin-right: 5px;
+}
+
 
 .contentleft .tablecon {
     background: #FFFFFF;
@@ -60,6 +93,7 @@ li {
     border: 1px solid #A3C4ED;
     box-sizing: border-box;
 }
+
 .contentleft>.buttontz {
     width: 100%;
     height: 115px;
@@ -74,6 +108,12 @@ li {
     cursor: pointer;
 }
 
+.contentleft>.buttontz span {
+    background: linear-gradient(0deg, rgba(154, 199, 255, 0.98) 0%, rgba(255, 255, 255, 0.98) 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+}
+
 
 .itemname {
     font-size: 32px;
@@ -81,11 +121,13 @@ li {
     color: #333333;
     margin: 20px 0;
 }
+
 .contentleft>.gk {
     background: #FFFFFF;
     padding: 10px;
     margin-top: 10px;
 }
+
 .text {
     font-size: 20px;
     color: #333333;
@@ -125,18 +167,25 @@ td.cont {
 
 .contentleft>.list .listitm {
     width: 23.5%;
-    height: 100px;
+    height: 110px;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    min-width: 199px;
+    /* min-width: 199px; */
+}
+
+.contentleft .list .listitm>span {
+    height: 50%;
 }
 
 .contentleft .list .listitm>span:first-child {
     font-size: 16px;
     color: rgb(255, 255, 255, 60%);
     margin-bottom: 10px;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
 }
 
 .contentleft .list .listitm>span:last-child {

nngkxxdp/src/main/resources/static/naxsb/css/qjt.css

@@ -0,0 +1,273 @@
+body {
+    margin: 0;
+    overflow: hidden;
+    /* 溢出隐藏 */
+}
+
+@font-face {
+    font-family: 'DOUYU';
+    src: url('../fonts/DOUYUFONT-2.OTF');
+    font-weight: normal;
+    font-style: normal;
+}
+
+#loading {
+    position: absolute;
+    left: 50%;
+    top: 45%;
+    transform: translate(-50%, 0)
+}
+
+.building-box {
+    text-align: center;
+    font-size: 12px;
+    width: 120px;
+    position: absolute;
+    top: -84px;
+    left: -58px;
+}
+
+.building-text {
+    background: #18A65A;
+    color: #fff;
+    padding: 4px;
+    border-radius: 8px;
+    margin-bottom: -8px;
+    display: flex;
+    flex-direction: column;
+}
+
+.building-bottom {
+    background: #18A65A;
+    width: 10px;
+    height: 10px;
+    border-radius: 5px;
+    margin-left: calc(50% - 5px);
+}
+
+.building-line {
+    width: 1px;
+    height: 40px;
+    border-left: 1px dashed #18A65A;
+    position: absolute;
+    top: -41px;
+    left: 2px;
+}
+
+.container {
+    position: relative;
+}
+
+.nowtime {
+    position: absolute;
+    top: 60px;
+    right: 1.25rem;
+    font-family: DOUYU;
+    font-weight: normal;
+    font-size: 1.0625rem;
+    color: #1B79CC;
+}
+
+.conList {
+    position: absolute;
+    width: 30%;
+    height: 36%;
+}
+
+.onefloor {
+    top: 10%;
+    left: 0;
+}
+
+.onefloor .list,
+.twofloor .list {
+    padding-left: 1.25rem;
+    box-sizing: border-box;
+}
+
+.twofloor {
+    top: 58%;
+    left: 0;
+}
+
+.floortitle {
+    max-width: 562px;
+    width: 100%;
+    max-height: 96px;
+    height: 26%;
+    background-image: url(../images/qjt-titlebg.png);
+    background-size: 100% 100%;
+    font-family: Microsoft YaHei;
+    font-size: 1.5rem;
+    color: #FFFFFF;
+    display: flex;
+    font-style: italic;
+    padding-left: 3.75rem;
+    box-sizing: border-box;
+    align-items: center;
+}
+
+.floorcontent {
+    width: calc(100% - 2.5rem);
+    height: 72%;
+    background: #D3EBFF;
+    box-shadow: 5px 9px 9px 0px rgba(17, 126, 202, 0.24);
+    border-radius: 20px;
+    border: 2px solid #D0E0EA;
+    font-size: 1.25rem;
+    color: #333;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    margin-left: 2.5rem;
+}
+
+.floorcontent .list {
+    width: 50%;
+}
+
+.floorcontent .top {
+    color: #333333;
+    display: flex;
+    align-items: center;
+    white-space: nowrap;
+}
+
+.floorcontent .bottom {
+    display: flex;
+    align-items: center;
+    margin-top: 0.625rem;
+}
+
+.floorcontent .bottom img {
+    width: 2.875rem;
+    margin: 0 0.9375rem;
+}
+
+.floorcontent .bottom .number {
+    font-weight: bold;
+    font-size: 2.5rem;
+    font-style: italic;
+}
+
+.floorcontent .radio::before {
+    content: '';
+    display: inline-block;
+    width: 0.5625rem;
+    height: 0.5625rem;
+    border-radius: 50%;
+    margin-right: 0.3125rem;
+}
+
+.floorcontent .blue .radio::before {
+    background-color: rgb(26 149 235 / 50%);
+}
+
+.floorcontent .blue .bottom {
+    color: #1A95EB;
+}
+
+.floorcontent .yellow .radio::before {
+    background-color: rgb(255 128 0 / 50%);
+}
+
+.floorcontent .yellow .bottom {
+    color: #FF8000;
+}
+
+.floorcontent .green .radio::before {
+    background-color: rgb(35 177 74 / 50%);
+}
+
+.floorcontent .green .bottom {
+    color: #23B14A;
+}
+
+.floorcontent .purple .radio::before {
+    background-color: rgb(137 84 255 / 50%);
+}
+
+.floorcontent .purple .bottom {
+    color: #8954FF;
+}
+
+.blsl {
+    top: 10%;
+    right: 1.25rem;
+}
+
+.blsl .list {
+    width: 50%;
+    display: flex;
+    align-items: center;
+    height: 33%;
+}
+
+.blsl .list .img {
+    width: 40%;
+    height: 90%;
+    display: flex;
+    justify-content: flex-end;
+    margin-right: 0.625rem;
+}
+
+.blsl .list .right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.blsl .list .right>span {
+    white-space: nowrap;
+}
+
+.blsl .list .right .number {
+    color: #5482F9;
+}
+
+.blsl .list .right .number span:first-child {
+    font-weight: bold;
+    font-size: 2.5rem;
+    font-style: italic;
+}
+
+.pdgdf {
+    right: 1.25rem;
+    top: 58%;
+}
+
+.pdgdf .text {
+    position: absolute;
+    top: -5rem;
+    left: 7rem;
+    display: flex;
+    flex-direction: column;
+    font-size: 1rem;
+    color: #1A95EB;
+}
+
+.qjttitle {
+    width: 100%;
+    position: absolute;
+    top: 0;
+    height: 115px;
+    background-image: url(../images/qjttitle.png);
+    background-size: 100% 100%;
+}
+
+@keyframes counterAnimation {
+    from {
+        opacity: 0;
+        transform: translateY(-10px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.number.animate {
+    visibility: visible;
+    animation: counterAnimation 0.3s ease-out forwards;
+}

nngkxxdp/src/main/resources/static/naxsb/css/syygggy.css

@@ -2,11 +2,15 @@
     padding: 0;
     margin: 0;
 }
-body {
+
+body,
+html {
     margin: 0;
     padding: 0;
+    min-width: 1500px;
 }
 
+
 .toplogo {
     display: flex;
     align-items: center;
@@ -16,22 +20,51 @@ body {
     color: #186FF0;
     height: 66px;
     border-bottom: 1px solid #B7C7DC;
+    cursor: pointer;
 }
 
 .toplogo img {
     margin: 0 20px;
 }
 
+
+.backbutton {
+    width: 117px;
+    height: 42px;
+    background: #DEEDFF;
+    border-radius: 10px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+    color: #2474F1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 10px;
+    cursor: pointer;
+}
+
+.backbutton img {
+    margin-right: 0.625rem;
+}
+
 .title {
     display: flex;
     align-items: center;
     margin-top: 10px;
+    margin-bottom: 5px;
 }
-.title .more{
+
+.title .more {
     color: #666;
     cursor: pointer;
 }
 
+.title span {
+    font-size: 20px;
+    color: #333;
+}
+
 .contentleft {
     width: 50%;
     height: 100%;
@@ -91,8 +124,20 @@ body {
     padding-left: 20px;
     box-sizing: border-box;
     justify-content: center;
+    cursor: pointer;
+    transition: background-color 2.5s;
+    /* 背景色变化过渡时间 */
+    overflow: hidden;
+    /* 隐藏超出部分 */
+}
+
+.qwys .list:hover {
+    filter: brightness(120%);
+    background-color: #afb2b6;
+    /* color: #fff; */
 }
-.qwys ul{
+
+.qwys ul {
     padding-left: 30px;
     margin-top: 10px;
 }
@@ -111,13 +156,19 @@ body {
 .qwys .list .name img {
     margin-right: 10px;
 }
+
 .contentleft .left {
     width: 58.5%;
 }
 
+.contentleft .title>img {
+    margin-right: 5px;
+}
+
 .contentleft .right {
     width: 39%;
 }
+
 .yqhd {
     font-size: 16px;
     color: #333333;
@@ -127,6 +178,7 @@ body {
     box-sizing: border-box;
     overflow-y: scroll;
 }
+
 .yqhd::-webkit-scrollbar {
     width: 0px;
     height: 0px;
@@ -138,7 +190,8 @@ body {
     flex-direction: column;
     margin-left: 30px;
 }
-.yqhd ul li{
+
+.yqhd ul li {
     cursor: pointer;
     margin-bottom: 20px;
 }
@@ -146,6 +199,8 @@ body {
 .mxqy {
     height: 179px;
     background: #FFFFFF;
+    overflow: hidden;
+    position: relative;
 }
 
 .mxqy>ul {
@@ -153,17 +208,28 @@ body {
     display: flex;
     flex-wrap: wrap;
     list-style-type: none;
-    justify-content: space-between;
-    align-content: space-around;
+    align-content: flex-start;
+    position: absolute;
+    width: 100%;
+    overflow-y: scroll;
 }
-.mxqy>ul li{
+
+.mxqy>ul::-webkit-scrollbar {
+    width: 0px;
+    height: 0px;
+}
+
+.mxqy>ul li {
     cursor: pointer;
+    margin-left: 5px;
+    margin-top: 5px;
 }
 
 .mxqy ul img {
     width: 86px;
     height: 49px;
 }
+
 .zcwj {
     font-size: 16px;
     color: #333333;
@@ -173,6 +239,7 @@ body {
     box-sizing: border-box;
     overflow-y: scroll;
 }
+
 .zcwj::-webkit-scrollbar {
     width: 0px;
     height: 0px;
@@ -184,9 +251,11 @@ body {
     flex-direction: column;
     margin-left: 30px;
 }
-.zcwj li{
+
+.zcwj li {
     margin-bottom: 10px;
 }
+
 .zcwj li>div {
     display: -webkit-box;
     line-height: 20px;
@@ -206,7 +275,9 @@ body {
     display: flex;
     align-items: center;
 }
-.ztcr .list{
+
+.ztcr .list {
+    width: 32%;
     cursor: pointer;
     margin-left: 3px;
 }
@@ -217,6 +288,11 @@ body {
     position: relative;
 }
 
+.ztcr .list .bg img {
+    width: 100%;
+    height: 100%;
+}
+
 .ztcr .list .number {
     width: 100%;
     height: 30px;
@@ -232,57 +308,70 @@ body {
 }
 
 .ztcr .list .title {
+    width: 100%;
     font-size: 20px;
     color: #333333;
+    word-break: break-all;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
 }
 
 .ztcr .list .content {
     font-size: 16px;
     color: #333333;
     opacity: 0.6;
+    word-break: break-all;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
 }
 
 .tdcr {
-    height: 421px;
+    height: 427px;
     background: #FFFFFF;
 }
 
 .tdcr .top {
     display: flex;
+    justify-content: space-between;
     border-bottom: 1px solid #B7C7DC;
     padding-top: 20px;
     padding-left: 30px;
     padding-bottom: 10px;
     box-sizing: border-box;
 }
-.tdcr .content{
+
+.tdcr .content {
     height: calc(100% - 52px);
     overflow-y: scroll;
 }
+
 .tdcr .content::-webkit-scrollbar {
     width: 0px;
     height: 0px;
 }
 
 .tdcr .left {
-    width: 60%;
+    width: 62%;
 }
 
 .tdcr .right {
-    width: 40%;
+    width: 34%;
 }
 
 .tdcr .list {
     display: flex;
+    justify-content: space-between;
     padding-top: 20px;
     padding-left: 30px;
     box-sizing: border-box;
     cursor: pointer;
 }
 
-.tdcr .list .right {
-    margin-left: 20px;
-}
+.tdcr .list .right {}
 
 .tsfw {
     height: 188px;
@@ -317,12 +406,36 @@ body {
 }
 
 .fwsxqd .list {
-    height: 77px;
+    height: 70px;
     background: #DEEDFF;
-    border: 1px solid #4B98F6;
-    padding: 0 10px;
-    line-height: 77px;
+    /* line-height: 26px; */
     font-size: 20px;
     color: #4B98F6;
     cursor: pointer;
+    margin-left: 6px;
+    margin-top: 10px;
+    width: 27.5%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    white-space: nowrap;
+}
+
+.fwsxqd .list>div {
+    width: 100%;
+    height: 100%;
+    border: 1px solid #4B98F6;
+    padding: 0 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    white-space: nowrap;
+}
+
+.fwsxqd .ather {
+    padding: 0 22.5px;
+    margin-left: 6px;
+    margin-top: 10px;
 }

nngkxxdp/src/main/resources/static/naxsb/dqfw.html

@@ -0,0 +1,339 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>党建服务</title>
+    <!-- 引入 Vue -->
+    <script src="https://unpkg.com/vue@2.6.14/dist/vue.min.js"></script>
+    <!-- 引入样式 -->
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <!-- 引入组件库 -->
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <!-- jquery-->
+    <script src="js/jquery-3.5.1.min.js"></script>
+    <script src="js/urljson.js"></script>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+
+        html,
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: Microsoft YaHei;
+            height: 100%;
+            background: #EDF5FF;
+        }
+
+        @font-face {
+            font-family: 'DOUYU';
+            src: url('../fonts/DOUYUFONT-2.OTF');
+            font-weight: normal;
+            font-style: normal;
+        }
+
+        .dqfw>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
+
+        .toplogo {
+            display: flex;
+            align-items: center;
+            font-family: DOUYU;
+            font-weight: normal;
+            font-size: 30px;
+            color: #186FF0;
+            height: 66px;
+            cursor: pointer;
+        }
+
+        .toplogo img {
+            margin: 0 20px;
+            margin-bottom: 17px;
+        }
+
+        .backbutton {
+            width: 117px;
+            height: 42px;
+            background: #DEEDFF;
+            border-radius: 10px;
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            font-size: 16px;
+            color: #2474F1;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+
+        .backbutton img {
+            margin-right: 10px;
+        }
+
+        .container {
+            display: flex;
+            justify-content: space-between;
+            min-width: 1300px;
+            min-height: calc(100vh - 67px);
+        }
+
+        .container>.left {
+            width: 36%;
+            background: #fff;
+        }
+
+        .container>.left .title {
+            padding-left: 30px;
+            box-sizing: border-box;
+            height: 53px;
+            line-height: 53px;
+            background: #DEEDFF;
+            font-size: 20px;
+            color: #4B98F6;
+        }
+
+        .container>.left .title.active {
+            background: #4B98F6;
+            color: #fff;
+        }
+
+        .container>.left li {
+            cursor: pointer;
+            margin: 20px 0;
+        }
+
+        .container>.left li.active {
+            color: #4B98F6;
+        }
+
+        .container>.right {
+            background: #fff;
+            width: 63%;
+            min-width: 790px;
+        }
+
+        .dqfw .line {
+            width: 4px;
+            height: 20px;
+            background: #4B98F6;
+            margin: 0 10px;
+        }
+
+        .container>.right .title {
+            display: flex;
+            align-items: center;
+            color: #4B98F6;
+            padding: 10px;
+            box-sizing: border-box;
+            border-bottom: 1px solid #4B98F6;
+        }
+
+        .container>.right .title span {
+            word-break: break-all;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+        .container>.right .content {
+            border: 1px solid #4B98F6;
+            margin: 10px;
+        }
+
+        .content .person {
+            width: 100%;
+            height: 161px;
+            display: flex;
+        }
+
+        .content .person .grzl {
+            width: 36%;
+            min-width: 350px;
+            display: flex;
+            background: #4B98F6;
+            color: #FFFFFF;
+            padding: 10px;
+            box-sizing: border-box;
+        }
+
+        .content .person .grzl img {
+            width: 51px;
+            height: 51px;
+        }
+
+        .content .person .grzl p {
+            margin-bottom: 5px;
+        }
+
+        .content .person .grzl p:first-child {
+            font-size: 26px;
+            color: #FFFFFF;
+            line-height: 48px;
+            text-shadow: 3px 5px 7px rgba(44, 119, 210, 0.43);
+            background: linear-gradient(0deg, rgba(172, 204, 243, 0.98) 0%, rgba(255, 255, 255, 0.98) 99.12109375%);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+        }
+
+        .content .person .sevre {
+            color: #4B98F6;
+            padding: 40px;
+            background: #DEEDFF;
+            box-sizing: border-box;
+        }
+
+        .content>.bottom {
+            padding: 35px;
+            box-sizing: border-box;
+        }
+
+        .content>.bottom .name {
+            height: 51px;
+            line-height: 51px;
+            width: 263px;
+            background: #4BB664;
+            font-size: 20px;
+            color: #FFFFFF;
+            padding: 0 30px;
+            margin-bottom: 30px;
+            word-break: break-all;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="dqfw" id="dqfw">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>党群服务</span>
+            </div>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
+            </div>
+        </div>
+        <div class="container">
+            <div class="left">
+                <div class="list" v-for="(item, index)  in leftList" :key="index" v-if="leftList.length">
+                    <div class="title" :class="{ active: currtopId == item.id }">{{item.partyForm?item.partyForm:'- '}}
+                    </div>
+                    <ul style="padding-left: 40px;">
+                        <li :class="{ active: currentTab == tabl.id }" v-for="(tabl, indexl)  in item.children"
+                            :key="indexl" @click="menuChange(tabl.id,item.id)">
+                            {{tabl.information?tabl.information:'- '}}
+                        </li>
+                    </ul>
+                </div>
+                <div v-else>- </div>
+            </div>
+            <div class="right">
+                <div class="title">
+                    <div class="line"></div>
+                    <span>{{rightdata.information?rightdata.information:'- '}}</span>
+                </div>
+                <div class="content">
+                    <div class="person">
+                        <div class="grzl">
+                            <img src="images/logo-person.png" alt="">
+                            <div>
+                                <p>联系人</p>
+                                <p><span>姓名：</span><span>{{rightdata.contacts?rightdata.contacts:'- '}}</span></p>
+                                <p><span>联系电话：</span>
+                                    <span>{{rightdata.contactsPhone?rightdata.contactsPhone:'-'}}</span>
+                                </p>
+                                <p><span>地址：</span><span>{{rightdata.contactsAddr?rightdata.contactsAddr:'- '}}</span>
+                                </p>
+                            </div>
+                        </div>
+                        <div class="sevre">{{rightdata.contactsFunction?rightdata.contactsFunction:'- '}}</div>
+                    </div>
+                    <div class="bottom">
+                        <div class="name" :title="rightdata.title">{{rightdata.information?rightdata.information:'-'}}
+                        </div>
+                        <div style="color: #333333;line-height: 48px;">{{rightdata.createWork}}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</body>
+<script>
+    // 初始化Vue实例
+    new Vue({
+        el: '#dqfw',
+        data: function () {
+            return {
+                reqPtah: '',
+                currentTab: '',
+                currtopId: '',
+                leftList: [],
+                rightdata: {}
+            };
+        },
+        methods: {
+            menuChange(id, topid) {
+                this.currtopId = topid;
+                this.currentTab = id;
+                this.getrightData(id);
+            },
+            getParkData(id) {
+                let that = this;
+                $.ajax({
+                    url: conpath + "/partyService/listAll/" + id,
+                    type: "get",
+                    dataType: "json",
+                    success: function (data) {
+                        let value = data.data.PartyServiceList;
+                        let newList = []
+                        value.forEach(item => {
+                            let status = newList.find(el => el.partyForm === item.partyForm) // 判断第一层级，用name属性来判断
+                            if (status) {
+                                status.children.push({ ...item }) // 将数据插入到第二层级中
+                            } else {
+                                let obj = { ...item, children: [{ ...item }] }
+                                newList.push(obj)
+                            }
+                        })
+                        that.currentTab = newList[0].children[0].id;
+                        that.currtopId = newList[0].id;
+                        that.getrightData(that.currentTab);
+                        that.leftList = newList;
+                    }
+                })
+            },
+            getrightData(id) {
+                let that = this;
+                $.ajax({
+                    url: conpath + "/partyService/" + id,
+                    type: "get",
+                    dataType: "json",
+                    success: function (data) {
+                        that.rightdata = data;
+                    }
+                })
+            }
+        },
+        mounted() {
+            const url = new URL(window.location.href);
+            const id = url.searchParams.get('id');
+            this.getParkData(id);
+        }
+    });
+</script>
+
+</html>

nngkxxdp/src/main/resources/static/naxsb/floorone.html

@@ -4,15 +4,19 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+    <title>楼层</title>
     <link rel="stylesheet" href="css/floorcon.css">
+    <!-- jquery-->
+    <script src="js/jquery-3.5.1.min.js"></script>
+    <script src="js/urljson.js"></script>
 </head>
 <style>
     .container {
         position: relative;
         background-image: url(images/indexbgfloor.png);
+        background-size: 100% 100%;
         width: 100%;
-        min-height: 100vh;
+        /* min-height: 900px; */
         height: 100%;
     }
 
@@ -34,77 +38,315 @@
     .el-tab-pane {
         display: flex;
         flex-direction: column;
-        justify-content: space-evenly;
+        justify-content: space-between;
+    }
+
+    .moxing .namebtn {
+        padding: 0 5px;
+        border-radius: 4px;
+        font-size: 14px;
+        color: #FFFFFF;
+        background: #A7C4E0;
+        text-shadow: 3px 1px 2px rgb(40 149 255 / 80%);
+        position: absolute;
+        cursor: pointer;
+    }
+
+    .moxing .namebtnl {
+        padding: 0;
+        background-color: rgb(239 41 19 / 40%);
+        border-radius: 6px;
+        line-height: 17px;
+        font-size: 14px;
+        color: #FFFFFF;
+        position: absolute;
+        text-shadow: 3px 1px 2px rgb(217 112 100 / 100%);
+    }
+
+    #lines {
+        position: absolute;
+        height: 150px;
+        transition: top 0.3s;
+        width: 0;
+        border: 1px dashed #1A95EB;
+        z-index: 111;
+    }
+
+    #lineh {
+        position: absolute;
+        height: 0;
+        transition: top 0.3s;
+        width: 100px;
+        border: 1px dashed #1A95EB;
+        z-index: 111;
+    }
+
+    #redio {
+        width: 13px;
+        height: 13px;
+        background: #2896FF;
+        border-radius: 50%;
+        position: absolute;
+        z-index: 111;
+    }
+
+    .vrdiv {
+        width: 38px;
+        height: 38px;
+        position: absolute;
+        cursor: pointer;
+        background-image: url(images/logo-vr.png);
+        background-size: 100% 100%;
+    }
+
+    .btable {
+        height: calc(100% - 67px);
+        margin-top: 20px;
+        background-color: #fff;
+        padding: 15px 10px;
+        box-sizing: border-box;
+    }
+
+    .jysm {
+        color: #2895FF;
+        display: flex;
+        align-items: center;
+        font-weight: bold;
+    }
+
+    .btable table {
+        margin-top: 10px;
+    }
+
+    .sxqd::-webkit-scrollbar {
+        width: 0;
+    }
+
+    @media screen and (max-width:1600px) {
+
+        html,
+        body {
+            font-size: 14px;
+        }
+
+        .sxqd li {
+            cursor: pointer;
+            margin-top: 10px;
+        }
+
+        .zxfw {
+            top: 66%;
+        }
+
+    }
+
+    @media screen and (max-width:1800px) {
+        .moxing {
+            left: 100px;
+        }
+
+        .detailDiv {
+            max-height: 500px;
+        }
+
     }
 </style>
 
 <body>
     <div class="container" id="app">
         <div class="floorTabs">
-            <div class="list" :class="{ active: currentFloor === tab.id }" v-for="(tab,index) in floorList" :key="index"
-                @click="currentFloor = tab.id">
+            <div class="list" :class="{ active: currentFloor == tab.id }" v-for="(tab,index) in floorList" :key="index"
+                @click="floorChange(tab.id)">
                 {{tab.name}}
             </div>
             <div class="list" @click="backsw">返回室外</div>
         </div>
-        <div class="detailDiv" v-if="currentFloor === 1">
-            <div class="top">
-                <div style="font-weight: bold;font-size: 26px;">咨询台您可以办理：</div>
-                <div class="right">
-                    <span>工作时间：</span>
-                    <span>法定工作日 9:00-12:30 14:00-18:00</span>
+        <div id="lines" style="display: none;"></div>
+        <div id="lineh" style="display: none;"></div>
+        <div id="redio" style="display: none;"></div>
+        <div class="detailDiv" style="display: none;">
+            <div v-show="popupType == '1'">
+                <div class="top">
+                    <div style="font-weight: bold;font-size: 1.625rem;">{{btnName}}您可以办理：</div>
+                    <div class="right" style="font-size: 1rem;">
+                        <span>工作时间：</span>
+                        <span>法定工作日 9:00-12:30 14:00-18:00</span>
+                    </div>
                 </div>
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane label="依申请公开" name="first">
+                        <div class="ysqgk">
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="政策咨询" name="second">
+                        <div class="ysqgk">
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="接待导引" name="third">
+                        <div class="ysqgk">
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="帮代办申请" name="fourth">
+                        <div class="ysqgk">
+                        </div>
+                    </el-tab-pane>
+                </el-tabs>
             </div>
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="依申请公开" name="first">
-                    <div class="ysqgk">
-                    </div>
-                </el-tab-pane>
-                <el-tab-pane label="政策咨询" name="second">
-                    <div class="ysqgk">
+            <div v-show="popupType == '2'">
+                <div class="top">
+                    <div style="font-weight: bold;font-size: 1.625rem;white-space: nowrap;">{{btnName}}您可以办理：</div>
+                    <div class="right" style="font-size: 1rem;">
+                        <span>工作时间：</span>
+                        <span>法定工作日 9:00-12:30 14:00-18:00</span>
                     </div>
-                </el-tab-pane>
-                <el-tab-pane label="接待导引" name="third">
-                    <div class="ysqgk">
+                </div>
+                <el-tabs v-model="activeNametwo" @tab-click="handleClicktwo">
+                    <el-tab-pane label="事项清单" name="sxqd">
+                        <ul class="sxqd">
+                            <li v-for="(item,index) in sxqdList">
+                                <span @click="goToLink(item.url)" v-if="item.url">{{item.mattersName}}</span>
+                                <span v-else>{{item.mattersName}}</span>
+                            </li>
+                        </ul>
+                        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+                            :page-size="7" layout="prev, pager, next" :total="total">>
+                        </el-pagination>
+
+                    </el-tab-pane>
+                    <el-tab-pane label="入驻部门" name="rzbm">
+                        <ul class="sxqd" style="overflow-y: scroll;">
+                            <li v-for="(item,index) in rzbmList">
+                                <span>{{item.deptName}}</span>
+                            </li>
+                        </ul>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+            <div v-show="popupType == '6'">
+                <div class="top">
+                    <div style="font-weight: bold;font-size: 1.625rem;">{{btnName}}您可以办理：</div>
+                    <div class="right" style="font-size: 1rem;">
+                        <span>工作时间：</span>
+                        <span>法定工作日 9:00-12:30 14:00-18:00</span>
                     </div>
-                </el-tab-pane>
-                <el-tab-pane label="帮代办申请" name="fourth">
-                    <div class="ysqgk">
+                </div>
+                <!-- <div class="btable">
+                    <div class="jysm">
+                        <div style="width: 2px;height: 14px;background-color: #2895FF;margin-right: 10px;"></div>
+                        <div>简要说明</div>
                     </div>
-                </el-tab-pane>
-            </el-tabs>
+                    <table border="0" cellspacing="0" style="width: 100%;">
+                        <tbody>
+                            <tr>
+                                <td class="tit">办理主体</td>
+                                <td class="cont">200万元/亩</td>
+                                <td class="tit">办件类型</td>
+                                <td class="cont">200万元/亩</td>
+                            </tr>
+                            <tr>
+                                <td class="tit">服务对象</td>
+                                <td class="cont">200万元/亩</td>
+                                <td class="tit">材料清单</td>
+                                <td class="cont"></td>
+                            </tr>
+                            <tr>
+                                <td class="tit">法定办结时期</td>
+                                <td class="cont">200万元/亩</td>
+                                <td class="tit">承诺办结时期</td>
+                                <td class="cont"></td>
+                            </tr>
+                            <tr>
+                                <td class="tit">咨询方式</td>
+                                <td class="cont">200万元/亩</td>
+                                <td class="tit">监督投诉方式</td>
+                                <td class="cont"></td>
+                            </tr>
+                            <tr>
+                                <td class="tit">办理地点</td>
+                                <td colspan="3"></td>
+                            </tr>
+                            <tr>
+                                <td class="tit">办理时间</td>
+                                <td colspan="3"></td>
+                            </tr>
+                            <tr>
+                                <td class="tit">办理形式</td>
+                                <td colspan="3"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div> -->
+            </div>
         </div>
-        <div class="detailDiv" v-if="currentFloor === 2">
-            <div class="top">
-                <div style="font-weight: bold;font-size: 26px;white-space: nowrap;">无差别综合办理区您可以办理：</div>
-                <div class="right">
-                    <span>工作时间：</span>
-                    <span>法定工作日 9:00-12:30 14:00-18:00</span>
+        <div class="moxing" v-show="currentFloor == 1">
+            <div class="imgDiv">
+                <img src="images/floordetail1.png" alt="">
+                <img src="images/floorArowRigt.png" alt=""
+                    style="position:absolute; left:52px;bottom: 73px;width: 40px;height: 34px;">
+                <img src="images/floorArowTop.png" alt=""
+                    style="position:absolute; right: 220px;top: 22px;width: 34px;height: 39px;">
+                <div class="vrdiv" style="left: 217px;bottom: 119px;"
+                    @click="window.open('https://www.cqna.gov.cn/vr/vr.html')"></div>
+                <div class="vrdiv" style="left: 384px;bottom: 146px;"
+                    @click="window.open('https://www.cqna.gov.cn/vr/vr.html')"></div>
+                <div class="namebtn threed" style="left: 150px;bottom: 88px;background-color: #D97064;
+        text-shadow: 3px 1px 2px rgb(217 112 100 / 80%);" data-popupType="1">咨询台
                 </div>
+                <div class="namebtn threed" style="left: 217px;bottom: 119px;" data-popupType="2" data-id="12">政务公开专区
+                </div>
+                <div class="namebtn threed" style="left: 217px;bottom: 72px;" data-popupType="2" data-id="3">24h自助服务区
+                </div>
+                <div class="namebtn threed" style="left: 331px;bottom: 97px;" data-popupType="2" data-id="2">社保卡办理区
+                </div>
+                <div class="namebtnl threed" style="right: 220px;bottom: 82px;">免费婚检室</div>
+                <div class="namebtnl threed" style="left: 470px;bottom: 203px;">领政厅</div>
+                <div class="namebtnl threed" style="right: 88px;bottom: 194px;">婚姻家庭辅导室</div>
+                <div class="namebtn threed" style="right: 110px;top: 54px;" data-popupType="2" data-id="1">婚姻登记处</div>
             </div>
-            <el-tabs v-model="activeNametwo" @tab-click="handleClicktwo">
-                <el-tab-pane label="事项清单" name="sxqd">
-                    <ul class="sxqd">
-                        <li v-for="(item,index) in sxqdList">
-                            <span>{{item.title}}</span>
-                        </li>
-                    </ul>
-                    <el-pagination background layout="prev, pager, next" :total="1000">
-                    </el-pagination>
-                </el-tab-pane>
-                <el-tab-pane label="入驻部门" name="rzbm">
-                </el-tab-pane>
-            </el-tabs>
+            <div style="font-size: 26px;color: #004A93;">2号楼一楼婚姻登记处社保卡办理</div>
+            <div style="font-size: 20px;color: #547596;">（您可以点击图中的按钮查看详情）</div>
+        </div>
+        <div class="moxing" v-show="currentFloor == 2">
+            <div class="imgDiv">
+                <img src="images/floordetail2.png" alt="">
+                <div class="namebtnl threed" style="left: 286px;bottom: 91px;">自助服务区</div>
+                <div class="namebtn threed" style="left: 326px;bottom: 215px;" data-popupType="2" data-id="4">公安综合办理区
+                </div>
+                <div class="namebtnl threed" style="right: 175px;bottom: 156px;">自助服务区</div>
+                <div class="namebtn threed" style="right: 110px;top: 87px;" data-popupType="2" data-id="5">无差别综合办理区
+                </div>
+                <div class="namebtnl threed" style="right: 187px;top: 15px;">母婴室</div>
+            </div>
+            <div style="font-size: 26px;color: #004A93;">2号楼二楼无差别、区公安办理区</div>
+            <div style="font-size: 20px;color: #547596;">（您可以点击图中的按钮查看详情）</div>
+        </div>
+        <div class="moxing" v-show="currentFloor == 3">
+            <div class="imgDiv">
+                <img src="images/floordetail3.png" alt="">
+                <div class="namebtnl threed"
+                    style="left: 7px;bottom: 50px;display: flex;flex-direction: column;align-items: center;">
+                    <span>314工程建设项目</span><span>审批会议室</span>
+                </div>
+                <div class="namebtn threed" style="left: 341px;top: 114px;" data-popupType="2" data-id="6">经开区企业开办办理区
+                </div>
+                <div class="namebtnl threed" style="right: 169px;top: 92px;">政务公开专区</div>
+                <div class="namebtnl threed" style="right: 189px;top: 59px;">自助服务区</div>
+                <div class="namebtn threed" style="right: 67px;top: 123px;" data-popupType="2" data-id="8">工程建设领域办理区
+                </div>
+                <div class="namebtn threed" style="right: 85px;top: 0;" data-popupType="2" data-id="7">不动产登记办理区</div>
+            </div>
+            <div style="font-size: 26px;color: #004A93;">2号楼三楼婚姻登记处社保卡办理</div>
+            <div style="font-size: 20px;color: #547596;">（您可以点击图中的按钮查看详情）</div>
         </div>
         <div class="bottomBtn">
-            <div class="btn active">3D</div>
-            <div class="btn">VR</div>
+            <div class="btn active" id="threed" @click="showthreed">3D</div>
+            <div class="btn" id="vrdiv" @click="showvrdiv">VR</div>
         </div>
         <div class="zxfw">
             <div style="color: #004A93;margin: 15px 0;">在线服务</div>
             <div class="buttonList">
-                <div class="button">预约取号</div>
-                <div class="button">远程帮办</div>
+                <div class="button" @click="goToLink('wyyy.html')">延时办</div>
+                <div class="button" @click="goToLink('wybdb.html')">帮代办</div>
                 <div class="button">智能问答</div>
                 <div class="button">联系我们</div>
             </div>
@@ -118,13 +360,19 @@
 <!-- 引入组件库 -->
 <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 <script>
-    new Vue({
+    var nowDiv = new Vue({
         el: "#app",
         data: function () {
             return {
                 activeName: 'second',
-                activeNametwo: 'sxqd',
+                activeNametwo: 'rzbm',
+                popupShow: false,
+                btnName: '',
                 currentFloor: 1,
+                popupType: "other",
+                currentPage: 1,
+                total: 0,
+                btnid: 1,
                 floorList: [
                     {
                         id: 1,
@@ -139,6 +387,7 @@
                         name: "三楼"
                     },
                 ],
+                rzbmList: [],
                 sxqdList: [
                     {
                         id: 1,
@@ -169,25 +418,197 @@
                         id: 1,
                         title: "残疾类别/等级变更",
                         url: ""
-                    },
-                    {
-                        id: 1,
-                        title: "全国残疾人按比例就业情况联网认证",
-                        url: ""
                     }
                 ]
             };
         },
+        created() {
+            this.unitBtnClick();
+        },
+        mounted() {
+            const url = new URL(window.location.href);
+            const id = url.searchParams.get('floorid');
+            // this.currentFloor = id;
+            $('.threed').show();
+            $('.vrdiv').hide();
+        },
         methods: {
+            handleCurrentChange(val) {
+                this.getItemList(val, this.btnid)
+            },
             handleClick(tab, event) {
                 console.log(tab, event);
             },
+            goToLink(url) {
+                if (url) {
+                    window.open(url);
+                }
+            },
+            floorChange(id) {
+                this.currentFloor = id;
+                this.popupType = 'other'
+                this.popupShow = false;
+                $('.threed').show();
+                $('.vrdiv').hide();
+                this.unitBtnClick();
+                this.showthreed();
+                var detailDivs = document.getElementsByClassName('detailDiv');
+                detailDivs[0].style.display = 'none'; // 强制显示元素
+            },
+            showthreed() {
+                $('.threed').show();
+                $('.vrdiv').hide();
+                $('#vrdiv').removeClass('active');
+                $('#threed').addClass('active');
+            },
+            showvrdiv() {
+                $('.threed').hide();
+                $('.vrdiv').show();
+                $('#threed').removeClass('active');
+                $('#vrdiv').addClass('active');
+                this.unitBtnClick();
+                var detailDivs = document.getElementsByClassName('detailDiv');
+                detailDivs[0].style.display = 'none'; // 强制显示元素
+            },
             handleClicktwo() { },
             backsw() {
                 window.location.href = "qjt.html"
+            },
+            unitBtnClick() {
+                lines.style.display = 'none';
+                lineh.style.display = 'none';
+                redio.style.display = 'none';
+            },
+            getItemList(currentPage, businessId) {
+                var that = this;
+                $.ajax({
+                    url: conpath + "/handleBusiness/query",
+                    type: "post",
+                    contentType: 'application/json',
+                    data: JSON.stringify({
+                        "currentPage": currentPage,
+                        "pageSize": 7,
+                        "businessId": businessId
+                    }),
+                    dataType: "json",
+                    success: function (data) {
+                        that.sxqdList = data.data.handleMatters;
+                        that.total = data.data.total;
+                    }
+                })
             }
         }
     })
 </script>
+<script>
+    var that = this;
+    document.querySelectorAll('.namebtn').forEach(function (element) {
+        element.addEventListener('click', function (event) {
+
+            var detailDivs = document.getElementsByClassName('detailDiv');
+            detailDivs[0].style.display = 'block'; // 强制显示元素
+
+
+
+            var offset2 = $(detailDivs[0]).offset(); // 获取偏移量
+
+            that.nowDiv.popupShow = true;
+            //弹窗的宽高
+            var element2 = document.getElementsByClassName('detailDiv');
+            var offset2 = $('.detailDiv').offset();
+            var rect = element2[0].getBoundingClientRect();
+            var height2 = rect.top;
+            var left2 = rect.left;
+
+            //图中按钮的位置
+            var rect1 = this.getBoundingClientRect();
+            var top1 = rect1.top;
+            var left1 = rect1.left;
+            var width1 = rect1.width;
+
+            var widthDiff = left2 - left1;
+            var heightDiff = top1 - height2;
+
+            var lines = document.getElementById('lines');
+            var lineh = document.getElementById('lineh');
+            var redio = document.getElementById('redio');
+
+            lines.style.display = 'block';
+            lineh.style.display = 'block';
+            redio.style.display = 'block';
+
+            //横线的位置
+            lineh.style.width = widthDiff - width1 / 2 + 'px';
+            lineh.style.left = left1 + width1 / 2 + 'px';
+            lineh.style.top = top1 - heightDiff + 93.5 + 'px';
+
+            //竖线的位置
+            lines.style.height = heightDiff - 100 + 'px';
+            var nowLeft = left1 + width1 / 2;
+            lines.style.left = nowLeft - 1 + 'px';
+            lines.style.top = top1 - heightDiff + 93.5 + 'px';
+            //点的位置
+            redio.style.top = top1 - 15 + 'px';
+            redio.style.left = nowLeft - 6.5 + 'px';
+
+            //获取弹窗内容
+            var popupType = element.getAttribute('data-popupType');
+            that.nowDiv.popupType = popupType ? popupType : "other";
+            //初始化tab栏
+            that.nowDiv.activeNametwo = "sxqd";
+            var id = element.getAttribute('data-id');
+            if (id && id != 12) {
+                that.nowDiv.btnid = id;
+                $.ajax({
+                    url: conpath + "/handleBusiness/" + id,
+                    type: "get",
+                    dataType: "json",
+                    success: function (data) {
+                        var value = data.data;
+                        that.nowDiv.btnName = value.handleBusiness.handleName;
+                        that.nowDiv.rzbmList = value.handleDepts;
+                    }
+                })
+                that.nowDiv.getItemList(1, id)
+            } else if (id && id == 12) {
+                that.nowDiv.btnName = '政务公开专区';
+                that.nowDiv.rzbmList = [];
+                that.nowDiv.sxqdList = [{
+                    id: 1,
+                    mattersName: '政府信息公开指南',
+                    url: 'https://www.cqna.gov.cn/zwgk_254/zfxxgkzn/qzfgkzn/202402/t20240202_12897323.html'
+                },
+                {
+                    id: 2,
+                    mattersName: '政府信息公开申请表',
+                    url: 'https://www.cqna.gov.cn/zwgk_254/zfxxgkzn/qzfgkzn/202402/t20240202_12897323.html'
+                },
+                {
+                    id: 3,
+                    mattersName: '依申请公开流程图',
+                    url: 'https://www.cqna.gov.cn/zwgk_254/ysqgk/202310/t20231008_12406289.html'
+                },
+                {
+                    id: 4,
+                    mattersName: '重庆市南岸区人民政府行政规范性文件',
+                    url: 'https://www.cqna.gov.cn/zwgk_254/zfxxgkml/zcwj/xzgfxwjk/'
+                },
+                {
+                    id: 5,
+                    mattersName: '中华人民共和国国务院公报',
+                    url: 'https://www.gov.cn/gongbao/2024/issue_11606/'
+                },
+                {
+                    id: 6,
+                    mattersName: '重庆市人民政府公报',
+                    url: 'https://www.cq.gov.cn/zwgk/zfxxgkml/zfgb/2024/'
+                }
+                ];
+            } else {
+                that.nowDiv.btnName = '';
+            }
+        });
+    });
+</script>
 
 </html>