Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

sgz
2 parents cd85505c fef9b8c5
Showing 73 changed files with 1587 additions and 1303 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/controller/PersonnelController.java
src/main/java/com/bsth/controller/realcontrol/DataManagerController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/thread/ScheduleLateThread.java → src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/entity/mcy_forms/Shiftuehiclemanth.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1Flat.java
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/DataManagerService.java
src/main/java/com/bsth/service/realcontrol/impl/DataManagerServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -36,4 +36,14 @@ public class Constants {
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+
+	/**
+	 * 解除调度指令和班次的外键约束
+	 */
+	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
+
+	/**
+	 * 批量解除调度指令和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
 }
 package com.bsth.controller;
-import com.bsth.common.ResponseCode;
 import com.bsth.service.BaseService;
-import com.bsth.service.schedule.utils.DataImportExportService;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,8 +29,6 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
     @Autowired
     protected BaseService<T, ID> baseService;
-    @Autowired
-    DataImportExportService dataImportExportService;
     /**
      * @param @param map 查询条件
@@ -126,115 +118,4 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
         return baseService.delete(id);
     }
-    /**
-     * 上传数据文件，并使用ktr转换文件导入数据。
-     *
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(MultipartFile file) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(file, ktrfile);
-
-            resultMap.put("status", ResponseCode.SUCCESS);
-            resultMap.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            resultMap.put("status", ResponseCode.ERROR);
-            resultMap.put("msg", exp.getLocalizedMessage());
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * 使用ktr导出数据。
-     *
-     * @param response
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response) throws Exception {
-        dataExport(response, null);
-    }
-
-    @RequestMapping(value = "/dataExportExt", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        File ktrfile = new File(this.getClass().getResource(getDataExportKtrClasspath()).toURI());
-        File outputfile = null;
-        if (!CollectionUtils.isEmpty(param)) {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile,
-                    param);
-        } else {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile);
-        }
-
-        System.out.println(outputfile.getName());
-        String filePath = outputfile.getAbsolutePath();
-        String fp[] = filePath.split(File.separator);
-        String fileName = fp[fp.length - 1];
-
-        // TODO：使用ktr获取导出数据
-
-        response.setHeader("conent-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + "东东");
-
-        OutputStream os = response.getOutputStream();
-        BufferedOutputStream bos = new BufferedOutputStream(os);
-
-        InputStream is = null;
-
-        is = new FileInputStream(filePath);
-        BufferedInputStream bis = new BufferedInputStream(is);
-
-        int length = 0;
-        byte[] temp = new byte[1 * 1024 * 10];
-
-        while ((length = bis.read(temp)) != -1) {
-            bos.write(temp, 0, length);
-        }
-        bos.flush();
-        bis.close();
-        bos.close();
-        is.close();
-    }
-
-    /**
-     * @return 数据导出的ktr转换文件类路径。
-     */
-    protected String getDataExportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-    /**
-     * @return 导出文件名。
-     */
-    protected String getDataExportFilename() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定导出的文件路径名
-        throw new RuntimeException("必须override，并指定导出文件名");
-    }
-
-    /**
-     * @return 数据导入的ktr转换文件类路径。
-     */
-    protected String getDataImportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导入功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
 }
-package com.bsth.controller;
-
-
-import com.bsth.common.ResponseCode;
-import com.bsth.service.BaseService;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.google.common.base.Splitter;
-import jxl.Sheet;
-import jxl.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by xu on 16/11/3.
- */
-public class BaseController2<T, ID extends Serializable> {
-
-    @Autowired
-    protected BaseService<T, ID> baseService;
-    @Autowired
-    DataImportExportService dataImportExportService;
-
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件分页查询)
-     * @param @param map 查询条件
-     * @param @param page 页码
-     * @param @param size 每页显示数量
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.GET)
-    public Page<T> list(@RequestParam Map<String, Object> map,
-                        @RequestParam(defaultValue = "0") int page,
-                        @RequestParam(defaultValue = "10") int size,
-                        @RequestParam(defaultValue = "id") String order,
-                        @RequestParam(defaultValue = "DESC") String direction){
-
-        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
-        // 多个字段格式：{col1},{col2},{col3},....,{coln}
-        List<String> order_columns = Splitter.on(",").trimResults().splitToList(order);
-        // 多字段排序：DESC,ASC...
-        List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction);
-
-        if (order_dirs.size() == 1) { // 所有字段采用一种排序
-            if (null != order_dirs.get(0) && order_dirs.get(0).equals("ASC")) {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Sort.Direction.ASC, order_columns)));
-            } else {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Sort.Direction.DESC, order_columns)));
-            }
-        } else if (order_columns.size() == order_dirs.size()) {
-            List<Sort.Order> orderList = new ArrayList<>();
-            for (int i = 0; i < order_columns.size(); i++) {
-                if (null != order_dirs.get(i) && order_dirs.get(i).equals("ASC")) {
-                    orderList.add(new Sort.Order(Sort.Direction.ASC, order_columns.get(i)));
-                } else {
-                    orderList.add(new Sort.Order(Sort.Direction.DESC, order_columns.get(i)));
-                }
-            }
-            return baseService.list(map, new PageRequest(page, size, new Sort(orderList)));
-        } else {
-            throw new RuntimeException("多字段排序参数格式问题，排序顺序和字段数不一致");
-        }
-    }
-
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件查询)
-     * @param @param map
-     * @throws
-     */
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    public Iterable<T> list(@RequestParam Map<String, Object> map){
-        return baseService.list(map);
-    }
-
-    /**
-     * 这里保存直接返回保存后的对象，不自己定义Map返回了，和前端angularjs配合。
-     * form也可以提交，但是页面参数可能不全，
-     * json的化比较灵活，但是貌似有多余属性也会报错，或者碰到lazy属性值，也有问题
-     * 不论form，还是json提交都能解决问题，就看哪个方便哪个来
-     *
-     * @param t 参数需要使用@RequestBody转换json成对象
-     * @return
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public T save(@RequestBody T t) {
-        baseService.save(t);
-        return t;
-    }
-
-    @RequestMapping(value="/{id}", method = RequestMethod.POST)
-    public T update(@RequestBody T t) {
-        baseService.save(t);
-        return t;
-    }
-
-    /**
-     *
-     * @Title: findById
-     * @Description: TODO(根据主键获取单个对象)
-     * @param @param id
-     * @throws
-     */
-    @RequestMapping(value="/{id}",method = RequestMethod.GET)
-    public T findById(@PathVariable("id") ID id){
-        return baseService.findById(id);
-    }
-
-    /**
-     *
-     * @Title: delete
-     * @Description: TODO(根据主键删除对象)
-     * @param @param id
-     * @throws
-     */
-    @RequestMapping(value="/{id}",method = RequestMethod.DELETE)
-    public Map<String, Object> delete(@PathVariable("id") ID id){
-        return baseService.delete(id);
-    }
-
-    /**
-     * 上传数据文件，并使用ktr转换文件导入数据。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(MultipartFile file) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(file, ktrfile);
-
-            resultMap.put("status", ResponseCode.SUCCESS);
-            resultMap.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            resultMap.put("status", ResponseCode.ERROR);
-            resultMap.put("msg", exp.getLocalizedMessage());
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * 使用ktr导出数据。
-     * @param response
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response) throws Exception {
-        dataExport(response, null);
-    }
-
-    @RequestMapping(value = "/dataExportExt", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        File ktrfile = new File(this.getClass().getResource(getDataExportKtrClasspath()).toURI());
-        File outputfile = null;
-        if (!CollectionUtils.isEmpty(param)) {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile,
-                    param);
-        } else {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile);
-        }
-
-        System.out.println(outputfile.getName());
-        System.out.println(outputfile.getAbsolutePath());
-
-        String filePath = outputfile.getAbsolutePath();
-//        String fp[] = filePath.split(File.separator);
-//        String fileName = fp[fp.length - 1];
-
-        // TODO：使用ktr获取导出数据
-
-        response.setHeader("conent-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + "东东");
-
-        OutputStream os = response.getOutputStream();
-        BufferedOutputStream bos = new BufferedOutputStream(os);
-
-        InputStream is = null;
-
-        is = new FileInputStream(filePath);
-        BufferedInputStream bis = new BufferedInputStream(is);
-
-        int length = 0;
-        byte[] temp = new byte[1 * 1024 * 10];
-
-        while ((length = bis.read(temp)) != -1) {
-            bos.write(temp, 0, length);
-        }
-        bos.flush();
-        bis.close();
-        bos.close();
-        is.close();
-    }
-
-    /**
-     * @return 数据导出的ktr转换文件类路径。
-     */
-    protected String getDataExportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-    /**
-     * @return 导出文件名。
-     */
-    protected String getDataExportFilename() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定导出的文件路径名
-        throw new RuntimeException("必须override，并指定导出文件名");
-    }
-
-    /**
-     * @return 数据导入的ktr转换文件类路径。
-     */
-    protected String getDataImportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导入功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-
-    public static class ExcelFileOutput {
-        private String fileName;
-        private List<Map<String, Object>> sheetnames = new ArrayList<>();
-
-        public String getFileName() {
-            return fileName;
-        }
-
-        public void setFileName(String fileName) {
-            this.fileName = fileName;
-        }
-
-        public List<Map<String, Object>> getSheetnames() {
-            return sheetnames;
-        }
-
-        public void setSheetnames(List<Map<String, Object>> sheetnames) {
-            this.sheetnames = sheetnames;
-        }
-    }
-
-    /**
-     * 上传Excel文件，返回文件全路径名，工作区名称列表。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    public ExcelFileOutput fileUpload(MultipartFile file) throws Exception {
-        // 返回对象
-        ExcelFileOutput rs = new ExcelFileOutput();
-
-        // 上传文件
-        File file1 = dataImportExportService.uploadFile(file);
-        // 获取文件的sheet
-        Workbook book = Workbook.getWorkbook(file1);
-        for (Sheet sheet : book.getSheets()) {
-            String sheetname = sheet.getName();
-            Map<String, Object> s = new HashMap<>();
-            s.put("name", sheetname);
-            rs.getSheetnames().add(s);
-        }
-
-        rs.setFileName(file1.getAbsolutePath());
-        return rs;
-    }
-
-}
 package com.bsth.controller;
-import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Created by xu on 16/5/31.
  */
 @RestController
 @RequestMapping("cars")
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class CarsController extends BaseController2<Cars, Integer> {
-
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private DataImportExportService dataImportExportService;
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较自编号是否重复
-        return baseService.validateEquale(map);
-    }
-
-    // uploadFile post
-
-    // 验证excel sheet
-    @RequestMapping(value = "/validate/sheet", method = RequestMethod.GET)
-    public Map<String, Object> validateSheet() throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // TODO：
-
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-    }
-
-    @RequestMapping(value = "/importfile", method = RequestMethod.POST)
-    public Map<String, Object> importData(
-            @RequestParam Map<String, Object> form)
-            throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // TODO：
-        String filename = (String) form.get("filename");
-
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(new File(filename), ktrfile);
-
-            rtn.put("status", ResponseCode.SUCCESS);
-            rtn.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getLocalizedMessage());
-        }
-
-        return rtn;
-    }
-
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getCarsDatainputktr();
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getCarsDataoutputktr();
-    }
+public class CarsController extends BaseController<Cars, Integer> {
-    @Override
-    protected String getDataExportFilename() {
-        return "车辆基础数据";
-    }
 }
@@ -2,10 +2,11 @@ package com.bsth.controller;
 import com.bsth.entity.Personnel;
 import com.bsth.service.PersonnelService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
