update...

潘钊
1 parent 933d77af
Showing 5 changed files with 59 additions and 2 deletions
src/main/java/com/bsth/common/BasicData.java
src/main/java/com/bsth/controller/UserController.java
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleInOut.java
src/main/java/com/bsth/service/UserService.java
src/main/java/com/bsth/service/impl/UserServiceImpl.java
 package com.bsth.common;
 import com.bsth.Application;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
@@ -37,6 +39,10 @@ public class BasicData implements CommandLineRunner {
         Application.mainServices.scheduleWithFixedDelay(basicDataLoader, 60 * 10, 60 * 10, TimeUnit.SECONDS);
     }
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyyMMdd");
+    private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+    private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
     @Component
     public static class BasicDataLoader extends Thread {
@@ -54,6 +60,7 @@ public class BasicData implements CommandLineRunner {
             Map<String, String> lineStartTimeMapCopy = new HashMap<>();
             String sql = "select START_OPT,t2.LINE_CODE from bsth_c_line_config t1 INNER JOIN bsth_c_line t2 on t1.line=t2.id where t2.line_code is not null";
+            //String cts = fmtHHmm.print(System.currentTimeMillis());
             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
             String lineCode, startTime;
@@ -69,7 +76,12 @@ public class BasicData implements CommandLineRunner {
         }
         private String calcScheduleDate(String startDate){
-            return "20170831";
+            long t = System.currentTimeMillis();
+
+            if(fmtHHmm.print(t).compareTo(startDate) < 0)
+                t += DAY_TIME;
+
+            return fmtyyyyMMdd.print(t);
         }
     }
 }
+package com.bsth.controller;
+
+import com.bsth.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/9/4.
+ */
+@RestController
+@RequestMapping("/line2System")
+public class UserController {
+
+    @Autowired
+    UserService userService;
+
+    @RequestMapping("load_db_data")
+    private void loadDbData(){
+        userService.loadData();
+    }
+}
@@ -37,6 +37,24 @@ public class ScheduleInOut implements Serializable {
     ScheduleInOut(ScheduleRealInfo sch){
         this.id = sch.getId();
+        this.scheduleDateStr = sch.getScheduleDateStr();
+        this.lineCode = sch.getXlBm();
+        this.lineName = sch.getXlName();
+        this.lpName = sch.getLpName();
+        this.nbbm = sch.getClZbh();
+        this.jsy = sch.getjGh() + "/" + sch.getjName();
+        this.spy = sch.getsGh() + "/" + sch.getsName();
+        this.upDown = Integer.parseInt(sch.getXlDir());
+        this.qdzCode = sch.getQdzCode();
+        this.qdzName = sch.getQdzName();
+        this.zdzCode = sch.getZdzCode();
+        this.zdzName = sch.getZdzName();
+        this.dfsjT = sch.getDfsjT();
+        this.zdsjT = sch.getZdsjT();
+        this.fcsjActualTime = sch.getFcsjActualTime();
+        this.zdsjActualTime = sch.getZdsjActualTime();
+        this.sflj = sch.isSflj();
+        this.remarks = sch.getRemarks();
     }
     private Long id;
@@ -8,4 +8,6 @@ import com.bsth.entity.PasswordUser;
 public interface UserService {
     PasswordUser get(String pwd);
+
+    void loadData();
 }
@@ -29,7 +29,8 @@ public class UserServiceImpl implements UserService , CommandLineRunner {
         return pwd2UserMap.get(pwd);
     }
-    private void loadData(){
+    @Override
+    public void loadData(){
         Map<String, PasswordUser> map = new HashMap<>();
         Iterator<PasswordUser> iterator = userRepository.findAll().iterator();
         PasswordUser user;
@@ -38,6 +39,8 @@ public class UserServiceImpl implements UserService , CommandLineRunner {
             map.put(user.getPwd(), user);
         }
         pwd2UserMap = map;
+
+        System.out.println("加载user size:" + pwd2UserMap.size());
     }
     @Override