feats

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

@@ -47,10 +47,11 @@ public class TaResourceController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                @ApiParam("定位") @RequestParam(value ="location", required = false) String location) throws Exception{
+                                @ApiParam("定位") @RequestParam(value ="location", required = false) String location,
+                                @ApiParam("分类") @RequestParam(value ="typeId", required = false) String typeId) throws Exception{
 
 		    IPage<ResourceListVO> pg = new Page<>(pageNum, pageSize);
-            IPage<ResourceListVO> result = iTaResourceService.getWxPagedBy(pg, getCurrentPerson(), location);
+            IPage<ResourceListVO> result = iTaResourceService.getWxPagedBy(pg, getCurrentPerson(), location, typeId);
             return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/shigongli/mapper/TaResourceMapper.java

@@ -22,5 +22,5 @@ public interface TaResourceMapper extends BaseMapper<TaResource> {
 
     int updateQuota(@Param("quota") String save_num,  @Param("targetType") String targetType, @Param("targetId")  String targetId, @Param("num") int num);
 
-    IPage<ResourceListVO> getWxPagedBy(IPage<ResourceListVO> pg, @Param("personId") String personId, @Param("location") String location);
+    IPage<ResourceListVO> getWxPagedBy(IPage<ResourceListVO> pg, @Param("personId") String personId, @Param("location") String location, @Param("typeId") String typeId);
 }

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

@@ -25,5 +25,5 @@ public interface ITaResourceService extends IBaseService<TaResource> {
 
     void updateSave(TaSave taSave, int num);
 
-    IPage<ResourceListVO> getWxPagedBy(IPage<ResourceListVO> pg, TaPerson taPerson, String location);
+    IPage<ResourceListVO> getWxPagedBy(IPage<ResourceListVO> pg, TaPerson taPerso, String location, String typeId);
 }

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

@@ -93,12 +93,12 @@ public class TaResourceServiceImpl extends BaseServiceImpl<TaResourceMapper, TaR
     }
 
     @Override
-    public IPage<ResourceListVO> getWxPagedBy(IPage<ResourceListVO> pg, TaPerson taPerson, String location) {
+    public IPage<ResourceListVO> getWxPagedBy(IPage<ResourceListVO> pg, TaPerson taPerson, String location, String typeId) {
         if (StringUtils.isEmpty(location)) {
             // 南京新街口
             location = "116.367742,39.940667";
         }
 
-        return baseMapper.getWxPagedBy(pg, taPerson.getPersonId(), location);
+        return baseMapper.getWxPagedBy(pg, taPerson.getPersonId(), location, typeId);
     }
 }

src/main/resources/mapper/TaTargetQuotaMapper.xml

@@ -32,6 +32,11 @@
             ) 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>
         ORDER BY
             IFNULL( t.weight, 0 ) DESC,
             fn_distance ( #{location}, CONCAT( t.lng, ',', t.lat ) ) DESC