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

娄高锋
2 parents 2a6aa1cd 701de6e7
Showing 20 changed files with 797 additions and 386 deletions
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/dto/StationSpatialData.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/sys/CompanyAuthorityController.java
src/main/java/com/bsth/controller/sys/dto/CompanyData.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/sys/CompanyAuthority.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/sys/CompanyAuthorityRepository.java
src/main/java/com/bsth/service/realcontrol/RealMapService.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/utils/DataImportExportService.java
src/main/java/com/bsth/service/schedule/utils/DataImportExportServiceImpl.java
src/main/java/com/bsth/service/sys/CompanyAuthorityService.java
src/main/java/com/bsth/service/sys/impl/CompanyAuthorityServiceImpl.java
src/main/resources/application-dev.properties
@@ -5,10 +5,13 @@ 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;
@@ -164,11 +167,24 @@ public class BaseController2&lt;T, ID extends Serializable&gt; {
      */
     @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 = dataImportExportService.fileDataOutput(
-                getDataExportFilename(),
-                ktrfile);
+        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();
@@ -225,4 +241,52 @@ public class BaseController2&lt;T, ID extends Serializable&gt; {
         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.*;
+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;
 /**
@@ -14,24 +21,12 @@ import java.util.Map;
 @RestController
 @RequestMapping("cars")
 @EnableConfigurationProperties(DataToolsProperties.class)
-public class CarsController extends BaseController<Cars, Integer> {
+public class CarsController extends BaseController2<Cars, Integer> {
     @Autowired
     private DataToolsProperties dataToolsProperties;
-
-    /**
-     * 覆写方法，因为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 Cars t){
-        return baseService.save(t);
-    }
+    @Autowired
+    private DataImportExportService dataImportExportService;
     /**
      * 验证。
@@ -44,6 +39,48 @@ public class CarsController extends BaseController&lt;Cars, Integer&gt; {
         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();
+package com.bsth.controller.realcontrol;
+
+import com.bsth.service.realcontrol.RealMapService;
+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 2016/11/23.
+ */
+@RestController
+@RequestMapping("realMap")
+public class RealMapController {
+
+    @Autowired
+    RealMapService realMapService;
+
+    /**
+     * 根据线路获取站点路由及空间数据
+     */
+    @RequestMapping(value = "/stationSpatialData")
+    public Map<String, Object> stationSpatialData(@RequestParam String idx){
+        return realMapService.stationSpatialData(idx);
+    }
+}
 package com.bsth.controller.realcontrol;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.*;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.drools.core.runtime.help.impl.XStreamJSon.JSonAbortWorkItemConverter;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-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.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.controller.BaseController;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
@@ -23,9 +7,14 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
 @RestController
 @RequestMapping("/realSchedule")
+package com.bsth.controller.realcontrol.dto;
+
+/**
+ * Created by panzhao on 2016/11/23.
+ */
+public class StationSpatialData {
+
+    private String lineCode;
+
+    private String stationName;
+
+    private String stationCode;
+
+    private String stationMark;
+
+    private int directions;
+
+    private Float distances;
+
+    private Float toTime;
+
+    private Integer versions;
+
+    private Float gLonx;
+
+    private Float gLaty;
+
+    private Float radius;
+
+    private String shapesType;
+
+    private String gPolygonGrid;
+
+    private Integer stationRouteCode;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public Float getDistances() {
+        return distances;
+    }
+
+    public void setDistances(Float distances) {
+        this.distances = distances;
+    }
+
+    public Float getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Float toTime) {
+        this.toTime = toTime;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public Float getgLonx() {
+        return gLonx;
+    }
+
+    public void setgLonx(Float gLonx) {
+        this.gLonx = gLonx;
+    }
+
+    public Float getgLaty() {
+        return gLaty;
+    }
+
+    public void setgLaty(Float gLaty) {
+        this.gLaty = gLaty;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public String getShapesType() {
+        return shapesType;
+    }
+
+    public void setShapesType(String shapesType) {
+        this.shapesType = shapesType;
+    }
+
+    public String getgPolygonGrid() {
+        return gPolygonGrid;
+    }
+
+    public void setgPolygonGrid(String gPolygonGrid) {
+        this.gPolygonGrid = gPolygonGrid;
+    }
+
+    public Integer getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(Integer stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+}
 package com.bsth.controller.schedule;
 import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
+import com.bsth.controller.BaseController2;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
  */
 @RestController
 @RequestMapping("tidc")
-public class TTInfoDetailController extends BaseController<TTInfoDetail, Long> {
+public class TTInfoDetailController extends BaseController2<TTInfoDetail, Long> {
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
     @Autowired
@@ -56,53 +56,13 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
     @Autowired
     private DataToolsProperties dataToolsProperties;
-
-    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;
-        }
-    }
-
     /**
      * 1、上传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;
-    }
     /**
      * 2、验证sheet（以后放到规则引擎里去做）。
@@ -441,21 +401,6 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
         return ttInfoDetailService.getEditInfo(xlid, ttid);
     }
-    /**
-     * 覆写方法，因为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 TTInfoDetail t){
-
-        return baseService.save(t);
-    }
-
     @Override
     public TTInfoDetail findById(@PathVariable("id") Long aLong) {
         return ttInfoDetailRepository.findOneExtend(aLong);
-package com.bsth.controller.sys;
-
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.controller.BaseController;
-import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.service.sys.CompanyAuthorityService;
-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.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2016/11/22.
- */
-@RestController
-@RequestMapping("companyAuthority")
-public class CompanyAuthorityController extends BaseController<CompanyAuthority, Integer>{
-
-    @Autowired
-    CompanyAuthorityService companyAuthorityService;
-
-    @RequestMapping(value = "save")
-    public Map<String, Object> save(@RequestParam  Integer roleId, @RequestParam String authJsonStr){
-        authJsonStr = StringEscapeUtils.unescapeHtml4(authJsonStr);
-        System.out.println(authJsonStr);
-        List<CompanyAuthority> list = JSONArray.parseArray(authJsonStr, CompanyAuthority.class);
-        return companyAuthorityService.save(roleId, list);
-    }
-}
+package com.bsth.controller.sys;
+
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.service.sys.CompanyAuthorityService;
+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.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@RestController
+@RequestMapping("companyAuthority")
+public class CompanyAuthorityController extends BaseController<CompanyAuthority, Integer>{
+
+    @Autowired
+    CompanyAuthorityService companyAuthorityService;
+
+    @RequestMapping(value = "save")
+    public Map<String, Object> save(@RequestParam  Integer roleId, @RequestParam String authJsonStr){
+        authJsonStr = StringEscapeUtils.unescapeHtml4(authJsonStr);
+        System.out.println(authJsonStr);
+        List<CompanyAuthority> list = JSONArray.parseArray(authJsonStr, CompanyAuthority.class);
+        return companyAuthorityService.save(roleId, list);
+    }
+}
-package com.bsth.controller.sys.dto;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2016/11/22.
- */
-public class CompanyData {
-
-    private String companyCode;
-
-    private String companyName;
-
-    private List<ChildrenCompany> children;
-
-    public String getCompanyCode() {
-        return companyCode;
-    }
-
-    public void setCompanyCode(String companyCode) {
-        this.companyCode = companyCode;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public List<ChildrenCompany> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<ChildrenCompany> children) {
-        this.children = children;
-    }
-
-    public static class ChildrenCompany {
-        private String code;
-
-        private String name;
-
-        public ChildrenCompany(String code, String name){
-            this.code = code;
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public void setCode(String code) {
-            this.code = code;
-        }
-    }
-}
+package com.bsth.controller.sys.dto;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+public class CompanyData {
+
+    private String companyCode;
+
+    private String companyName;
+
+    private List<ChildrenCompany> children;
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public List<ChildrenCompany> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<ChildrenCompany> children) {
+        this.children = children;
+    }
+
+    public static class ChildrenCompany {
+        private String code;
+
+        private String name;
+
+        public ChildrenCompany(String code, String name){
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+    }
+}
@@ -2,13 +2,11 @@ package com.bsth.entity.realcontrol;
 import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import javax.persistence.*;
-
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -177,8 +175,116 @@ public class ScheduleRealInfo {
 	/** 子任务 */
 	@OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/)
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
-	
-	/** ---------------- 
+
+	/** 关联的公司名称 */
+	private String gsName;
+	/** 关联的公司编码 */
+	private String gsBm;
+	/** 关联的分公司名称 */
+	private String fgsName;
+	/** 关联的分公司编码 */
+	private String fgsBm;
+	/** 出场顺序号 */
+	private Integer ccno;
+
+	//待发调试（是否自动调整）
+	private boolean dfAuto;
+	//是否有GPS信号
+	private boolean online;
+
+	public boolean isDfAuto() {
+		return dfAuto;
+	}
+
+	public void setDfAuto(boolean dfAuto) {
+		this.dfAuto = dfAuto;
+	}
+
+	public boolean isOnline() {
+		return online;
+	}
+
+	public void setOnline(boolean online) {
+		this.online = online;
+	}
+
+	public String getQdzArrDatejh() {
+		return qdzArrDatejh;
+	}
+
+	public void setQdzArrDatejh(String qdzArrDatejh) {
+		this.qdzArrDatejh = qdzArrDatejh;
+	}
+
+	public String getQdzArrDatesj() {
+		return qdzArrDatesj;
+	}
+
+	public void setQdzArrDatesj(String qdzArrDatesj) {
+		this.qdzArrDatesj = qdzArrDatesj;
+	}
+
+	public void setcTasks(Set<ChildTaskPlan> cTasks) {
+		this.cTasks = cTasks;
+	}
+
+	public String getGsName() {
+		return gsName;
+	}
+
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+
+	public String getGsBm() {
+		return gsBm;
+	}
+
+	public void setGsBm(String gsBm) {
+		this.gsBm = gsBm;
+	}
+
+	public String getFgsName() {
+		return fgsName;
+	}
+
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
+
+	public String getFgsBm() {
+		return fgsBm;
+	}
+
+	public void setFgsBm(String fgsBm) {
+		this.fgsBm = fgsBm;
+	}
+
+	public Integer getCcno() {
+		return ccno;
+	}
+
+	public void setCcno(Integer ccno) {
+		this.ccno = ccno;
+	}
+
+	public static DateTimeFormatter getFmtHHmm() {
+		return fmtHHmm;
+	}
+
+	public static void setFmtHHmm(DateTimeFormatter fmtHHmm) {
+		ScheduleRealInfo.fmtHHmm = fmtHHmm;
+	}
+
+	public static DateTimeFormatter getFmtyyyyMMddHHmm() {
+		return fmtyyyyMMddHHmm;
+	}
+
+	public static void setFmtyyyyMMddHHmm(DateTimeFormatter fmtyyyyMMddHHmm) {
+		ScheduleRealInfo.fmtyyyyMMddHHmm = fmtyyyyMMddHHmm;
+	}
+
+	/** ----------------
 	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	private RealTimeModel sjfcModel;
 	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-package com.bsth.entity.sys;
-
-import javax.persistence.*;
-
-/**
- * Created by panzhao on 2016/11/22.
- */
-@Entity
-@Table(name = "bsth_c_sys_company_auth")
-public class CompanyAuthority {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
-
-    /** 公司代码 */
-    private String companyCode;
-
-    /** 公司名称 */
-    private String companyName;
-
-    /** 分公司代码 */
-    private String subCompanyCode;
-
-    /** 分公司代码 */
-    private String subCompanyName;
-
-    private Integer roleId;
-
-    public String getSubCompanyName() {
-        return subCompanyName;
-    }
-
-    public void setSubCompanyName(String subCompanyName) {
-        this.subCompanyName = subCompanyName;
-    }
-
-    public String getSubCompanyCode() {
-        return subCompanyCode;
-    }
-
-    public void setSubCompanyCode(String subCompanyCode) {
-        this.subCompanyCode = subCompanyCode;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getCompanyCode() {
-        return companyCode;
-    }
-
-    public void setCompanyCode(String companyCode) {
-        this.companyCode = companyCode;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Integer roleId) {
-        this.roleId = roleId;
-    }
-}
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Entity
+@Table(name = "bsth_c_sys_company_auth")
+public class CompanyAuthority {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /** 公司代码 */
+    private String companyCode;
+
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司代码 */
+    private String subCompanyCode;
+
+    /** 分公司代码 */
+    private String subCompanyName;
+
+    private Integer roleId;
+
+    public String getSubCompanyName() {
+        return subCompanyName;
+    }
+
+    public void setSubCompanyName(String subCompanyName) {
+        this.subCompanyName = subCompanyName;
+    }
+
+    public String getSubCompanyCode() {
+        return subCompanyCode;
+    }
+
+    public void setSubCompanyCode(String subCompanyCode) {
+        this.subCompanyCode = subCompanyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+}
@@ -37,14 +37,14 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,"
 			+ " d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 "
 			+ "d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ "r.schedule_date like %?2% and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
+			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
 	List<Object[]> historyMessage(String line,String date,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
 			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
 			+ " ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ " r.schedule_date like %?2% and r.cl_zbh like %?3% group by "
-			+ " lp_name,xl_name,cl_zbh order by d.timestamp",nativeQuery=true)
+			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% group by "
+			+ " lp_name,xl_name,cl_zbh",nativeQuery=true)
 	List<Object[]> historyMessageCount(String line,String date,String code);
 	@Query(value = "select max(id) from ScheduleRealInfo")
-package com.bsth.repository.sys;
-
-import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.repository.BaseRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2016/11/22.
- */
-@Repository
-public interface CompanyAuthorityRepository extends BaseRepository<CompanyAuthority, Integer>{
-
-    @Modifying
-    @Query(value="DELETE FROM CompanyAuthority WHERE roleId = ?1")
-    void deleteByRoleId(Integer roleId);
-
-    @Query(value = "select ca from CompanyAuthority ca where ca.roleId in ?1")
-    List<CompanyAuthority> findByRoles(List<Integer> idx);
-}
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Repository
+public interface CompanyAuthorityRepository extends BaseRepository<CompanyAuthority, Integer>{
+
+    @Modifying
+    @Query(value="DELETE FROM CompanyAuthority WHERE roleId = ?1")
+    void deleteByRoleId(Integer roleId);
+
+    @Query(value = "select ca from CompanyAuthority ca where ca.roleId in ?1")
+    List<CompanyAuthority> findByRoles(List<Integer> idx);
+}
+package com.bsth.service.realcontrol;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/23.
+ */
+public interface RealMapService {
+    Map<String, Object> stationSpatialData(String idx);
+}
+package com.bsth.service.realcontrol.impl;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.realcontrol.dto.StationSpatialData;
+import com.bsth.service.realcontrol.RealMapService;
+import com.google.common.base.Splitter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/23.
+ */
+@Service
+public class RealMapServiceImpl implements RealMapService {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Map<String, Object> stationSpatialData(String idx) {
+        Map<String, Object> rs = new HashMap();
+
+        try {
+            List<String> idArray = Splitter.on(",").splitToList(idx);
+            //拼接in语句
+            String inStr = "";
+            for (String code : idArray) {
+                inStr += (",'" + code+"'");
+            }
+            inStr = " (" + inStr.substring(1) + ")";
+
+            String sql = "select R.LINE_CODE,R.STATION_NAME,R.STATION_CODE,R.STATION_MARK,R.DIRECTIONS,R.DISTANCES,R.TO_TIME, R.VERSIONS,S.G_LONX,S.G_LATY,S.RADIUS,S.SHAPES_TYPE,ST_AsText(S.G_POLYGON_GRID) as G_POLYGON_GRID, R.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in "+inStr+" and r.destroy=0";
+
+            List<StationSpatialData> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(StationSpatialData.class));
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "查询站点空间数据出现异常！");
+        }
+
+        return rs;
+    }
+}
@@ -1281,6 +1281,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						if(scheduleRealInfo.isSflj()){
 							ljgl += tempJhlc;
 						}
+					}else{
+						ssgl += tempJhlc;
+						ssgl_other += tempJhlc;
 					}
 				}else{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -24,6 +24,7 @@ public interface DataImportExportService {
      * @throws Exception
      */
     void fileDataImport(MultipartFile datafile, File ktrFile) throws Exception;
+    void fileDataImport(File datafile, File ktrFile) throws Exception;
     /**
      * 数据导出。
@@ -111,6 +111,31 @@ public class DataImportExportServiceImpl implements DataImportExportService, Ini
     }
     @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);
     }
-package com.bsth.service.sys;
-
-import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.service.BaseService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2016/11/22.
- */
-public interface CompanyAuthorityService extends BaseService<CompanyAuthority, Integer> {
-    Map<String,Object> save(Integer roleId, List<CompanyAuthority> list);
-
-    List<CompanyAuthority> findByUser(SysUser user);
-}
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+public interface CompanyAuthorityService extends BaseService<CompanyAuthority, Integer> {
+    Map<String,Object> save(Integer roleId, List<CompanyAuthority> list);
+
+    List<CompanyAuthority> findByUser(SysUser user);
+}
-package com.bsth.service.sys.impl;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.entity.sys.Role;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.sys.CompanyAuthorityRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.sys.CompanyAuthorityService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-/**
- * Created by panzhao on 2016/11/22.
- */
-@Service
-public class CompanyAuthorityServiceImpl extends BaseServiceImpl<CompanyAuthority, Integer> implements CompanyAuthorityService {
-
-    @Autowired
-    CompanyAuthorityRepository companyAuthorityRepository;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Transactional
-    @Override
-    public Map<String, Object> save(Integer roleId, List<CompanyAuthority> list) {
-        Map<String, Object> rs = new HashMap();
-
-        try {
-            for(CompanyAuthority cauth : list){
-                cauth.setRoleId(roleId);
-            }
-
-            //删除原数据
-            companyAuthorityRepository.deleteByRoleId(roleId);
-
-            //重新写入数据
-            companyAuthorityRepository.save(list);
-
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-        }
-
-        return rs;
-    }
-
-    @Override
-    public List<CompanyAuthority> findByUser(SysUser user) {
-        Set<Role> roles = user.getRoles();
-        if(roles == null || roles.size() == 0)
-            return null;
-
-        List<Integer> idx = new ArrayList<>();
-        for(Role r : roles)
-            idx.add(r.getId());
-
-        List<CompanyAuthority> cAuths = companyAuthorityRepository.findByRoles(idx);
-        return cAuths;
-    }
-}
+package com.bsth.service.sys.impl;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.CompanyAuthorityRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.CompanyAuthorityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Service
+public class CompanyAuthorityServiceImpl extends BaseServiceImpl<CompanyAuthority, Integer> implements CompanyAuthorityService {
+
+    @Autowired
+    CompanyAuthorityRepository companyAuthorityRepository;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Transactional
+    @Override
+    public Map<String, Object> save(Integer roleId, List<CompanyAuthority> list) {
+        Map<String, Object> rs = new HashMap();
+
+        try {
+            for(CompanyAuthority cauth : list){
+                cauth.setRoleId(roleId);
+            }
+
+            //删除原数据
+            companyAuthorityRepository.deleteByRoleId(roleId);
+
+            //重新写入数据
+            companyAuthorityRepository.save(list);
+
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+
+        return rs;
+    }
+
+    @Override
+    public List<CompanyAuthority> findByUser(SysUser user) {
+        Set<Role> roles = user.getRoles();
+        if(roles == null || roles.size() == 0)
+            return null;
+
+        List<Integer> idx = new ArrayList<>();
+        for(Role r : roles)
+            idx.add(r.getId());
+
+        List<CompanyAuthority> cAuths = companyAuthorityRepository.findByRoles(idx);
+        return cAuths;
+    }
+}
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= 123456
 #DATASOURCE