@@ -15,54 +16,11 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("personnel")
-@EnableConfigurationProperties(DataToolsProperties.class)
 public class PersonnelController extends BaseController<Personnel, Integer> {
     @Autowired
-    private DataToolsProperties dataToolsProperties;
-
-    @Autowired
     private PersonnelService service;
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody Personnel t){
-        return baseService.save(t);
-    }
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较相同公司下工号是否相同
-        return baseService.validateEquale(map);
-    }
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getEmployeesDatainputktr();
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getEmployeesDataoutputktr();
-    }
-    @Override
-    protected String getDataExportFilename() {
-        return "人员基础信息";
-    }
-    
     @RequestMapping(value = "/sreachPersonnel", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String jobCode) {
 		return service.sreachPersonnel(jobCode);
+package com.bsth.controller.realcontrol;
+
+import com.bsth.service.realcontrol.DataManagerService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 数据管理，包括从老系统的数据迁移。新系统的数据校验等
+ * Created by panzhao on 2017/4/17.
+ */
+@RestController
+@RequestMapping("dataManager")
+public class DataManagerController {
+
+    @Autowired
+    DataManagerService dataManagerService;
+
+    @RequestMapping("cars/old_now")
+    public Map<String, Object> carInfos(@RequestParam Integer lineId){
+        return dataManagerService.carInfos(lineId);
+    }
+
+    @RequestMapping("car/updateDevices")
+    public Map<String, Object> updateDevices(@RequestParam String jsonStr){
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        return dataManagerService.updateDevices(jsonStr);
+    }
+}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 相关数据异常检测
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("anomalyCheck")
+public class anomalyCheckController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    /**
+     * 出现重复班次的车辆
+     * @param nbbm
+     */
+    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+    public void schRepeat(@RequestParam String nbbm){
+        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+
+        Set<ScheduleRealInfo> set = new HashSet<>();
+        for(ScheduleRealInfo sch : list){
+            if(!set.add(sch)){
+                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            }
+        }
+
+        if(set.size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, set);
+        }
+    }
+}
@@ -237,4 +237,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		}
 		return msg;
 	}
+
+	@RequestMapping(value = "/register" ,method = RequestMethod.POST)
+	public Map<String, Object> register(SysUser u){
+		return sysUserService.register(u);
+	}
 }
@@ -3,12 +3,14 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.thread.*;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -27,6 +29,8 @@ 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.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.text.ParseException;
@@ -383,6 +387,11 @@ public class DayOfSchedule implements CommandLineRunner {
                     sch.setLate(false);
                 }
+                //售票员为空设置为""字符串
+                if(StringUtils.isEmpty(sch.getsGh())){
+                    sch.setsGh("");
+                    sch.setsName("");
+                }
                 sch.setJhlcOrig(sch.getJhlc());
                 //保留备注
                 if(StringUtils.isNotEmpty(sch.getRemark()))
@@ -855,6 +864,9 @@ public class DayOfSchedule implements CommandLineRunner {
         return false;
     }
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
     /**
      * 删除实际排班
      * @param lineCode
@@ -866,20 +878,33 @@ public class DayOfSchedule implements CommandLineRunner {
         try {
             String rq = currSchDateMap.get(lineCode);
             if(StringUtils.isNotEmpty(rq)){
+                List<ScheduleRealInfo> all = findByLineCode(lineCode);
                 //解除gps 和班次之间的关联
-                List<ScheduleRealInfo> unions = calcUnion(findByLineCode(lineCode), carExecutePlanMap.values());
+                List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
                 for(ScheduleRealInfo sch : unions){
                     removeExecPlan(sch.getClZbh());
                 }
+                //解除调度指令和班次的外键约束
+                StringBuilder inStr = new StringBuilder("(");
+                for(ScheduleRealInfo sch : all){
+                    inStr.append(sch.getId() + ",");
+                }
+                inStr.deleteCharAt(inStr.length() - 1).append(")");
+                jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
                 //删除班次数据
                 removeRealSch(lineCode, rq);
                 //删除相关班次修正记录
+
             }
             rs.put("status", ResponseCode.SUCCESS);
         }catch (Exception e){
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
+            if(e instanceof DataIntegrityViolationException)
+                rs.put("msg", "失败，违反数据约束！！");
+            else
+                rs.put("msg", e.getMessage());
         }
         return rs;
@@ -902,4 +927,16 @@ public class DayOfSchedule implements CommandLineRunner {
         }
         return rs;
     }
+
+    /**
+     * 覆盖一辆车的所有班次
+     * @param nbbm
+     * @param sets
+     */
+    public void replaceByNbbm(String nbbm, Set<ScheduleRealInfo> sets){
+        nbbmScheduleMap.removeAll(nbbm);
+        nbbmScheduleMap.putAll(nbbm, sets);
+        //重新计算班次应到时间
+        updateQdzTimePlan(nbbm);
+    }
 }
 \ No newline at end of file
