PSM-12

徐烜
2 parents 6dc5bdaa ed9bb7ee
Showing 9 changed files with 169 additions and 78 deletions
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/service/realcontrol/dto/ScheduleExecRate.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/schedule/utils/DataToolsProperties.java
src/main/resources/datatools/config-dev.properties
src/main/resources/datatools/config-prod.properties
@@ -9,6 +9,7 @@ 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;
@@ -167,11 +168,24 @@ public class BaseController&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();
@@ -14,6 +14,7 @@ import com.bsth.service.StationRouteService;
 import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.utils.DataImportExportService;
+import com.bsth.service.schedule.utils.DataToolsProperties;
 import jxl.Cell;
 import jxl.Sheet;
 import jxl.Workbook;
@@ -26,6 +27,7 @@ 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.File;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -51,6 +53,8 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
     private StationRouteService stationRouteService;
     @Autowired
     private GuideboardInfoService guideboardInfoService;
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
  
  
     public static class ExcelFileOutput {
@@ -126,11 +130,15 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
                 Cell[] cells = sheet.getRow(0); // 获取第一行数据列
                 for (int i = 0; i < cells.length; i++) {
                     String cell_con = cells[i].getContents();
+
                     if (StringUtils.isEmpty(cell_con)) {
                         rtn.put("status", ResponseCode.ERROR);
                         rtn.put("msg", String.format("第1行，第%d列数据不能为空", i + 1));
                         return rtn;
                     } else {
+                        // 正则表达式去除数字
+                        cell_con = cell_con.replaceAll("[\\d+]", "");
+
                         if (i == 0) { // 第一列必须是路牌2个字
                             if (!"路牌".equals(cell_con.trim())) {
                                 rtn.put("status", ResponseCode.ERROR);
@@ -457,4 +465,25 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
     public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
         return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
     }
+
+    @Override
+    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
+        // 获取injectktr
+        File ktrFile2 = new File(this.getClass().getResource(
+                dataToolsProperties.getTtinfodetailOutput()).toURI());
+        param.put("injectktrfile", ktrFile2.getAbsolutePath());
+        param.put("ttinfoid", param.get("ttinfoid"));
+
+        super.dataExport(response, param);
+    }
+
+    @Override
+    protected String getDataExportKtrClasspath() {
+        return dataToolsProperties.getTtinfodetailMetaoutput();
+    }
+
+    @Override
+    protected String getDataExportFilename() {
+        return "时刻表";
+    }
 }
@@ -50,8 +50,8 @@ public class ArrivalData_GPS implements CommandLineRunner{
  
 	@Override
 	public void run(String... arg0) throws Exception {
-		logger.info("ArrivalData_GPS,100,10 @11-10");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 100, 10, TimeUnit.SECONDS);
+		logger.info("ArrivalData_GPS,30,10");
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 10, TimeUnit.SECONDS);
 	}
  
 	@Component
-package com.bsth.service.realcontrol.dto;
-
-/**
- * 班次执行率DTO
- * Created by panzhao on 2016/11/14.
- */
-public class ScheduleExecRate {
-
-    private long id;
-    private String dfsj;
-    private String fcsjActual;
-    private String zdsj;
-    private String zdsjActual;
-    private int status;
-    private String lineCode;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDfsj() {
-        return dfsj;
-    }
-
-    public void setDfsj(String dfsj) {
-        this.dfsj = dfsj;
-    }
-
-    public String getFcsjActual() {
-        return fcsjActual;
-    }
-
-    public void setFcsjActual(String fcsjActual) {
-        this.fcsjActual = fcsjActual;
-    }
-
-    public String getZdsj() {
-        return zdsj;
-    }
-
-    public void setZdsj(String zdsj) {
-        this.zdsj = zdsj;
-    }
-
-    public String getZdsjActual() {
-        return zdsjActual;
-    }
-
-    public void setZdsjActual(String zdsjActual) {
-        this.zdsjActual = zdsjActual;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-}
+package com.bsth.service.realcontrol.dto;
+
+/**
+ * 班次执行率DTO
+ * Created by panzhao on 2016/11/14.
+ */
+public class ScheduleExecRate {
+
+    private long id;
+    private String dfsj;
+    private String fcsjActual;
+    private String zdsj;
+    private String zdsjActual;
+    private int status;
+    private String lineCode;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.service.schedule.utils;
 import org.springframework.web.multipart.MultipartFile;
  
 import java.io.File;
+import java.util.Map;
  
 /**
  * 数据导入导出服务。
@@ -32,4 +33,7 @@ public interface DataImportExportService {
      * @throws Exception
      */
     File fileDataOutput(String fileName, File ktrFile) throws Exception;
+
+
+    File fileDataOutput(String fileName, File ktrFile, Map<String, Object> param) throws Exception;
 }
@@ -10,6 +10,7 @@ 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;
@@ -111,6 +112,11 @@ public class DataImportExportServiceImpl implements DataImportExportService, Ini
  
     @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);
@@ -120,6 +126,14 @@ public class DataImportExportServiceImpl implements DataImportExportService, Ini
                 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);
         // 等待转换结束
@@ -83,6 +83,10 @@ public class DataToolsProperties {
     /** 人员信息导出ktr转换 */
     @NotNull
     private String employeesDataoutputktr;
+    /** 时刻表导出元数据ktr转换 */
+    private String ttinfodetailMetaoutput;
+    /** 时刻表导出数据ktr转换 */
+    private String ttinfodetailOutput;
  
     // TODO：
  
@@ -253,4 +257,20 @@ public class DataToolsProperties {
     public void setKvarsDbdname(String kvarsDbdname) {
         this.kvarsDbdname = kvarsDbdname;
     }
+
+    public String getTtinfodetailMetaoutput() {
+        return ttinfodetailMetaoutput;
+    }
+
+    public void setTtinfodetailMetaoutput(String ttinfodetailMetaoutput) {
+        this.ttinfodetailMetaoutput = ttinfodetailMetaoutput;
+    }
+
+    public String getTtinfodetailOutput() {
+        return ttinfodetailOutput;
+    }
+
+    public void setTtinfodetailOutput(String ttinfodetailOutput) {
+        this.ttinfodetailOutput = ttinfodetailOutput;
+    }
 }
@@ -48,13 +48,19 @@ datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.
  
 # 4、数据导出配置信息
 # 导出数据文件目录配置（根据不同的环境需要修正）
-datatools.fileoutput_dir=/Users/xu/resource/project/bsth_control_u_d_files
+datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
  
 ##---------------------------- 导出数据ktr -----------------------------##
 # 车辆信息导出ktr转换
 datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
 # 人员信息导出ktr转换
 datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
+# 时刻表导出元数据ktr转换
+datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
+# 时刻表导出数据ktr转换
+datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
+
+
  
 # TODO：
  
@@ -56,5 +56,9 @@ datatools.fileoutput_dir=/opt/bsth_control_u_d_files
 datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
 # 人员信息导出ktr转换
 datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
+# 时刻表导出元数据ktr转换
+datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
+# 时刻表导出数据ktr转换
+datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
  
 # TODO：
 \ No newline at end of file