From c87ca07f9dfc52951e737931c3c0c147931b6f9b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 23 Jul 2024 19:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E5=9C=88?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/app/AppShipinquanController.java | 1 + .../shipinquan/entity/BlShipinquan.java | 18 ++++++++++++++++++ .../mapper/shipinquan/ShipinquanDao.xml | 16 ++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java index 5bc8053..eccb247 100644 --- a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java +++ b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java @@ -41,6 +41,7 @@ public class AppShipinquanController { return service.findPage(page,limit,entity); } + @PostMapping("/add") @ApiOperation("添加视频内容") public Result add(@RequestBody BlShipinquan BlShipinquan){ diff --git a/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java b/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java index bf0014c..8fd2f86 100644 --- a/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java +++ b/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java @@ -36,4 +36,22 @@ public class BlShipinquan implements Serializable { @TableField(exist = false) private String sfdz;//是否点赞(0未点赞 1点赞) + @TableField(exist = false) + private String parType;//1推荐视频 2附近视频 3关注视频 + /** + * 经度 + */ + @TableField(exist = false) + private String longitude; + /** + * 纬度 + */ + @TableField(exist = false) + private String latitude; + + @TableField(exist = false) + private String userId; + + + } diff --git a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml index 7cff553..f78d6d6 100644 --- a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml +++ b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml @@ -30,18 +30,30 @@ a.pls, a.type, a.pic_path, + (st_distance (point (b.longitude, b.latitude),point('125.377434','43.872621') ) *111195) as distance, b.artificer_id as create_by, b.artificer_img AS artificerImg, if(c.id is null,0,1) as sfdz FROM bl_shipinquan a left join artificer b on a.create_by = b.user_id - left join bl_shipinquan_dianzan c on a.id = b.user_id + left join bl_shipinquan_dianzan c on a.id = b.user_id and c.create_by = #{params.userId} + left join collect_artificer d on b.artificer_id = d.artificer_id + + and d.user_id = #{params.userId} + and a.create_by = #{params.createBy} - order by create_time desc + + + order by (st_distance (point (b.longitude, b.latitude),point(#{params.longitude},#{params.longitude}) ) *111195) asc,create_time desc + + + order by create_time desc + + \ No newline at end of file