更新

house-biz/src/main/resources/mapper/TmEstateMapper.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ljq.house.biz.dao.TmEstateDao">
+
+    <select id="selectTmEstateList" resultType="com.ljq.house.biz.model.TmEstate">
+        select * from tm_estate limit 1000
+    </select>
+
+    <select id="countAll" resultType="java.lang.Long">
+        select count(1) from tm_estate where enable = 1
+        <if test="deptId != null  ">
+            and CREATE_USER_DEPT_ID = #{deptId};
+        </if>
+    </select>
+
+    <select id="selectTmEstateById" resultType="com.ljq.house.biz.model.TmEstate">
+        select * from tm_estate
+        <where>
+            <if test="estateId != null and estateId != '' ">
+                and estate_id = #{estateId}
+            </if>
+        </where>
+        limit 1
+    </select>
+
+    <delete id="delete">
+    delete from tm_estate
+    where estate_id=#{estate_id}
+   </delete>
+
+
+    <update id="updateByIdSelectively" parameterType="com.ljq.house.biz.model.TmEstate">
+        update tm_estate
+        <set>
+            <if test="tmEstate.estateName != null and tmEstate.estateName.trim() != ''">`estate_name` = #{tmEstate.estateName},</if>
+            <if test="tmEstate.address != null and tmEstate.address.trim() != ''">`address` = #{tmEstate.address},</if>
+            <if test="tmEstate.buildingType != null and tmEstate.buildingType.trim() != ''">`building_type` = #{tmEstate.buildingType},</if>
+            <if test="tmEstate.period != null ">`period` = #{tmEstate.period},</if>
+            <if test="tmEstate.developer != null and tmEstate.developer.trim() != ''">`developer` = #{tmEstate.developer},</if>
+            <if test="tmEstate.propertyType != null and tmEstate.propertyType.trim() != ''">`property_type` = #{tmEstate.propertyType},</if>
+            <if test="tmEstate.propertyCompany != null and tmEstate.propertyCompany.trim() != ''">`property_company` = #{tmEstate.propertyCompany},</if>
+            <if test="tmEstate.estateFeature != null and tmEstate.estateFeature.trim() != ''">`estate_feature` = #{tmEstate.estateFeature},</if>
+            <if test="tmEstate.buildingArea != null">`building_area` = #{tmEstate.buildingArea},</if>
+            <if test="tmEstate.floorSpace != null">`floor_space` = #{tmEstate.floorSpace},</if>
+            <if test="tmEstate.plotRatio != null">`plot_ratio` = #{tmEstate.plotRatio},</if>
+            <if test="tmEstate.greeningRate != null">`greening_rate` = #{tmEstate.greeningRate},</if>
+            <if test="tmEstate.carports != null">`carports` = #{tmEstate.carports},</if>
+            <if test="tmEstate.carportRate != null">`carport_rate` = #{tmEstate.carportRate},</if>
+            <if test="tmEstate.heatingType != null and tmEstate.heatingType.trim() != ''">`heating_type` = #{tmEstate.heatingType},</if>
+            <if test="tmEstate.waterSupply != null and tmEstate.waterSupply.trim() != ''">`water_supply` = #{tmEstate.waterSupply},</if>
+            <if test="tmEstate.powerSupply != null and tmEstate.powerSupply.trim() != ''">`power_supply` = #{tmEstate.powerSupply},</if>
+            <if test="tmEstate.additionsImages != null and tmEstate.additionsImages.trim() != ''">`additions_images` = #{tmEstate.additionsImages},</if>
+            <if test="tmEstate.country != null and tmEstate.country.trim() != ''">`country` = #{tmEstate.country},</if>
+            <if test="tmEstate.province != null and tmEstate.province.trim() != ''">`province` = #{tmEstate.province},</if>
+            <if test="tmEstate.city != null and tmEstate.city.trim() != ''">`city` = #{tmEstate.city},</if>
+            <if test="tmEstate.district != null and tmEstate.district.trim() != ''">`district` = #{tmEstate.district},</if>
+            <if test="tmEstate.reserve1 != null and tmEstate.reserve1.trim() != ''">`reserve1` = #{tmEstate.reserve1},</if>
+            <if test="tmEstate.reserve2 != null and tmEstate.reserve2.trim() != ''">`reserve2` = #{tmEstate.reserve2},</if>
+            <if test="tmEstate.videoCoverImage != null and tmEstate.videoCoverImage.trim() != ''">`video_cover_image` = #{tmEstate.videoCoverImage},</if>
+            <if test="tmEstate.coverImage != null and tmEstate.coverImage.trim() != ''">`cover_image` = #{tmEstate.coverImage},</if>
+            <if test="tmEstate.buildingNum != null">`building_num` = #{tmEstate.buildingNum},</if>
+            <if test="tmEstate.houseNum != null">`house_num` = #{tmEstate.houseNum},</if>
+            <if test="tmEstate.salesType != null">`sales_type` = #{tmEstate.salesType},</if>
+            <if test="tmEstate.longitude != null">`longitude` = #{tmEstate.longitude},</if>
+            <if test="tmEstate.latitude != null">`latitude` = #{tmEstate.latitude},</if>
+            <if test="tmEstate.enable != null">`enable` = #{tmEstate.enable},</if>
+            <if test="tmEstate.onSaleTime != null">`on_sale_time` = #{tmEstate.onSaleTime},</if>
+            last_modify_datetime = now()
+        </set>
+        where `estate_id` = #{tmEstate.estateId}
+        limit 1
+    </update>
+</mapper>

