新需求调整

src/main/java/com/huiju/estateagents/controller/TaBuildingPanoramaController.java

@@ -16,6 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -42,22 +45,21 @@ public class TaBuildingPanoramaController extends BaseController {
     private ITaBuildingApartmentService taBuildingApartmentService;
 
     /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
+     * 查询列表
      * @return
      */
-    @RequestMapping(value="/panorama",method= RequestMethod.GET)
-    public ResponseBean taBuildingPanoramaList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/panorama/{buildingId}",method= RequestMethod.GET)
+    public ResponseBean taBuildingPanoramaList(@PathVariable String buildingId,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaBuildingPanorama> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingPanorama> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            
             queryWrapper.orderByDesc("create_date");
+            List<TaBuildingPanorama> result = iTaBuildingPanoramaService.list(queryWrapper);
 
-            IPage<TaBuildingPanorama> result = iTaBuildingPanoramaService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -72,7 +74,7 @@ public class TaBuildingPanoramaController extends BaseController {
      * 获取全景图的户型列表
      * @return
      */
-    @RequestMapping(value="/panorama/apartment",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/panorama/apartment",method= RequestMethod.GET)
     public ResponseBean getApartmentList(@RequestParam(value ="buildingId") String buildingId,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -82,7 +84,6 @@ public class TaBuildingPanoramaController extends BaseController {
             queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             queryWrapper.eq("apartment_type",CommConstant.APARTMENT_TYPR_APART);
             queryWrapper.eq("building_id",buildingId);
-            queryWrapper.eq("org_id",getOrgId(request));
             List<TaBuildingApartment> apartmentList = taBuildingApartmentService.list(queryWrapper);
 
             //获取此楼盘下所有已经有全景图的户型
@@ -92,8 +93,15 @@ public class TaBuildingPanoramaController extends BaseController {
             panoramaQueryWrapper.eq("building_id",buildingId);
             panoramaQueryWrapper.eq("org_id",getOrgId(request));
             List<TaBuildingPanorama> panoramaList = iTaBuildingPanoramaService.list(panoramaQueryWrapper);
-            //去除已经有全景图的户型
-            List<TaBuildingApartment> resultList = apartmentList.stream().filter(x -> !x.getApartmentId().equals(panoramaList.stream().map(e -> e.getApartmentId()))).collect(Collectors.toList());
+            List<String> stringList = panoramaList.stream().map(TaBuildingPanorama::getApartmentId).collect(Collectors.toList());
+
+            List<TaBuildingApartment> resultList = new ArrayList<>();
+            //过滤已经选择的
+            apartmentList.forEach(e -> {
+                if (!stringList.contains(e.getApartmentId())){
+                    resultList.add(e);
+                }
+            });
 
             responseBean.addSuccess(resultList);
         }catch (Exception e){
@@ -110,9 +118,17 @@ public class TaBuildingPanoramaController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/panorama",method= RequestMethod.POST)
-    public ResponseBean taBuildingPanoramaAdd(@RequestBody TaBuildingPanorama taBuildingPanorama){
+    public ResponseBean taBuildingPanoramaAdd(@RequestBody TaBuildingPanorama taBuildingPanorama,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taBuildingPanorama.setStatus(CommConstant.STATUS_NORMAL);
+            taBuildingPanorama.setCreateDate(LocalDateTime.now());
+            taBuildingPanorama.setOrgId(getOrgId(request));
+            //把户型给内容
+            if (taBuildingPanorama.getPanoramaType().equals(CommConstant.PANORAMA_TYPE_APARTMENT)){
+                TaBuildingApartment apartment = taBuildingApartmentService.getById(taBuildingPanorama.getApartmentId());
+                taBuildingPanorama.setContent(apartment.getApartmentName());
+            }
             if (iTaBuildingPanoramaService.save(taBuildingPanorama)){
                 responseBean.addSuccess(taBuildingPanorama);
             }else {