feats

src/main/java/com/yunzhi/shigongli/controller/TaShopImagesController.java → src/main/java/com/yunzhi/shigongli/controller/TaImageController.java

@@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.shigongli.service.ITaShopImagesService;
-import com.yunzhi.shigongli.entity.TaShopImages;
+import com.yunzhi.shigongli.service.ITaImageService;
+import com.yunzhi.shigongli.entity.TaImage;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -32,12 +32,12 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "商铺图片")
 @RestController
 @RequestMapping("/")
-public class TaShopImagesController extends BaseController {
+public class TaImageController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaShopImagesController.class);
+    private final Logger logger = LoggerFactory.getLogger(TaImageController.class);
 
     @Autowired
-    public ITaShopImagesService iTaShopImagesService;
+    public ITaImageService iTaImageService;
 
 
 //    /**
@@ -51,11 +51,11 @@ public class TaShopImagesController extends BaseController {
 //    public ResponseBean taShopImagesList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 //									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 //
-//		    IPage<TaShopImages> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaShopImages> queryWrapper = new QueryWrapper<>();
+//		    IPage<TaImage> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaImage> queryWrapper = new QueryWrapper<>();
 //            queryWrapper.orderByDesc("create_date");
 //
-//            IPage<TaShopImages> result = iTaShopImagesService.page(pg, queryWrapper);
+//            IPage<TaImage> result = iTaImageService.page(pg, queryWrapper);
 //            return ResponseBean.success(result);
 //    }
 //
@@ -66,9 +66,9 @@ public class TaShopImagesController extends BaseController {
 //     */
 //    @RequestMapping(value="/taShopImages",method= RequestMethod.POST)
 //    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-//    public ResponseBean taShopImagesAdd(@ApiParam("保存内容") @RequestBody TaShopImages taShopImages) throws Exception{
+//    public ResponseBean taShopImagesAdd(@ApiParam("保存内容") @RequestBody TaImage taShopImages) throws Exception{
 //
-//        if (iTaShopImagesService.save(taShopImages)){
+//        if (iTaImageService.save(taShopImages)){
 //            return ResponseBean.success(taShopImages);
 //        }else {
 //            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -82,7 +82,7 @@ public class TaShopImagesController extends BaseController {
 //    @RequestMapping(value="/taShopImages/{id}", method= RequestMethod.DELETE)
 //    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
 //    public ResponseBean taShopImagesDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTaShopImagesService.removeLogicById(id)){
+//        if(iTaImageService.removeLogicById(id)){
 //            return ResponseBean.success("success");
 //        }else {
 //            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -98,10 +98,10 @@ public class TaShopImagesController extends BaseController {
 //    @RequestMapping(value="/taShopImages/{id}",method= RequestMethod.PUT)
 //    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
 //    public ResponseBean taShopImagesUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaShopImages taShopImages) throws Exception{
+//                                        @ApiParam("更新内容") @RequestBody TaImage taShopImages) throws Exception{
 //
-//        if (iTaShopImagesService.updateById(taShopImages)){
-//            return ResponseBean.success(iTaShopImagesService.getById(id));
+//        if (iTaImageService.updateById(taShopImages)){
+//            return ResponseBean.success(iTaImageService.getById(id));
 //        }else {
 //            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
 //        }
@@ -114,6 +114,6 @@ public class TaShopImagesController extends BaseController {
 //    @RequestMapping(value="/taShopImages/{id}",method= RequestMethod.GET)
 //    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
 //    public ResponseBean taShopImagesGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTaShopImagesService.getById(id));
+//        return ResponseBean.success(iTaImageService.getById(id));
 //    }
 }

src/main/java/com/yunzhi/shigongli/controller/TaSaveController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.entity.TaLike;
 import com.yunzhi.shigongli.entity.TaSave;
@@ -118,13 +119,17 @@ public class TaSaveController extends BaseController {
 //        }
 //    }
 //
-//    /**
-//     * 根据id查询对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taLike/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taLikeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTaLikeService.getById(id));
-//    }
+    /**
+     * 根据id查询对象
+     * @param targetType  对象类型
+     * @param targetId  对象ID
+     */
+    @RequestMapping(value="/wx/{targetType}/save/{targetId}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taLikeGet(@ApiParam("对象类型") @PathVariable String targetType,
+                                  @ApiParam("对象ID") @PathVariable String targetId) throws Exception{
+        TaSave taSave = iTaSaveService.getByTarget(targetType, targetId, getCurrentPerson().getPersonId());
+
+        return ResponseBean.success(taSave);
+    }
 }

src/main/java/com/yunzhi/shigongli/controller/TaShopController.java

@@ -44,7 +44,7 @@ public class TaShopController extends BaseController {
 
 
     @Autowired
-    public ITaShopImagesService shopImagesService;
+    public ITaImageService shopImagesService;
 
     @Autowired
     public ITaTargetTypeService taTargetTypeService;
@@ -85,7 +85,7 @@ public class TaShopController extends BaseController {
 
         try {
             iTaShopService.createNew(taShop);
-            shopImagesService.updateImages(taShop.getShopId(), taShop.getImageList());
+            shopImagesService.updateImages(Constants.TARGET_SHOP, taShop.getShopId(), taShop.getImageList());
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
@@ -121,7 +121,7 @@ public class TaShopController extends BaseController {
                                         @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
 
         if (iTaShopService.updateById(taShop)){
-            shopImagesService.updateImages(taShop.getShopId(), taShop.getImageList());
+            shopImagesService.updateImages(Constants.TARGET_SHOP, taShop.getShopId(), taShop.getImageList());
             taTargetTypeService.updateTypes(Constants.TARGET_SHOP, taShop.getShopId(), taShop.getTypeList());
 
             ResourceFieldVO resourceVO = iTaShopService.copyProperties(taShop);
@@ -152,7 +152,7 @@ public class TaShopController extends BaseController {
         taShop.setPvNum(taResource.getPvNum());
         taShop.setUvNum(taResource.getUvNum());
         taShop.setLikeNum(taResource.getLikeNum());
-        taShop.setImageList(shopImagesService.getBy(TaShopImages::getShopId, id));
+        taShop.setImageList(shopImagesService.getListBy(Constants.TARGET_SHOP, id));
         taShop.setTypeList(taTargetTypeService.getListBy(Constants.TARGET_SHOP, id));
         
         if ("wx".equals(plat)) {

src/main/java/com/yunzhi/shigongli/controller/TaTouristController.java

@@ -7,6 +7,7 @@ import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.entity.TaResource;
+import com.yunzhi.shigongli.service.ITaImageService;
 import com.yunzhi.shigongli.service.ITaResourceService;
 import com.yunzhi.shigongli.vo.ResourceFieldVO;
 import io.swagger.annotations.Api;
@@ -47,6 +48,9 @@ public class TaTouristController extends BaseController {
     @Autowired
     public ITaResourceService taResourceService;
 
+    @Autowired
+    public ITaImageService iTaImageService;
+
 
     /**
      * 分页查询列表
@@ -113,6 +117,8 @@ public class TaTouristController extends BaseController {
                                         @ApiParam("更新内容") @RequestBody TaTourist taTourist) throws Exception{
 
         if (iTaTouristService.updateById(taTourist)){
+            iTaImageService.updateImages(Constants.TARGET_TOURIST, taTourist.getTouristId(), taTourist.getImageList());
+
             ResourceFieldVO resourceVO = iTaTouristService.copyProperties(taTourist);
             TaResource taResource = taResourceService.getByTarget(Constants.TARGET_TOURIST, id);
             BeanUtils.copyProperties(resourceVO, taResource);
@@ -141,6 +147,7 @@ public class TaTouristController extends BaseController {
         taTourist.setPvNum(taResource.getPvNum());
         taTourist.setUvNum(taResource.getUvNum());
         taTourist.setLikeNum(taResource.getLikeNum());
+        taTourist.setImageList(iTaImageService.getListBy(Constants.TARGET_TOURIST, id));
 
         if ("wx".equals(plat)) {
             try {

src/main/java/com/yunzhi/shigongli/entity/TaShopImages.java → src/main/java/com/yunzhi/shigongli/entity/TaImage.java

@@ -21,8 +21,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="TaShopImages对象", description="商铺图片")
-public class TaShopImages implements Serializable {
+@ApiModel(value="TaImage对象", description="商铺图片")
+public class TaImage implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -30,8 +30,11 @@ public class TaShopImages implements Serializable {
     @TableId(value = "image_id", type = IdType.AUTO)
     private Integer imageId;
 
-    @ApiModelProperty(value = "商铺ID")
-    private String shopId;
+    @ApiModelProperty(value = "所属对象ID")
+    private String targetId;
+
+    @ApiModelProperty(value = "所属对象Type")
+    private String targetType;
 
     @ApiModelProperty(value = "图片类型")
     private String imageType;

src/main/java/com/yunzhi/shigongli/entity/TaShop.java

@@ -98,7 +98,7 @@ public class TaShop implements Serializable {
 
     @ApiModelProperty(value = "图片列表")
     @TableField(exist = false)
-    private List<TaShopImages> imageList;
+    private List<TaImage> imageList;
 
     @ApiModelProperty(value = "分类标签")
     @TableField(exist = false)

src/main/java/com/yunzhi/shigongli/entity/TaTourist.java

@@ -6,6 +6,8 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -87,4 +89,7 @@ public class TaTourist implements Serializable {
     @TableField(exist = false)
     private Integer uvNum;
 
+    @ApiModelProperty(value = "图片列表")
+    @TableField(exist = false)
+    private List<TaImage> imageList;
 }

src/main/java/com/yunzhi/shigongli/mapper/TaShopImagesMapper.java → src/main/java/com/yunzhi/shigongli/mapper/TaImageMapper.java

@@ -1,6 +1,6 @@
 package com.yunzhi.shigongli.mapper;
 
-import com.yunzhi.shigongli.entity.TaShopImages;
+import com.yunzhi.shigongli.entity.TaImage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2021-08-17
  */
 @Mapper
-public interface TaShopImagesMapper extends BaseMapper<TaShopImages> {
+public interface TaImageMapper extends BaseMapper<TaImage> {
 
 }

src/main/java/com/yunzhi/shigongli/service/ITaImageService.java

@@ -0,0 +1,21 @@
+package com.yunzhi.shigongli.service;
+
+import com.yunzhi.shigongli.entity.TaImage;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 商铺图片 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaImageService extends IBaseService<TaImage> {
+
+    void updateImages(String targetType, String targetId, List<TaImage> imageList) throws Exception;
+
+    List<TaImage> getListBy(String targetType, String targetId);
+}

src/main/java/com/yunzhi/shigongli/service/ITaShopImagesService.java

@@ -1,19 +0,0 @@
-package com.yunzhi.shigongli.service;
-
-import com.yunzhi.shigongli.entity.TaShopImages;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 商铺图片 服务类
- * </p>
- *
- * @author yansen
- * @since 2021-08-17
- */
-public interface ITaShopImagesService extends IBaseService<TaShopImages> {
-
-    void updateImages(String shopId, List<TaShopImages> imageList) throws Exception;
-}

src/main/java/com/yunzhi/shigongli/service/impl/TaImageServiceImpl.java

@@ -0,0 +1,68 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaImage;
+import com.yunzhi.shigongli.mapper.TaImageMapper;
+import com.yunzhi.shigongli.service.ITaImageService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商铺图片 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaImageServiceImpl extends BaseServiceImpl<TaImageMapper, TaImage> implements ITaImageService {
+
+    @Autowired
+    TaImageMapper taShopImagesMapper;
+
+
+    @Override
+    public void updateImages(String targetType, String targetId, List<TaImage> imageList) throws Exception {
+        if (null == imageList) {
+            throw new Exception("未找到图片列表信息");
+        }
+
+        if (StringUtils.isEmpty(targetType) || StringUtils.isEmpty(targetId)) {
+            throw new Exception("未找到有效的属主信息");
+        }
+
+        // 先删除所有的
+        removeByTarget(targetType, targetId);
+
+        // 再插入新记录
+        for (TaImage image: imageList) {
+            image.setImageId(null);
+            image.setTargetId(targetId);
+            image.setTargetType(targetType);
+        }
+
+        saveBatch(imageList);
+    }
+
+    @Override
+    public List<TaImage> getListBy(String targetType, String targetId) {
+        LambdaQueryWrapper<TaImage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaImage::getTargetType, targetType);
+        queryWrapper.eq(TaImage::getTargetId, targetId);
+
+        return list(queryWrapper);
+    }
+
+    private boolean removeByTarget(String targetType, String targetId) throws Exception {
+        LambdaQueryWrapper<TaImage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaImage::getTargetType, targetType);
+        queryWrapper.eq(TaImage::getTargetId, targetId);
+
+        return remove(queryWrapper);
+    }
+}

src/main/java/com/yunzhi/shigongli/service/impl/TaShopImagesServiceImpl.java

@@ -1,57 +0,0 @@
-package com.yunzhi.shigongli.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yunzhi.shigongli.common.StringUtils;
-import com.yunzhi.shigongli.entity.TaShopImages;
-import com.yunzhi.shigongli.mapper.TaShopImagesMapper;
-import com.yunzhi.shigongli.service.ITaShopImagesService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 商铺图片 服务实现类
- * </p>
- *
- * @author yansen
- * @since 2021-08-17
- */
-@Service
-public class TaShopImagesServiceImpl extends BaseServiceImpl<TaShopImagesMapper, TaShopImages> implements ITaShopImagesService {
-
-    @Autowired
-    TaShopImagesMapper taShopImagesMapper;
-
-
-    @Override
-    public void updateImages(String shopId, List<TaShopImages> imageList) throws Exception {
-        if (null == imageList) {
-            throw new Exception("未找到图片列表信息");
-        }
-
-        if (StringUtils.isEmpty(shopId)) {
-            throw new Exception("未找到有效的商铺信息");
-        }
-
-        // 先删除所有的
-        removeByShop(shopId);
-
-        // 再插入新记录
-        for (TaShopImages image: imageList) {
-            image.setImageId(null);
-            image.setShopId(shopId);
-        }
-
-        saveBatch(imageList);
-    }
-
-    private boolean removeByShop(String shopId) throws Exception {
-        LambdaQueryWrapper<TaShopImages> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaShopImages::getShopId, shopId);
-
-        return remove(queryWrapper);
-    }
-}

src/main/java/com/yunzhi/shigongli/service/impl/TaShopServiceImpl.java

@@ -37,7 +37,7 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
     TaShopAccountMapper taShopAccountMapper;
 
     @Autowired
-    TaShopImagesMapper imagesMapper;
+    TaImageMapper imagesMapper;
 
     @Autowired
     TaTargetTypeMapper targetTypeMapper;
@@ -72,8 +72,9 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
 
         // 图片
         if (null != taShop.getImageList()) {
-            for (TaShopImages image: taShop.getImageList()) {
-                image.setShopId(taShop.getShopId());
+            for (TaImage image: taShop.getImageList()) {
+                image.setTargetType(Constants.TARGET_SHOP);
+                image.setTargetId(taShop.getShopId());
                 imagesMapper.insert(image);
             }
         }

src/main/java/com/yunzhi/shigongli/service/impl/TaTargetTypeServiceImpl.java

@@ -2,7 +2,7 @@ package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yunzhi.shigongli.common.StringUtils;
-import com.yunzhi.shigongli.entity.TaShopImages;
+import com.yunzhi.shigongli.entity.TaImage;
 import com.yunzhi.shigongli.entity.TaTargetType;
 import com.yunzhi.shigongli.mapper.TaTargetTypeMapper;
 import com.yunzhi.shigongli.service.ITaTargetTypeService;

src/main/java/com/yunzhi/shigongli/service/impl/TaTouristServiceImpl.java

@@ -3,9 +3,11 @@ package com.yunzhi.shigongli.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaImage;
 import com.yunzhi.shigongli.entity.TaResource;
 import com.yunzhi.shigongli.entity.TaShop;
 import com.yunzhi.shigongli.entity.TaTourist;
+import com.yunzhi.shigongli.mapper.TaImageMapper;
 import com.yunzhi.shigongli.mapper.TaResourceMapper;
 import com.yunzhi.shigongli.mapper.TaTouristMapper;
 import com.yunzhi.shigongli.service.ITaTouristService;
@@ -30,6 +32,9 @@ public class TaTouristServiceImpl extends BaseServiceImpl<TaTouristMapper, TaTou
     @Autowired
     TaResourceMapper quotaMapper;
 
+    @Autowired
+    TaImageMapper imagesMapper;
+
     @Override
     public IPage<TaTourist> getPagedBy(IPage<TaTourist> pg, String touristName, String cityId) {
         return baseMapper.getPagedBy(pg, touristName, cityId);
@@ -41,6 +46,15 @@ public class TaTouristServiceImpl extends BaseServiceImpl<TaTouristMapper, TaTou
         boolean isSuccess = save(taTourist);
         if (!isSuccess) return false;
 
+        // 图片
+        if (null != taTourist.getImageList()) {
+            for (TaImage image: taTourist.getImageList()) {
+                image.setTargetType(Constants.TARGET_SHOP);
+                image.setTargetId(taTourist.getTouristId());
+                imagesMapper.insert(image);
+            }
+        }
+
         ResourceFieldVO resourceVO = copyProperties(taTourist);
 
         TaResource taResource = new TaResource();

src/main/resources/mapper/TaShopImagesMapper.xml → src/main/resources/mapper/TaImageMapper.xml

@@ -1,5 +1,5 @@
 <?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.yunzhi.shigongli.mapper.TaShopImagesMapper">
+<mapper namespace="com.yunzhi.shigongli.mapper.TaImageMapper">
 
 </mapper>

src/main/resources/mapper/TaTargetQuotaMapper.xml

@@ -18,27 +18,32 @@
     </update>
     <select id="getWxPagedBy" resultType="com.yunzhi.shigongli.vo.ResourceListVO">
         SELECT
-            t.*,
-            fn_distance ( #{location}, CONCAT( t.lng, ',', t.lat ) ) AS distance,
-            (
-                SELECT
-                    count( 1 )
-                FROM
-                    ta_save a
-                WHERE
-                    a.target_type = t.target_type
-                  AND a.target_id = t.target_id
-                  AND a.person_id = #{personId}
-            ) AS is_saved
+        *
         FROM
-            ta_resource t
-        <if test="typeId != null and typeId != ''">
-            INNER JOIN ta_target_type s ON s.target_type = t.target_type
-                AND s.target_id = t.target_id
-                AND s.type_id = #{typeId}
-        </if>
+        (
+            SELECT
+                t.*,
+                fn_distance ( #{location}, CONCAT( t.lng, ',', t.lat ) ) AS distance,
+                (
+                    SELECT
+                        count( 1 )
+                    FROM
+                        ta_save a
+                    WHERE
+                        a.target_type = t.target_type
+                      AND a.target_id = t.target_id
+                      AND a.person_id = #{personId}
+                ) AS is_saved
+            FROM
+                ta_resource t
+            <if test="typeId != null and typeId != ''">
+                INNER JOIN ta_target_type s ON s.target_type = t.target_type
+                    AND s.target_id = t.target_id
+                    AND s.type_id = #{typeId}
+            </if>
+        ) w
         ORDER BY
-            IFNULL( t.weight, 0 ) DESC,
-            fn_distance ( #{location}, CONCAT( t.lng, ',', t.lat ) ) DESC
+            IFNULL( w.weight, 0 ) DESC,
+            w.distance DESC
     </select>
 </mapper>