house-biz/src/main/resources/mapper/custom/MyTmAdminMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ljq.house.biz.dao.custom.MyTmAdminDao">
+
+
+    <select id="getAdminList" resultType="com.ljq.house.biz.vo.response.TmAdminVo">
+     select admin.*, dept.name as dept_name from tm_admin admin
+         left join sys_dept dept on (dept.dept_id = admin.dept_id and dept.del_flag = 0)
+          ${ew.customSqlSegment}
+   </select>
+
+
+</mapper>

house-common/src/main/java/com/ljq/house/common/service/HouseHelperService.java

@@ -8,6 +8,9 @@ import com.ljq.house.biz.dao.*;
 import com.ljq.house.biz.model.*;
 import com.ljq.house.common.enums.ResultCodeEnum;
 import com.ljq.house.common.exception.CommonBaseException;
+import com.ljq.house.common.utils.DataUtils;
+import com.ljq.house.common.utils.HttpClientUtil;
+import com.ljq.house.common.utils.SHAUtils;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,10 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author abnerhou
@@ -30,7 +30,7 @@ import java.util.Map;
 public class HouseHelperService {
 
     @Autowired
-    private TmHouseDao tmHouseDao;
+    private TmEstateDao tmEstateDao;
 
     @Autowired
     private TmUserDao tmUserDao;
@@ -42,13 +42,16 @@ public class HouseHelperService {
     private TmAgencyDao tmAgencyDao;
 
     @Autowired
+    private TmHouseDao tmHouseDao;
+
+    @Autowired
     private TmHouseAgencyRelationDao tmHouseAgencyRelationDao;
 
     public Map<String ,Object> getHouseInfoByHouse(TmHouse tmHouse , String userId, String roomId , String type , String callBackUrl){
-        QueryWrapper<TmHouse> estateQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<TmEstate> estateQueryWrapper = new QueryWrapper<>();
         estateQueryWrapper.eq("estate_id" , tmHouse.getEstateId());
         estateQueryWrapper.last("limit 1");
-        TmHouse tmEstate = tmHouseDao.selectOne(estateQueryWrapper);
+        TmEstate tmEstate = tmEstateDao.selectOne(estateQueryWrapper);
 
         QueryWrapper<TmHouseAgencyRelation> agencyRelationQuery = new QueryWrapper<>();
         agencyRelationQuery.eq("house_id" , tmHouse.getHouseId());
@@ -87,7 +90,7 @@ public class HouseHelperService {
         houseQueryWrapper.ne("house_id" , tmHouse.getHouseId());
         houseQueryWrapper.eq("enable" ,1);
         if(StringUtils.isNoneBlank(tmHouse.getHouseType())){
-             houseQueryWrapper.like("house_type" , tmHouse.getHouseType());
+            houseQueryWrapper.like("house_type" , tmHouse.getHouseType());
         }
         if(null != tmHouse.getPrice()){
             if(tmHouse.getPrice().compareTo(new BigDecimal(500000)) > 0){
@@ -142,6 +145,24 @@ public class HouseHelperService {
     }
 
 
+    public List<Map<String , Object>> getOneLevelAgencyRecHouseInfo(TmHouse tmHouse , String userId, String roomId , String type , String callBackUrl){
+        List<TmHouse> recommendHouseList = getAgencyHouseByHouseWithoutSelf(tmHouse);
+        List<Map<String , Object>> recommendHouseInfoList = formatOneLevelAgentRecommendHouse(recommendHouseList , userId , roomId , type, callBackUrl);
+        return recommendHouseInfoList;
+    }
+    public List<Map<String , Object>> formatOneLevelAgentRecommendHouse(List<TmHouse> recommendHouseList , String userId, String roomId , String type , String callBackUrl){
+        List<Map<String , Object>> recommendHouseInfoList = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(recommendHouseList)) {
+            for (TmHouse house : recommendHouseList) {
+                Map<String, Object> houseMap = getHouseInfoByHouse(house, userId, roomId, type, callBackUrl);
+                if (!CollectionUtils.isEmpty(houseMap)) {
+                    recommendHouseInfoList.add(houseMap);
+                }
+            }
+        }
+        return recommendHouseInfoList;
+    }
+
     public List<Map<String , Object>> formatAgentRecommendHouseWithRecommend(List<TmHouse> recommendHouseList , String userId, String roomId , String type , String callBackUrl){
         List<Map<String , Object>> recommendHouseInfoList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(recommendHouseList)){
@@ -203,7 +224,7 @@ public class HouseHelperService {
     }
 
     public Map<String , Object> assembleOpenApiData(TmHouse tmHouse , TmAgency tmAgency ,
-                                                    TmUser tmUser , TmHouse tmEstate){
+                                                    TmUser tmUser , TmEstate tmEstate){
         Map<String , Object> result = new HashMap<>();
         if(null != tmHouse){
             result.put("houseId" , tmHouse.getHouseId());
@@ -216,22 +237,38 @@ public class HouseHelperService {
             //TODO这里应该加载楼盘上的
             result.put("estateReferenceAveragePrice" , tmHouse.getUnitPrice());
             result.put("houseTypeImages" , tmHouse.getHouseTypeImages());
+            result.put("enable" , tmHouse.getEnable());
+            result.put("wxAqrCode" , tmHouse.getWxAqrCode());
         }
 
         if(null != tmEstate){
             result.put("estateId" , tmEstate.getEstateId());
+            result.put("earlistHandOver" , tmEstate.getEarliestHandOver());
+            result.put("onSaleTime" , tmEstate.getOnSaleTime());
+            result.put("estateDeveloper" , tmEstate.getDeveloper());
+            result.put("estatePeriodInt" , tmEstate.getPeriod());
             result.put("estateAddress" , tmEstate.getAddress());
             result.put("estateIntroduceVideo" , tmEstate.getIntroduceVideo());
             result.put("estateImages" , tmEstate.getAdditionsImages());
+            result.put("estateLongitude" , tmEstate.getLatitude());
+            result.put("estateLatitude" , tmEstate.getLongitude());
             result.put("estateVideoCoverImage" , tmEstate.getVideoCoverImage());
             result.put("estateCoverImage" , tmEstate.getCoverImage());
+            result.put("estateIntroduceVideoDesc" , tmEstate.getIntroduceVideoDesc());
         }
 
         if(null != tmAgency){
-
-            result.put("agencyAvatar" , tmAgency.getAvatar());
+            result.put("agencyId" , tmAgency.getAgencyUserId());
+            result.put("agencyName" , tmAgency.getName());
+            result.put("agencyStore" , tmAgency.getStore());
+            result.put("agencyTag" , tmAgency.getTag());
+            result.put("agnencyPhone" , tmAgency.getPhone());
+            result.put("agencyHalfYearVolume" , tmAgency.getVolumeHalfYear());
+            result.put("agencyDealAverage" , tmAgency.getDealAveragePeriod());
+            result.put("agencyRecentRecommend" , tmAgency.getRecentRecommendVrs());
             result.put("agencyAvatar" , tmAgency.getAvatar());
             result.put("agencyPassImage" , tmAgency.getWorkPassImage());
+            result.put("agencyTagImage" , tmAgency.getTagImage());
 
         }
 
@@ -244,5 +281,55 @@ public class HouseHelperService {
 
     }
 
+    public String sendDataToOpenApi(String houseId , String fdvrhouseCallBackUrl ,
+                                    String userId ,String roomId , String type ,
+                                    String fdAppId ,String fdAppSecret ,String apiVrHouseHost){
+        if(StringUtils.isBlank(houseId)){
+            throw new CommonBaseException(ResultCodeEnum.D017);
+        }
+        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("house_id" , houseId);
+        queryWrapper.last("limit 1");
+        TmHouse dbHouse = tmHouseDao.selectOne(queryWrapper);
+        if(null == dbHouse){
+            throw  new CommonBaseException(ResultCodeEnum.D101 , "房源信息不存在");
+        }
+
+        String callBackUrl = fdvrhouseCallBackUrl;
+        Map<String , Object> data = getHouseInfoByHouse(dbHouse , userId , roomId , type , callBackUrl);
+
+        //这里只包一层推荐房源，推荐房源里面不再插入推荐房源，由api平台建立房源和推荐房源的关联关系
+        List<Map<String , Object>> recommends = getOneLevelAgencyRecHouseInfo(dbHouse , userId , roomId , type ,callBackUrl);
+        data.put("recommend_houses" , JSONObject.toJSONString(recommends));
+        Long timeStamp = System.currentTimeMillis();
+
+        //token=app_id+app_secret+timestamp
+        String token = SHAUtils.getSHA256(fdAppId + fdAppSecret + timeStamp.toString());
+        String dataStr = JSONObject.toJSONString(data);
+        Map<String , Object> dataMap = JSONObject.parseObject(dataStr);
+
+        Map<String , Object> sortMap = DataUtils.sortMapByKey(dataMap);
+        String sortMapStr = JSONObject.toJSONString(sortMap);
+        log.info("待加密的数据={}" ,sortMapStr + fdAppSecret + timeStamp);
+
+        String sign  = SHAUtils.getSHA256(sortMapStr + fdAppSecret + timeStamp);
+
+        String openApiurl = apiVrHouseHost + "/api/vrhouse/format?appId=" + fdAppId + "&sign=" + sign + "&token=" + token + "&timeStamp=" + timeStamp;
+        log.info("请求openApi的url={}", openApiurl);
+        String apiResultStr = HttpClientUtil.doPostJson(openApiurl , dataStr);
+        return apiResultStr;
+    }
+
+    public String getHouseInfoFromOpenApi(TmHouse tmHouse , String openApiHost){
+
+        if(null != tmHouse && StringUtils.isNotBlank(tmHouse.getSceneNum())){
+            if(StringUtils.isNotBlank(openApiHost)){
+                String url = openApiHost + "/vrhouse/4dage/getHouseInfo?scene_code=" + tmHouse.getSceneNum();
+                url  += "&user_id=&terminal_type";
+                return  HttpClientUtil.doGet(url);
+            }
+        }
+        return "";
+    }
 
 }

house-common/src/main/java/com/ljq/house/common/service/UserService.java

@@ -97,12 +97,13 @@ public class UserService {
         return true;
     }
 
-    public TmUser getUserByName(String name){
-        if(StringUtils.isBlank(name)){
+    public TmUser getUserByName(String wxopenid){
+        if(StringUtils.isBlank(wxopenid)){
             return null;
         }
         QueryWrapper<TmUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name" , name);
+//        queryWrapper.eq("name" , name);
+        queryWrapper.eq("WX_OPEN_ID",wxopenid);
         queryWrapper.eq("enable" , 1);
         queryWrapper.last("limit 1");
         return tmUserDao.selectOne(queryWrapper);

house-common/src/main/java/com/ljq/house/common/utils/DataUtils.java

@@ -6,8 +6,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author abnerhou
@@ -118,4 +117,21 @@ public class DataUtils {
             }
         }
     }
+
+    /**
+     *  根据map的key进行字典升序排序
+     * @param map
+     * @return map
+     */
+    public static Map<String, Object> sortMapByKey(Map<String, Object>map) {
+        Map<String, Object> treemap = new TreeMap<String, Object>(map);
+        List<Map.Entry<String, Object>> list = new ArrayList<Map.Entry<String, Object>>(treemap.entrySet());
+        Collections.sort(list, new Comparator<Map.Entry<String, Object>>() {
+            @Override
+            public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+                return org.apache.commons.lang3.StringUtils.compare(o1.getKey() , o2.getKey());
+            }
+        });
+        return treemap;
+    }
 }

house-web/src/main/java/com/ljq/house/app/controller/AppTmHouseController.java

@@ -607,33 +607,9 @@ public class AppTmHouseController {
                                            @RequestParam(value =  "user_id") String userId ,
                                            @RequestParam(value =  "room_id") String roomId,
                                            @RequestParam(value =  "type") String type) {
-        if(StringUtils.isBlank(houseId)){
-            throw new CommonBaseException(ResultCodeEnum.D017);
-        }
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("house_id" , houseId);
-        queryWrapper.last("limit 1");
-        TmHouse dbHouse = tmHouseDao.selectOne(queryWrapper);
-        if(null == dbHouse){
-            throw  new CommonBaseException(ResultCodeEnum.D101 , "房源信息不存在");
-        }
-
-        String callBackUrl = fdvrhouseCallBackUrl;
-        Map<String , Object> data = houseHelperService.getHouseInfoByHouse(dbHouse , userId , roomId , type , callBackUrl);
-
-        List<Map<String , Object>> recommends = houseHelperService.getAgencyRecHouseInfo(dbHouse , userId , roomId , type ,callBackUrl);
-        data.put("recommend_houses" , JSONObject.toJSONString(recommends));
-        Long timeStamp = System.currentTimeMillis();
-
-        //token=app_id+app_secret+timestamp
-        String token = SHAUtils.getSHA256(fdAppId + fdAppSecret + timeStamp.toString());
-
-        String dataStr = JSONObject.toJSONString(data);
-        String sign  = SHAUtils.getSHA256(dataStr + fdAppSecret + timeStamp);
 
-        String openApiurl = apiVrHouseHost + "/api/format?appId=" + fdAppId + "&sign=" + sign + "&token=" + token + "&timeStamp=" + timeStamp;
-        log.info("请求openApi的url={}", openApiurl);
-        String apiResultStr = HttpClientUtil.doPostJson(openApiurl , dataStr);
+        String apiResultStr = houseHelperService.sendDataToOpenApi(houseId , fdvrhouseCallBackUrl , userId ,
+                roomId , type ,fdAppId , fdAppSecret , apiVrHouseHost);
         Result res = JSONObject.parseObject(apiResultStr , Result.class);
 
         return res;

house-web/src/main/java/com/ljq/house/app/controller/AppTmUserController.java

@@ -123,7 +123,7 @@ public class AppTmUserController {
 
         //先通过wxOpenId获取用户表，查看用户是否已经存在
         //先通过手机号获取用户表，查看用户是否已经存在
-        TmUser dbUser = userService.getUserByName(wxUserInfoDto.getNickName());
+        TmUser dbUser = userService.getUserByName(wxUserInfoDto.getOpenId());
         if (null == dbUser) {
             dbUser = userService.addNewUser("", wxOpenId, nickName, avatarUrl);
             log.info("新插入的用户id={}", (null != dbUser ? dbUser.getUserId() : ""));

house-web/src/main/resources/application-test.properties

@@ -86,7 +86,7 @@ info.version=1.0
 
 #redis
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+spring.redis.host=120.25.146.52
 spring.redis.port=6379
 spring.redis.password=
 # ���ӳ�ʱʱ�� ��λ ms�����룩

house-web/src/main/resources/application.properties

@@ -1,2 +1,2 @@
-spring.profiles.active=dev
-#spring.profiles.active=dev
+#spring.profiles.active=test
+spring.profiles.active=dev