1.

王通
1 parent e2fd7aca
Showing 5 changed files with 206 additions and 145 deletions
src/main/java/com/bsth/controller/UserController.java
src/main/java/com/bsth/server_rs/base_info/line/buffer/LineBufferData.java
src/main/java/com/bsth/server_rs/dks/DksRestService.java
src/main/java/com/bsth/server_rs/dks/LineServiceConfig.java
src/main/java/com/bsth/service/impl/UserServiceImpl.java
-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("/user")
-public class UserController {
-
-    @Autowired
-    UserService userService;
-
-    @RequestMapping("load_db_data")
-    private void loadDbData(){
-        userService.loadData();
-    }
-}
+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("/user")
+public class UserController {
+
+    @Autowired
+    UserService userService;
+
+    @RequestMapping("load_db_data")
+    public void loadDbData(){
+        userService.loadData();
+    }
+}
-package com.bsth.server_rs.base_info.line.buffer;
-
-import com.bsth.Application;
-import com.bsth.server_rs.base_info.line.Line;
-import com.google.common.collect.ArrayListMultimap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 线路数据缓存（自更新）
- * Created by panzhao on 2017/3/27.
- */
-@Component
-@Order(5)
-public class LineBufferData implements CommandLineRunner {
-
-    @Autowired
-    LineRefreshThread lineRefreshThread;
-
-    private static List<Line> data;
-    private static Map<String, Line> idMap;
-    private static ArrayListMultimap<String, Line> companyListMap;
-
-    public static List<Line> findAll(){
-        return data;
-    }
-
-    public static Line findOne(String lineCode){
-        return idMap.get(lineCode);
-    }
-
-    public static List<Line> findByCompany(String company){
-        return companyListMap.get(company);
-    }
-
-    public static void replaceAll(List<Line> newData){
-        data = newData;
-        Map<String, Line> idMapCopy = new HashMap<>();
-        ArrayListMultimap<String, Line> listMap = ArrayListMultimap.create();
-
-        for(Line line : data){
-            idMapCopy.put(line.getLineCode(), line);
-            listMap.put(line.getCompany(), line);
-        }
-        idMap = idMapCopy;
-
-        companyListMap = listMap;
-    }
-
-    @Override
-    public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(lineRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
-    }
-
-    public static List<String> findCodesByCompany(String company) {
-        List<Line> list = companyListMap.get(company);
-        List<String> codes = new ArrayList<>(list.size());
-
-        for(Line line : list)
-            codes.add(line.getLineCode());
-        return codes;
-    }
-}
+package com.bsth.server_rs.base_info.line.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.line.Line;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 线路数据缓存（自更新）
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+@Order(5)
+public class LineBufferData implements CommandLineRunner {
+
+    @Autowired
+    LineRefreshThread lineRefreshThread;
+
+    private static List<Line> data;
+    private static Map<String, Line> idMap = new HashMap<>();
+    private static ArrayListMultimap<String, Line> companyListMap;
+
+    public static List<Line> findAll(){
+        return data;
+    }
+
+    public static Line findOne(String lineCode){
+        return idMap.get(lineCode);
+    }
+
+    public static List<Line> findByCompany(String company){
+        return companyListMap.get(company);
+    }
+
+    public static void replaceAll(List<Line> newData){
+        data = newData;
+        Map<String, Line> idMapCopy = new HashMap<>();
+        ArrayListMultimap<String, Line> listMap = ArrayListMultimap.create();
+
+        for(Line line : data){
+            idMapCopy.put(line.getLineCode(), line);
+            listMap.put(line.getCompany(), line);
+        }
+        idMap = idMapCopy;
+
+        companyListMap = listMap;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(lineRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+
+    public static List<String> findCodesByCompany(String company) {
+        List<Line> list = companyListMap.get(company);
+        List<String> codes = new ArrayList<>(list.size());
+
+        for(Line line : list)
+            codes.add(line.getLineCode());
+        return codes;
+    }
+}
@@ -156,7 +156,7 @@ public class DksRestService {
         String oldLineCode = "";
         BusVo vo = null;
         int max = 0;
-        String maxCodes = "";
+        String maxCodes = "", maxCompanyCode = "", maxCompanyName = "";
         for (int i = 0, len = configs.size();i < len;i++) {
             LineServiceConfig config = configs.get(i);
             if (i == 0) {
@@ -167,11 +167,15 @@ public class DksRestService {
                 vo.setMonth(month);
                 vo.setBusFirstCount(config.getCarCount());
                 vo.setBusFirstCodes(config.getCarCodes());
+                vo.setCompanyCode(config.getCompanyCode());
+                vo.setCompanyName(config.getCompanyName());
             } else if (!oldLineCode.equals(config.getLineCode())) {
                 oldLineCode = config.getLineCode();
                 vo.setBusMaxCount(max);
                 vo.setBusMaxCount(max);
                 vo.setBusMaxCodes(maxCodes);
+                vo.setCompanyCode(maxCompanyCode);
+                vo.setCompanyName(maxCompanyName);
                 result.add(vo);
                 max = 0;
                 vo = new BusVo();
@@ -180,10 +184,14 @@ public class DksRestService {
                 vo.setMonth(month);
                 vo.setBusFirstCount(config.getCarCount());
                 vo.setBusFirstCodes(config.getCarCodes());
+                vo.setCompanyCode(config.getCompanyCode());
+                vo.setCompanyName(config.getCompanyName());
             }
             if (max < config.getCarCount()) {
                 max = config.getCarCount();
                 maxCodes = config.getCarCodes();
+                maxCompanyCode = config.getCompanyCode();
+                maxCompanyName = config.getCompanyName();
             }
             if (i == len - 1) {
                 vo.setBusMaxCount(max);
@@ -192,6 +200,8 @@ public class DksRestService {
             }
             vo.setBusLastCount(config.getCarCount());
             vo.setBusLastCodes(config.getCarCodes());
+            vo.setCompanyCode(config.getCompanyCode());
+            vo.setCompanyName(config.getCompanyName());
         }
         return result;
@@ -327,6 +337,8 @@ public class DksRestService {
                 sb.append(car).append(",");
             }
             object.setCarCodes(sb.toString());
+            object.setCompanyCode(line == null ? "" : line.getCompany());
+            object.setCompanyName(line == null ? "" : line.getCompanyName());
             objects.add(object);
         }
@@ -339,7 +351,7 @@ public class DksRestService {
         try {
             jdbcTemplate.update("delete from control_interface.bsth_t_plan where schedule_date = ?", new Object[]{ dateTime.toString("yyyy-MM-dd") });
-            jdbcTemplate.batchUpdate("insert into control_interface.bsth_t_plan (line_code, line_name, schedule_date, conductor_count, driver_count, car_count, car_codes) values (?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+            jdbcTemplate.batchUpdate("insert into control_interface.bsth_t_plan (line_code, line_name, schedule_date, conductor_count, driver_count, car_count, car_codes, company_code, company_name) values (?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int i) throws SQLException {
                     LineServiceConfig object = objects.get(i);
@@ -350,6 +362,8 @@ public class DksRestService {
                     ps.setInt(5, object.getDriverCount());
                     ps.setInt(6, object.getCarCount());
                     ps.setString(7, object.getCarCodes());
+                    ps.setString(8, object.getCompanyCode());
+                    ps.setString(9, object.getCompanyName());
                 }
                 @Override
@@ -359,6 +373,7 @@ public class DksRestService {
             });
             tran.commit(status);
         } catch (Exception e) {
+            log.error("planComputation", e);
             tran.rollback(status);
         }
     }
@@ -435,6 +450,7 @@ public class DksRestService {
             });
             tran.commit(status);
         } catch (Exception e) {
+            log.error("", e);
             tran.rollback(status);
         }
     }
@@ -612,6 +628,7 @@ public class DksRestService {
             });
             tran.commit(status);
         } catch (Exception e) {
+            log.error("", e);
             tran.rollback(status);
         }
     }
