PSM-7

徐烜
1 parent 8ed2f6f3
Showing 6 changed files with 103 additions and 23 deletions
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/entity/schedule/SchedulePlan.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
src/main/java/com/bsth/service/schedule/TTInfoDetailServiceImpl.java
@@ -116,6 +116,7 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
         if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", String.format("%s 工作区没有数据！", sheetname));
+            return rtn;
         } else {
             if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
                 rtn.put("status", ResponseCode.ERROR);
@@ -147,11 +148,11 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
                                 List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
                                 if (CollectionUtils.isEmpty(stationRouteList)) {
                                     rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据在%s站点路由中不是起点站", i + 1, linename));
+                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
                                     return rtn;
                                 } else if (stationRouteList.size() > 1) {
                                     rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据在%s站点路由中上下行都是起点站", i + 1, linename));
+                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
                                     return rtn;
                                 }
                             }
@@ -363,6 +364,7 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
         ttInfoDetailService.fileDataImport(
                 new File(filename + "_temp.xls"),
+                (String) form.get("sheetname"),
                 (String) form.get("xlname"),
                 (String) form.get("ttname"),
                 tccname
@@ -38,6 +38,15 @@ public class SchedulePlan {
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private ScheduleRule1 scheduleRule1;
+    // TODO： 新字段，测试完后删除旧的字段
+
+    /** 使用的时刻表名字列表（用逗号连接） */
+    private String ttInfoNames;
+    /** 使用的时刻表id列表（用逗号连接） */
+    private String ttInfoId;
+    /** 使用的规则1列表（用逗号连接） */
+    private String rule1Ids;
+
     /** 排班计划的开始时间 */
     @Column(nullable = false)
     private Date scheduleFromTime;
@@ -150,4 +159,28 @@ public class SchedulePlan {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public String getTtInfoNames() {
+        return ttInfoNames;
+    }
+
+    public void setTtInfoNames(String ttInfoNames) {
+        this.ttInfoNames = ttInfoNames;
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+
+    public String getRule1Ids() {
+        return rule1Ids;
+    }
+
+    public void setRule1Ids(String rule1Ids) {
+        this.rule1Ids = rule1Ids;
+    }
 }
@@ -121,6 +121,13 @@ public class SchedulePlanInfo {
     @Column(nullable = false)
     private String bcType;
+    // 重要的新增字段
+    /** 关联的时刻表id */
+    private Long ttInfo;
+    /** 关联的时刻表名字 */
+    private String ttInfoName;
+
+
     /** 创建人 */
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private SysUser createBy;
@@ -555,4 +562,20 @@ public class SchedulePlanInfo {
     public void setSchedulePlan(SchedulePlan schedulePlan) {
         this.schedulePlan = schedulePlan;
     }
+
+    public Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
 }
@@ -29,7 +29,26 @@ public class PredicatesBuilder {
 	}
 	public static Predicate eq(CriteriaBuilder cb,Path<?> expression, Object object){
-		return cb.equal(expression, object);
+        Class<?> leftType = expression.getJavaType();
+        Class<?> rightType = object.getClass();
+
+        if (Number.class.isAssignableFrom(leftType) &&
+                (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number == Number/String
+            return cb.equal(expression, object);
+        } else if (String.class.isAssignableFrom(leftType) &&
+                (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String == String/Number
+            return cb.equal(expression, object);
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                Date.class.isAssignableFrom(rightType)) { // Date == Date
+            return cb.equal(expression, object);
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                String.class.isAssignableFrom(rightType)) { // Date == String
+            DateTime dateTime = new DateTime(object);
+            return cb.equal(expression, dateTime.toDate());
+        } else {
+            throw new RuntimeException("eq 不支持类型组合：" + expression.getJavaType() + "==" + object.getClass());
+        }
+
 	}
 	public static Predicate ne(CriteriaBuilder cb,Path<?> expression, Object object){
@@ -49,17 +68,17 @@ public class PredicatesBuilder {
         Class<?> leftType = expression.getJavaType();
         Class<?> rightType = object.getClass();
-        if (leftType.isAssignableFrom(Number.class) &&
-                rightType.isAssignableFrom(Number.class)) { // 判定是否是Number类型的子类
+        if (Number.class.isAssignableFrom(leftType) &&
+                (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number >= Number/String
             return cb.ge((Path<Number>) expression, (Number) object);
-        } else if (leftType.isAssignableFrom(String.class) &&
-                rightType.isAssignableFrom(String.class)) { // 判定是否是String类型的子类
+        } else if (String.class.isAssignableFrom(leftType) &&
+                (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String >= String/Number
             return cb.greaterThanOrEqualTo((Path<String>) expression, (String) object);
-        } else if (leftType.isAssignableFrom(Date.class) &&
-                rightType.isAssignableFrom(Date.class)) { // 判定是否是Date类型的子类
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                Date.class.isAssignableFrom(rightType)) { // Date >= Date
             return cb.greaterThanOrEqualTo((Path<Date>) expression, (Date) object);
-        } else if (leftType.isAssignableFrom(Date.class) &&
-                rightType.isAssignableFrom(String.class)) { // 左边是日期，右边是字符串，尝试转换字符串到日期
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                String.class.isAssignableFrom(rightType)) { // Date >= String
             DateTime dateTime = new DateTime(object);
             return cb.greaterThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
         } else {
@@ -80,21 +99,22 @@ public class PredicatesBuilder {
         Class<?> leftType = expression.getJavaType();
         Class<?> rightType = object.getClass();
-        if (leftType.isAssignableFrom(Number.class) &&
-                rightType.isAssignableFrom(Number.class)) { // 判定是否是Number类型的子类
+
+        if (Number.class.isAssignableFrom(leftType) &&
+                (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number <= Number/String
             return cb.le((Path<Number>) expression, (Number) object);
-        } else if (leftType.isAssignableFrom(String.class) &&
-                rightType.isAssignableFrom(String.class)) { // 判定是否是String类型的子类
+        } else if (String.class.isAssignableFrom(leftType) &&
+                (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String <= String/Number
             return cb.lessThanOrEqualTo((Path<String>) expression, (String) object);
-        } else if (leftType.isAssignableFrom(Date.class) &&
-                rightType.isAssignableFrom(Date.class)) { // 判定是否是Date类型的子类
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                Date.class.isAssignableFrom(rightType)) { // Date <= Date
             return cb.lessThanOrEqualTo((Path<Date>) expression, (Date) object);
-        } else if (leftType.isAssignableFrom(Date.class) &&
-                rightType.isAssignableFrom(String.class)) { // 左边是日期，右边是字符串，尝试转换字符串到日期
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                String.class.isAssignableFrom(rightType)) { // Date <= String
             DateTime dateTime = new DateTime(object);
             return cb.lessThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
         } else {
-            throw new RuntimeException("ge 不支持类型组合：" + expression.getJavaType() + ">=" + object.getClass());
+            throw new RuntimeException("le 不支持类型组合：" + expression.getJavaType() + "<=" + object.getClass());
         }
 	}
@@ -136,7 +136,7 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
                                String ttinfoname,
                                String tccname) throws Exception;
-    void fileDataImport(File file, String xlmc, String ttinfoname, String tccname) throws Exception;
+    void fileDataImport(File file, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception;
 }
@@ -114,6 +114,7 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl&lt;TTInfoDetail, Long&gt;
         return editInfo;
     }
+    @Override
     /**
      * 上传并导入数据，和DataImportExportService的同名方法有差别。
      * @param datafile form上传文件
@@ -128,12 +129,12 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl&lt;TTInfoDetail, Long&gt;
                                String tccname) throws Exception {
         // 上传数据文件
         File uploadFile = dataImportExportService.uploadFile(datafile);
-        fileDataImport(uploadFile, xlmc, ttinfoname, tccname);
+        fileDataImport(uploadFile, "工作表1", xlmc, ttinfoname, tccname);
     }
     @Override
-    public void fileDataImport(File uploadFile, String xlmc, String ttinfoname, String tccname) throws Exception {
+    public void fileDataImport(File uploadFile, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception {
         // 1、上传数据文件
         System.out.println("线路名称：" + xlmc);
         System.out.println("时刻表名称：" + ttinfoname);
@@ -162,6 +163,7 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl&lt;TTInfoDetail, Long&gt;
         // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
         trans.setParameterValue("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
         trans.setParameterValue("filepath", uploadFile.getAbsolutePath()); // 指定导入数据文件的位置
+        trans.setParameterValue("sheetname", sheetname); // sheet工作区的名字
         trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
         trans.setParameterValue("xlname", xlmc); // 线路名称
         trans.setParameterValue("ttinfoname", ttinfoname); // 时刻表名称