订制修改

build.gradle

@@ -25,7 +25,6 @@ dependencies {
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4'
     implementation 'com.auth0:java-jwt:3.4.0'
     implementation 'junit:junit:4.12'
-    implementation 'junit:junit:4.12'
     compileOnly 'org.projectlombok:lombok'
     implementation 'com.alibaba:fastjson:1.2.76'
     implementation 'cn.hutool:hutool-all:5.6.5'

src/main/java/com/travel/config/SaticScheduleTask.java

@@ -1,7 +1,10 @@
 package com.travel.config;
 
+import com.travel.model.OrderingConllection;
+import com.travel.model.PrivateOrder;
 import com.travel.model.User;
 import com.travel.service.LoginService;
+import com.travel.service.PrivateOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -16,11 +19,15 @@ import java.util.List;
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
 @EnableScheduling   // 2.开启定时任务
 public class SaticScheduleTask {
+    //个人用户
     @Autowired
     private LoginService loginService;
+    //私人订制
+    @Autowired
+    private PrivateOrderService privateOrderService;
 
     /**
-     * 定时删除无效用户  每天中午十二点触发方法
+     * 定时删除无效用户  每月底23：59触发方法
      */
     @Scheduled(cron = "0 59 23 L * ?")
     public void deleteUser(){
@@ -34,4 +41,28 @@ public class SaticScheduleTask {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 定制单哪些超出出行时间 修改状态  每天23：59触发方法
+     */
+    @Scheduled(cron = "0 59 23 * * ?")
+    public void updatePrivate(){
+        try{
+            //查询有多少个超时定制单
+            List<PrivateOrder> list = privateOrderService.updatePrivate();
+            //循环修改
+            for(PrivateOrder privateOrder : list){
+                //查询该定制单是否报价
+                int count = privateOrderService.getPrivateType(privateOrder);
+                OrderingConllection orderingConllection = new OrderingConllection().setOrderingUuid(privateOrder.getUuid());
+                if(count == 0){
+                    privateOrderService.addCollection(orderingConllection);
+                } else {
+                    privateOrderService.updateCollection(orderingConllection);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -260,6 +260,4 @@ public class PersonalController {
         }
         return map;
     }
-
-
 }

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

@@ -50,6 +50,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -71,6 +72,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -92,6 +94,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -116,6 +119,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -136,6 +140,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -154,6 +159,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -181,6 +187,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -205,6 +212,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -224,6 +232,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }
@@ -242,6 +251,7 @@ public class ReleaseTravelController {
         }catch (Exception e){
             e.printStackTrace();
             map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }

src/main/java/com/travel/jwt/JWTUtil.java

@@ -20,7 +20,7 @@ public class JWTUtil {
      */
     public static String getToken(Map<String, String> map) throws Exception {
         Calendar instance = Calendar.getInstance();
-        instance.add(Calendar.DATE, 30);   //默认7天过期
+//        instance.add(Calendar.DATE, 30);   //默认30天过期
         // 创建jwt builder
         JWTCreator.Builder builder = JWT.create();
         // 将map中的payload 放入

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

@@ -21,4 +21,10 @@ public interface PrivateOrderMapper {
     void addPrivateType(PrivateOrder privateOrder);
 
     List<PrivateOrder> getPrivateZero(PrivateOrder privateOrder);
+
+    List<PrivateOrder> updatePrivate();
+
+    int getPrivateType(PrivateOrder privateOrder);
+
+    void updateCollection(OrderingConllection orderingConllection);
 }

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

@@ -125,4 +125,16 @@ public class Travel implements Serializable {
      * 查看数量
      */
     private int lookNum;
+    /**
+     * 页数
+     */
+    private int page;
+    /**
+     * 条数
+     */
+    private int limit;
+    /**
+     * 集合标题
+     */
+    private String titleDayName;
 }

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

@@ -19,4 +19,10 @@ public interface PrivateOrderService {
     void addPrivateType(PrivateOrder privateOrder);
 
     List<PrivateOrder> getPrivateZero(PrivateOrder privateOrder);
+
+    List<PrivateOrder> updatePrivate();
+
+    int getPrivateType(PrivateOrder privateOrder);
+
+    void updateCollection(OrderingConllection orderingConllection);
 }

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

@@ -54,4 +54,20 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     public List<PrivateOrder> getPrivateZero(PrivateOrder privateOrder) {
         return privateOrderMapper.getPrivateZero(privateOrder);
     }
+
+    @Override
+    public List<PrivateOrder> updatePrivate() {
+        return privateOrderMapper.updatePrivate();
+    }
+
+    @Override
+    public int getPrivateType(PrivateOrder privateOrder) {
+        return privateOrderMapper.getPrivateType(privateOrder);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateCollection(OrderingConllection orderingConllection) {
+        privateOrderMapper.updateCollection(orderingConllection);
+    }
 }

src/main/resources/application.yml

@@ -21,9 +21,9 @@ spring:
     async:
       request-timeout: 20000
   redis:
-    host: 127.0.0.1
+    host: 8.142.144.205
     port: 6379
-    password:
+    password: '#09SilverB'
     jedis:
       pool:
         max-active: 0

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

@@ -50,7 +50,7 @@
     </insert>
     <!-- 新增定制单状态 -->
     <insert id="addPrivateType" parameterType="PrivateOrder">
-        insert into bus_private_ordering_type(code,demand_uuid,order_type) values(null, #{uuid}, 0)
+        insert into bus_private_ordering_type(code,demand_uuid,order_type) values('0000000000', #{uuid}, 10)
     </insert>
     <!-- 查询私人订制零 -->
     <select id="getPrivateZero" resultType="PrivateOrder">
@@ -69,4 +69,16 @@
             and b.code = #{code}
         </if>
     </select>
+    <!-- 查询定制单哪些超出出行时间 修改状态 -->
+    <select id="updatePrivate" parameterType="PrivateOrder" resultType="PrivateOrder">
+        select * from bus_private_ordering where end_time <![CDATA[ < ]]> format(SYSDATETIME(),'yyyy-MM-dd')
+    </select>
+    <!-- 查询定制单状态里是否存在这一项 -->
+    <select id="getPrivateType" parameterType="PrivateOrder">
+        select COUNT( * ) AS COUNT from bus_private_ordering_type where demand_uuid = #{uuid}
+    </select>
+    <!-- 超时修改状态 -->
+    <update id="updateCollection" parameterType="OrderingConllection">
+        update bus_private_ordering_type set order_type = 10 where demand_uuid = #{uuid}
+    </update>
 </mapper>

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

@@ -8,29 +8,31 @@
     </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,look_num)
-        values (#{code},#{titleImg},#{synopsis},#{videoUrl},#{imgUrl},#{uuid},#{stateType},#{travelDate},#{travelDay},#{capita},#{figure},#{playType},#{season},#{destination},GETDATE(),#{title},#{titleTravel},#{demandUuid},0)
+        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,title_day_name)
+        values (#{code},#{titleImg},#{synopsis},#{videoUrl},#{imgUrl},#{uuid},#{stateType},#{travelDate},#{travelDay},#{capita},#{figure},#{playType},#{season},#{destination},GETDATE(),#{title},#{titleTravel},#{demandUuid},0,#{titleDayName})
     </insert>
     <!-- 查询游记内容 -->
     <select id="getTravel" 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
+        from
+        ( SELECT *, ROW_NUMBER ( ) OVER ( ORDER BY ID ) AS RowId FROM bus_travel ) AS a
+        LEFT JOIN ( SELECT COUNT ( * ) AS countNum, travel_uuid FROM sys_travel_give GROUP BY travel_uuid ) b ON a.uuid = b.travel_uuid
+        LEFT 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
+        LEFT 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">
+            RowId BETWEEN #{page} AND #{limit}
             <if test="uuid != null and uuid != ''">
-                and uuid = #{uuid}
+                and a.uuid = #{uuid}
             </if>
             <if test="code != null and code != ''">
-                and code = #{code}
+                and a.code = #{code}
             </if>
             <if test="stateType != null and stateType != ''">
-                and state_type = #{stateType}
+                and a.state_type = #{stateType}
             </if>
             <if test="demandUuid != null and demandUuid != ''">
-                and demand_uuid = #{demandUuid}
+                and a.demand_uuid = #{demandUuid}
             </if>
         </trim>
     </select>
@@ -38,19 +40,21 @@
     <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
+        from
+        ( SELECT *, ROW_NUMBER ( ) OVER ( ORDER BY ID ) AS RowId FROM bus_travel ) AS a
+        LEFT JOIN ( SELECT COUNT ( * ) AS countNum, travel_uuid FROM sys_travel_give GROUP BY travel_uuid ) b ON a.uuid = b.travel_uuid
+        LEFT 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
+        LEFT 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">
+            RowId BETWEEN #{page} AND #{limit}
             <if test="uuid != null and uuid != ''">
-                and uuid = #{uuid}
+                and a.uuid = #{uuid}
             </if>
             <if test="stateType != null and stateType != ''">
-                and state_type = #{stateType}
+                and a.state_type = #{stateType}
             </if>
             <if test="demandUuid != null and demandUuid != ''">
-                and demand_uuid = #{demandUuid}
+                and a.demand_uuid = #{demandUuid}
             </if>
         </trim>
     </select>
@@ -117,6 +121,9 @@
                 <if test="titleTravel != null and titleTravel != ''">
                     title_travel=#{titleTravel},
                 </if>
+                <if test="titleDayName != null and titleDayName != ''">
+                    title_day_name=#{titleDayName},
+                </if>
             </trim>
         </set>
         where uuid = #{uuid}