Merge remote-tracking branch 'origin/yjzx_test' into yjzx_test

src/main/java/com/zzsn/thinktank/controller/ThinktankBasicInfoController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.thinktank.entity.ThinktankBasicInfo;
 import com.zzsn.thinktank.service.ThinktankBasicInfoService;
+import com.zzsn.thinktank.util.AccessTokenUtil;
 import com.zzsn.thinktank.vo.Result;
 import com.zzsn.thinktank.vo.ThinktankBasicInfoListVo;
 import com.zzsn.thinktank.vo.ThinktankBasicInfoVo;
@@ -91,11 +92,57 @@ public class ThinktankBasicInfoController {
      * @return
      */
     @GetMapping("info")
-    public Result<?> getThinktankBasicInfoById(@RequestParam(name="id",required=true) String id){
-        ThinktankInfoVo thinktankInfoVo = thinktankBasicInfoService.getThinktankBasicInfoById(id);
+    public Result<?> getThinktankBasicInfoById(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
+        String userId = "";
+        try {
+            userId = AccessTokenUtil.getUserIdFromAccessToken(request);
+        } catch (Exception e) {
+            if (userId == null || "".equals(userId)) {
+                userId = request.getSession().getId();
+            }
+        }
+        ThinktankInfoVo thinktankInfoVo = thinktankBasicInfoService.getThinktankBasicInfoById(id,userId);
         return Result.OK(thinktankInfoVo);
     }
 
+    /**
+     * 收藏/取消收藏
+     * @param id
+     * @return
+     */
+    @GetMapping("collect")
+    public Result<?> collect(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
+        String userId = "";
+        try {
+            userId = AccessTokenUtil.getUserIdFromAccessToken(request);
+        } catch (Exception e) {
+            if (userId == null || "".equals(userId)) {
+                userId = request.getSession().getId();
+            }
+        }
+        thinktankBasicInfoService.collect(id,userId);
+        return Result.OK("操作成功");
+    }
+
+    /**
+     * 已收藏智库列表
+     * @return
+     */
+    @GetMapping("collectList")
+    public Result<?> collectList(HttpServletRequest request) {
+        String userId = "";
+        try {
+            userId = AccessTokenUtil.getUserIdFromAccessToken(request);
+        } catch (Exception e) {
+            if (userId == null || "".equals(userId)) {
+                userId = request.getSession().getId();
+            }
+        }
+        List<ThinktankBasicInfo> thinktankBasicInfos = thinktankBasicInfoService.collectList(userId);
+        return Result.OK(thinktankBasicInfos);
+    }
+
+
     @PostMapping("/list")
     public Result<?> getList(@RequestBody ThinktankBasicInfoListVo thinktankBasicInfoListVo){
         log.info("智库信息条件分页查询:{}", thinktankBasicInfoListVo);

src/main/java/com/zzsn/thinktank/mapper/ThinktankOttInfoMapper.java

 package com.zzsn.thinktank.mapper;
 
+import com.zzsn.thinktank.entity.ThinktankBasicInfo;
 import com.zzsn.thinktank.entity.ThinktankOttInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: 1
@@ -11,4 +18,48 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ThinktankOttInfoMapper extends BaseMapper<ThinktankOttInfo> {
 
+    /**
+     * 根据智库机构编码获取ott信息
+     * @param baseCode 智库机构编码
+     * @return
+     */
+    @Select("select ott.id,ott.full_name fullName,ott.abbreviation,ott.summary,ott.contact,ott.areas,ott.organisation,ott.performance from thinktank_ott_info ott left join thinktank_base_ott_relation rel on ott.id = rel.ott_code where rel.base_code = #{baseCode}")
+    ThinktankOttInfo getOttInfoByBaseCode(@Param("baseCode") String baseCode);
+
+    /**
+     * 获取智库收藏信息
+     * @param baseCode 智库机构编码
+     * @param userId 用户id
+     * @return int 1-已收藏 0-未收藏
+     */
+    @Select("select count(1) from thinktank_collect where base_code = #{baseCode} and user_id = #{userId}")
+    int getCollectInfo(@Param("baseCode") String baseCode,@Param("userId") String userId);
+
+    /**
+     * 获取已收藏的智库列表
+     * @param userId
+     * @return
+     */
+    @Select("select id,code_id codeId,chinese_whole chineseWhole,chinese_simple chineseSimple,english_whole englishWhole,english_simple englishSimple from thinktank_collect coll left join thinktank_basic_info tbi on coll.base_code = tbi.code_id where coll.user_id = #{userId} order by coll.create_time desc")
+    List<ThinktankBasicInfo> getCollectList(@Param("userId") String userId);
+
+    /**
+     * 收藏智库
+     * @param baseCode 智库机构编码
+     * @param userId 用户id
+     * @param date 收藏时间
+     * @return
+     */
+    @Update("insert into thinktank_collect(base_code,user_id,create_time) value (#{baseCode},#{userId},#{date})")
+    int collect(@Param("baseCode") String baseCode,@Param("userId") String userId, @Param("date") Date date);
+
+    /**
+     * 取消收藏智库
+     * @param baseCode 智库机构编码
+     * @param userId 用户id
+     * @return
+     */
+    @Update("delete from thinktank_collect where base_code = #{baseCode} and user_id = #{userId}")
+    int cancelCollect(@Param("baseCode") String baseCode,@Param("userId") String userId);
+
 }

src/main/java/com/zzsn/thinktank/service/ThinktankBasicInfoService.java

@@ -31,7 +31,11 @@ public interface ThinktankBasicInfoService extends IService<ThinktankBasicInfo>
 
     ThinktankBasicInfoVo getInfoById(String id);
 
-    ThinktankInfoVo getThinktankBasicInfoById(String id);
+    ThinktankInfoVo getThinktankBasicInfoById(String id, String userId);
+
+    void collect(String id, String userId);
+
+    List<ThinktankBasicInfo> collectList(String userId);
 
     Result<?> getList(ThinktankBasicInfoListVo thinktankBasicInfoListVo);
 

src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zzsn.thinktank.entity.*;
 import com.zzsn.thinktank.mapper.ThinktankBasicInfoMapper;
+import com.zzsn.thinktank.mapper.ThinktankOttInfoMapper;
 import com.zzsn.thinktank.service.*;
 import com.zzsn.thinktank.util.*;
 import com.zzsn.thinktank.vo.*;
@@ -48,6 +49,9 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
     @Autowired
     ThinktankBasicInfoMapper thinktankBasicInfoMapper;
 
+    @Autowired
+    ThinktankOttInfoMapper thinktankOttInfoMapper;
+
     //生成id
     @Autowired
     IGeneratorIdService generatorIdService;
@@ -245,17 +249,53 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
         return list.get(0);
     }
 
+    /**
+     * 获取智库详情
+     * @param id 智库id
+     * @param userId 用户id
+     * @return
+     */
     @Override
-    public ThinktankInfoVo getThinktankBasicInfoById(String id) {
+    public ThinktankInfoVo getThinktankBasicInfoById(String id, String userId) {
         ThinktankInfoVo thinktankInfoVo = new ThinktankInfoVo();
         // 获取基础信息
         ThinktankBasicInfo baseInfo = this.getById(id);
         thinktankInfoVo.setBasicInfo(baseInfo);
-        // TODO-获取OTT信息
-
+        // 获取OTT信息
+        ThinktankOttInfo ottInfo = thinktankOttInfoMapper.getOttInfoByBaseCode(baseInfo.getCodeId());
+        thinktankInfoVo.setOttInfo(ottInfo);
+        // 获取收藏状态
+        int collectInfo = thinktankOttInfoMapper.getCollectInfo(baseInfo.getCodeId(), userId);
+        if (collectInfo > 0) {
+            thinktankInfoVo.setCollect("1");
+        } else {
+            thinktankInfoVo.setCollect("0");
+        }
+        return thinktankInfoVo;
+    }
 
+    /**
+     * 收藏/取消收藏智库
+     * @param id 智库id
+     * @param userId 用户id
+     */
+    @Override
+    public void collect(String id, String userId) {
+        // 获取智库基础信息
+        ThinktankBasicInfo baseInfo = this.getById(id);
+        // 获取收藏状态
+        int collectInfo = thinktankOttInfoMapper.getCollectInfo(baseInfo.getCodeId(), userId);
+        if (collectInfo > 0) {
+            thinktankOttInfoMapper.cancelCollect(baseInfo.getCodeId(),userId);
+        } else {
+            thinktankOttInfoMapper.collect(baseInfo.getCodeId(),userId,new Date());
+        }
+    }
 
-        return thinktankInfoVo;
+    @Override
+    public List<ThinktankBasicInfo> collectList(String userId) {
+        List<ThinktankBasicInfo> collectList = thinktankOttInfoMapper.getCollectList(userId);
+        return collectList;
     }
 
     @Override

src/main/java/com/zzsn/thinktank/vo/ThinktankInfoVo.java

 package com.zzsn.thinktank.vo;
 
 import com.zzsn.thinktank.entity.ThinktankBasicInfo;
+import com.zzsn.thinktank.entity.ThinktankOttInfo;
 import lombok.Data;
 
 /**
@@ -10,6 +11,17 @@ import lombok.Data;
 @Data
 public class ThinktankInfoVo {
 
+    /**
+     * 智库基础信息
+     */
     private ThinktankBasicInfo basicInfo;
+    /**
+     * ott信息
+     */
+    private ThinktankOttInfo ottInfo;
+    /**
+     * 收藏状态 1-已收藏 0-未收藏
+     */
+    private String collect;
 
 }