在岛人数表清空

mq-crj-service/src/main/java/cn/com/taiji/mqcrj/mapper/BaseCreateNewTableMapper.java

@@ -29,4 +29,6 @@ public interface BaseCreateNewTableMapper {
 
 
     void dropTable(String tableName);
+
+    void delTable(String tableName);
 }

mq-crj-service/src/main/java/cn/com/taiji/mqcrj/task/OracleScheduleTask.java

@@ -169,7 +169,7 @@ public class OracleScheduleTask {
                 preparedStatement.close();
                 resultSet.close();
             }
-            log.info("数据导入结束后表名修改");
+            //log.info("数据导入结束后表名修改");
             //数据导入结束后表名修改
             baseCreateNewTableMapper.modifyTableName("v_sg_mqwgr_his"+DateUtil.format(DateUtil.yesterday(), "YYYYMMdd"),"v_sg_mqwgr");
             baseCreateNewTableMapper.modifyTableName("v_sg_mqwgr","v_sg_mqwgr_"+DateUtil.format(DateUtil.yesterday(), "YYYYMMdd"));

mq-crj-service/src/main/java/cn/com/taiji/mqcrj/task/ScheduleTask.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.mqcrj.task;
 
 import cn.com.taiji.mqcrj.entity.*;
+import cn.com.taiji.mqcrj.mapper.BaseCreateNewTableMapper;
 import cn.com.taiji.mqcrj.service.*;
 import cn.com.taiji.mqcrj.utils.Constant;
 import cn.com.taiji.mqcrj.utils.SSLClient;
@@ -47,6 +48,8 @@ public class ScheduleTask {
     @Resource
     private MQWGRYJSJService mqwgryjsjService;
 
+    @Resource
+    private BaseCreateNewTableMapper baseCreateNewTableMapper;
 
     @Value("${taiji.jgUrl}")
     private String jgUrl;
@@ -60,7 +63,7 @@ public class ScheduleTask {
     /**
      * 每天六点执行一次  获取免签地区在岛人数
      */
-    @Scheduled(cron = "0 40 5 * * ?")
+    @Scheduled(cron = "0 40 6 * * ?")
     public void scheduleOne() throws Exception {
         log.info("免签-执行START时间-{}", DateUtil.date());
         HttpClient client = new SSLClient();
@@ -72,7 +75,7 @@ public class ScheduleTask {
             JSONObject jsonObject = JSONObject.parseObject(result);
             Integer total = jsonObject.getInteger("total");
             for (int i=1;i<=total/200+1;i++){
-                Thread.sleep(10000);
+                Thread.sleep(1000);
                 HttpGet httpGet = handleJgUrl(Constant.MQDQZDRS, null, i);
                 HttpResponse response = client.execute(httpGet);
                 if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
@@ -85,6 +88,7 @@ public class ScheduleTask {
                         mqdqzdrsService.saveOrUpdateBatch(visaFreeAreaIslandPeople);
                     }
                 }
+                httpGet.releaseConnection();
             }
         }
 
@@ -103,8 +107,12 @@ public class ScheduleTask {
             JSONObject jsonObject = JSONObject.parseObject(result);
 
             Integer total = jsonObject.getInteger("total");
+            if(total>0){
+                baseCreateNewTableMapper.delTable("jg_mqdqcrj_zdrs");
+            }
+
             for (int i=1;i<=total/200+1;i++){
-                Thread.sleep(10000);
+                Thread.sleep(1000);
                 HttpGet httpGet = handleJgUrl(Constant.MQDQCRJZDRS, null, i);
                 HttpResponse response = client.execute(httpGet);
                 if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
@@ -117,12 +125,13 @@ public class ScheduleTask {
                         mqdqcrjzdrsService.saveOrUpdateBatch(visaFree);
                     }
                 }
+                httpGet.releaseConnection();
             }
         }
         log.info("执行END时间-{}", DateUtil.date());
     }
 
