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

潘钊
2 parents 60e8d247 f16d9dec
Showing 5 changed files with 8 additions and 5 deletions
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
src/main/java/com/bsth/service/schedule/rules/validate/ValidRepeatBcFunction.java
@@ -124,7 +124,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                     // poi读
                     String cellContent = PoiUtils.getStringValueFromCell(
                             poi_sheet.getRow(i).getCell(j)
-                    );
+                    ).replaceAll("\\s*", "");
                     // jxl写
                     sheet1.addCell(new Label(j, i, cellContent));
                 }
@@ -278,6 +278,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         Date start2 = new Date();
         ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
         Date end2 = new Date();
+
+        logger.info("规则计算结果={}", scheduleResults_output.showGuideboardDesc1());
+
         // 3、计划输出
         Date start3 = new Date();
         PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
@@ -251,7 +251,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
                         Row row = sheet.getRow(i);
                         for (int j = 1; j < colNums; j++) { // 从第2列开始
-                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))); // trimToEmpty
+                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))).replaceAll("\\s*", ""); // trimToEmpty
                             if (StringUtils.isNotEmpty(bcell_con)) {
                                 Matcher m1 = p1.matcher(bcell_con.trim());
                                 Matcher m2 = p2.matcher(bcell_con.trim());
@@ -44,7 +44,7 @@ public class TTInfo_input implements Comparable&lt;TTInfo_input&gt; {
         this.ttInfoId = String.valueOf(ttInfo.getId());
         this.xlId = String.valueOf(ttInfo.getXl().getId());
         String[] days = ttInfo.getRule_days().split(",");
-        System.out.println(days.length);
+//        System.out.println(days.length);
         for (int i = 0; i < 7; i++) {
             if ("1".equals(days[i])) {
                 weekdays.add(true);
@@ -47,14 +47,14 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
     @Override
     public Serializable createContext() {
-        System.out.println("create");
+//        System.out.println("create");
         return new RepeatBcInfo();
     }
     @Override
     public void init(Serializable serializable) throws Exception {
         // TODO：
-        System.out.println("init");
+//        System.out.println("init");
     }
     @Override