feats

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

@@ -16,12 +16,14 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TaShareMapper;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
+import net.bytebuddy.asm.Advice;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -85,6 +87,14 @@ public class MiniAppController extends BaseController {
     @Autowired
     public ITdPointsRulesService iTdPointsRulesService;
 
+    @Autowired
+    public ITaMiniappService iTaMiniappService;
+
+    @Autowired
+    public TaOrgCityMapper taOrgCityMapper;
+
+    @Autowired
+    public ITdCityService iTdCityService;
 
     /**
      * 验证接入
@@ -97,6 +107,60 @@ public class MiniAppController extends BaseController {
         return echostr;
     }
 
+
+    /**
+     * 小程序数据预拉取 https://developers.weixin.qq.com/miniprogram/dev/framework/ability/pre-fetch.html
+     * @param appid
+     * @param timestamp
+     * @param token
+     * @param code
+     * @param path
+     * @param query
+     * @param scene
+     * @return
+     */
+    @GetMapping("/preload")
+    public ResponseBean getPreloadData(
+            @RequestParam(name = "appid") String appid,
+            @RequestParam(name = "timestamp") Long timestamp,
+            String token,
+            String code,
+            String path,
+            String query,
+            Integer scene
+    ) {
+        // 获取小程序信息
+        TaMiniapp taMiniapp = iTaMiniappService.getInfoWithTpls(appid);
+        if (null == taMiniapp) {
+            return ResponseBean.error("当前 appid 未在系统内注册", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 获取组织信息
+        TaOrg taOrg = taOrgService.getById(taMiniapp.getOrgId());
+        if (null == taOrg) {
+            return ResponseBean.error("当前 appid 未设置对应组织", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 获取城市列表
+        QueryWrapper<TaOrgCity> queryCity = new QueryWrapper<>();
+        queryCity.eq("id", taOrg.getOrgId());
+        queryCity.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectList(queryCity);
+
+        // 获取默认扩展设置
+        QueryWrapper<TaCustomImg> queryExt = new QueryWrapper<>();
+        queryExt.eq("org_id", taOrg.getOrgId());
+        queryExt.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaCustomImg> taCustomImg = iTaCustomImgService.list(queryExt);
+
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("miniapp", taMiniapp);
+            put("org", taOrg);
+            put("cityList", taOrgCityList);
+            put("customImg", taCustomImg);
+        }});
+    }
+
     /**
      * 登陆接口
      */
@@ -104,8 +168,10 @@ public class MiniAppController extends BaseController {
     public ResponseBean login(
             String code,
             @RequestParam(required = false) String from,
-            @RequestParam(required = false)String recommender,
-            @RequestParam(required = false)String targetId,
+            @RequestParam(required = false) String recommender,
+            @RequestParam(required = false) String targetId,
+            @RequestParam(required = false) String lon,
+            @RequestParam(required = false) String lat,
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
@@ -218,7 +284,7 @@ public class MiniAppController extends BaseController {
             // 所有人员都返回 org yansen 2019-11-13 19:56:18
 //            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
                 QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
-                orgQueryWrapper.eq("org_id",taPerson.getOrgId());
+                orgQueryWrapper.eq("org_id", orgId);
                 TaOrg org = taOrgService.getOne(orgQueryWrapper);
                 taPerson.setOrg(org);
 //            }
@@ -230,21 +296,25 @@ public class MiniAppController extends BaseController {
 
             //返回是否授权标识
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("org_id", orgId);
             queryWrapper.eq("img_type", "auth");
             List<TaCustomImg>  taCustomImgs = iTaCustomImgService.list(queryWrapper);
             result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true: false);
 
-
             String token = (String) miniResp.get("token");
             sysTokenService.saveToken(token);
 
             //把積分規則返回給小程序
             QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
-            tdPointsRulesQueryWrapper.eq("org_id",taPerson.getOrgId());
+            tdPointsRulesQueryWrapper.eq("org_id", orgId);
             List<TdPointsRules> rulesPointList = iTdPointsRulesService.list(tdPointsRulesQueryWrapper);
             result.put("rulesPointList",rulesPointList);
 
+            // 定位城市
+            String location = null == lon ? null : lon + "," + lat;
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
+            result.put("city", tdCity);
+
             return ResponseBean.success(result);
         } catch (WxErrorException e) {
             System.err.println(e.getError());

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

@@ -322,9 +322,9 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/building/main", method = RequestMethod.GET)
-    public ResponseBean getWxMainBuildingList(HttpServletRequest request){
+    public ResponseBean getWxMainBuildingList(String cityId, HttpServletRequest request){
         Integer orgId = getOrgId(request);
-        return taBuildingService.getWxMainBuildingList(orgId);
+        return taBuildingService.getWxMainBuildingList(cityId, orgId);
     }
 
     /**

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

@@ -189,8 +189,9 @@ public class TdCityController extends BaseController {
     @RequestMapping(value="/wx/location/city",method= RequestMethod.GET)
     public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
         try {
-            TdCity tdCity = iTdCityService.getLocationCity(location);
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
             responseBean.addSuccess(tdCity);
         }catch (Exception e){
             logger.error("tdCityList -=- {}",e.toString());

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -52,6 +52,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/",
             "/api/wx/tdCity",
+            "/api/wx/preload",
             "/api/admin/signin",
             "/api/taCheckin/activity",
             "/api/wx/qrcode/scene",

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

@@ -92,5 +92,5 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      */
     int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
 
-    List<TaBuilding> selectMainBuildings(@Param("orgId") Integer orgId);
+    List<TaBuilding> selectMainBuildings(@Param("cityId") String cityId, @Param("orgId") Integer orgId);
 }

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

@@ -26,4 +26,6 @@ public interface TdCityMapper extends BaseMapper<TdCity> {
      * @return
      */
     List<TdCity> selectWxCity(@Param("orgId") Integer orgId);
+
+    TdCity getOrgDefaultCity(@Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -133,7 +133,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * 微信小程序 楼盘列表
      * @return
      */
-    ResponseBean getWxMainBuildingList(Integer orgId);
+    ResponseBean getWxMainBuildingList(String cityId, Integer orgId);
 
     ResponseBean getWxBuildingById(String buildingId);
 

src/main/java/com/huiju/estateagents/service/ITaMiniappService.java

@@ -14,4 +14,6 @@ import com.huiju.estateagents.entity.TaMiniapp;
 public interface ITaMiniappService extends IService<TaMiniapp> {
 
     TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp, Integer channelId) throws Exception;
+
+    TaMiniapp getInfoWithTpls(String appid);
 }

src/main/java/com/huiju/estateagents/service/ITdCityService.java

@@ -18,12 +18,12 @@ public interface ITdCityService extends IService<TdCity> {
     List<TdCity> selectCity(String leveltype,String status);
 
     // 微信端城市
-    List<TdCity> selectWxCity(String leveltype,Integer orgId);
+    List<TdCity> selectWxCity(String leveltype, Integer orgId);
 	
 	/**
 	 * 根据经纬度获取城市详情信息
 	 * @param location
 	 * @return
 	 */
-	TdCity getLocationCity(String location);
+	TdCity getLocationCity(String location, Integer orgId);
 }

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

@@ -764,8 +764,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxMainBuildingList(Integer orgId) {
-        List<TaBuilding> buildingList = taBuildingMapper.selectMainBuildings(orgId);
+    public ResponseBean getWxMainBuildingList(String cityId, Integer orgId) {
+        List<TaBuilding> buildingList = taBuildingMapper.selectMainBuildings(cityId, orgId);
         if (null == buildingList) {
             return ResponseBean.success(new ArrayList<>());
         }

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

@@ -30,6 +30,9 @@ import java.time.LocalDateTime;
  */
 @Service
 public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp> implements ITaMiniappService {
+    @Autowired
+    TaMiniappMapper taMiniappMapper;
+
     @Autowired
     TaMiniappTemplateMapper taMiniappTemplateMapper;
 
@@ -108,4 +111,16 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
 
         return taMiniapp;
     }
+
+    @Override
+    public TaMiniapp getInfoWithTpls(String appid) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(appid);
+
+        QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("miniapp_id", appid);
+        queryWrapper.eq("is_subscribe", 1);
+        taMiniapp.setTpls(taMiniappTemplateMapper.selectList(queryWrapper));
+
+        return taMiniapp;
+    }
 }

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

@@ -45,7 +45,11 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
      * @return
      */
     @Override
-    public TdCity getLocationCity(String location) {
+    public TdCity getLocationCity(String location, Integer orgId) {
+        if (null == location) {
+            return tdCityMapper.getOrgDefaultCity(orgId);
+        }
+
         //获取高德地图的坐标
         String amapString = CommConstant.AMAP_HTTP + "?location="+location+"&key=" + CommConstant.AMAP_KEY;
         RestTemplate restTemplate = new RestTemplate();
@@ -62,9 +66,11 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
             if (tdCities.size() > 0){
                 return tdCities.get(0);
             }
-            return null;
+//            return null;
         }
-        return null;
+
+        // 没有匹配到则返回默认城市
+        return tdCityMapper.getOrgDefaultCity(orgId);
     }
     
 }

src/main/resources/mapper/TaBuildingMapper.xml

@@ -232,8 +232,11 @@
         LEFT JOIN ta_building_tag m ON t.building_id = m.building_id
         WHERE
             t.org_id = #{orgId}
-        AND t.status = 1
-        AND t.is_main = 1
+        <if test="cityId != null and cityId != ''">
+            AND t.city_id = #{cityId}
+        </if>
+            AND t.status = 1
+            AND t.is_main = 1
         GROUP BY
             t.building_id
         ORDER BY t.order_no

src/main/resources/mapper/TdCityMapper.xml

@@ -47,5 +47,14 @@ ORDER BY
                 ORDER BY
                 c.pinyin
     </select>
+    <select id="getOrgDefaultCity" resultType="com.huiju.estateagents.entity.TdCity">
+        SELECT
+            t.*
+        FROM
+            td_city t
+            JOIN ta_org s ON t.id = s.default_city_id
+        WHERE
+            s.org_id = #{orgId}
+    </select>
 
 </mapper>