@@ -715,6 +732,10 @@ public class DksRestService {
         private String busMaxCodes;
+        private String companyCode;
+
+        private String companyName;
+
         public String getLineCode() {
             return lineCode;
         }
@@ -786,6 +807,22 @@ public class DksRestService {
         public void setBusMaxCodes(String busMaxCodes) {
             this.busMaxCodes = busMaxCodes;
         }
+
+        public String getCompanyCode() {
+            return companyCode;
+        }
+
+        public void setCompanyCode(String companyCode) {
+            this.companyCode = companyCode;
+        }
+
+        public String getCompanyName() {
+            return companyName;
+        }
+
+        public void setCompanyName(String companyName) {
+            this.companyName = companyName;
+        }
     }
     /**
@@ -22,6 +22,10 @@ public class LineServiceConfig {
     private String carCodes;
+    private String companyCode;
+
+    private String companyName;
+
     public String getLineCode() {
         return lineCode;
     }
@@ -85,4 +89,20 @@ public class LineServiceConfig {
     public void setCarCodes(String carCodes) {
         this.carCodes = carCodes;
     }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
 }
-package com.bsth.service.impl;
-
-import com.bsth.entity.PasswordUser;
-import com.bsth.repository.UserRepository;
-import com.bsth.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/3/26.
- */
-@Service
-@Order(4)
-public class UserServiceImpl implements UserService , CommandLineRunner {
-
-    @Autowired
-    UserRepository userRepository;
-
-    private Map<String, PasswordUser> pwd2UserMap;
-
-    @Override
-    public PasswordUser get(String pwd) {
-        return pwd2UserMap.get(pwd);
-    }
-
-    @Override
-    public void loadData(){
-        Map<String, PasswordUser> map = new HashMap<>();
-        Iterator<PasswordUser> iterator = userRepository.findAll().iterator();
-        PasswordUser user;
-        while (iterator.hasNext()){
-            user = iterator.next();
-            map.put(user.getPwd(), user);
-        }
-        pwd2UserMap = map;
-
-        System.out.println("加载user size:" + pwd2UserMap.size());
-    }
-
-    @Override
-    public void run(String... strings) throws Exception {
-        loadData();
-    }
-}
+package com.bsth.service.impl;
+
+import com.bsth.entity.PasswordUser;
+import com.bsth.repository.UserRepository;
+import com.bsth.service.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/3/26.
+ */
+@Service
+@Order(4)
+public class UserServiceImpl implements UserService , CommandLineRunner {
+
+    private final static Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
+
+    @Autowired
+    UserRepository userRepository;
+
+    private Map<String, PasswordUser> pwd2UserMap;
+
+    @Override
+    public PasswordUser get(String pwd) {
+        return pwd2UserMap.get(pwd);
+    }
+
+    @Override
+    public void loadData(){
+        Map<String, PasswordUser> map = new HashMap<>();
+        Iterator<PasswordUser> iterator = userRepository.findAll().iterator();
+        PasswordUser user;
+        while (iterator.hasNext()){
+            user = iterator.next();
+            map.put(user.getPwd(), user);
+        }
+        pwd2UserMap = map;
+
+        log.info("加载user size:" + pwd2UserMap.size());
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        loadData();
+    }
+}