修改的定时器时间

yiming
1 parent 014e55c3
Showing 5 changed files with 103 additions and 68 deletions
src/main/java/com/example/demo/SaticScheduleTask.java
src/main/java/com/example/demo/service/Analysis.java
src/main/java/com/example/demo/service/Contrast.java
src/main/resources/application.properties
src/main/resources/logback.xml
@@ -50,61 +50,73 @@ public class SaticScheduleTask implements InitializingBean {
     @Scheduled(cron = "0 0/10 * * * ?")
-    void getArrivalInfos() throws Exception {
+    void getArrivalInfos(){
         logger.info("票务数据缓存加载: " + LocalDateTime.now());
-        LocalDateTime now=LocalDateTime.now();
-        List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
-        contrast.getSchedulingS=result.get(0);
-        contrast.getSchedulingSSell=result.get(1);
-        logger.info("===============================数据存放结束,开始读取文件================================");
-        WatchKey watchKey = null;
-        List<File> files = new ArrayList<>();
-        while ((watchKey = watchService.poll()) != null) {
-            for (WatchEvent watchEvent : watchKey.pollEvents()) {
-                Path path = (Path)watchEvent.context();
-                if(path!=null){
-                    files.add(new File(rootPath + File.separator + path));
-                }
+        try {
+            LocalDateTime now=LocalDateTime.now();
+            List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
+            contrast.getSchedulingS=result.get(0);
+            contrast.getSchedulingSSell=result.get(1);
+            logger.info("===============================数据存放结束,开始读取文件================================");
+            WatchKey watchKey = null;
+            List<File> files = new ArrayList<>();
+            while ((watchKey = watchService.poll()) != null) {
+                for (WatchEvent watchEvent : watchKey.pollEvents()) {
+                    Path path = (Path)watchEvent.context();
+                    if(path!=null){
+                        files.add(new File(rootPath + File.separator + path));
+                    }
+                }
+                watchKey.reset();
             }
-            watchKey.reset();
-        }
-        System.out.println("文件数"+files.size());
-        logger.info("===============================文件数"+files.size()+",读取文件结束================================");
-        //先把处理上一次没匹配到的
-        logger.info("===============================处理上次未匹配到的数据"+contrast.oldData.size()+"================================");
-        if(!contrast.oldData.isEmpty()){
-            contrast.filterCardList(contrast.oldData,true);
+            System.out.println("文件数"+files.size());
+            logger.info("===============================文件数"+files.size()+",读取文件结束================================");
+            //先把处理上一次没匹配到的
+            logger.info("===============================处理上次未匹配到的数据"+contrast.oldData.size()+"================================");
+            if(!contrast.oldData.isEmpty()){
+                contrast.filterCardList(contrast.oldData,true);
+            }
+            logger.info("===============================文件解析开始================================");
+            List<TJRLDB> allFile = analysis.getAllFile(files);
+            logger.info("===============================交易数"+allFile.size()+"文件解析结束================================");
+            contrast.filterCardList(allFile,false);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        logger.info("===============================文件解析开始================================");
-        List<TJRLDB> allFile = analysis.getAllFile(files);
-        logger.info("===============================交易数"+allFile.size()+"文件解析结束================================");
-        contrast.filterCardList(allFile,false);
     }
     void getArrivalInfos2() {
         logger.info("票务数据缓存加载: " + LocalDateTime.now());
-        LocalDateTime now=LocalDateTime.now();
-        //测试
-        DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        now=LocalDateTime.parse("2021-11-19 00:00",tdf);
-        List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
-        contrast.getSchedulingS=result.get(0);
-        contrast.getSchedulingSSell=result.get(1);
-        List<File> fl= FileUtil.loopFiles("/home/sftp/20211118");
-        System.out.println(fl.size());
-        List<List<File>> subList=getSubList(100,fl);
-        if(!subList.isEmpty()){
-            subList.forEach(fs->{
-                if (!fs.isEmpty()) {
-                    System.out.println("文件数"+fs.size());
-                    List<TJRLDB> allFile = analysis.getAllFile(fs);
-                    System.out.println("交易数"+allFile.size());
-                    contrast.filterCardList(allFile,true);
-                }
-            });
+        try {
+            LocalDateTime now=LocalDateTime.now();
+            //测试
+            DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            now=LocalDateTime.parse("2021-11-19 00:00",tdf);
+            List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
+            contrast.getSchedulingS=result.get(0);
+            contrast.getSchedulingSSell=result.get(1);
+            List<File> fl= FileUtil.loopFiles("/home/oldFile/20211118COPY");
+            System.out.println(fl.size());
+            List<List<File>> subList=getSubList(100,fl);
+            if(!subList.isEmpty()){
+                subList.forEach(fs->{
+                    if (!fs.isEmpty()) {
+                        System.out.println("文件数"+fs.size());
+                        try {
+                            List<TJRLDB> allFile = analysis.getAllFile(fs);
+                            System.out.println("交易数"+allFile.size());
+                            contrast.filterCardList(allFile,true);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
@@ -34,7 +34,7 @@ public class Analysis {
      * @param files 需要遍历的文件夹路径
      * @return
      */
-    public  List<TJRLDB> getAllFile(List<File> files) {
+    public  List<TJRLDB> getAllFile(List<File> files) throws Exception {
         List<TJRLDB> listMap = new ArrayList<>();
         List<String> list = new ArrayList<String>();
         for (File file : files) {
@@ -55,6 +55,8 @@ public class Analysis {
                         String text = strings.get(i);
                         Map<String, Object> map = new HashMap<>();
                         TJRLDB tjrl=new TJRLDB();
+                        String POSID=text.substring(0,8);
+                        tjrl.setTJRLPOSID(POSID);
                         Long val = Long.parseLong(text.substring(30, 40));
                         String cardId = Long.toHexString(val).toUpperCase();
                         tjrl.setTJRLDRVCRDID(cardId);//司售卡号 DriverCardId签到卡片ID号，BCD编码，司售卡卡号
@@ -62,8 +64,7 @@ public class Analysis {
                         //map.put("CHECKINDATE", text.substring(42, 54));//签到时间YYYYMMDDhhmm，BCD编码
                         //map.put("CHECKOUTCOUNT", text.substring(54, 60));//签到总次数，BCD编码
                         tjrl.setTJRLTXFG(text.substring(60, 62));//交易类型  Txn Flag HEX格式，交易标志，其中88为正常交易，99为锁卡交易，BCD编码，定义见附录1交易类型对照表
-                        String TJRLPOSID=text.substring(62, 68);
-                        tjrl.setTJRLPOSID(TJRLPOSID);//HEX格式，消费交易流水号，BCD编码
+                        String POSSEQID=text.substring(62, 68);//HEX格式，消费交易流水号，BCD编码
                         //map.put("CITYCODE", text.substring(68, 72));    //城市代码号，BCD编码
                         tjrl.setTJRLCARDNO(text.substring(72, 82));//CARDID消费卡的ID号，BCD编码
                         tjrl.setTJRLCDKIND(text.substring(82, 84));//Card Type HEX格式，消费卡卡型，BCD编码
@@ -89,7 +90,7 @@ public class Analysis {
                         tjrl.setTJRLORGAMT(text.substring(120, 124));//交易原始金额Orignal Txn Amount
                         //map.put("CARDSPEC", text.substring(124, 126));   //卡规范，BCD编码 01—建设部卡 02—交通部卡 03-交通部二维码
                         String TAC=text.substring(126, 134);//HEX格式，交易认证码，BCD编码
-                        String TRAD_ID=TAC+TJRLPOSID+TJRLRDATE+TJRLRTIME;
+                        String TRAD_ID=TAC+POSSEQID+TJRLRDATE+TJRLRTIME;
                         tjrl.setTRAD_ID(TRAD_ID);////pos交易数据需要加上 trad_id 用tac+pos流水+交易日期+交易时间
                         listMap.add(tjrl);
@@ -176,5 +177,25 @@ public class Analysis {
         Analysis.oldFile = oldFile;
     }*/
+
+    public static boolean containsWords(String inputString, String[] items) {
+        boolean found = false;
+        for (String item : items) {
+            if (inputString.contains(item)) {
+                found = true;
+                break;
+            }
+
+        }
+        return found;
+    }
+
+    public static void main(String[] args) {
+        String s="A123";
+        String[] arr={"A","B","C","D","E","F"};
+        if(containsWords(s,arr)){
+            System.out.println(s);
+        }
+    }
 }
@@ -50,7 +50,7 @@ public class Contrast {
     private final int TIME=5;
     private final int TIME2=0;//刷卡的时间和到站实际允许误差值
-    public List<Map> getDriverCardList() {
+    public List<Map> getDriverCardList() throws Exception{
         List<Map> list = new ArrayList<>();
         String drivercard = HttpUtils.sendPost("http://112.64.187.3:1080/gjService/gjService/drivercard", null);
         JSONObject obj = JSONObject.parseObject(drivercard);
@@ -79,7 +79,7 @@ public class Contrast {
     * @Author: YM
     * @Date: 2021/10/12
     */
-    public  List<Map<String,List<Scheduling>>>  getSchedulingS(LocalDateTime now,int day)  {
+    public  List<Map<String,List<Scheduling>>>  getSchedulingS(LocalDateTime now,int day)  throws Exception{
         List<Scheduling> schedulingS=new ArrayList<>();
         long start = System.currentTimeMillis();
         Map map = new HashMap();
@@ -192,7 +192,7 @@ public class Contrast {
      * @Author: YM
      * @Date: 2021/10/13
      */
-    public void filterCardList(List<TJRLDB> allData, Boolean isOld)  {
+    public void filterCardList(List<TJRLDB> allData, Boolean isOld) throws Exception {
         logger.info("===============================票务数据匹配开始================================");
         long start = System.currentTimeMillis();
         List<Map> driverCardList = getDriverCardList();//获取司机信息
@@ -342,7 +342,7 @@ public class Contrast {
-    public static int getWeek(String today){
+    public static int getWeek(String today)throws Exception{
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Date date = null;
         try {
@@ -364,7 +364,7 @@ public class Contrast {
         return out;
     }
-    public static String getTransTime(String timeStr) {
+    public static String getTransTime(String timeStr) throws Exception{
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd HHmmss");
         LocalDateTime date = LocalDateTime.parse(timeStr, df);
         DateTimeFormatter f2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -384,7 +384,7 @@ public class Contrast {
         filterCardList(records,false);
     }
-    public List<List<TJRLDB>> getSubList(int length, List<TJRLDB> list){
+    public List<List<TJRLDB>> getSubList(int length, List<TJRLDB> list)throws Exception{
         int size = list.size();
         int temp = size / length + 1;
         boolean result = size % length == 0;
@@ -402,7 +402,7 @@ public class Contrast {
         return subList;
     }
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception{
         String carId="B140C906";
         Contrast contrast=new Contrast();
         List<Map> driverCardList = contrast.getDriverCardList();
@@ -66,6 +66,3 @@ spring.kafka.producer.properties.max.request.size=20971520
 #spring.kafka.producer.acks=all
 #spring.kafka.producer.properties.max.request.size=10485760
-
-logging.path=./logs
-logging.file=Log
 \ No newline at end of file
@@ -6,6 +6,8 @@
         </layout>
     </appender>
+
+    <property name="LOG_INFO_HOME" value="./logs/info" />
     <!--获取比info级别高(包括info级别)但除error级别的日志-->
     <appender name="INFO-LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -24,6 +26,18 @@
             <maxHistory>30</maxHistory>
         </rollingPolicy>
     </appender>
+
+    <appender name="ASYNC-INFO" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>256</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="INFO-LOG"/>
+    </appender>
+
+    <property name="LOG_ERROR_HOME" value="./logs/error" />
+
     <appender name="ERROR-LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>ERROR</level>
@@ -39,15 +53,6 @@
         </rollingPolicy>
     </appender>
-    <appender name="ASYNC-INFO" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>256</queueSize>
-        <!-- 添加附加的appender,最多只能添加一个 -->
-        <appender-ref ref="INFO-LOG"/>
-    </appender>
-
     <appender name="ASYNC-ERROR" class="ch.qos.logback.classic.AsyncAppender">
         <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
         <discardingThreshold>0</discardingThreshold>