Эх сурвалжийг харах

添加按照no查找园区详情

wangjiang988 5 жил өмнө
parent
commit
2409d0c0d6

+ 2 - 0
src/main/java/platform/modules/carrier/dao/ParkDao.java

@@ -41,4 +41,6 @@ public interface ParkDao extends BaseMapper<Park> {
     Integer findBuildingNum(Integer id);
 
     Double findParkRemainArea(Integer id);
+
+    Park findbyNo(@Param("no")String no);
 }

+ 0 - 11
src/main/java/platform/modules/carrier/service/BuildingService.java

@@ -1,25 +1,17 @@
 package platform.modules.carrier.service;
 
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sun.org.apache.xpath.internal.operations.Bool;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.util.StringUtil;
-import org.omg.CORBA.INTERNAL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import platform.common.Constant;
-import platform.common.base.model.Dict;
 import platform.common.base.model.DictionaryItem;
 import platform.common.base.service.BaseService;
 import platform.common.base.service.DictionaryItemService;
 import platform.modules.api.dto.SkyImageCount;
 import platform.modules.build.entity.BuildFloor;
-import platform.modules.build.entity.BuildInfo;
-import platform.modules.build.service.ContractService;
 import platform.modules.build.service.FloorService;
 import platform.modules.carrier.dao.BuildingDao;
 import platform.modules.carrier.dto.*;
@@ -28,10 +20,7 @@ import platform.modules.government.entity.Street;
 import platform.modules.government.service.StreetService;
 import tk.mybatis.mapper.entity.Example;
 
-import javax.swing.plaf.DesktopIconUI;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.Period;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;

+ 20 - 0
src/main/java/platform/modules/carrier/service/ParkService.java

@@ -232,6 +232,24 @@ public class ParkService extends BaseService<Park> {
         return park;
     }
 
+    public Park frontParkDetailByNo(String no) {
+        Park park = findByNo(no);
+        if (park != null) {
+            double sumBuildingArea = carrierStatisticService.getSumParkBuildingArea(park.getId());
+            park.setBuild_area(sumBuildingArea);
+            park.setRest_area(findParkRemainArea(park.getId()));
+            park.setBuild_num(parkDao.findBuildingNum(park.getId()));
+            this.updateSelective(park);
+            //获取其他信息
+            getParkInfo(park);
+        }
+        return park;
+    }
+
+    private Park findByNo(String no) {
+        return parkDao.findbyNo(no);
+    }
+
     /**
      * 获取园区剩余面积
      *
@@ -649,4 +667,6 @@ public class ParkService extends BaseService<Park> {
     public List<SubPark> findParentParkById(String park_id) {
        return parkDao.findParentParkById(park_id);
     }
+
+
 }

+ 11 - 0
src/main/java/platform/modules/carrier/web/CommunityController.java

@@ -117,6 +117,17 @@ public class CommunityController extends BaseController{
         park.setFile_down_url(setFileUrl());
         return ResponseMessage.success("success", park);
     }
+    /**
+     * 查看园区详情(前台)
+     *
+     * @return
+     */
+    @GetMapping("/front/parkDetail/no/{no}")
+    public Object frontParkDetailByNo(@PathVariable String no){
+        Park park = parkService.frontParkDetailByNo(no);
+        park.setFile_down_url(setFileUrl());
+        return ResponseMessage.success("success", park);
+    }
 
     /**
      * 编辑园区信息

+ 3 - 3
src/main/resources/application.yml

@@ -15,9 +15,9 @@ spring:
   #激活哪一个环境的配置文件
   profiles:
 
-    active: dev
+#    active: dev
 #    active: test
-#    active: aliyun
+    active: aliyun
 #    active: vpn
 #    active: prod_in
 #    active: prod_out
@@ -263,7 +263,7 @@ spring:
     password: ${password}
   #redis
   redis:
-    host: 192.168.1.115
+    host: 127.0.0.1
     password:
     port: 6379
     pool:

+ 4 - 0
src/main/resources/mapper/carrier/ParkDao.xml

@@ -184,6 +184,10 @@
         SELECT * FROM ic_sub_park WHERE parent_id = #{park_id}
     </select>
 
+    <select id="findbyNo" resultType="platform.modules.carrier.entity.Park">
+        SELECT * FROM ic_park WHERE no = #{no} and del_flag = false
+    </select>
+
     <select id="findBuildingNum" resultType="java.lang.Integer">
         select count(id) from ic_building where park_id = #{id} and del_flag = false and is_use = true
     </select>