评论+点赞修改

src/main/java/com/travel/controller/ReleaseTravelController.java

@@ -60,10 +60,12 @@ public class ReleaseTravelController {
      * @return 返回结果
      */
     @GetMapping("getTravelAll")
-    public Map<String ,Object> getTravelAll(Travel travel){
+    public Map<String ,Object> getTravelAll(Travel travel, HttpServletRequest request){
         Map<String, Object> map = new HashMap<>();
         try{
-            List<Travel> list = releaseTravelService.getTravel(travel);
+            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+            travel.setCode((String) userMap.get("code"));
+            List<Travel> list = releaseTravelService.getTravelAll(travel);
             map.put("data", list);
             map.put("msg", "200");
         }catch (Exception e){
@@ -225,4 +227,22 @@ public class ReleaseTravelController {
         }
         return map;
     }
+
+    /**
+     * 查看数量
+     * @param travel
+     * @return
+     */
+    @PutMapping("updateLookNum")
+    public Map<String, Object> updateLookNum(Travel travel){
+        Map<String, Object> map = new HashMap<>();
+        try{
+            releaseTravelService.updateLookNum(travel);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+        }
+        return map;
+    }
 }

src/main/java/com/travel/controller/TravelCommentsController.java

@@ -100,13 +100,15 @@ public class TravelCommentsController {
      */
     public List recursiveComments(TravelComments comments){
         List<TravelComments> listData = travelCommentsService.getComments(comments);
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<List<TravelComments>> list = new ArrayList<>();
         for(TravelComments comments1 : listData){
-            comments.setCode(comments1.getCode());
-            comments.setParentUuid(comments1.getUuid());
-            Map<String, Object> map = BeanMap.objectToMap(comments1);
-            map.put("children", recursiveComments(comments));//子集内容
-            list.add(map);
+            List<TravelComments> list1 = new ArrayList<>();
+            list1.add(comments1);
+            List<TravelComments> listData1 = travelCommentsService.getComments(comments1);
+            for(TravelComments comments2 : listData1){
+                list1.add(comments2);
+            }
+            list.add(list1);
         }
         return list;
     }

src/main/java/com/travel/mapper/ReleaseTravelMapper.java

@@ -26,4 +26,8 @@ public interface ReleaseTravelMapper {
     void addGive(TravelGive travelGive);
 
     void delGive(TravelGive travelGive);
+
+    List<Travel> getTravelAll(Travel travel);
+
+    void updateLookNum(Travel travel);
 }

src/main/java/com/travel/model/Travel.java

@@ -109,4 +109,20 @@ public class Travel implements Serializable {
      * 需求编号
      */
     private String demandUuid;
+    /**
+     * 是否点赞过
+     */
+    private String flag;
+    /**
+     * 评论数
+     */
+    private String commCount;
+    /**
+     * 点赞数
+     */
+    private String countNum;
+    /**
+     * 查看数量
+     */
+    private int lookNum;
 }

src/main/java/com/travel/model/TravelComments.java

@@ -48,4 +48,16 @@ public class TravelComments implements Serializable {
      * 评论用户头像
      */
     private String headpir;
+    /**
+     * 评论用户编号
+     */
+    private String commCode;
+    /**
+     * 评论用户昵称
+     */
+    private String commName;
+    /**
+     * 评论用户头像
+     */
+    private String commHeadpir;
 }

src/main/java/com/travel/service/ReleaseTravelService.java

@@ -24,4 +24,8 @@ public interface ReleaseTravelService {
     void addGive(TravelGive travelGive);
 
     void delGive(TravelGive travelGive);
+
+    List<Travel> getTravelAll(Travel travel);
+
+    void updateLookNum(Travel travel);
 }

src/main/java/com/travel/service/impl/ReleaseTravelServiceImpl.java

@@ -68,4 +68,15 @@ public class ReleaseTravelServiceImpl implements ReleaseTravelService {
     public void delGive(TravelGive travelGive) {
         releaseTravelMapperl.delGive(travelGive);
     }
+
+    @Override
+    public List<Travel> getTravelAll(Travel travel) {
+        return releaseTravelMapperl.getTravelAll(travel);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateLookNum(Travel travel) {
+        releaseTravelMapperl.updateLookNum(travel);
+    }
 }

src/main/resources/config/mapping/CommentsMapper.xml

@@ -4,8 +4,8 @@
 <mapper namespace="com.travel.mapper.TravelCommentsMapper">
     <!-- 新增游记评论 -->
     <insert id="addComments" parameterType="TravelComments">
-        insert into bus_travel_comments(code,uuid,parent_uuid,jdrq,content,travel_uuid)
-        values (#{code},#{uuid},#{parentUuid},format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),#{content},#{travelUuid})
+        insert into bus_travel_comments(code,uuid,parent_uuid,jdrq,content,travel_uuid,comm_code)
+        values (#{code},#{uuid},#{parentUuid},format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),#{content},#{travelUuid},#{commCode})
     </insert>
     <!-- 删除评论 -->
     <delete id="delComments" parameterType="TravelComments">
@@ -14,11 +14,13 @@
     <!-- 查询指定游记下的评论 -->
     <select id="getComments" parameterType="TravelComments" resultType="TravelComments">
         select
-            a.*,b.name as name,b.headpir as headpir
+            a.*,b.name as name,b.headpir as headpir,c.name as commName,c.headpir as commHeadpir
         from
             bus_travel_comments a
         join (select code,name,headpir from sys_users where code = #{code}) b on a.code = b.code
+        left join (select code,name,headpir from sys_users) c on a.comm_code = c.code
         where
             a.parent_uuid = #{parentUuid} and a.travel_uuid = #{travelUuid}
+        order by a.jdrq
     </select>
 </mapper>

src/main/resources/config/mapping/ReleaseTravelMapper.xml

@@ -8,14 +8,17 @@
     </insert>
     <!-- 新增游记内容 -->
     <insert id="travelInster" parameterType="Travel">
-        insert into bus_travel(code,title_img,synopsis,video_url,img_url,uuid,state_type,travel_date,travel_day,capita,figure,play_type,season,destination,jdrq,title,title_travel,demand_uuid)
-        values (#{code},#{titleImg},#{synopsis},#{videoUrl},#{imgUrl},#{uuid},#{stateType},#{travelDate},#{travelDay},#{capita},#{figure},#{playType},#{season},#{destination},GETDATE(),#{title},#{titleTravel},#{demandUuid})
+        insert into bus_travel(code,title_img,synopsis,video_url,img_url,uuid,state_type,travel_date,travel_day,capita,figure,play_type,season,destination,jdrq,title,title_travel,demand_uuid,look_num)
+        values (#{code},#{titleImg},#{synopsis},#{videoUrl},#{imgUrl},#{uuid},#{stateType},#{travelDate},#{travelDay},#{capita},#{figure},#{playType},#{season},#{destination},GETDATE(),#{title},#{titleTravel},#{demandUuid},0)
     </insert>
     <!-- 查询游记内容 -->
     <select id="getTravel" resultType="Travel">
         select
-               id,code,title_img as titleImg,synopsis,video_url as videoUrl,img_url as imgUrl,uuid,state_type as stateType,travel_date as travelDate,travel_day as travelDay,capita,figure,play_type as playType,season,destination,jdrq,title,title_travel as titleTravel
-        from bus_travel
+               a.*,b.countNum,c.flag,d.commCount
+        from bus_travel a
+        JOIN ( SELECT COUNT ( * ) AS countNum, travel_uuid FROM sys_travel_give GROUP BY travel_uuid ) b ON a.uuid = b.travel_uuid
+        JOIN ( SELECT COUNT ( * ) AS flag, travel_uuid FROM sys_travel_give WHERE code = #{code} GROUP BY travel_uuid ) c ON a.uuid = c.travel_uuid
+        JOIN ( SELECT COUNT ( * ) AS commCount, travel_uuid FROM bus_travel_comments GROUP BY travel_uuid ) d ON a.uuid = d.travel_uuid
         <trim prefix="WHERE" prefixOverrides="and | or">
             <if test="uuid != null and uuid != ''">
                 and uuid = #{uuid}
@@ -31,6 +34,26 @@
             </if>
         </trim>
     </select>
+    <!-- 查询游记列表内容 -->
+    <select id="getTravelAll" resultType="Travel">
+        select
+            a.*,b.countNum,c.flag,d.commCount
+        from bus_travel a
+        JOIN ( SELECT COUNT ( * ) AS countNum, travel_uuid FROM sys_travel_give GROUP BY travel_uuid ) b ON a.uuid = b.travel_uuid
+        JOIN ( SELECT COUNT ( * ) AS flag, travel_uuid FROM sys_travel_give WHERE code = #{code} GROUP BY travel_uuid ) c ON a.uuid = c.travel_uuid
+        JOIN ( SELECT COUNT ( * ) AS commCount, travel_uuid FROM bus_travel_comments GROUP BY travel_uuid ) d ON a.uuid = d.travel_uuid
+        <trim prefix="WHERE" prefixOverrides="and | or">
+            <if test="uuid != null and uuid != ''">
+                and uuid = #{uuid}
+            </if>
+            <if test="stateType != null and stateType != ''">
+                and state_type = #{stateType}
+            </if>
+            <if test="demandUuid != null and demandUuid != ''">
+                and demand_uuid = #{demandUuid}
+            </if>
+        </trim>
+    </select>
     <!-- 查询每天游记内容 -->
     <select id="getTravelExper" resultType="TravelExperience">
         select id,uuid,day_num as dayNum,synopsis,video_url as videoUrl,img_url as imgUrl,title
@@ -106,4 +129,8 @@
     <delete id="delGive" parameterType="TravelGive">
         delete from sys_travel_give where code = #{code} and travel_uuid=#{travelUuid}
     </delete>
+    <!-- 查看数量 -->
+    <update id="updateLookNum" parameterType="Travel">
+        update bus_travel set
+    </update>
 </mapper>