Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 29f78d10 c681de6f
Showing 5 changed files with 148 additions and 76 deletions
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/service/schedule/utils/DataImportExportService.java
src/main/java/com/bsth/service/schedule/utils/DataImportExportServiceImpl.java
@@ -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.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);
@@ -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);
     }