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

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

@@ -27,6 +27,15 @@ public class SpecialServiceController {
         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) {

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

@@ -35,7 +35,7 @@ public class SellBuild implements Serializable {
     * 面积(平方米)
     */
 
-    private Float space;
+    private String space;
     /**
     * 用途
     */

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

@@ -36,4 +36,8 @@ public class SpecialService implements Serializable {
     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/service/SpecialServiceService.java

@@ -28,4 +28,6 @@ public interface SpecialServiceService{
 
 
     HashMap<String,Object> findByParkId(Long id);
+
+    List<SpecialService> findByParkIds(Long id);
 }

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

@@ -56,6 +56,13 @@ public class SpecialServiceServiceImpl implements SpecialServiceService{
         map.put("parkData",parkData);
         return map;
     }
+
+    @Override
+    public List<SpecialService> findByParkIds(Long id) {
+        List<SpecialService> byParkId = specialServiceDao.findByParkId(id);
+        return byParkId;
+    }
+
 }
 
 

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

@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.example.nngkxxdp.entity.SellBuild">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="area" column="area" jdbcType="VARCHAR"/>
-            <result property="space" column="space" jdbcType="FLOAT"/>
+            <result property="space" column="space" jdbcType="VARCHAR"/>
             <result property="application" column="application" jdbcType="VARCHAR"/>
             <result property="carrierName" column="carrier_name" jdbcType="VARCHAR"/>
             <result property="subtitle" column="subtitle" jdbcType="VARCHAR"/>

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

@@ -9,6 +9,9 @@
             <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"/>