潘钊 / bsth_control · Commits

Commit 2349ecbc43da3eee11607ad0b07636fe12b915bd

Authored by 潘钊
1 parent 143d992a
build: skipped

Merge branch 'minhang' into qingpu 

# Conflicts:
#	src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
#	src/main/resources/ms-jdbc.properties
#	src/main/resources/static/real_control_v2/js/north/toolbar.js
Inline Side-by-side
Showing 3 changed files with 31 additions and 33 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @2349ecb
... ... @@ -420,6 +420,8 @@ public class DayOfSchedule implements CommandLineRunner {
420 420 while (itrab.hasNext()) {
421 421 sp = itrab.next();
422 422 sp.setSchedulePlan(null);
  423 + sp.setCreateBy(null);
  424 + sp.setUpdateBy(null);
423 425 list.add(sp);
424 426 }
425 427 return list;
... ... @@ -633,6 +635,7 @@ public class DayOfSchedule implements CommandLineRunner {
633 635 // }
634 636  
635 637 public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
  638 + Collections.sort(nbbmScheduleMap.get(nbbm), schFCSJComparator);
636 639 return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
637 640 }
638 641  
... ... @@ -785,6 +788,8 @@ public class DayOfSchedule implements CommandLineRunner {
785 788 public void addExecPlan(ScheduleRealInfo sch) {
786 789 if(sch != null)
787 790 carExecutePlanMap.put(sch.getClZbh(), sch);
  791 + else
  792 + carExecutePlanMap.remove(sch.getClZbh());
788 793 }
789 794  
790 795 public void removeExecPlan(String clzbh) {
... ... @@ -836,6 +841,14 @@ public class DayOfSchedule implements CommandLineRunner {
836 841 return ups;
837 842 }
838 843  
  844 + public void removeNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
  845 + nbbmScheduleMap.remove(nbbm, sch);
  846 + }
  847 +
  848 + public void addNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
  849 + nbbmScheduleMap.put(nbbm, sch);
  850 + }
  851 +
839 852 public void reCalcExecPlan(String nbbm){
840 853 carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
841 854 }
... ...
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @2349ecb
1 1 package com.bsth.service.oil.impl;
2 2  
3   -import java.sql.ResultSet;
4   -import java.sql.SQLException;
5   -import java.text.DecimalFormat;
6   -import java.text.ParseException;
7   -import java.text.SimpleDateFormat;
8   -import java.util.ArrayList;
9   -import java.util.Calendar;
10   -import java.util.Date;
11   -import java.util.HashMap;
12   -import java.util.Iterator;
13   -import java.util.List;
14   -import java.util.Map;
15   -
16   -import javax.transaction.Transactional;
17   -
18   -import org.slf4j.Logger;
19   -import org.slf4j.LoggerFactory;
20   -import org.springframework.beans.factory.annotation.Autowired;
21   -import org.springframework.data.domain.Sort;
22   -import org.springframework.data.domain.Sort.Direction;
23   -import org.springframework.jdbc.core.JdbcTemplate;
24   -import org.springframework.jdbc.core.RowMapper;
25   -import org.springframework.stereotype.Service;
26   -
27 3 import com.bsth.common.ResponseCode;
28   -import com.bsth.data.BasicData;
29 4 import com.bsth.entity.Cars;
30 5 import com.bsth.entity.oil.Cyl;
31 6 import com.bsth.entity.oil.Ylb;
... ... @@ -40,7 +15,20 @@ import com.bsth.service.oil.YlbService;
40 15 import com.bsth.service.realcontrol.ScheduleRealInfoService;
41 16 import com.bsth.util.Arith;
42 17 import com.bsth.util.BatchSaveUtils;
43   -import com.github.abel533.echarts.code.Y;
  18 +import org.slf4j.Logger;
  19 +import org.slf4j.LoggerFactory;
  20 +import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.jdbc.core.JdbcTemplate;
  22 +import org.springframework.jdbc.core.RowMapper;
  23 +import org.springframework.stereotype.Service;
  24 +
  25 +import javax.transaction.Transactional;
  26 +import java.sql.ResultSet;
  27 +import java.sql.SQLException;
  28 +import java.text.DecimalFormat;
  29 +import java.text.ParseException;
  30 +import java.text.SimpleDateFormat;
  31 +import java.util.*;
44 32  
45 33 @Service
46 34 public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
... ...
src/main/resources/static/real_control_v2/css/line_schedule.css
  View file @2349ecb
... ... @@ -95,7 +95,7 @@
95 95 }
96 96  
97 97 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
98   - width: calc(2% + 66px);
  98 + width: calc(2% + 86px);
99 99 }
100 100  
101 101 .line-schedule-table dl dt:nth-of-type(4), .line-schedule-table dl dd:nth-of-type(4) {
... ... @@ -121,7 +121,7 @@
121 121 }
122 122  
123 123 .line-schedule-table dl dt:nth-of-type(9), .line-schedule-table dl dd:nth-of-type(9) {
124   - width: 70px;
  124 + width: 50px;
125 125 border-right: 0;
126 126 }
127 127  
... ... @@ -237,10 +237,6 @@
237 237 height: 36px;
238 238 }
239 239  
240   -.schedule-body .ct_table dl:nth-child(even){
241   - background: rgba(101, 204, 220, 0.13);
242   -}
243   -
244 240 span.fcsj-diff {
245 241 color: gray;
246 242 margin-left: 3px;
... ... @@ -531,7 +527,8 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
531 527 }
532 528  
533 529 dl.relevance-active dd:nth-child(n+2) {
534   - background: #d2d2d2 !important;
  530 + background: #f1efef !important;
  531 + color: #333;
535 532 }
536 533  
537 534 dl.relevance-active.intimity dd:nth-child(n+2) {
... ...