修改网点详情页关注状态

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/ChannelMapController.java

@@ -248,7 +248,7 @@ public class ChannelMapController {
      */
     @GetMapping("/getWdInfo")
     public R getWdInfo(String wdId){
-        WdInfo wdInfo = channelMapService.getWdInfo(wdId);
+        WdInfo wdInfo = channelMapService.getWdInfo(wdId,LoginHelper.getUserId());
         if(wdInfo == null)
             return R.ok(null);
         if("1".equals(wdInfo.getWdTypeCode())){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/AttentionPool.java

@@ -34,7 +34,7 @@ public class AttentionPool{
     @TableField("brand_name")
     private String brandName;
 
-    @TableField("user_id")
+    @TableField("userId")
     private String userId;
 
     @TableField("attention_time")

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/WdInfo.java

@@ -155,4 +155,10 @@ public class WdInfo implements Serializable {
     @TableField("show_delete")
     @TableLogic
     private int showDelete;
+
+    /**
+     * 是否关注
+     */
+    @TableField(exist = false)
+    private int attention;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/ChannelMapService.java

@@ -15,7 +15,7 @@ public interface ChannelMapService {
 
     public Page<WdInfo> point(ChannelMapAceeptVo channel);
 
-    WdInfo getWdInfo(String wdId);
+    WdInfo getWdInfo(String wdId,Long userId);
 
     WdCount areaProvince(ChannelMapAceeptVo channel);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelMapServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.demo.entity.*;
 import com.ruoyi.demo.entity.bo.*;
 import com.ruoyi.demo.entity.vo.ChannelMapAceeptVo;
@@ -526,7 +527,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
      * @return
      */
     @Override
-    public WdInfo getWdInfo(String wdId) {
+    public WdInfo getWdInfo(String wdId,Long userId) {
         QueryWrapper<WdInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("wd_id",wdId);
 
@@ -534,6 +535,18 @@ public class ChannelMapServiceImpl implements ChannelMapService {
         if(wdInfo == null)
             return wdInfo;
 
+        //查询是否关注
+        CompletableFuture<Integer> objectCompletableFuture = CompletableFuture.supplyAsync(() -> {
+            QueryWrapper<AttentionPool> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.select("wd_id");
+            queryWrapper1.eq("user_id", userId);
+            queryWrapper1.and(attentionPoolQueryWrapper -> {
+                attentionPoolQueryWrapper.eq("wd_id",wdId);
+            });
+            AttentionPool attentionPool = attentionPoolDao.selectOne(queryWrapper1);
+            return attentionPool == null ? 0:1;
+        });
+
         if("1".equals(wdInfo.getWdTypeCode())){
             //门店网点
             QueryWrapper<StoreWd> queryWrapper1 = new QueryWrapper<>();
@@ -542,7 +555,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             StoreWdInfoBo storeWdInfoBo = new StoreWdInfoBo(wdInfo);
             storeWdInfoBo.setStoreWd(storeWd);
             storeWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            storeWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(storeWdInfoBo.getAddrCode()));
+            storeWdInfoBo.setAttention(objectCompletableFuture.join());
             return storeWdInfoBo;
         }else if("2".equals(wdInfo.getWdTypeCode())){
             //小区网点
@@ -552,7 +565,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             HouseWdInfoBo houseWdInfoBo = new HouseWdInfoBo(wdInfo);
             houseWdInfoBo.setHouseWd(houseWd);
             houseWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            houseWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(houseWdInfoBo.getAddrCode()));
+            houseWdInfoBo.setAttention(objectCompletableFuture.join());
             return houseWdInfoBo;
         }else if("3".equals(wdInfo.getWdTypeCode())){
             //楼宇网点
@@ -562,7 +575,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             BuildWdInfoBo buildWdInfoBo = new BuildWdInfoBo(wdInfo);
             buildWdInfoBo.setBuildWd(buildWd);
             buildWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            buildWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(buildWdInfoBo.getAddrCode()));
+            buildWdInfoBo.setAttention(objectCompletableFuture.join());
             return buildWdInfoBo;
         }else if("4".equals(wdInfo.getWdTypeCode())){
             //交通设施网点
@@ -572,7 +585,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             TrafficWdInfoBo trafficWdInfoBo = new TrafficWdInfoBo(wdInfo);
             trafficWdInfoBo.setTrafficWd(trafficWd);
             trafficWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            trafficWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(trafficWdInfoBo.getAddrCode()));
+            trafficWdInfoBo.setAttention(objectCompletableFuture.join());
             return trafficWdInfoBo;
         }else if("5".equals(wdInfo.getWdTypeCode())){
             //企业网点
@@ -582,7 +595,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             EnterpriseWdInfoBo enterpriseWdInfoBo = new EnterpriseWdInfoBo(wdInfo);
             enterpriseWdInfoBo.setEnterpriseWd(enterpriseWd);
             enterpriseWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            enterpriseWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(enterpriseWdInfoBo.getAddrCode()));
+            enterpriseWdInfoBo.setAttention(objectCompletableFuture.join());
             return enterpriseWdInfoBo;
         }