合并

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -236,7 +236,7 @@ public class BuildingController extends BaseController {
 
    @ApiOperation(value = "户型列表根据楼盘ID查询", notes = "户型列表根据楼盘ID查询")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "id", value = "核销id"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "id", value = "楼盘id"),
     })
     @RequestMapping(value = "/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
     public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id){
@@ -255,4 +255,15 @@ public class BuildingController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "户型删除", notes = "户型删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "buildingId:楼盘ID，buildingName:楼盘名称," +
+                    "name:楼盘别名，price:价格，openingDate:开盘时间，coordinate:项目坐标，propertyType:物业类型，dynamic:最新动态，tel:电话,code:樓盤編碼,img:[]多个图片,imgType:图片类型，orderNo：排序\"")
+
+    })
+    @RequestMapping(value = "/building/deleted", method = RequestMethod.DELETE)
+    public ResponseBean buildingDeleted(@RequestBody String parameter, HttpSession session){
+        ResponseBean  responseBean = iBuildingService.buildingUpdate(parameter);
+        return responseBean;
+    }
 }

whole-estate/src/main/java/com/example/wholeestate/controller/PageImgController.java

@@ -66,6 +66,20 @@ public class PageImgController extends BaseController {
         return responseBean;
     }
 
-    
+    @ApiOperation(value = "后台添加首页图片", notes = "后台添加首页图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "imgLocation",value = "图片位置" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "imgType",value = "图片类型" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "url",value = "url图片地址" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "orderNo",value = "orderNo排序" )
+    })
+    @RequestMapping(value = "/pageIm/add", method = RequestMethod.PUT)
+    public ResponseBean pageImAdd(@RequestParam(value = "imgLocation",required = false)String imgLocation,
+                                  @RequestParam(value = "imgType",required = false)String imgType,
+                                  @RequestParam(value = "url",required = false)String url,
+                                  @RequestParam(value = "orderNo",required = false)String orderNo) {
+        ResponseBean responseBean = iPageImgService.pageImAdd(imgLocation,imgType,url,orderNo);
+        return responseBean;
+    }
 
 }

whole-estate/src/main/java/com/example/wholeestate/service/IPageImgService.java

@@ -19,4 +19,14 @@ public interface IPageImgService extends IService<PageImg> {
      * @return
      */
     ResponseBean apageImgSelect(String id);
+
+    /**
+     * 后台图片添加
+     * @param imgLocation
+     * @param imgType
+     * @param url
+     * @param orderNo
+     * @return
+     */
+    ResponseBean pageImAdd(String imgLocation, String imgType, String url, String orderNo);
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -266,17 +266,18 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             Images.setImgType(img.getImgType());
             Images.setUrl(img.getUrl());
             Images.setOrderNo(Integer.valueOf(img.getOrderNo()));
-            Images.setStatus(0);
+            Images.setStatus(1);
             Images.setCreateDate(LocalDateTime.now());
             buildingImgMapper.insert(Images);
             //维护楼盘户型对应表
             ApartmentImg apartmentImg= new ApartmentImg();
             apartmentImg.setApartmentId(idGen.nextId()+"");
             apartmentImg.setImgId(Images.getImgId());
-            apartmentImg.setStatus(0);
+            apartmentImg.setStatus(1);
             apartmentImgMapper.insert(apartmentImg);
 
         }
+        building.setStatus(1);
         buildingApartmentMapper.insert(building);
         responseBean.addSuccess("成功");
         return responseBean;
@@ -345,8 +346,11 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         for (ApartmentImg apartmentImg:buildingImg){
             QueryWrapper<BuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
             buildingImgQueryWrapper.eq("img_id",apartmentImg.getImgId());
+            buildingImgQueryWrapper.eq("img_type","aparment");
              List<BuildingImg> buildingImgList= buildingImgMapper.selectList(buildingImgQueryWrapper);
-             arrayList.add(buildingImgList);
+             for (BuildingImg buImg:buildingImgList) {
+                 arrayList.add(buImg);
+             }
         }
         buildingApartment.setBuildingImgList(arrayList);
         responseBean .addSuccess(buildingApartment);

whole-estate/src/main/java/com/example/wholeestate/service/impl/PageImgServiceImpl.java

@@ -3,12 +3,14 @@ package com.example.wholeestate.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.dao.PageImgMapper;
 import com.example.wholeestate.model.PageImg;
 import com.example.wholeestate.service.IPageImgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -23,6 +25,8 @@ import java.util.List;
 public class PageImgServiceImpl extends ServiceImpl<PageImgMapper, PageImg> implements IPageImgService {
 @Autowired
 private  PageImgMapper pageImgMapper;
+
+    private IdGen idGen = IdGen.get();
     @Override
     public ResponseBean apageImgSelect(String id) {
         ResponseBean responseBean= new ResponseBean();
@@ -37,4 +41,20 @@ private  PageImgMapper pageImgMapper;
         responseBean.addSuccess(pageImgList);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean pageImAdd(String imgLocation, String imgType, String url, String orderNo) {
+        ResponseBean responseBean= new ResponseBean();
+        PageImg pageImg= new PageImg();
+                pageImg.setPageId(idGen.nextId()+"");
+                pageImg.setImgLocation(imgLocation);
+                pageImg.setImgType(imgType);
+                pageImg.setUrl(url);
+                pageImg.setStatus(0);
+                pageImg.setCreateDate(LocalDateTime.now());
+                pageImg.setOrderNo(Integer.valueOf(orderNo));
+        pageImgMapper.insert(pageImg);
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
 }