+
+package com.bsth.data.schedule.late_adjust;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.Map;
+
+/**
+ * 误点调整处理程序
+ * Created by panzhao on 2017/4/16.
+ */
+public class LateAdjustHandle {
+
+    /**
+     * 误点的车辆 和 班次
+     */
+    private static Map<String, ScheduleRealInfo> lateSchMap;
+
+
+    /**
+     * 误点的班次ID 和 停靠时间（秒）
+     */
+    private static Map<Long, Integer> stopTimeMap;
+
+
+    /**
+     * 班次误点（考虑停靠时间）
+     * @param sch
+     */
+    public static void schLate(ScheduleRealInfo sch){
+
+    }
+}
-package com.bsth.data.schedule.thread;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
-
-/**
- * 
- * @ClassName: ScheduleLateThread 
- * @Description: TODO(班次误点扫描线程) 
- * @author PanZhao 
- * @date 2016年8月31日 下午3:09:02 
- *
- */
-@Component
-public class ScheduleLateThread extends Thread{
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	@Autowired
-	SendUtils sendUtils;
-	
-	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
-	
-	@Override
-	public void run() {
-		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-		Collections.sort(all, cpm);
-		
-		long t = System.currentTimeMillis();
-		int size = all.size();
-		
-		ScheduleRealInfo sch;
-		for(int i = 0; i < size; i ++){
-			sch = all.get(i);
-			if(sch.getDfsjT() > t)
-				break;
-			
-			if(sch.isLate() == false 
-					&& sch.getStatus() == 0 
-					&& sch.getFcsjActual() == null){
-				//应发未发
-				sch.setLate(true);
-				//通知客户端
-				sendUtils.refreshSch(sch);
-			}
-		}
-	}
-}
+package com.bsth.data.schedule.late_adjust;
+
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: ScheduleLateThread 
+ * @Description: TODO(班次误点扫描线程) 
+ * @author PanZhao 
+ * @date 2016年8月31日 下午3:09:02 
+ *
+ */
+@Component
+public class ScheduleLateThread extends Thread{
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	SendUtils sendUtils;
+	
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
+	
+	@Override
+	public void run() {
+		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+		Collections.sort(all, cpm);
+		
+		long t = System.currentTimeMillis();
+		int size = all.size();
+		
+		ScheduleRealInfo sch;
+		for(int i = 0; i < size; i ++){
+			sch = all.get(i);
+			if(sch.getDfsjT() > t)
+				break;
+			
+			if(sch.isLate() == false 
+					&& sch.getStatus() == 0 
+					&& sch.getFcsjActual() == null){
+				//应发未发
+				sch.setLate(true);
+				//通知客户端
+				sendUtils.refreshSch(sch);
+			}
+		}
+	}
+}
@@ -22,6 +22,17 @@ public class Shiftuehiclemanth {
 	private String jgh;
 	private String zbh;
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
+	private String sgh;
+	
+	
 	public String getJgh() {
 		return jgh;
 	}
@@ -773,6 +773,7 @@ public class ScheduleRealInfo {
 	public void destroy(){
 		this.jhlc = 0.0;
 		this.status = -1;
+		this.clearFcsjActual();
 	}
 	public boolean isDestroy(){
@@ -57,6 +57,7 @@ public class ScheduleRule1Flat extends BEntity {
     private String lpNames;
     /** 对应的路牌ids（用逗号隔开） */
     @NotNull
+    @Column(length = 1000)
     private String lpIds;
     /** 起始路牌（从0开始） */
     @NotNull
@@ -66,6 +67,7 @@ public class ScheduleRule1Flat extends BEntity {
     private String ryDbbms;
     /** 对应的人员配置ids（用逗号隔开，如果分班，就先-隔开再逗号隔开） */
     @NotNull
+    @Column(length = 1000)
     private String ryConfigIds;
     /** 起始人员（从0开始） */
     @NotNull
@@ -2,10 +2,7 @@ package com.bsth.entity.schedule.temp;
 import com.bsth.entity.schedule.SchedulePlan;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.Date;
 /**
@@ -32,12 +29,14 @@ public class SchedulePlanRuleResult {
     private String ccZbh;
     /** 路牌id列表字符串 */
+    @Column(length = 1000)
     private String gids;
     /** 路牌名字列表字符串 */
     private String gnames;
     /** 翻到哪个路牌索引 */
     private String gidindex;
     /** 人员配置id列表字符串 */
+    @Column(length = 1000)
     private String ecids;
     /** 人员配置搭班编码列表字符串 */
     private String ecdbbms;
@@ -156,7 +156,10 @@ public class FormsServiceImpl implements FormsService {
 		if(map.containsKey("fgsdmManth")){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
-		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name " 
+		String sql = "select"
+				+ " r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name "
+//				+ "r.gs_bm,r.gs_name,"
+//				+ " r.fgs_bm,r.fgs_name,r.bc_type,r.lp_name " 
 		        + " from bsth_c_s_sp_info_real r "
 		    	+ " where 1=1  ";
 		if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
@@ -169,19 +172,23 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("line")!=null&&!map.get("line").equals("")){
 			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
 		}
-			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
-		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
-			sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
-		}
+//			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
+//		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
+			sql+=" and r.gs_bm like'%"+gsdmManth+"%' ";
+//		}
 		if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
-			sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
+			sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
 		}	
 		if(empnames.equals("售票员")){
 			sql+="and r.s_name is not null AND r.s_name !=''";
 		}
-			sql	+= " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
+			sql	+= " GROUP BY "
+					+ "r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name ";
+//					+ ",r.gs_bm,r.gs_name,"
+//					+ "r.fgs_bm,r.fgs_name,r.bc_type ";
-	
+//			r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,"
+//					+ " r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
 			@Override
@@ -191,12 +198,13 @@ public class FormsServiceImpl implements FormsService {
 					shif.setjName(arg0.getString("j_name"));
 				}else if(empnames.equals("售票员")){
 					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name"));
+			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-				
 				shif.setJgh(arg0.getString("j_gh"));
 		        shif.setZbh(arg0.getString("cl_zbh"));
+//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -208,9 +216,24 @@ public class FormsServiceImpl implements FormsService {
 			Shiftuehiclemanth d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-					sList.add(s);
+//				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+//					sList.add(s);
+//				}
+				if(empnames.equals("驾驶员")){
+					if(d.getJgh().equals(s.getjGh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("售票员")){
+					String sgh=s.getsGh()==null?"":s.getsGh();
+					if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("车辆自编号")){
+					if(d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
 				}
+				
 			}
 			double ksgl=culateMileageService.culateKsgl(sList);
@@ -219,16 +242,17 @@ public class FormsServiceImpl implements FormsService {
 			double ljgl=culateMileageService.culateLjgl(sList);
 			double sjgl=culateMileageService.culateSjgl(sList);
 			double zyygl=Arith.add(ljgl, sjgl);
-			double cjbc=culateMileageService.culateLbbc(sList);
-			double Ljbc=culateMileageService.culateLjbc(sList,"");
+			int cjbc=culateMileageService.culateLbbc(sList);
+			int ljbc=culateMileageService.culateLjbc(sList,"");
+			int sjbc=culateMileageService.culateSjbc(sList, "");
 			double cjgl=culateMileageService.culateLbgl(sList);
 			double zjgl=culateMileageService.culateLjgl(sList);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
-			d.setSjbc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
+			d.setSjbc(String.valueOf(sjbc+ljbc));
 			d.setJhlc(String.valueOf(zyygl));//运营里程
 			d.setCjbc(String.valueOf(cjbc));//抽检班次
-			d.setLjbc(String.valueOf(Ljbc));//增加班次
+			d.setLjbc(String.valueOf(ljbc));//增加班次
 			d.setRemMileage(String.valueOf(cjgl));//抽检里程
 			d.setAddMileage(String.valueOf(zjgl));//增加里程
@@ -258,13 +282,16 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmShif")!=null&&!map.get("fgsdmShif").equals("")){
 			fgsdmShif =map.get("fgsdmShif").toString();
 		}
-		String sql ="select t.* from (select r.schedule_date,r.j_name,IFNULL(r.s_name,'')as s_name,"
-				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name FROM bsth_c_s_sp_info_real r  where 1=1  "
+		String sql ="select t.* from (select r.schedule_date,r.j_name,"
+				+ "IFNULL(r.s_name,'')as s_name,"
+				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
+				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
 				+ " and to_days(r.schedule_date)=to_days('"+date + "')  "
 				+ " and r.xl_bm like '%"+line+"%' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
 				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
-				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm  ";
+				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, "
+				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  ";
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -302,22 +329,23 @@ public class FormsServiceImpl implements FormsService {
 			double zyygl=Arith.add(ljgl, sjgl);
 			double jhgl=culateMileageService.culateJhgl(sList);
 			double cjgl=culateMileageService.culateLbgl(sList);
-			double jhbc	=culateMileageService.culateJhbc(sList,"");
-			double cjbc=culateMileageService.culateLbbc(sList);
-			double Ljbc=culateMileageService.culateLjbc(sList,"");
+			int jhbc	=culateMileageService.culateJhbc(sList,"");
+			int cjbc=culateMileageService.culateLbbc(sList);
+			int ljbc=culateMileageService.culateLjbc(sList,"");
+			int sjbc=culateMileageService.culateSjbc(sList, "");
 			double zjgl=culateMileageService.culateLjgl(sList);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
-			d.setSjbc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
+			d.setSjbc(String.valueOf(sjbc+ljbc));
 			d.setJhlc(String.valueOf(jhgl));//计划里程
 			d.setYygl(String.valueOf(zyygl));//运营公里
 			d.setSjjhlc(String.valueOf(sjgl));//实际计划里程
 			d.setRemMileage(String.valueOf(cjgl));//抽减里程
 			d.setJhbc(String.valueOf(jhbc));//计划班次
 			d.setCjbc(String.valueOf(cjbc));//抽检班次
-			d.setLjbc(String.valueOf(Ljbc));//增加班次
+			d.setLjbc(String.valueOf(ljbc));//增加班次
 			d.setAddMileage(String.valueOf(zjgl));//增加公里
-			d.setSjjhbc(String.valueOf(culateMileageService.culateSjbc(sList, "")));//实际计划班次
+			d.setSjjhbc(String.valueOf(sjbc));//实际计划班次
 			}
 		return list;
 	}
@@ -806,7 +834,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " and  y.ssgsdm like '%"+gsbm+"%' "
 				+ " and y.fgsdm like '%"+fgsbm+"%'"
 				+ " ) x"
-				+ " on t.cl_zbh = x.nbbm ";
+				+ " on t.cl_zbh = x.nbbm and t.j_gh=x.jsy";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
@@ -106,8 +106,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
-		List<Ylb> addList=new ArrayList<Ylb>();
-		List<Ylb> updateList=new ArrayList<Ylb>();
 		for(int x=0;x<listpb.size();x++){
 			String type="add";
 			boolean sfdc=false;
+package com.bsth.service.realcontrol;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/18.
+ */
+public interface DataManagerService {
+
+    Map<String, Object> carInfos(Integer lineId);
+
+    Map<String,Object> updateDevices(String jsonStr);
+}
+package com.bsth.service.realcontrol.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
+import com.bsth.repository.CarsRepository;
+import com.bsth.service.realcontrol.DataManagerService;
+import com.bsth.util.db.DBUtils_oldSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/18.
+ */
+@Service
+public class DataManagerServiceImpl implements DataManagerService{
+
+    @Autowired
+    CarsRepository carsRepository;
+
+    @Autowired
+    JdbcTemplate controlJdbcTemp;
+
+    @Autowired
+    BasicData.BasicDataLoader dataLoader;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Map<String, Object> carInfos(Integer lineId) {
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<Map<String, String>> nowData = new ArrayList<>();
+            List<Map<String, String>> oldData = new ArrayList<>();
+            Map<String, String> map;
+
+            //查询新系统车辆信息
+            List<Cars> list = carsRepository.findCarsByLineId(lineId);
+            for(Cars c : list){
+                map = new HashMap<>();
+                map.put("nbbm", c.getInsideCode());
+                map.put("device", c.getEquipmentCode());
+                nowData.add(map);
+            }
+
+            //获取老系统数据
+            JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
+            List<Map<String, Object>> oyList = jdbcTemplate.queryForList("select NBBM,SBBH from JJWGPS_T_CLXXB t where xlbm=?", BasicData.lineId2CodeMap.get(lineId));
+            for(Map<String, Object> tempMap : oyList){
+                map = new HashMap<>();
+                map.put("nbbm", tempMap.get("NBBM").toString());
+                map.put("device", tempMap.get("SBBH").toString());
+                oldData.add(map);
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("nows", nowData);
+            rs.put("olds", oldData);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+
+        return rs;
+    }
+
+    /**
+     * 更新设备号
+     * @param jsonStr
+     * @return
+     */
+    @Override
+    public Map<String, Object> updateDevices(String jsonStr) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            int count=0;
+            JSONArray array = JSONArray.parseArray(jsonStr);
+            JSONObject jObj;
+            for(int i = 0; i < array.size(); i ++){
+                jObj = array.getJSONObject(i);
+                count += controlJdbcTemp.update("update bsth_c_cars set equipment_code=? where inside_code=?"
+                        , jObj.getString("device"), jObj.getString("nbbm"));
+            }
+
+            //刷新缓存
+            dataLoader.loadDeviceInfo();
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("count", count);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.service.realcontrol.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
@@ -400,25 +401,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> rs = new HashMap<>();
         rs.put("status", ResponseCode.ERROR);
-        ScheduleRealInfo sch = dayOfSchedule.get(id);
-        if (sch == null) {
-            rs.put("msg", "无效的id号");
-            return rs;
-        }
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch == null) {
+                rs.put("msg", "无效的id号");
+                return rs;
+            }
-        if (!sch.isSflj()) {
-            rs.put("msg", "你只能删除临加班次");
-            return rs;
-        }
+            if (!sch.isSflj()) {
+                rs.put("msg", "你只能删除临加班次");
+                return rs;
+            }
-        //数据库删除
-        rs = super.delete(id);
-        if(rs.get("status").equals(ResponseCode.SUCCESS)){
-            dayOfSchedule.delete(sch);
-            //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
-            rs.put("ts", ts);
-            rs.put("delete", sch);
+            //解除和调度指令的外键约束
+            jdbcTemplate.update(Constants.REMOVE_DIRECTIVE_SCH_FK, id);
+
+            //数据库删除
+            rs = super.delete(id);
+            if(rs.get("status").equals(ResponseCode.SUCCESS)){
+                dayOfSchedule.delete(sch);
+                //更新起点应到时间
+                List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
+                rs.put("ts", ts);
+                rs.put("delete", sch);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("msg", e.getMessage());
         }
         return rs;
@@ -494,14 +503,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String px = type;
         if (state.equals("lpName")) {
             state = state + "+1";
-            type = "asc";
+            type = "ASC";
         }
         String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
-                + " s.lp_Name as lpName,s.j_Name as jName"
+                + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,min(s.fcsj) as fcsj"
                 + " from bsth_c_s_sp_info_real s "
                 + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "
                 + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
-                + " order by (" + state + ") " + type;
+                + " order by (" + state + "),dateStr,fcsj " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
                 new RowMapper<ScheduleRealInfo>() {
                     @Override
@@ -518,29 +527,41 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         if (lpname.equals("lpName")) {
             List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
             Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
-            if (px.equals("desc")) {
+//            if (px.equals("desc")) {
                 int zt = 0;
-                for (int l = 0; l < 3; l++) {
+                for (int l = 0; l < 2; l++) {
                     for (int i = 0; i < list.size(); i++) {
                         ScheduleRealInfo t = list.get(i);
                         if (t.getLpName().indexOf("+") != -1) {
                             if (zt == 0) {
                                 listNew.add(t);
                             }
-
                         } else if (pattern.matcher(t.getLpName()).matches()) {
                             if (zt == 1) {
                                 listNew.add(t);
                             }
                         } else {
-                            if (zt == 2) {
-                                listNew.add(t);
-                            }
+//                            if (zt == 2) {
+//                                listNew.add(t);
+//                            }
+                        	continue;
                         }
                     }
                     zt++;
                 }
-            } else {
+                
+           	 Collections.sort(list, new ComparableLp());
+           	 for (int i = 0; i < list.size(); i++) {
+           		 ScheduleRealInfo t = list.get(i);
+           		 if (t.getLpName().indexOf("+") != -1) {
+           			 continue;
+                 } else if (pattern.matcher(t.getLpName()).matches()) {
+                	 continue;
+                 } else {
+                	 listNew.add(t);
+                 }
+			}
+            /*} else {
                 int zt = 0;
                 for (int l = 0; l < 3; l++) {
                     for (int i = 0; i < list.size(); i++) {
@@ -563,7 +584,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     zt++;
                 }
-            }
+            }*/
             return listNew;
         } else {
             return list;
@@ -1382,20 +1403,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     			lists.add(s);
     		}
 		}
-    	double ksgl=culateService.culateKsgl(lists);
+    	double ksgl=culateService.culateKsgl(list);
     	double sjgl=culateService.culateSjgl(lists);
     	double jccgl=culateService.culateJccgl(lists);
     	double ljgl=culateService.culateLjgl(lists);
     	 map.put("jhlc", culateService.culateJhgl(list)); //计划里程
-         map.put("remMileage", culateService.culateLbgl(lists)); //烂班公里
+         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
          map.put("addMileage", ljgl); //临加公里
          map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
          map.put("ksgl", ksgl);//空驶公里
          map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
          map.put("jhbc", culateService.culateJhbc(list,""));
-         map.put("cjbc", culateService.culateLbbc(lists));
+         map.put("cjbc", culateService.culateLbbc(list));
          map.put("ljbc", culateService.culateLjbc(lists,""));
          map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
          map.put("jcclc", jccgl);
@@ -3712,7 +3733,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             tempMap.put("zdsjk" + size, "");
             tempMap.put("zdsjm" + size, "");
             tempMap.put("fcsj" + size, schedule.getFcsj());
-            tempMap.put("fcsjActual" + size, schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");
+            String fcsjActural=schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "";
+            String bcType=schedule.getBcType()!=null?schedule.getBcType():"";
+            if(bcType.equals("in")){
+            	fcsjActural=fcsjActural+"(进)";
+            }
+            if(bcType.equals("out")){
+            	fcsjActural=fcsjActural+"(出)";
+            }
+            tempMap.put("fcsjActual" + size, fcsjActural);
             tempMap.put("fcsjk" + size, "");
             tempMap.put("fcsjm" + size, "");
             tempMap.put("remarks" + size, schedule.getRemarks() != null ? schedule.getRemarks() : "");
 package com.bsth.service.report.impl;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -14,6 +15,7 @@ import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableJob;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
@@ -25,6 +27,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	@Override
 	public List<Map<String, Object>> jobFwqk(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
+		String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo = lists.get(i);
@@ -47,7 +50,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
-						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
+						newMap.put("lblc", scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
 						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
 						list.add(newMap);
 					}
@@ -71,7 +74,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							newMap.put("dz", childTaskPlan.getStartStationName());
 							newMap.put("sj", childTaskPlan.getStartDate());
 							newMap.put("lbbc", 0);
-							newMap.put("lblc", childTaskPlan.getMileage());
+							newMap.put("lblc", childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
 							newMap.put("jyqp", scheduleRealInfo.getRealMileage());
 							list.add(newMap);
@@ -80,7 +83,33 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				}
 			}
 		}
-		return list;
+		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>(); 
+		for (int i = 0; i < lblxs.length; i++) {
+			 String lx=lblxs[i];
+			 double lblc=0.0;
+			 int lbbc=0;
+			 for (int j = 0; j < list.size(); j++) {
+				Map<String, Object> m1=list.get(j);
+				m1.put("lx", 0);
+				listNew.add(m1);
+				if(lx.equals(m1.get("nr").toString())){
+					lblc =Arith.add(lblc,Double.parseDouble(m1.get("lblc").toString()));
+					lbbc += Integer.parseInt(m1.get("lbbc").toString());
+				}
+			}
+			 Map<String, Object> newMap = new HashMap<String, Object>();
+			 newMap.put("lx", 1);
+		 	 newMap.put("nr", lx);
+			 newMap.put("lp", "小计");
+			 newMap.put("nbbm", "少驶公里");
+			 newMap.put("dz", lbbc);
+			 newMap.put("sj", "少驶公里");
+			 newMap.put("lblc", lblc);
+			 listNew.add(newMap);
+			 
+		}
+		Collections.sort(listNew, new ComparableJob());
+		return listNew;
 	}
 	@Override
@@ -364,7 +393,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						time=scheduleRealInfo.getFcsj();
 					}
 					if(!time.equals("")){
-						String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
+						String[] fcsjStr = time.split(":");
 						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
 						if(childTaskPlans.isEmpty()){
 							if(scheduleRealInfo.getStatus()!=-1){
@@ -8,6 +8,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -38,6 +39,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableJob;
 import com.bsth.util.db.DBUtils_MS;
 @Service
@@ -1150,6 +1152,7 @@ public class ReportServiceImpl implements ReportService{
 	@Override
 	public List<Map<String, Object>> jobFwqk(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+		String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
 		String line=map.get("line").toString();
 		String date=map.get("date").toString();
 		map.put("bcType", "normal");
@@ -1179,7 +1182,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
 						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
-						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+						newMap.put("jyqp", scheduleRealInfo.getRemarks());
 						list.add(newMap);
 					}
@@ -1205,7 +1208,7 @@ public class ReportServiceImpl implements ReportService{
 							newMap.put("sj", childTaskPlan.getStartDate());
 							newMap.put("lbbc", 0);
 							newMap.put("lblc", childTaskPlan.getMileage());
-							newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+							newMap.put("jyqp", childTaskPlan.getRemarks());
 							list.add(newMap);
 						}
@@ -1213,7 +1216,36 @@ public class ReportServiceImpl implements ReportService{
 				}
 			}
 		}
-		return list;
+		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>(); 
+		for (int i = 0; i < lblxs.length; i++) {
+			 String lx=lblxs[i];
+			 double lblc=0.0;
+			 int lbbc=0;
+			 for (int j = 0; j < list.size(); j++) {
+				Map<String, Object> m1=list.get(j);
+				if(lx.equals(m1.get("nr").toString())){
+					m1.put("lx", 0);
+					listNew.add(m1);
+					lblc =Arith.add(lblc,Double.parseDouble(m1.get("lblc").toString()));
+					lbbc += Integer.parseInt(m1.get("lbbc").toString());
+				}
+			}
+			 if(lblc>0){
+				 Map<String, Object> newMap = new HashMap<String, Object>();
+				 newMap.put("lx", 1);
+			 	 newMap.put("nr", lx);
+				 newMap.put("lp", "小计");
+				 newMap.put("nbbm", "少驶班次");
+				 newMap.put("jgh", lbbc);
+				 newMap.put("sj", "少驶公里");
+				 newMap.put("lblc", lblc);
+				 listNew.add(newMap);
+			 }
+			
+			 
+		}
+		Collections.sort(listNew, new ComparableJob());
+		return listNew;
 	}
 		//统计临加班次详细信息
@@ -65,7 +65,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * @param schedulePlan 排班计划对象
      * @param lpInfoResults_output 时刻表每日路牌的情况
      */
-    private ScheduleResults_output loopRuleOutput(
+    public ScheduleResults_output loopRuleOutput(
             SchedulePlan schedulePlan,
             LpInfoResults_output lpInfoResults_output) {
         // 1-1、构造drools规则输入数据，输出数据
@@ -116,7 +116,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * @param schedulePlan 排班计划对象
      * @return TTInfoResults_output, LpInfoResults_output
      */
-    private Object[] ttInfoOutput(SchedulePlan schedulePlan) {
+    public Object[] ttInfoOutput(SchedulePlan schedulePlan) {
         // 获取线路的所有未作废的时刻表
         List<TTInfo> ttInfos = ttInfoRepository.findInCanceledByXl(schedulePlan.getXl());
@@ -174,7 +174,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * @param ttInfoResults_output ttInfoOutput方法规则输出
      * @return PlanResult
      */
-    private PlanResult planResultOutput(
+    public PlanResult planResultOutput(
             SchedulePlan schedulePlan,
             ScheduleResults_output scheduleResults_output,
             TTInfoResults_output ttInfoResults_output) {
@@ -360,7 +360,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                 }
                 editInfo.getHeader().addAll(Arrays.asList(headarrays));
-                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.2f,营运里程=%.2f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy));
+                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.2f,营运里程=%.2f,总里程=%.2f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy));
             }
             LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
@@ -4,7 +4,6 @@ import org.kie.api.KieBase;
 import org.kie.api.KieBaseConfiguration;
 import org.kie.api.KieServices;
 import org.kie.api.builder.*;
-import org.kie.api.builder.Message;
 import org.kie.api.builder.model.KieBaseModel;
 import org.kie.api.builder.model.KieModuleModel;
 import org.kie.api.builder.model.KieSessionModel;
@@ -12,6 +11,8 @@ import org.kie.api.conf.EqualityBehaviorOption;
 import org.kie.api.conf.EventProcessingOption;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.conf.ClockTypeOption;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -20,6 +21,9 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class MyDroolsConfiguration {
+    /** 日志记录器 */
+    private static final Logger logger = LoggerFactory.getLogger(MyDroolsConfiguration.class);
+
     /**
      * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
      * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
@@ -72,8 +76,12 @@ public class MyDroolsConfiguration {
         // 4、创建KieBuilder，使用KieFileSystem构建
         KieBuilder kieBuilder = kieServices.newKieBuilder(kfs).buildAll();
         Results results = kieBuilder.getResults();
-        if (results.hasMessages(Message.Level.ERROR))
-            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+//        if (results.hasMessages(Message.Level.ERROR))
+//            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+        if (results.hasMessages(Message.Level.ERROR)) {
+            logger.info("构建drools6错误：" + results.getMessages());
+            return null;
+        }
         // 5、获取KieContainer
         // TODO：ReleaseId用处很大，以后再议
-package com.bsth.service.schedule.utils;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.Map;
-
-/**
- * 数据导入导出服务。
- */
-public interface DataImportExportService {
-    /**
-     * 上传文件。
-     * @param file mutipartFile
-     * @return 上传后的文件路径
-     * @throws Exception
-     */
-    File uploadFile(MultipartFile file) throws Exception;
-
-    /**
-     * 上传文件，并导入文件数据。
-     * @param datafile 上传的文件
-     * @param ktrFile 导入的逻辑ktr文件
-     * @throws Exception
-     */
-    void fileDataImport(MultipartFile datafile, File ktrFile) throws Exception;
-    void fileDataImport(File datafile, File ktrFile) throws Exception;
-
-    /**
-     * 数据导出。
-     * @param fileName 文件名
-     * @param ktrFile 导出的逻辑ktr文件
-     * @return 导出的文件
-     * @throws Exception
-     */
-    File fileDataOutput(String fileName, File ktrFile) throws Exception;
-
-
-    File fileDataOutput(String fileName, File ktrFile, Map<String, Object> param) throws Exception;
-}
-package com.bsth.service.schedule.utils;
-
-import com.google.common.io.Files;
-import org.joda.time.DateTime;
-import org.pentaho.di.core.KettleEnvironment;
-import org.pentaho.di.core.util.EnvUtil;
-import org.pentaho.di.trans.Trans;
-import org.pentaho.di.trans.TransMeta;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Created by xu on 16/6/23.
- */
-@Service
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class DataImportExportServiceImpl implements DataImportExportService, InitializingBean {
-
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-
-    /**
-     * 自定义kettle环境初始化定义。
-     */
-    private void ktrEnvironmentInit() throws Exception {
-        // 由于kettle.properties可能没有（没有安装过kettle），
-        // 导致 EnvUtil.environmentInit() 报找不到kettle.properties文件
-        // 所以这里重写 EnvUtil.environmentInit() 方法
-
-        if(Thread.currentThread().getContextClassLoader() == null) {
-            Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
-        }
-
-        // 获取配置文件
-        File file = new File(getClass().getResource(dataToolsProperties.getKettleProperties()).toURI());
-        Properties kettleProperties = EnvUtil.readProperties(file.getAbsolutePath());
-        EnvUtil.applyKettleProperties(kettleProperties);
-        System.getProperties().put("Internal.Cluster.Size", "1");
-        System.getProperties().put("Internal.Slave.Transformation.Number", "0");
-        System.getProperties().put("Internal.Slave.Server.Name", "slave-trans-name");
-        System.getProperties().put("Internal.Step.CopyNr", "0");
-        System.getProperties().put("Internal.Step.Name", "step-name");
-        System.getProperties().put("Internal.Step.Partition.ID", "partition-id");
-        System.getProperties().put("Internal.Step.Partition.Number", "0");
-        System.getProperties().put("Internal.Step.Unique.Count", "1");
-        System.getProperties().put("Internal.Step.Unique.Number", "0");
-        if(!kettleProperties.containsKey("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT")) {
-            System.getProperties().put("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT", "false");
-        }
-
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        // 初始化kettle环境（自定义）
-        ktrEnvironmentInit();
-
-        // 添加全局ktr变量，并覆盖原来的设置
-        Map<String, String> kvars = new HashMap<>();
-        kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
-        kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
-        kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
-        kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
-        EnvUtil.applyKettleProperties(kvars, true);
-        KettleEnvironment.init();
-    }
-
-    @Override
-    public File uploadFile(MultipartFile file) throws Exception {
-        // TODO：以后的文件名要加时间戳
-        File newFile = new File(
-                dataToolsProperties.getFileuploadDir() + File.separator +
-                        file.getOriginalFilename());
-        Files.write(file.getBytes(), newFile);
-
-        return newFile;
-    }
-
-    @Override
-    public void fileDataImport(MultipartFile datafile, File ktrFile) throws Exception {
-        // 1、上传数据文件
-        File uploadFile = uploadFile(datafile);
-
-        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
-        // 2.1、初始化kettle（组件初始化已经做了）
-        // 2.2、创建转换元数据，转换
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
-        trans.setParameterValue("filepath", uploadFile.getAbsolutePath()); // 指定导入数据文件的位置
-        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
-        // TODO：可以考虑设定日志输出
-        // 2.4、执行转换
-        trans.execute(null);
-        // 2.5、等待转换结束
-        trans.waitUntilFinished();
-
-        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-    }
-
-    @Override
-    public void fileDataImport(File datafile, File ktrFile) throws Exception {
-//        // 1、上传数据文件
-//        File uploadFile = datafile;
-
-        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
-        // 2.1、初始化kettle（组件初始化已经做了）
-        // 2.2、创建转换元数据，转换
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
-        trans.setParameterValue("filepath", datafile.getAbsolutePath()); // 指定导入数据文件的位置
-        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
-        // TODO：可以考虑设定日志输出
-        // 2.4、执行转换
-        trans.execute(null);
-        // 2.5、等待转换结束
-        trans.waitUntilFinished();
-
-        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-    }
-
-    @Override
-    public File fileDataOutput(String fileName, File ktrFile) throws Exception {
-        return fileDataOutput(fileName, ktrFile, null);
-    }
-
-    @Override
-    public File fileDataOutput(String fileName, File ktrFile, Map<String, Object> param) throws Exception {
-        // 初始化转换，元数据，转换对象
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 设定命名参数
-        String filepath = dataToolsProperties.getFileoutputDir() +
-                File.separator +
-                fileName +
-                new DateTime().toString("yyyyMMddHHmmss") + ".xls";
-        trans.setParameterValue("filepath", filepath);
-
-        // 添加其他参数
-        if (!CollectionUtils.isEmpty(param)) {
-            for (String key : param.keySet()) {
-                trans.setParameterValue(key, String.valueOf(param.get(key)));
-            }
-        }
-
-        // 执行转换
-        trans.execute(null);
-        // 等待转换结束
-        trans.waitUntilFinished();
-
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-
-        return new File(filepath);
-    }
-
-
-    // TODO：以后改成下面的样子
-//    import java.io.FileInputStream;
-//    import java.io.FileOutputStream;
-//    import java.io.IOException;
-//    import java.io.InputStream;
-//    import java.util.Iterator;
-//
-//    import org.apache.poi.hssf.usermodel.HSSFCell;
-//    import org.apache.poi.hssf.usermodel.HSSFRow;
-//    import org.apache.poi.hssf.usermodel.HSSFSheet;
-//    import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//
-//    import org.apache.poi.xssf.usermodel.XSSFCell;
-//    import org.apache.poi.xssf.usermodel.XSSFRow;
-//    import org.apache.poi.xssf.usermodel.XSSFSheet;
-//    import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//
-//    public class ReadWriteExcelFile {
-//
-//        public static void readXLSFile() throws IOException
-//        {
-//            InputStream ExcelFileToRead = new FileInputStream("C:/Test.xls");
-//            HSSFWorkbook wb = new HSSFWorkbook(ExcelFileToRead);
-//
-//            HSSFSheet sheet=wb.getSheetAt(0);
-//            HSSFRow row;
-//            HSSFCell cell;
-//
-//            Iterator rows = sheet.rowIterator();
-//
-//            while (rows.hasNext())
-//            {
-//                row=(HSSFRow) rows.next();
-//                Iterator cells = row.cellIterator();
-//
-//                while (cells.hasNext())
-//                {
-//                    cell=(HSSFCell) cells.next();
-//
-//                    if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
-//                    {
-//                        System.out.print(cell.getStringCellValue()+" ");
-//                    }
-//                    else if(cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
-//                    {
-//                        System.out.print(cell.getNumericCellValue()+" ");
-//                    }
-//                    else
-//                    {
-//                        //U Can Handel Boolean, Formula, Errors
-//                    }
-//                }
-//                System.out.println();
-//            }
-//
-//        }
-//
-//        public static void writeXLSFile() throws IOException {
-//
-//            String excelFileName = "C:/Test.xls";//name of excel file
-//
-//            String sheetName = "Sheet1";//name of sheet
-//
-//            HSSFWorkbook wb = new HSSFWorkbook();
-//            HSSFSheet sheet = wb.createSheet(sheetName) ;
-//
-//            //iterating r number of rows
-//            for (int r=0;r < 5; r++ )
-//            {
-//                HSSFRow row = sheet.createRow(r);
-//
-//                //iterating c number of columns
-//                for (int c=0;c < 5; c++ )
-//                {
-//                    HSSFCell cell = row.createCell(c);
-//
-//                    cell.setCellValue("Cell "+r+" "+c);
-//                }
-//            }
-//
-//            FileOutputStream fileOut = new FileOutputStream(excelFileName);
-//
-//            //write this workbook to an Outputstream.
-//            wb.write(fileOut);
-//            fileOut.flush();
-//            fileOut.close();
-//        }
-//
-//        public static void readXLSXFile() throws IOException
-//        {
-//            InputStream ExcelFileToRead = new FileInputStream("C:/Test.xlsx");
-//            XSSFWorkbook  wb = new XSSFWorkbook(ExcelFileToRead);
-//
-//            XSSFWorkbook test = new XSSFWorkbook();
-//
-//            XSSFSheet sheet = wb.getSheetAt(0);
-//            XSSFRow row;
-//            XSSFCell cell;
-//
-//            Iterator rows = sheet.rowIterator();
-//
-//            while (rows.hasNext())
-//            {
-//                row=(XSSFRow) rows.next();
-//                Iterator cells = row.cellIterator();
-//                while (cells.hasNext())
-//                {
-//                    cell=(XSSFCell) cells.next();
-//
-//                    if (cell.getCellType() == XSSFCell.CELL_TYPE_STRING)
-//                    {
-//                        System.out.print(cell.getStringCellValue()+" ");
-//                    }
-//                    else if(cell.getCellType() == XSSFCell.CELL_TYPE_NUMERIC)
-//                    {
-//                        System.out.print(cell.getNumericCellValue()+" ");
-//                    }
-//                    else
-//                    {
-//                        //U Can Handel Boolean, Formula, Errors
-//                    }
-//                }
-//                System.out.println();
-//            }
-//
-//        }
-//
-//        public static void writeXLSXFile() throws IOException {
-//
-//            String excelFileName = "C:/Test.xlsx";//name of excel file
-//
-//            String sheetName = "Sheet1";//name of sheet
-//
-//            XSSFWorkbook wb = new XSSFWorkbook();
-//            XSSFSheet sheet = wb.createSheet(sheetName) ;
-//
-//            //iterating r number of rows
-//            for (int r=0;r < 5; r++ )
-//            {
-//                XSSFRow row = sheet.createRow(r);
-//
-//                //iterating c number of columns
-//                for (int c=0;c < 5; c++ )
-//                {
-//                    XSSFCell cell = row.createCell(c);
-//
-//                    cell.setCellValue("Cell "+r+" "+c);
-//                }
-//            }
-//
-//            FileOutputStream fileOut = new FileOutputStream(excelFileName);
-//
-//            //write this workbook to an Outputstream.
-//            wb.write(fileOut);
-//            fileOut.flush();
-//            fileOut.close();
-//        }
-//
-//        public static void main(String[] args) throws IOException {
-//
-//            writeXLSFile();
-//            readXLSFile();
-//
-//            writeXLSXFile();
-//            readXLSXFile();
-//
-//        }
-//
-//    }
-}
@@ -13,10 +13,9 @@ import org.pentaho.di.trans.Trans;
 import org.pentaho.di.trans.TransMeta;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import java.io.File;
 import java.io.PrintWriter;
@@ -24,19 +23,41 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
 /**
  * Created by xu on 17/1/3.
  */
-@Service
+@Component
 @EnableConfigurationProperties(DataToolsProperties.class)
-public class DataToolsServiceImpl implements DataToolsService, InitializingBean {
+public class DataToolsServiceImpl implements DataToolsService {
     /** 日志记录器 */
     private static final Logger LOGGER = LoggerFactory.getLogger(DataToolsServiceImpl.class);
     @Autowired
     private DataToolsProperties dataToolsProperties;
+    /** 原子操作类 */
+    private AtomicBoolean flag = new AtomicBoolean(false);
+
+    private void initKettle() throws Exception {
+        if (flag.compareAndSet(false, true)) {
+            LOGGER.info("kettle初始化......");
+
+            // 初始化kettle环境（自定义）
+            ktrEnvironmentInit();
+
+            // 添加全局ktr变量，并覆盖原来的设置
+            Map<String, String> kvars = new HashMap<>();
+            kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
+            kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
+            kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
+            kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
+            EnvUtil.applyKettleProperties(kvars, true);
+            KettleEnvironment.init();
+        }
+    }
+
     /**
      * 自定义kettle环境初始化定义。
      */
@@ -70,24 +91,11 @@ public class DataToolsServiceImpl implements DataToolsService, InitializingBean 
     }
     @Override
-    public void afterPropertiesSet() throws Exception {
-        // 初始化kettle环境（自定义）
-        ktrEnvironmentInit();
-
-        // 添加全局ktr变量，并覆盖原来的设置
-        Map<String, String> kvars = new HashMap<>();
-        kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
-        kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
-        kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
-        kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
-        EnvUtil.applyKettleProperties(kvars, true);
-        KettleEnvironment.init();
-    }
-
-    @Override
     public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
         // 上传文件
         try {
+            initKettle();
+
             LOGGER.info("start uploadFile...originalFilename={}", filename);
             File newFile = new File(dataToolsProperties.getFileuploadDir() + File.separator +
                     filename + "-upload-" + new DateTime().toString("yyyyMMddHHmmss") + ".xls");
@@ -127,6 +135,8 @@ public class DataToolsServiceImpl implements DataToolsService, InitializingBean 
         String transLogId = "";
         String transMetaLogId = "";
         try {
+            initKettle();
+
             LOGGER.info("start importData...originalFilename={}", file.getAbsolutePath());
             // 检查参数
             String transpath = String.valueOf(params.get("transpath"));
@@ -189,6 +199,8 @@ public class DataToolsServiceImpl implements DataToolsService, InitializingBean 
         String transLogId = "";
         String transMetaLogId = "";
         try {
+            initKettle();
+
             LOGGER.info("start exportData...");
             // 检查参数
             String filename = String.valueOf(params.get("filename"));
@@ -3,6 +3,8 @@ package com.bsth.service.sys;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.BaseService;
+import java.util.Map;
+
 public interface SysUserService extends BaseService<SysUser, Integer>{
 	SysUser findByUserName(String name);
@@ -10,4 +12,6 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	int changeEnabled(int id,int enabled);
 	int changePWD(int id,String newPWD);
+
+	Map<String,Object> register(SysUser u);
 }
 package com.bsth.service.sys.impl;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.SysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
 	@Autowired
 	SysUserRepository sysUserRepository;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
 	public SysUser findByUserName(String name) {
@@ -45,4 +49,25 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	public int changePWD(int id,String newPWD) {
 		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
 	}
+
+	@Override
+	public Map<String, Object> register(SysUser u) {
+		Map<String, Object> rs = new HashMap();
+		try{
+			//检查用户名是否存在
+			if(findByUserName(u.getUserName()) != null){
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "用户名" + u.getUserName() + "已存在！");
+			}
+			else{
+				u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
+				rs = super.save(u);
+			}
+		}catch (Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
 }
+package com.bsth.util;
+
+import java.util.Comparator;
+import java.util.Map;
+
+
+public class ComparableJob implements Comparator<Map<String, Object>>{
+
+	@Override
+	public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+		// TODO Auto-generated method stub
+		return o1.get("nr").toString().compareTo(o2.get("nr").toString());
+	}
+
+}
+package com.bsth.util;
+
+import java.util.Comparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+public class ComparableLp implements Comparator<ScheduleRealInfo>{
+
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return o1.getLpName().compareTo(o2.getLpName());
+	}
+
+}
-package com.bsth.util.db;
-
-
-import org.apache.commons.lang3.CharUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 
- * @ClassName: BaseDao 
- * @author PanZhao
- * @param <T>
- * @date 2016年6月27日 上午10:33:12 
- *
- */
-public class BaseDao_MS {
-	
-	static Logger logger = LoggerFactory.getLogger(BaseDao_MS.class);
-	
-	/**
-	 * 
-	 * @Title: propertyToField 
-	 * @Description: TODO(java转数据库字段名) 
-	 * @param @param property
-	 * @throws
-	 */
-    public static String propertyToField(String property) {  
-        if (null == property) {  
-            return "";  
-        }  
-        char[] chars = property.toCharArray();  
-        StringBuffer sb = new StringBuffer();  
-        for (char c : chars) {  
-            if (CharUtils.isAsciiAlphaUpper(c)) {  
-                sb.append("_" + StringUtils.lowerCase(CharUtils.toString(c)));  
-            } else {  
-                sb.append(c);  
-            }  
-        }  
-        return sb.toString();  
-    }
-}
 package com.bsth.util.db;
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.sql.Connection;
@@ -10,15 +14,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import javax.sql.DataSource;
-
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import com.mchange.v2.c3p0.DataSources;
-
 /**
- * 808GPS SQL Server数据库连接工具类
+ * 网关ms库连接池
  * @author PanZhao
  *
  */
+package com.bsth.util.db;
+
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 老系统数据库连接池（保持少量的连接，不会对老系统有什么影响）
+ * @author PanZhao
+ *
+ */
+//@Component
+public class DBUtils_oldSystem {
+
+	private static String url = null;
+
+	private static String username = null;
+
+	private static String pwd = null;
+
+	private static DataSource ds_pooled;
+
+	static Logger logger = Logger.getLogger(DBUtils_oldSystem.class);
+	
+	static {
+
+		try {
+			// 1. 加载驱动类
+			Class.forName("oracle.jdbc.driver.OracleDriver");
+
+			url = "jdbc:oracle:thin:@10.10.200.225:1521:orcl";
+			username = "jjwgps";
+			pwd = "jjwgps";
+
+			// 设置连接数据库的配置信息
+			DataSource ds_unpooled = DataSources.unpooledDataSource(url,
+					username, pwd);
+
+			Map<String, Object> pool_conf = new HashMap<String, Object>();
+			// 设置最大连接数
+			pool_conf.put("maxPoolSize", 5);
+			
+			pool_conf.put("testConnectionOnCheckout", false);
+			//异步检测连接的有效性
+			pool_conf.put("testConnectionOnCheckin", true);
+			//10分钟检测一次
+			pool_conf.put("idleConnectionTestPeriod", 60 * 10);
+			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
+		}  catch (ClassNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (SQLException e) {
+			logger.error("初始化老系统连接池失败，非正式环境请忽略这个问题！");
+			logger.error(e.toString());
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 获取连接对象
+	 */
+	public static Connection getConnection() throws SQLException {
+		return ds_pooled.getConnection();
+	}
+
+	/**
+	 * 释放连接池资源
+	 */
+	public static void clearup() {
+		if (ds_pooled != null) {
+			try {
+				DataSources.destroy(ds_pooled);
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 资源关闭
+	 * 
+	 * @param rs
+	 * @param stmt
+	 * @param conn
+	 */
+	public static void close(ResultSet rs, Statement stmt, Connection conn) {
+		if (rs != null) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (stmt != null) {
+			try {
+				stmt.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (conn != null) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static DataSource getDataSource(){
+		return ds_pooled;
+	}
+}
@@ -86,6 +86,30 @@
   <notepads>
   </notepads>
   <connection>
+    <name>192.168.168.1_jwgl_dw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl_dw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
     <name>bus_control_variable</name>
     <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
     <type>MYSQL</type>
@@ -298,6 +322,18 @@
         <group/>
       </field>
       <field>
+        <name>&#x8f66;&#x8f86;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
         <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
         <type>String</type>
         <length>-1</length>
@@ -358,7 +394,7 @@
         <group/>
       </field>
       <field>
-        <name>&#x4f9b;&#x5e94;&#x5546;&#x540d;&#x79f0;</name>
+        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
         <type>String</type>
         <length>-1</length>
         <precision>-1</precision>
@@ -444,12 +480,12 @@
         <update>Y</update>
       </value>
       <value>
-        <name>inside_code</name>
-        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
+        <name>car_code</name>
+        <rename>&#x8f66;&#x8f86;&#x7f16;&#x7801;</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>car_code</name>
+        <name>inside_code</name>
         <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
         <update>Y</update>
       </value>
@@ -475,7 +511,7 @@
       </value>
       <value>
         <name>supplier_name</name>
-        <rename>&#x4f9b;&#x5e94;&#x5546;&#x540d;&#x79f0;</rename>
+        <rename>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</rename>
         <update>Y</update>
       </value>
       <value>
@@ -683,4 +719,3 @@
    <slave_transformation>N</slave_transformation>
 </transformation>
-
@@ -81,6 +81,30 @@
   <notepads>
   </notepads>
   <connection>
+    <name>192.168.168.1_jwgl_dw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl_dw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
     <name>bus_control_variable</name>
     <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
     <type>MYSQL</type>
@@ -292,6 +316,11 @@
         <format/>
       </field>
       <field>
+        <name>&#x8f66;&#x8f86;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
         <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
         <type>String</type>
         <format/>
@@ -317,6 +346,11 @@
         <format/>
       </field>
       <field>
+        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
         <name>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</name>
         <type>String</type>
         <format/>
@@ -362,6 +396,10 @@
         <rename>&#x8f66;&#x724c;&#x53f7;</rename>
         <length>-2</length>
         <precision>-2</precision>
+      </field>      <field>        <name>car_code</name>
+        <rename>&#x8f66;&#x8f86;&#x7f16;&#x7801;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
       </field>      <field>        <name>inside_code</name>
         <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
         <length>-2</length>
+/**
+ * 处理线调文件
+ */
+var fs = require('fs')
+    , cheerio = require('cheerio')
+    , minifier = require('./minifier')
+    , crypto = require("crypto")
+    , CleanCSS = require('clean-css')
+    , UglifyJS = require("uglify-js");
+;
+
+//不参与的目录
+var pName = 'bsth_control'
+    , path = process.cwd()
+    //根目录
+    , root = path.substr(0, path.indexOf('\\src\\main'))
+    , workspace = root.substr(0, root.indexOf('\\' + pName))
+    //临时目录
+    , dest = (workspace + '\\' + pName + '@fatso_copy').replace(/\//g, '\\')
+    , _static = '\\src\\main\\resources\\static';
+
+
+var mainFile = dest + _static + '\\real_control_v2\\main.html';
+var mapFile = dest + _static + '\\real_control_v2\\mapmonitor\\real.html';
+var realCtl = {
+    /**
+     * 处理线调首页
+     */
+    handleMain: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mainFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mainFile, cb);
+        });
+    },
+    /**
+     * 处理地图模块
+     * @param cb
+     */
+    handleMap: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mapFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mapFile, cb);
+        });
+    }
+};
+
+/**
+ * 处理css
+ * @type {any}
+ */
+var handleCss = function ($, cb) {
+    var cssArray = $('link[rel=stylesheet][merge]');
+    //按 merge 值分组
+    var cssMap = {}, mergeName;
+    for (var i = 0, c; c = cssArray[i++];) {
+        mergeName = $(c).attr('merge');
+        if (!cssMap[mergeName])
+            cssMap[mergeName] = [];
+        cssMap[mergeName].push(dest + _static + $(c).attr('href'));
+        //remove
+        $(c).remove();
+    }
+    //按 merge 合并压缩css
+    var ks = get_keys(cssMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并css
+        new CleanCSS().minify(cssMap[k], function (error, out) {
+            var data = out.styles;
+            var fName = (k + '_' + md5(data)) + '.css';
+            //写入 assets css 目录下
+            var descFile = dest + _static + '\\real_control_v2\\assets\\css\\' + fName;
+            fs.open(descFile, 'a', function (err, fd) {
+
+                fs.write(fd, data, function () {
+                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
+                    if ($('head').length > 0)
+                        $('head').append(tag);
+                    else {
+                        if($('link').length > 0)
+                            $('link').last().before(tag);
+                        else
+                            $('div').first().before(tag);
+                    }
+                    console.log(k + ' css', '结束，下一个');
+                    f();
+                });
+            });
+        });
+    })();
+};
+
+/**
+ * 处理js
+ */
+var handleJs = function ($, file, cb) {
+    var scriptArray = $('script[merge]');
+    //按 merge 值分组
+    var jsMap = {}, mergeName;
+    for (var i = 0, s; s = scriptArray[i++];) {
+        mergeName = $(s).attr('merge');
+        if (!jsMap[mergeName])
+            jsMap[mergeName] = [];
+        jsMap[mergeName].push(dest + _static + $(s).attr('src'));
+        //remove
+        $(s).remove();
+    }
+
+    //按 merge 合并压缩js
+    var ks = get_keys(jsMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            write(file, $.html());
+            console.log(file + ' 结束'.green);
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并压缩js
+        var result = UglifyJS.minify(jsMap[k]);
+        var data = result.code;
+        var fName = (k + '_' + md5(data)) + '.js';
+        //写入 assets js 目录下
+        var descFile = dest + _static + '\\real_control_v2\\assets\\js\\' + fName;
+        fs.open(descFile, 'a', function (err, fd) {
+
+            fs.write(fd, data, function () {
+                var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
+                if ($('body').length > 0)
+                    $('body').append(tag);
+                else {
+                    //没有body 就写在尾部
+                    $('*').last().after(tag);
+                }
+                console.log(k + ' js', '结束，下一个');
+                f();
+            });
+        });
+    })();
+};
+
+var get_keys = function (json) {
+    var array = [];
+    for (var key in json) {
+        array.push(key);
+    }
+    return array;
+};
+
+function md5(text) {
+    return crypto.createHash("md5").update(text).digest("hex");
+}
+
+function write(file, text) {
+    fs.writeFile(file, text, function (err) {
+        if (err) {
+            console.log(err.toString().red);
+            process.exit();
+        }
+        console.log(file.green);
+    });
+}
+
+module.exports = realCtl;
 \ No newline at end of file
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
     "colors": "^1.1.2",
     "eventproxy": "^0.3.4",
     "uglify-js": "^2.6.2"
@@ -51,7 +51,7 @@ var parse = {
 		}
 		return {jsArray: linkArray, $: $, scriptString: scriptString};
 	}
-}
+};
 function md5(text){
@@ -8,7 +8,8 @@ var fs = require(&#39;fs&#39;)
 	,EventProxy = require('eventproxy')
 	,parse = require('./parse')
 	,minifier = require('./minifier')
-	,crypto = require("crypto");
+	,crypto = require("crypto")
+	,handle_real_ctl = require('./handle_real_ctl');
 //不参与的目录
 var excludes = ['scheduleApp', 'trafficManage', 'control']
@@ -74,15 +75,21 @@ ep.tail(&#39;check-js&#39;, function(){
 //合并压缩JS
 ep.tail('minifier-js', function(){
 	logInfo('handle index.html...');
-	
-	//先处理首页
+
+	//再处理首页
 	ep.emit('handle-index', function(){
 		//递归处理片段
 		walk(dest + _static + '\\pages', function(item){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
-			ep.emit('package-jar');
+			//处理线调首页
+			handle_real_ctl.handleMain(function () {
+				//处理线调地图
+				handle_real_ctl.handleMap(function () {
+					ep.emit('package-jar');
+				});
+			});
 		});
 	});
 });
@@ -277,6 +277,27 @@
 			initPinYinSelect2('#line',data,'');
 		}) */
+		
+		jQuery.fn.rowspan = function(colIdx) { //封装的一个JQuery小插件
+		      return this.each(function(){
+		         var that;
+		         $('tr', this).each(function(row) {
+		            $('td:eq('+colIdx+')', this).filter(':visible').each(function(col) {
+		               if (that!=null && $(this).html() == $(that).html()) {
+		                  rowspan = $(that).attr("rowSpan");
+		                  if (rowspan == undefined) {
+		                     $(that).attr("rowSpan",1);
+		                     rowspan = $(that).attr("rowSpan"); }
+		                  rowspan = Number(rowspan)+1;
+		                  $(that).attr("rowSpan",rowspan);
+		                  $(this).hide();
+		               } else {
+		                  that = this;
+		               }
+		            });
+		         });
+		      });
+		   }
 		$("#query").on("click",function(){
 			var line=$("#line").val();;
 			var lineName=$(".select2-selection__rendered").html();
@@ -292,6 +313,11 @@
 					 var list_lbqk = template('list_lbqk',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#forms .list_lbqk').html(list_lbqk);
+						$('#forms .list_lbqk').rowspan(0);
+						$('#forms .list_lbqk').rowspan(1);
+						$('#forms .list_lbqk').rowspan(2);
+						$('#forms .list_lbqk').rowspan(3);
+						
 				})
 				$get('/report/jobLjqk',{line:line,date:date},function(result){
@@ -328,13 +354,19 @@
 			<td>{{obj.nr}}</td>
 			<td>{{obj.lp}}</td>
 			<td>{{obj.nbbm}}</td>
-			<td>{{obj.jgh}}</td>
+			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.jgh}}</td>
+ 				{{if obj.lx ==0}}
 			<td>{{obj.dz}}</td>
-			<td>{{obj.sj}}</td>
+				{{/if}}
+			<td {{if obj.lx ==1}} colspan="3" {{/if}}>{{obj.sj}}</td>
+				{{if obj.lx ==0}}
 			<td>&nbsp;</td>
 			<td>{{obj.lbbc}}</td>
-			<td>{{obj.lblc}}</td>
+				{{/if}}
+			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.lblc}}</td>
+				{{if obj.lx ==0}}
 			<td>{{obj.jyqp}}</td>
+				{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -14,6 +14,17 @@
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	   
+	  #forms > thead > tr> td >span{
+
+	  width: 5px; 
+word-wrap: break-word; 
+letter-spacing: 20px; 
+	  }
+	  
+	   #forms   tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
 </style>
 <div class="page-head">
@@ -60,18 +71,18 @@
 								<th colspan="40">线路调度日报</th>
 							</tr>
 							<tr>
-								<td rowspan="3">路线名</td>
+								<td rowspan="3"><span >路线名</span></td>
 								<td colspan="16"><c>全日</c>营运里程（公里）</td>
 								<td colspan="15"><c>全日</c>营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
 							<tr>
-								<td rowspan="2">计划</td>
-								<td rowspan="2">实驶</td>
-								<td rowspan="2">少驶公里</td>
-								<td rowspan="2">少驶班次</td>
+								<td rowspan="2"><span >计划</span></td>
+								<td rowspan="2"><span >实驶</span></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td rowspan="2"><span>少驶班次</span></td>
 								<td colspan="11">少驶原因（公里）</td>
-								<td rowspan="2">临加公里</td>
+								<td rowspan="2"><span >临加公里</span></td>
 								<td colspan="3">计划班次</td>
 								<td colspan="3">实际班次</td>
 								<td colspan="3">临加班次</td>
@@ -82,35 +93,35 @@
 								<td colspan="5" rowspan="2">原因</td>
 							</tr>
 							<tr>
-								<td>路阻</td>
-								<td>吊慢</td>
-								<td>故障</td>
-								<td>纠纷</td>
-								<td>肇事</td>
-								<td>缺人</td>
-								<td>缺车</td>
-								<td>客稀</td>
-								<td>气候</td>
-								<td>援外</td>
-								<td>其他</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
+								<td><span >路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span >故障</span></td>
+								<td><span >纠纷</span></td>
+								<td><span >肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span >客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span ><c>全日</c></span></td>
+								<td><span >早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
 							</tr>
 						</thead>
@@ -169,36 +180,36 @@
 							<td colspan="40">&nbsp;</td>
 						</tr> -->
 						<tr>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td> <label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
 						</tr>
 						<tbody class="scheduleDaily_2">
@@ -208,17 +219,17 @@
 						</tr>
 						<tr>
 							<td rowspan="2">路牌</td>
-							<td colspan="2" rowspan="2">起点站</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
 							<td colspan="4">到达时间</td>
 							<td colspan="4">发车时间</td>
 							<td colspan="2" rowspan="2">备注</td>
 							<td rowspan="2">路牌</td>
-							<td colspan="2" rowspan="2">起点站</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
 							<td colspan="4">到达时间</td>
 							<td colspan="4">发车时间</td>
 							<td colspan="2" rowspan="2">备注</td>
 							<td rowspan="2">路牌</td>
-							<td colspan="2" rowspan="2">起点站</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
 							<td colspan="4">到达时间</td>
 							<td colspan="4">发车时间</td>
 							<td colspan="2" rowspan="2">备注</td>
@@ -456,7 +467,7 @@
 </script>
 <script type="text/html" id="scheduleDaily_1">
 	{{each list as obj i}}
-		<tr>
+		<tr >
 			<td>{{obj.xlName}}</td>
 			<td>{{obj.jhlc}}</td>
 			<td>{{obj.sjgl}}</td>
@@ -534,13 +545,13 @@
 			<tr>
 		{{/if}}
 				<td>{{obj.lpName}}</td>
-				<td colspan="2">{{obj.qdzName}}</td>
+				<td colspan="2" style="word-break: keep-all;white-space:nowrap;">{{obj.qdzName}}</td>
 				<td>{{obj.zdsj}}</td>
 				<td>{{obj.zdsjActual}}</td>
 				<td>{{obj.fast}}</td>
 				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
-				<td>{{obj.fcsjActual}}
+				<td style="word-break: keep-all;white-space:nowrap;">{{obj.fcsjActual}}
 				{{if obj.bcType== "in"}}
 						(进)
 					{{/if}}
@@ -71,7 +71,7 @@
 								<th>车辆</th>
 								<th>计划里程</th>
 								<th>实际计划里程</th>
-								<th>运营</th>
+								<th>运营里程</th>
 								<th>空驶里程</th>
 								<th>抽减里程</th>
 								<th>增加里程</th>
@@ -239,5 +239,4 @@
 			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
-</script>
 </script>
 \ No newline at end of file
@@ -150,10 +150,26 @@
 			submitHandler : function(f) {
 				var params = form.serializeJSON();
 				error.hide();
-				console.log(params);
-				
-				//检查一下用户是否存在
-				$get('/user/all', {userName_eq: params.userName}, function(list){
+
+				$.ajax({
+					url: '/user/register',
+					type: 'POST',
+					traditional: true,
+					data: params,
+					success: function(rs){
+						if(!rs){
+							layer.msg('未知异常！');
+						}
+						if(rs.status=='SUCCESS'){
+							layer.msg('添加用户成功.');
+							loadPage('list.html');
+						}
+						else if(rs.status=='ERROR'){
+							layer.msg('添加失败[ ' + rs.msg + ']');
+						}
+					}
+				});
+				/*$get('/user/all', {userName_eq: params.userName}, function(list){
 					if(!list || list.length == 0){
 						console.log(params);
 						$.ajax({
@@ -166,14 +182,14 @@
 								loadPage('list.html');
 							}
 						});
-						/* $post('/user', params, function(res){
+						/!* $post('/user', params, function(res){
 							layer.msg('添加用户成功.');
 							loadPage('list.html');
-						}); */
+						}); *!/
 					}
 					else
 						layer.alert('用户【' + params.userName + '】已存在', {icon: 2, title: '提交被拒绝'});
-				});
+				});*/
 			}
 		});
 	});
+/**
+ * saTimeTable指令工具集，创建内部单元格类，及其他操作
+ */
+angular.module('ScheduleApp').factory(
+    'SaTimeTableUtils',
+    [
+        function() {
+            /**
+             * 表格，单元格头类
+             * 如：路牌，出1，青2......进6
+             */
+            var Cell_Header = function(str) {
+                /** 表头数据 */
+                this.headStr = str;
+            };
+            Cell_Header.prototype.setHead = function(str) {
+                this.headStr = str || "";
+            };
+
+            /**
+             * 表格，单元格内容类，在表格上只显示时间，但是内部还是保存其他值。
+             */
+            var Cell_Body_Bc = function() {
+                /** 表格单元格显示的信息 */
+                this.info = undefined;
+
+                this.isSel = false; // 是否被选中
+                this.isCanSel = true; // 是否能被选择
+                this.isValidInfo = false; // 数据是否有效
+
+                this.data = {}; // 内部信息
+
+                this.data.ttdid = undefined; // 班次信息Id
+                this.data.fcsj = undefined; // 发车时间
+                this.data.bcType = undefined; // 班次类型
+                this.data.xldir = undefined; // 线路方向
+                this.data.isfb = undefined; // 是否分班
+                this.data.jhlc = undefined; // 计划里程
+                this.data.qdz = null; // 起点站id
+                this.data.zdz = null; // 终点站id
+                this.data.tcc = null; // 停车场id
+
+                this.self.lpId = undefined; // 路牌Id
+                this.self.lpName = undefined; // 路牌名字
+
+                this.self.fcno = undefined; // 发车序号
+                this.self.bcs = undefined; // 班次数
+            };
+            /**
+             * 路牌单元格类。
+             */
+            var Cell_Body_Lp = function() {
+                this.info = undefined;
+
+                this.isSel = false; // 是否被选中
+                this.isCanSel = false; // 是否能被选择
+                this.isValidInfo = false; // 数据是否有效
+
+                this.data = {}; // 内部信息
+
+                this.data.lpId = undefined; // 路牌Id
+                this.data.lpName = undefined; // 路牌名字
+            };
+            /**
+             * 统计单元格类。
+             */
+            var Cell_Body_Stat = function() {
+                this.info = undefined;
+
+                this.isSel = false; // 是否被选中
+                this.isCanSel = false; // 是否能被选择
+                this.isValidInfo = false; // 数据是否有效
+
+                this.data = {}; // 内部信息
+            };
+
+            Cell_Body_Bc.prototype.canSel = function() { // 是否能被选中
+                return this.isCanSel;
+            };
+            Cell_Body_Bc.prototype.canUpdate = function() { // 是否能更新
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Bc.prototype.canDelete = function() { // 是否能删除
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Bc.prototype.validInfo = function() { // 验证班次内数据是否正确
+                if (this.canSel() && this.data.ttdid) {
+                    if (this.data.bcType == 'in') {
+                        this.isValidInfo = this.data.qdz != null && this.data.tcc != null;
+                    } else if (this.data.bcType == 'out') {
+                        this.isValidInfo = this.data.tcc != null && this.data.zdz != null;
+                    } else {
+                        this.isValidInfo = this.data.qdz != null && this.data.zdz != null;
+                    }
+                } else {
+                    this.isValidInfo = true;
+                }
+                return this.isValidInfo;
+            };
+            Cell_Body_Bc.prototype.where = function(
+                    xldir, startTime_h_m, endTime_h_m, isInOut
+                ) { // 判定班次是否在指定条件内
+
+                var fcsj_m_h = [];
+                fcsj_m_h[0] = parseInt(this.data.fcsj.split(":")[0]);
+                fcsj_m_h[1] = parseInt(this.data.fcsj.split(":")[1]);
+
+                var fcsj = new Date(2000,1,1);
+                fcsj.setHours(fcsj_m_h[0]);
+                fcsj.setMinutes(fcsj_m_h[1]);
+
+                var s_temp_date = new Date(2000, 1, 1);
+                var e_temp_date = new Date(2000, 1, 1);
+
+                if (xldir == 2) { // 上下行
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.data.bcType == "in" || this.data.bcType == "out")) {
+                        return false;
+                    }
+
+                    if (startTime_h_m) {
+                        if (endTime_h_m) {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                        } else {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            return fcsj >= s_temp_date;
+                        }
+                    } else {
+                        if (endTime_h_m) {
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj <= e_temp_date;
+                        } else {
+                            return false;
+                        }
+                    }
+                } else {
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.data.bcType == "in" || this.data.bcType == "out")) {
+                        return false;
+                    }
+
+                    if (xldir == this.xldir) {
+                        if (startTime_h_m) {
+                            if (endTime_h_m) {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                            } else {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                return fcsj >= s_temp_date;
+                            }
+                        } else {
+                            if (endTime_h_m) {
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj <= e_temp_date;
+                            } else {
+                                return true;
+                            }
+                        }
+                    } else {
+                        return false;
+                    }
+                }
+            };
+
+            Cell_Body_Lp.prototype.canSel = function() { // 是否能被选中
+                return this.isCanSel;
+            };
+            Cell_Body_Lp.prototype.canUpdate = function() { // 是否能更新
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Lp.prototype.canDelete = function() { // 是否能删除
+                return this.isSel && this.data.ttdid;
+            };
+
+            Cell_Body_Stat.prototype.canSel = function() { // 是否能被选中
+                return this.isCanSel;
+            };
+            Cell_Body_Stat.prototype.canUpdate = function() { // 是否能更新
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Stat.prototype.canDelete = function() { // 是否能删除
+                return this.isSel && this.data.ttdid;
+            };
+
+            return {
+                // TODO：
+            };
+        }
+    ]
+);
 \ No newline at end of file
@@ -126,8 +126,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 导出excel
             self.exportData = function() {
-                if (busConfigService.dataExport()) {
-                    busConfigService.dataExport().then(
+                var p = busConfigService.dataExport();
+                if (p) {
+                    p.then(
                         function(result) {
                             fileDownload.downloadFile(result.data, "application/octet-stream", "车辆配置信息.xls");
                         },
@@ -127,8 +127,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 导出excel
             self.exportData = function() {
-                if (service.dataExport()) {
-                    service.dataExport().then(
+                var p = service.dataExport();
+                if (p) {
+                    p.then(
                         function(result) {
                             fileDownload.downloadFile(result.data, "application/octet-stream", "人员配置信息.xls");
                         },
@@ -131,8 +131,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 导出excel
             self.exportData = function() {
-                if (service.dataExport()) {
-                    service.dataExport().then(
+                var p = service.dataExport();
+                if (p) {
+                    p.then(
                         function(result) {
                             fileDownload.downloadFile(result.data, "application/octet-stream", "路牌信息.xls");
                         },
-/*!
+/*
  * jQuery UI Accordion 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Autocomplete 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Button 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Datepicker 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Dialog 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Draggable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Menu 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Progressbar 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Resizable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Selectable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Selectmenu 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Slider 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Sortable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Spinner 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Tabs 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
@@ -30,7 +30,7 @@
 }
 .ui-widget-content {
 	border: 1px solid #aaaaaa/*{borderColorContent}*/;
-	background: #ffffff/*{bgColorContent}*/ url("images/ui-bg_flat_75_ffffff_40x100.png")/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/;
+	background: #ffffff/*{bgColorContent}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png")/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/;
 	color: #222222/*{fcContent}*/;
 }
 .ui-widget-content a {
@@ -38,7 +38,7 @@
 }
 .ui-widget-header {
 	border: 1px solid #aaaaaa/*{borderColorHeader}*/;
-	background: #cccccc/*{bgColorHeader}*/ url("images/ui-bg_highlight-soft_75_cccccc_1x100.png")/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
+	background: #cccccc/*{bgColorHeader}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png")/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
 	color: #222222/*{fcHeader}*/;
 	font-weight: bold;
 }
@@ -52,7 +52,7 @@
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
 	border: 1px solid #d3d3d3/*{borderColorDefault}*/;
-	background: #e6e6e6/*{bgColorDefault}*/ url("images/ui-bg_glass_75_e6e6e6_1x400.png")/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/;
+	background: #e6e6e6/*{bgColorDefault}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png")/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/;
 	font-weight: normal/*{fwDefault}*/;
 	color: #555555/*{fcDefault}*/;
 }
@@ -69,7 +69,7 @@
 .ui-widget-content .ui-state-focus,
 .ui-widget-header .ui-state-focus {
 	border: 1px solid #999999/*{borderColorHover}*/;
-	background: #dadada/*{bgColorHover}*/ url("images/ui-bg_glass_75_dadada_1x400.png")/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/;
+	background: #dadada/*{bgColorHover}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png")/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/;
 	font-weight: normal/*{fwDefault}*/;
 	color: #212121/*{fcHover}*/;
 }
@@ -88,7 +88,7 @@
 .ui-widget-content .ui-state-active,
 .ui-widget-header .ui-state-active {
 	border: 1px solid #aaaaaa/*{borderColorActive}*/;
-	background: #ffffff/*{bgColorActive}*/ url("images/ui-bg_glass_65_ffffff_1x400.png")/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/;
+	background: #ffffff/*{bgColorActive}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png")/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/;
 	font-weight: normal/*{fwDefault}*/;
 	color: #212121/*{fcActive}*/;
 }
@@ -105,7 +105,7 @@
 .ui-widget-content .ui-state-highlight,
 .ui-widget-header .ui-state-highlight {
 	border: 1px solid #fcefa1/*{borderColorHighlight}*/;
-	background: #fbf9ee/*{bgColorHighlight}*/ url("images/ui-bg_glass_55_fbf9ee_1x400.png")/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/;
+	background: #fbf9ee/*{bgColorHighlight}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png")/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/;
 	color: #363636/*{fcHighlight}*/;
 }
 .ui-state-highlight a,
@@ -117,7 +117,7 @@
 .ui-widget-content .ui-state-error,
 .ui-widget-header .ui-state-error {
 	border: 1px solid #cd0a0a/*{borderColorError}*/;
-	background: #fef1ec/*{bgColorError}*/ url("images/ui-bg_glass_95_fef1ec_1x400.png")/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/;
+	background: #fef1ec/*{bgColorError}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png")/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/;
 	color: #cd0a0a/*{fcError}*/;
 }
 .ui-state-error a,
@@ -163,27 +163,27 @@
 }
 .ui-icon,
 .ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png")/*{iconsContent}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_222222_256x240.png")/*{iconsContent}*/;
 }
 .ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png")/*{iconsHeader}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_222222_256x240.png")/*{iconsHeader}*/;
 }
 .ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png")/*{iconsDefault}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_888888_256x240.png")/*{iconsDefault}*/;
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png")/*{iconsHover}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_454545_256x240.png")/*{iconsHover}*/;
 }
 .ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png")/*{iconsActive}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_454545_256x240.png")/*{iconsActive}*/;
 }
 .ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png")/*{iconsHighlight}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_2e83ff_256x240.png")/*{iconsHighlight}*/;
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png")/*{iconsError}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_cd0a0a_256x240.png")/*{iconsError}*/;
 }
 /* positioning */
@@ -396,14 +396,14 @@
 /* Overlays */
 .ui-widget-overlay {
-	background: #aaaaaa/*{bgColorOverlay}*/ url("images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/;
+	background: #aaaaaa/*{bgColorOverlay}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/;
 	opacity: .3/*{opacityOverlay}*/;
 	filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; /* support: IE8 */
 }
 .ui-widget-shadow {
 	margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/;
 	padding: 8px/*{thicknessShadow}*/;
-	background: #aaaaaa/*{bgColorShadow}*/ url("images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;
+	background: #aaaaaa/*{bgColorShadow}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;
 	opacity: .3/*{opacityShadow}*/;
 	filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; /* support: IE8 */
 	border-radius: 8px/*{cornerRadiusShadow}*/;
-/*!
+/*
  * jQuery UI Tooltip 1.11.1
  * http://jqueryui.com
  *
@@ -400,7 +400,7 @@
 }
 .jstree-default .jstree-node,
 .jstree-default .jstree-icon {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
 }
 .jstree-default .jstree-node {
   background-position: -292px -4px;
@@ -505,13 +505,13 @@
   background-position: 0 0;
 }
 .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/throbber.gif") center center no-repeat;
 }
 .jstree-default .jstree-file {
-  background: url("32px.png") -100px -68px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -100px -68px no-repeat;
 }
 .jstree-default .jstree-folder {
-  background: url("32px.png") -260px -4px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -260px -4px no-repeat;
 }
 .jstree-default > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -523,7 +523,7 @@
 }
 #jstree-dnd.jstree-default .jstree-ok,
 #jstree-dnd.jstree-default .jstree-er {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -573,7 +573,7 @@
 }
 .jstree-default-small .jstree-node,
 .jstree-default-small .jstree-icon {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
 }
 .jstree-default-small .jstree-node {
   background-position: -295px -7px;
@@ -678,13 +678,13 @@
   background-position: 0 0;
 }
 .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/throbber.gif") center center no-repeat;
 }
 .jstree-default-small .jstree-file {
-  background: url("32px.png") -103px -71px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -103px -71px no-repeat;
 }
 .jstree-default-small .jstree-folder {
-  background: url("32px.png") -263px -7px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -263px -7px no-repeat;
 }
 .jstree-default-small > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -696,7 +696,7 @@
 }
 #jstree-dnd.jstree-default-small .jstree-ok,
 #jstree-dnd.jstree-default-small .jstree-er {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -746,7 +746,7 @@
 }
 .jstree-default-large .jstree-node,
 .jstree-default-large .jstree-icon {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
 }
 .jstree-default-large .jstree-node {
   background-position: -288px 0px;
@@ -851,13 +851,13 @@
   background-position: 0 0;
 }
 .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/throbber.gif") center center no-repeat;
 }
 .jstree-default-large .jstree-file {
-  background: url("32px.png") -96px -64px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -96px -64px no-repeat;
 }
 .jstree-default-large .jstree-folder {
-  background: url("32px.png") -256px 0px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -256px 0px no-repeat;
 }
 .jstree-default-large > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -869,7 +869,7 @@
 }
 #jstree-dnd.jstree-default-large .jstree-ok,
 #jstree-dnd.jstree-default-large .jstree-er {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -904,12 +904,12 @@
     height: 40px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
     background-position: 0 -200px;
     background-size: 120px 240px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
     background-position: -40px -200px;
     background-size: 120px 240px;
   }
@@ -928,7 +928,7 @@
 	*/
   }
   .jstree-default-responsive .jstree-icon {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
   }
   .jstree-default-responsive .jstree-node,
   .jstree-default-responsive .jstree-leaf > .jstree-ocl {
@@ -1032,7 +1032,7 @@
   .jstree-default-responsive .jstree-node > .jstree-ocl,
   .jstree-default-responsive .jstree-themeicon,
   .jstree-default-responsive .jstree-checkbox {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
     background-size: 120px 240px;
   }
   .jstree-default-responsive .jstree-node {
@@ -1054,11 +1054,11 @@
     background-position: 0 0;
   }
   .jstree-default-responsive .jstree-file {
-    background: url("40px.png") 0 -160px no-repeat;
+    background: url("/real_control_v2/assets/plugins/jstree/default/40px.png") 0 -160px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-responsive .jstree-folder {
-    background: url("40px.png") -40px -40px no-repeat;
+    background: url("/real_control_v2/assets/plugins/jstree/default/40px.png") -40px -40px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-responsive > .jstree-container-ul > .jstree-node {
-.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-context{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default .jstree-disabled{background:0 0;color:#666}.jstree-default .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default>.jstree-wholerow-ul .jstree-hovered,.jstree-default>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-image:url(32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default>.jstree-no-dots .jstree-node,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled{background:0 0}.jstree-default .jstree-disabled.jstree-hovered{background:0 0}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-ok,#jstree-dnd.jstree-default .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-node,.jstree-default-small .jstree-icon{background-image:url(32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small>.jstree-no-dots .jstree-node,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled{background:0 0}.jstree-default-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-ok,#jstree-dnd.jstree-default-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-node,.jstree-default-large .jstree-icon{background-image:url(32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large>.jstree-no-dots .jstree-node,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled{background:0 0}.jstree-default-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-ok,#jstree-dnd.jstree-default-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}
 \ No newline at end of file
+/* perfect-scrollbar v0.6.16 */
+.ps-container {
+  -ms-touch-action: auto;
+  touch-action: auto;
+  overflow: hidden !important;
+  -ms-overflow-style: none; }
+  @supports (-ms-overflow-style: none) {
+    .ps-container {
+      overflow: auto !important; } }
+  @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+    .ps-container {
+      overflow: auto !important; } }
+  .ps-container.ps-active-x > .ps-scrollbar-x-rail,
+  .ps-container.ps-active-y > .ps-scrollbar-y-rail {
+    display: block;
+    background-color: transparent; }
+  .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      background-color: #999;
+      height: 11px; }
+  .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      background-color: #999;
+      width: 11px; }
+  .ps-container > .ps-scrollbar-x-rail {
+    display: none;
+    position: absolute;
+    /* please don't change 'position' */
+    opacity: 0;
+    -webkit-transition: background-color .2s linear, opacity .2s linear;
+    -o-transition: background-color .2s linear, opacity .2s linear;
+    -moz-transition: background-color .2s linear, opacity .2s linear;
+    transition: background-color .2s linear, opacity .2s linear;
+    bottom: 0px;
+    /* there must be 'bottom' for ps-scrollbar-x-rail */
+    height: 15px; }
+    .ps-container > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      position: absolute;
+      /* please don't change 'position' */
+      background-color: #aaa;
+      -webkit-border-radius: 6px;
+      -moz-border-radius: 6px;
+      border-radius: 6px;
+      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      bottom: 2px;
+      /* there must be 'bottom' for ps-scrollbar-x */
+      height: 6px; }
+    .ps-container > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x, .ps-container > .ps-scrollbar-x-rail:active > .ps-scrollbar-x {
+      height: 11px; }
+  .ps-container > .ps-scrollbar-y-rail {
+    display: none;
+    position: absolute;
+    /* please don't change 'position' */
+    opacity: 0;
+    -webkit-transition: background-color .2s linear, opacity .2s linear;
+    -o-transition: background-color .2s linear, opacity .2s linear;
+    -moz-transition: background-color .2s linear, opacity .2s linear;
+    transition: background-color .2s linear, opacity .2s linear;
+    right: 0;
+    /* there must be 'right' for ps-scrollbar-y-rail */
+    width: 15px; }
+    .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      position: absolute;
+      /* please don't change 'position' */
+      background-color: #aaa;
+      -webkit-border-radius: 6px;
+      -moz-border-radius: 6px;
+      border-radius: 6px;
+      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      right: 2px;
+      /* there must be 'right' for ps-scrollbar-y */
+      width: 6px; }
+    .ps-container > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y, .ps-container > .ps-scrollbar-y-rail:active > .ps-scrollbar-y {
+      width: 11px; }
+  .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      background-color: #999;
+      height: 11px; }
+  .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      background-color: #999;
+      width: 11px; }
+  .ps-container:hover > .ps-scrollbar-x-rail,
+  .ps-container:hover > .ps-scrollbar-y-rail {
+    opacity: 0.6; }
+  .ps-container:hover > .ps-scrollbar-x-rail:hover {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x {
+      background-color: #999; }
+  .ps-container:hover > .ps-scrollbar-y-rail:hover {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y {
+      background-color: #999; }