潘钊 / bsth_control · Commits

Commit 221d3f90a957610ddde973dbdec2b89252595660

Authored by 潘钊
2 parents 60e8d247 f16d9dec
build: skipped

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

Inline Side-by-side
Showing 5 changed files with 8 additions and 5 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 5 of 10 files are displayed.

src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
  View file @221d3f9
... ... @@ -124,7 +124,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
124 124 // poi读
125 125 String cellContent = PoiUtils.getStringValueFromCell(
126 126 poi_sheet.getRow(i).getCell(j)
127   - );
  127 + ).replaceAll("\\s*", "");
128 128 // jxl写
129 129 sheet1.addCell(new Label(j, i, cellContent));
130 130 }
... ...
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
  View file @221d3f9
... ... @@ -278,6 +278,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl<SchedulePlan, Long> im
278 278 Date start2 = new Date();
279 279 ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
280 280 Date end2 = new Date();
  281 +
  282 + logger.info("规则计算结果={}", scheduleResults_output.showGuideboardDesc1());
  283 +
281 284 // 3、计划输出
282 285 Date start3 = new Date();
283 286 PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
... ...
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @221d3f9
... ... @@ -251,7 +251,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im
251 251 for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
252 252 Row row = sheet.getRow(i);
253 253 for (int j = 1; j < colNums; j++) { // 从第2列开始
254   - String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))); // trimToEmpty
  254 + String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))).replaceAll("\\s*", ""); // trimToEmpty
255 255 if (StringUtils.isNotEmpty(bcell_con)) {
256 256 Matcher m1 = p1.matcher(bcell_con.trim());
257 257 Matcher m2 = p2.matcher(bcell_con.trim());
... ...
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
  View file @221d3f9
... ... @@ -44,7 +44,7 @@ public class TTInfo_input implements Comparable&lt;TTInfo_input&gt; {
44 44 this.ttInfoId = String.valueOf(ttInfo.getId());
45 45 this.xlId = String.valueOf(ttInfo.getXl().getId());
46 46 String[] days = ttInfo.getRule_days().split(",");
47   - System.out.println(days.length);
  47 +// System.out.println(days.length);
48 48 for (int i = 0; i < 7; i++) {
49 49 if ("1".equals(days[i])) {
50 50 weekdays.add(true);
... ...
src/main/java/com/bsth/service/schedule/rules/validate/ValidRepeatBcFunction.java
  View file @221d3f9
... ... @@ -47,14 +47,14 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
47 47  
48 48 @Override
49 49 public Serializable createContext() {
50   - System.out.println("create");
  50 +// System.out.println("create");
51 51 return new RepeatBcInfo();
52 52 }
53 53  
54 54 @Override
55 55 public void init(Serializable serializable) throws Exception {
56 56 // TODO：
57   - System.out.println("init");
  57 +// System.out.println("init");
58 58 }
59 59  
60 60 @Override
... ...