Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -27,7 +27,7 @@ import com.huiju.estateagents.base.BaseController;
  * @since 2019-07-29
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TdBuildingTypeController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdBuildingTypeController.class);
@@ -42,7 +42,7 @@ public class TdBuildingTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdBuildingType",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/tdBuildingType",method= RequestMethod.GET)
     public ResponseBean tdBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -66,7 +66,7 @@ public class TdBuildingTypeController extends BaseController {
      * @param tdBuildingType 实体对象
      * @return
      */
-    @RequestMapping(value="/tdBuildingType",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/tdBuildingType",method= RequestMethod.POST)
     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -87,7 +87,7 @@ public class TdBuildingTypeController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/tdBuildingType/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/tdBuildingType/{id}", method= RequestMethod.DELETE)
     public ResponseBean tdBuildingTypeDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -109,7 +109,7 @@ public class TdBuildingTypeController extends BaseController {
      * @param tdBuildingType 实体对象
      * @return
      */
-    @RequestMapping(value="/tdBuildingType/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/tdBuildingType/{id}",method= RequestMethod.PUT)
     public ResponseBean tdBuildingTypeUpdate(@PathVariable Integer id,
                                         @RequestBody TdBuildingType tdBuildingType){
         ResponseBean responseBean = new ResponseBean();
@@ -130,7 +130,7 @@ public class TdBuildingTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdBuildingType/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/tdBuildingType/{id}",method= RequestMethod.GET)
     public ResponseBean tdBuildingTypeGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -222,4 +222,7 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private Integer isSave;
+
+    @TableField(exist = false)
+    private List<TaBuildingProjectType> buildingProjectType;
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingProjectTypeMapper.java

@@ -1,9 +1,14 @@
 package com.huiju.estateagents.mapper;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaBuildingProjectType;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,4 +21,16 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaBuildingProjectTypeMapper extends BaseMapper<TaBuildingProjectType> {
 
+    /**
+     * 根据 楼盘id 删除
+     * @param buildingId
+     */
+    @Delete("delete from ta_building_project_type where building_id = #{buildingId}")
+    void deleteByBuildingId(@Param("buildingId") String buildingId);
+
+    /**
+     * 批量添加
+     * @param list
+     */
+    void insertBuildingProjectTypeBatch(@Param("list") List list);
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,6 +13,8 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jodd.util.CollectionUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,6 +65,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     TdCityMapper tdCityMapper;
 
+    @Autowired
+    private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
+
 
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
@@ -105,6 +111,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingTag> buildingTags= taBuildingTagMapper.selectList(BuildingTagQueryWrapper);
         building.setBuildingTag(buildingTags);
 
+        // 项目类型
+        QueryWrapper<TaBuildingProjectType> buildingProjectTypeQueryWrapper = new QueryWrapper<>();
+        buildingProjectTypeQueryWrapper.eq("building_id", building.getBuildingId());
+        List<TaBuildingProjectType> taBuildingProjectTypes = taBuildingProjectTypeMapper.selectList(buildingProjectTypeQueryWrapper);
+        building.setBuildingProjectType(taBuildingProjectTypes);
+
         return ResponseBean.success(building);
     }
 
@@ -192,6 +204,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             city.setStatus("1");
             tdCityMapper.updateById(city);
         }
+
+        // 项目类型
+        // 先删除之前关联的
+        taBuildingProjectTypeMapper.deleteByBuildingId(building.getBuildingId());
+        JSONArray buildingProjectTypeArray = object.getJSONArray("buildingProjectType");
+        if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
+            taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray);
+        }
         return ResponseBean.success("");
     }
 
@@ -231,6 +251,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingTag> buildingTags = JSONObject.parseArray(tagStr, TaBuildingTag.class);
         insertTagBatch(buildingTags, building.getBuildingId());
 
+        // 项目类型
+        // 先删除之前关联的
+        JSONArray buildingProjectTypeArray = object.getJSONArray("buildingProjectType");
+        if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
+            taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray);
+        }
+
         return ResponseBean.success("");
     }
 

src/main/resources/mapper/TaBuildingProjectTypeMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaBuildingProjectTypeMapper">
 
+    <insert id="insertBuildingProjectTypeBatch" parameterType="list" >
+        insert into ta_building_project_type
+        (building_id, price, decoration, rights_year, status, building_type_id, building_type_name)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.buildingId}, #{item.price}, #{item.decoration}, #{item.rightsYear}
+            , #{item.status}, #{item.buildingTypeId}, #{item.buildingTypeName})
+        </foreach>
+    </insert>
+
 </mapper>