接口增加修改

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

@@ -1,5 +1,6 @@
 package com.travel.controller;
 
+import com.travel.model.Travel;
 import com.travel.model.TravelComments;
 import com.travel.service.TravelCommentsService;
 import com.travel.util.BeanMap;
@@ -41,6 +42,7 @@ public class TravelCommentsController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -67,6 +69,7 @@ public class TravelCommentsController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -89,6 +92,7 @@ public class TravelCommentsController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -131,4 +135,33 @@ public class TravelCommentsController {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 查询个人评论
+     * @param request 参数
+     * @param travelComments 参数
+     * @return 返回结果
+     */
+    @GetMapping("getCommentsUser")
+    public Map<String, Object> getCommentsUser(TravelComments travelComments, HttpServletRequest request){
+        Map<String, Object> map = new HashMap<>();
+        try{
+            //获取token
+            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+            travelComments.setCode((String) userMap.get("code"));
+            List<Map<String, Object>> list = travelCommentsService.getCommentsUser(travelComments);
+            Map<String, Object> mapVal = new HashMap<>();
+            mapVal.put("list", list);
+            mapVal.put("count", travelCommentsService.getCommentsUserCount(travelComments));
+            mapVal.put("page", travelComments.getPage());
+
+            map.put("data", mapVal);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.travel.mapper;
 
+import com.travel.model.Travel;
 import com.travel.model.TravelComments;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface TravelCommentsMapper {
@@ -13,4 +15,11 @@ public interface TravelCommentsMapper {
 
     List<TravelComments> getComments(TravelComments comments);
 
+    List<Map<String, Object>> getCommentsUser(TravelComments travelComments);
+
+    Travel getPtyhUserTravel(String uuid);
+
+    Travel getGysUserTravel(String uuid);
+
+    int getCommentsUserCount(TravelComments travelComments);
 }

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

@@ -173,5 +173,9 @@ public class Travel implements Serializable {
      * 游记类型
      */
     private String typeForm;
+    /**
+     * 评论内容
+     */
+    private String content;
 
 }

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

@@ -64,4 +64,12 @@ public class TravelComments implements Serializable {
      * 评论类型
      */
     private String type;
+    /**
+     * 条数
+     */
+    private int limit;
+    /**
+     * 页数
+     */
+    private int page;
 }

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

@@ -1,8 +1,10 @@
 package com.travel.service;
 
+import com.travel.model.Travel;
 import com.travel.model.TravelComments;
 
 import java.util.List;
+import java.util.Map;
 
 public interface TravelCommentsService {
     void addComments(TravelComments comments);
@@ -11,4 +13,11 @@ public interface TravelCommentsService {
 
     List<TravelComments> getComments(TravelComments comments);
 
+    List<Map<String, Object>> getCommentsUser(TravelComments travelComments);
+
+    Travel getPtyhUserTravel(String uuid);
+
+    Travel getGysUserTravel(String demandUuid);
+
+    int getCommentsUserCount(TravelComments travelComments);
 }

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

@@ -1,6 +1,7 @@
 package com.travel.service.impl;
 
 import com.travel.mapper.TravelCommentsMapper;
+import com.travel.model.Travel;
 import com.travel.model.TravelComments;
 import com.travel.service.TravelCommentsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +9,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class TravelCommentsServiceImpl implements TravelCommentsService {
@@ -31,4 +33,24 @@ public class TravelCommentsServiceImpl implements TravelCommentsService {
     public List<TravelComments> getComments(TravelComments comments) {
         return travelCommentsMapper.getComments(comments);
     }
+
+    @Override
+    public List<Map<String, Object>> getCommentsUser(TravelComments travelComments) {
+        return travelCommentsMapper.getCommentsUser(travelComments);
+    }
+
+    @Override
+    public Travel getPtyhUserTravel(String uuid) {
+        return travelCommentsMapper.getPtyhUserTravel(uuid);
+    }
+
+    @Override
+    public Travel getGysUserTravel(String demandUuid) {
+        return travelCommentsMapper.getGysUserTravel(demandUuid);
+    }
+
+    @Override
+    public int getCommentsUserCount(TravelComments travelComments) {
+        return travelCommentsMapper.getCommentsUserCount(travelComments);
+    }
 }

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

@@ -5,7 +5,7 @@
     <!-- 新增游记评论 -->
     <insert id="addComments" parameterType="TravelComments">
         insert into bus_travel_comments(code,uuid,parent_uuid,jdrq,content,travel_uuid,comm_code,type)
-        values (#{code},#{uuid},#{parentUuid},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{content},#{travelUuid},#{commCode},#{type})
+        values (#{code},#{uuid},#{parentUuid},GETDATE(),#{content},#{travelUuid},#{commCode},#{type})
     </insert>
     <!-- 删除评论 -->
     <delete id="delComments" parameterType="TravelComments">
@@ -21,6 +21,35 @@
         left join sys_users c on a.comm_code = c.code
         where
             a.travel_uuid = #{travelUuid}
-        order by a.jdrq desc
+        order by a.jdrq
+    </select>
+    <!-- 查询个人评论 -->
+    <select id="getCommentsUser" resultType="Map">
+        SELECT
+            TOP ${limit}
+            a.id,
+            a.jdrq,
+            a.type AS typeForm,
+            a.content,
+            CASE a.type WHEN 'ptyh' THEN b.uuid END as uuid,
+            CASE a.type WHEN 'ptyh' THEN b.title_img END as titleImg,
+            CASE a.type WHEN 'ptyh' THEN b.title_travel END as titleTravel,
+            CASE a.type WHEN 'ptyh' THEN b.synopsis END as synopsis,
+            CASE a.type WHEN 'gys' THEN c.uuid END as uuidGys,
+            CASE a.type WHEN 'gys' THEN c.title_img END as titleImgGys,
+            CASE a.type WHEN 'gys' THEN c.offer_name END as titleTravelGys,
+            CASE a.type WHEN 'gys' THEN '' END as synopsisGys
+        FROM
+            bus_travel_comments a
+            LEFT JOIN bus_travel b ON a.travel_uuid = b.uuid
+            LEFT JOIN bus_supplier_route c ON a.travel_uuid = c.uuid
+        WHERE
+            a.code = #{code}
+            AND a.id not in (select TOP ${page} id from bus_travel_comments where code = #{code})
+        ORDER BY a.jdrq
+    </select>
+    <!-- 查询个人评论条数 -->
+    <select id="getCommentsUserCount" resultType="int">
+        SELECT count(*) from bus_travel_comments where code = #{code}
     </select>
 </mapper>

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

@@ -5,11 +5,11 @@
     <!-- 新增确认方案主表数据 -->
     <insert id="addConfirm" parameterType="ConfirmOrdering">
         insert into bus_confirm_ordering(uuid,code,jdrq,name,phone,email,is_invoice,invoie_remark,release_uuid)
-        values(#{uuid},#{code},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{name},#{phone},#{email},#{isInvoice},#{invoiceRemark},#{releaseUuid})
+        values(#{uuid},#{code},GETDATE(),#{name},#{phone},#{email},#{isInvoice},#{invoiceRemark},#{releaseUuid})
     </insert>
     <!-- 新增旅客信息 -->
     <insert id="addUsedConfirm" parameterType="UsedUser">
         insert into sys_confirm_used(confirm_uuid,name,nationality,sex,phone,document_type,id_number,date_of_birth,jdrq)
-        values(#{confirmUuid},#{name},#{nationality},#{sex},#{phone},#{documentType},#{idNumber},#{dateOfBirth},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'))
+        values(#{confirmUuid},#{name},#{nationality},#{sex},#{phone},#{documentType},#{idNumber},#{dateOfBirth},GETDATE())
     </insert>
 </mapper>

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

@@ -9,7 +9,7 @@
     <!-- 新增用户 -->
     <insert id="insetUser" parameterType="User">
         INSERT INTO sys_users (code,name,sex,age,pass,phone,jdrq,headpir,remake,wxid,wxtoken,flag,captcha)
-        VALUES(#{code},#{name},#{sex},#{age},#{pass},#{phone},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{headpir},#{remake},#{wxid},#{wxtoken},0,#{captcha})
+        VALUES(#{code},#{name},#{sex},#{age},#{pass},#{phone},GETDATE(),#{headpir},#{remake},#{wxid},#{wxtoken},0,#{captcha})
     </insert>
     <!-- 校验手机号是否已注册 -->
     <select id="checkTele" resultType="int">

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

@@ -7,7 +7,7 @@
         insert into
             bus_private_ordering(code,origin,destination,start_time,end_time,people_num,jdrq,people_all,budget_min,budget_max,language,nature_type,name,email,rhythm,hotel_scale,resources_needed,flight,remarks,uuid,travel_is_no,travel_user,order_no)
         values
-            (#{code},#{origin},#{destination},#{startTime},#{endTime},#{peopleNum},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{peopleAll},#{budgetMin},#{budgetMax},#{language},#{natureType},#{name},#{email},#{rhythm},#{hotelScale},#{resourcesNeeded},#{flight},#{remarks},#{uuid},#{travelIsNo},#{travelUser},#{orderNo})
+            (#{code},#{origin},#{destination},#{startTime},#{endTime},#{peopleNum},GETDATE(),#{peopleAll},#{budgetMin},#{budgetMax},#{language},#{natureType},#{name},#{email},#{rhythm},#{hotelScale},#{resourcesNeeded},#{flight},#{remarks},#{uuid},#{travelIsNo},#{travelUser},#{orderNo})
     </insert>
     <!-- 查询私人订制 -->
     <select id="getPrivate" resultType="PrivateOrder">
@@ -53,7 +53,7 @@
     </delete>
     <!-- 新增收藏 -->
     <insert id="addCollection" parameterType="OrderingConllection">
-        insert into bus_collection(uuid,code,jdrq,ordering_uuid,type) values(#{uuid},#{code},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{orderingUuid},#{type})
+        insert into bus_collection(uuid,code,jdrq,ordering_uuid,type) values(#{uuid},#{code},GETDATE(),#{orderingUuid},#{type})
     </insert>
     <!-- 取消收藏 -->
     <delete id="delCollection" parameterType="OrderingConllection">
@@ -109,7 +109,7 @@
     </select>
     <!-- 查询定制单哪些超出出行时间 修改状态 -->
     <select id="updatePrivate" parameterType="PrivateOrder" resultType="PrivateOrder">
-        select * from bus_private_ordering where end_time <![CDATA[ < ]]> format(GETDATE(),'yyyy-MM-dd')
+        select * from bus_private_ordering where end_time <![CDATA[ < ]]> GETDATE()
     </select>
     <!-- 查询定制单状态里是否存在这一项 -->
     <select id="getPrivateType" parameterType="PrivateOrder" resultType="int">

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

@@ -9,7 +9,7 @@
     <!-- 新增游记内容 -->
     <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,people_all,title,title_travel,demand_uuid,look_num,title_day_name,amount)
-        values (#{code},#{titleImg},#{synopsis},#{videoUrl},#{imgUrl},#{uuid},#{stateType},#{travelDate},#{travelDay},#{capita},#{figure},#{playType},#{season},#{destination},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{peopleAll},#{title},#{titleTravel},#{demandUuid},0,#{titleDayName},#{amount})
+        values (#{code},#{titleImg},#{synopsis},#{videoUrl},#{imgUrl},#{uuid},#{stateType},#{travelDate},#{travelDay},#{capita},#{figure},#{playType},#{season},#{destination},GETDATE(),#{peopleAll},#{title},#{titleTravel},#{demandUuid},0,#{titleDayName},#{amount})
     </insert>
     <!-- 查询游记内容 -->
     <select id="getTravel" resultType="Travel">

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

@@ -52,7 +52,7 @@
     <!-- 新增供应商 -->
     <insert id="insetUser" parameterType="Supplier">
         INSERT INTO sys_supplier (code,nature_supplier,contact,phone,language,certificate_type,certificate,headpir,jdrq,flag,captcha,invoice,name,offer_num,balance_of)
-        VALUES(#{code},#{natureSupplier},#{contact},#{phone},#{language},#{certificateType},#{certificate},#{headpir},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),0,#{captcha},#{invoice},#{name},0,0)
+        VALUES(#{code},#{natureSupplier},#{contact},#{phone},#{language},#{certificateType},#{certificate},#{headpir},GETDATE(),0,#{captcha},#{invoice},#{name},0,0)
     </insert>
     <!-- 修改验证码 -->
     <update id="updateCaptcha">

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

@@ -9,7 +9,7 @@
     <!-- 新增常用旅客信息 -->
     <insert id="addUsed" parameterType="UsedUser">
         insert into sys_used_user_information(code,name,nationality,sex,phone,document_type,id_number,date_of_birth,uuid,jdrq,prefix_phone)
-        values(#{code},#{name},#{nationality},#{sex},#{phone},#{documentType},#{idNumber},#{dateOfBirth},#{uuid},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{prefixPhone})
+        values(#{code},#{name},#{nationality},#{sex},#{phone},#{documentType},#{idNumber},#{dateOfBirth},#{uuid},GETDATE(),#{prefixPhone})
     </insert>
     <!-- 删除常用旅客信息 -->
     <delete id="delUsed" parameterType="UsedUser">