-    @Scheduled(cron = "2 20 5 * * ?")
+    @Scheduled(cron = "2 50 6 * * ?")
     public void scheduleThree() throws Exception {
         HttpClient client = new SSLClient();
         HttpGet get = handleJgUrl(Constant.MQWGRQZQK, null, 1);
@@ -133,7 +142,7 @@ public class ScheduleTask {
             JSONObject jsonObject = JSONObject.parseObject(result);
             Integer total = jsonObject.getInteger("total");
             for (int i=1;i<=total/200+1;i++){
-                Thread.sleep(10000);
+                Thread.sleep(1000);
                 HttpGet httpGet = handleJgUrl(Constant.MQWGRQZQK, null, i);
                 HttpResponse response = client.execute(httpGet);
                 if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
@@ -146,11 +155,12 @@ public class ScheduleTask {
                         mqwgrqzblqkService.saveOrUpdateBatch(visaFreeForeignerApplies);
                     }
                 }
+                httpGet.releaseConnection();
             }
         }
     }
 
-    @Scheduled(cron = "3 0 5 * * ?")
+    @Scheduled(cron = "3 0 6 * * ?")
     public void scheduleFour() throws Exception {
         HttpClient client = new SSLClient();
         HttpGet get = handleJgUrl(Constant.MQWGRYJ, null, 1);
@@ -162,7 +172,7 @@ public class ScheduleTask {
 
             Integer total = jsonObject.getInteger("total");
             for (int i=1;i<=total/200+1;i++){
-                Thread.sleep(10000);
+                Thread.sleep(1000);
                 HttpGet httpGet = handleJgUrl(Constant.MQWGRYJ, null, i);
                 HttpResponse response = client.execute(httpGet);
                 if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
@@ -175,11 +185,12 @@ public class ScheduleTask {
                         mqwgryjService.saveOrUpdateBatch(visaFreePersonWarnings);
                     }
                 }
+                httpGet.releaseConnection();
             }
         }
     }
 
-    @Scheduled(cron = "4 20 4 * * ?")
+    @Scheduled(cron = "4 20 6 * * ?")
     public void scheduleFive() throws Exception {
         HttpClient client = new SSLClient();
         HttpGet get = handleJgUrl(Constant.MQWGRZDJZQK, null, 1);
@@ -190,7 +201,7 @@ public class ScheduleTask {
             JSONObject jsonObject = JSONObject.parseObject(result);
             Integer total = jsonObject.getInteger("total");
             for (int i=1;i<=total/200+1;i++){
-                Thread.sleep(10000);
+                Thread.sleep(1000);
                 HttpGet httpGet = handleJgUrl(Constant.MQWGRZDJZQK, null, i);
                 HttpResponse response = client.execute(httpGet);
                 if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
@@ -203,12 +214,13 @@ public class ScheduleTask {
                         mqwgrzdjzqkService.saveOrUpdateBatch(visaFreePersonPutUpConditions);
                     }
                 }
+                httpGet.releaseConnection();
             }
         }
     }
 
 
-    @Scheduled(cron = "6 10 3 * * ?")
+    @Scheduled(cron = "6 10 6 * * ?")
     public void scheduleSix() throws Exception {
         HttpClient client = new SSLClient();
         HttpGet get = handleJgUrl(Constant.MQWGRYJSJ, null, 1);
@@ -219,9 +231,9 @@ public class ScheduleTask {
             JSONObject jsonObject = JSONObject.parseObject(result);
             Integer total = jsonObject.getInteger("total");
             for (int i=1;i<=total/200+1;i++){
-                Thread.sleep(10000);
                 HttpGet httpGet = handleJgUrl(Constant.MQWGRYJSJ, null, i);
                 HttpResponse response = client.execute(httpGet);
+
                 if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
                     HttpEntity entityPage = response.getEntity();
                     String resultPage = EntityUtils.toString(entityPage);
@@ -232,6 +244,7 @@ public class ScheduleTask {
                         mqwgryjsjService.saveOrUpdateBatch(visaFreeWarningData);
                     }
                 }
+                httpGet.releaseConnection();
             }
         }
     }

mq-crj-service/src/main/resources/mapper/CreateNewTableMapper.xml

@@ -110,4 +110,8 @@
     <update id="dropTable" parameterType="string">
         DROP TABLE IF EXISTS ${tableName}
     </update>
+
+    <update id="delTable" parameterType="string">
+        TRUNCATE FROM ${tableName}
+    </update>
 </mapper>