潘钊 / bsth_control · Commits

Commit ce64498553ea1e71a7c569314e10e56d6e0cf7f8

Authored by 李强
2 parents fe64c70c ade54c1f
build: skipped

Merge branch 'minhang' of git@192.168.168.201:panzhaov5/bsth_control.git into minhang

Inline Side-by-side
Showing 14 changed files with 364 additions and 706 deletions

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

To preserve performance only 14 of 39 files are displayed.

hs_err_pid6460.log deleted 100644 → 0
  View file @fe64c70
1 -#  
2 -# A fatal error has been detected by the Java Runtime Environment:  
3 -#  
4 -# EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00000000535b9f79, pid=6460, tid=4048  
5 -#  
6 -# JRE version: Java(TM) SE Runtime Environment (7.0_80-b15) (build 1.7.0_80-b15)  
7 -# Java VM: Java HotSpot(TM) 64-Bit Server VM (24.80-b11 mixed mode windows-amd64 compressed oops)  
8 -# Problematic frame:  
9 -# V [jvm.dll+0x199f79]  
10 -#  
11 -# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows  
12 -#  
13 -# If you would like to submit a bug report, please visit:  
14 -# http://bugreport.java.com/bugreport/crash.jsp  
15 -#  
16 -  
17 ---------------- T H R E A D ---------------  
18 -  
19 -Current thread (0x000000000e39e800): JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_in_vm, id=4048, stack(0x000000000e960000,0x000000000ea60000)]  
20 -  
21 -siginfo: ExceptionCode=0xc0000005, reading address 0x0000000000000000  
22 -  
23 -Registers:  
24 -RAX=0x0000000000000000, RBX=0x000000000e3930e8, RCX=0x0000000000000000, RDX=0x0000000000000000  
25 -RSP=0x000000000ea5f250, RBP=0x000000000ea5f2b9, RSI=0x0000000000000000, RDI=0x000000000e3930f0  
26 -R8 =0x0000000762fe21a8, R9 =0x0000000054bb0000, R10=0x0000000000000000, R11=0x0000000000000000  
27 -R12=0x000000000e39e800, R13=0x000000000ea5f730, R14=0x000000000e39e800, R15=0x000000000ea5f730  
28 -RIP=0x00000000535b9f79, EFLAGS=0x0000000000010246  
29 -  
30 -Top of Stack: (sp=0x000000000ea5f250)  
31 -0x000000000ea5f250: 000000000e3930e8 000000000ea5f2b9  
32 -0x000000000ea5f260: 0000000000000000 0000000000000001  
33 -0x000000000ea5f270: 0000000000000008 000000000e39e800  
34 -0x000000000ea5f280: 0000000000000000 0000000054c18d17  
35 -0x000000000ea5f290: 0000000000000002 000000000e39e800  
36 -0x000000000ea5f2a0: 0000000000000008 00000000128b0c20  
37 -0x000000000ea5f2b0: 0000000000000000 00000000535f8b35  
38 -0x000000000ea5f2c0: 0000000000000000 0000000000000000  
39 -0x000000000ea5f2d0: 00000000128628f0 000000000ea5f730  
40 -0x000000000ea5f2e0: 000000000ea5f730 000000000e39e800  
41 -0x000000000ea5f2f0: 000000000c3aef00 000000000e392870  
42 -0x000000000ea5f300: 0000000000000000 000000000e3a7de0  
43 -0x000000000ea5f310: 000000000ea5f3c9 00000000535ba905  
44 -0x000000000ea5f320: 000000000000068c 0000000000000000  
45 -0x000000000ea5f330: 000000000e3930b0 000000000e39e800  
46 -0x000000000ea5f340: 0000000000000000 0000000000000000  
47 -  
48 -Instructions: (pc=0x00000000535b9f79)  
49 -0x00000000535b9f59: 85 c0 75 05 48 8b c6 eb 10 49 8b 8c 24 20 01 00  
50 -0x00000000535b9f69: 00 48 8b d0 e8 ee ad e6 ff 48 89 45 c7 4c 8b 03  
51 -0x00000000535b9f79: 48 8b 08 41 8b 50 3c 85 d2 75 09 41 8b 40 34 89  
52 -0x00000000535b9f89: 41 3c eb 03 89 51 3c 4d 8b a4 24 18 01 00 00 33  
53 -  
54 -  
55 -Register to memory mapping:  
56 -  
57 -RAX=0x0000000000000000 is an unknown value  
58 -RBX=0x000000000e3930e8 is an unknown value  
59 -RCX=0x0000000000000000 is an unknown value  
60 -RDX=0x0000000000000000 is an unknown value  
61 -RSP=0x000000000ea5f250 is pointing into the stack for thread: 0x000000000e39e800  
62 -RBP=0x000000000ea5f2b9 is pointing into the stack for thread: 0x000000000e39e800  
63 -RSI=0x0000000000000000 is an unknown value  
64 -RDI=0x000000000e3930f0 is an unknown value  
65 -R8 =0x0000000762fe21a8 is an oop  
66 -  
67 -[error occurred during error reporting (printing register info), id 0xe0000000]  
68 -  
69 -Stack: [0x000000000e960000,0x000000000ea60000], sp=0x000000000ea5f250, free space=1020k  
70 -Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)  
71 -V [jvm.dll+0x199f79]  
72 -  
73 -  
74 ---------------- P R O C E S S ---------------  
75 -  
76 -Java Threads: ( => current thread )  
77 - 0x00000000115c3000 JavaThread "WebSocket background processing" daemon [_thread_blocked, id=6088, stack(0x00000000195c0000,0x00000000196c0000)]  
78 - 0x00000000115bb800 JavaThread "SockJS-8" [_thread_blocked, id=12788, stack(0x00000000194c0000,0x00000000195c0000)]  
79 - 0x00000000115c2000 JavaThread "SockJS-7" [_thread_blocked, id=9020, stack(0x00000000193c0000,0x00000000194c0000)]  
80 - 0x00000000115c0000 JavaThread "SockJS-6" [_thread_blocked, id=1068, stack(0x00000000192c0000,0x00000000193c0000)]  
81 - 0x00000000115bf000 JavaThread "SockJS-5" [_thread_blocked, id=6768, stack(0x00000000191c0000,0x00000000192c0000)]  
82 - 0x00000000115bd000 JavaThread "SockJS-4" [_thread_blocked, id=12372, stack(0x00000000190c0000,0x00000000191c0000)]  
83 - 0x00000000115be800 JavaThread "SockJS-3" [_thread_blocked, id=13176, stack(0x0000000018ec0000,0x0000000018fc0000)]  
84 - 0x00000000115c0800 JavaThread "WebSocketServer-localhost-ROOT-1" daemon [_thread_blocked, id=5664, stack(0x0000000018dc0000,0x0000000018ec0000)]  
85 - 0x00000000115bd800 JavaThread "SockJS-2" [_thread_blocked, id=12388, stack(0x0000000018cc0000,0x0000000018dc0000)]  
86 - 0x00000000115ba800 JavaThread "SockJS-1" [_thread_blocked, id=12812, stack(0x0000000018bc0000,0x0000000018cc0000)]  
87 - 0x00000000115c1800 JavaThread "pool-4-thread-2" [_thread_blocked, id=8172, stack(0x00000000189c0000,0x0000000018ac0000)]  
88 - 0x0000000010d23000 JavaThread "pool-4-thread-1" [_thread_blocked, id=8228, stack(0x00000000188c0000,0x00000000189c0000)]  
89 - 0x0000000010d20000 JavaThread "com.mchange.v2.async.ThreadPoolAsynchronousRunner$PoolThread-#2" daemon [_thread_blocked, id=7532, stack(0x00000000187c0000,0x00000000188c0000)]  
90 - 0x0000000010d1b800 JavaThread "com.mchange.v2.async.ThreadPoolAsynchronousRunner$PoolThread-#1" daemon [_thread_blocked, id=6200, stack(0x00000000186c0000,0x00000000187c0000)]  
91 - 0x0000000010d1e800 JavaThread "com.mchange.v2.async.ThreadPoolAsynchronousRunner$PoolThread-#0" daemon [_thread_blocked, id=7872, stack(0x00000000185c0000,0x00000000186c0000)]  
92 - 0x0000000010d1d000 JavaThread "Timer-2" daemon [_thread_blocked, id=10996, stack(0x00000000184c0000,0x00000000185c0000)]  
93 - 0x0000000010d1e000 JavaThread "http-nio-9088-exec-10" daemon [_thread_blocked, id=13928, stack(0x00000000183c0000,0x00000000184c0000)]  
94 - 0x0000000010d21000 JavaThread "http-nio-9088-exec-9" daemon [_thread_blocked, id=9656, stack(0x00000000182c0000,0x00000000183c0000)]  
95 - 0x0000000010d21800 JavaThread "http-nio-9088-exec-8" daemon [_thread_blocked, id=13800, stack(0x00000000181c0000,0x00000000182c0000)]  
96 - 0x0000000010d1f800 JavaThread "http-nio-9088-exec-7" daemon [_thread_blocked, id=12916, stack(0x00000000180c0000,0x00000000181c0000)]  
97 - 0x0000000010d1c800 JavaThread "http-nio-9088-exec-6" daemon [_thread_blocked, id=13056, stack(0x0000000017fc0000,0x00000000180c0000)]  
98 - 0x0000000010d22800 JavaThread "http-nio-9088-exec-5" daemon [_thread_blocked, id=13128, stack(0x0000000017ec0000,0x0000000017fc0000)]  
99 - 0x0000000010d14000 JavaThread "http-nio-9088-exec-4" daemon [_thread_blocked, id=2376, stack(0x0000000017dc0000,0x0000000017ec0000)]  
100 - 0x0000000010d18000 JavaThread "http-nio-9088-exec-3" daemon [_thread_blocked, id=2028, stack(0x0000000017cc0000,0x0000000017dc0000)]  
101 - 0x0000000010d1a000 JavaThread "http-nio-9088-exec-2" daemon [_thread_blocked, id=13288, stack(0x0000000017bc0000,0x0000000017cc0000)]  
102 - 0x0000000010d18800 JavaThread "http-nio-9088-exec-1" daemon [_thread_blocked, id=13336, stack(0x0000000017ac0000,0x0000000017bc0000)]  
103 - 0x0000000010d17000 JavaThread "DestroyJavaVM" [_thread_blocked, id=13188, stack(0x0000000002810000,0x0000000002910000)]  
104 - 0x0000000010d15800 JavaThread "pool-3-thread-8" [_thread_blocked, id=10168, stack(0x00000000177c0000,0x00000000178c0000)]  
105 - 0x0000000010d15000 JavaThread "pool-3-thread-7" [_thread_blocked, id=13976, stack(0x00000000176c0000,0x00000000177c0000)]  
106 - 0x0000000010d16800 JavaThread "pool-3-thread-6" [_thread_blocked, id=6360, stack(0x00000000175c0000,0x00000000176c0000)]  
107 - 0x0000000010d1b000 JavaThread "pool-3-thread-5" [_thread_blocked, id=12004, stack(0x00000000174c0000,0x00000000175c0000)]  
108 - 0x0000000010d19800 JavaThread "pool-3-thread-4" [_thread_blocked, id=2952, stack(0x00000000173c0000,0x00000000174c0000)]  
109 - 0x000000000fe6b000 JavaThread "pool-3-thread-3" [_thread_blocked, id=12564, stack(0x00000000171c0000,0x00000000172c0000)]  
110 - 0x000000000fe6c800 JavaThread "pool-3-thread-2" [_thread_blocked, id=13104, stack(0x00000000170c0000,0x00000000171c0000)]  
111 - 0x000000000fe6b800 JavaThread "pool-3-thread-1" [_thread_blocked, id=11560, stack(0x0000000016fc0000,0x00000000170c0000)]  
112 - 0x000000000fe6e000 JavaThread "http-nio-9088-Acceptor-0" daemon [_thread_in_native, id=9136, stack(0x0000000015d50000,0x0000000015e50000)]  
113 - 0x0000000014c5a000 JavaThread "http-nio-9088-ClientPoller-1" daemon [_thread_in_native, id=7852, stack(0x0000000015c50000,0x0000000015d50000)]  
114 - 0x0000000013dc0000 JavaThread "http-nio-9088-ClientPoller-0" daemon [_thread_in_native, id=12424, stack(0x0000000015b50000,0x0000000015c50000)]  
115 - 0x0000000013dbf000 JavaThread "NioBlockingSelector.BlockPoller-1" daemon [_thread_in_native, id=13700, stack(0x0000000015a50000,0x0000000015b50000)]  
116 - 0x00000000120f5000 JavaThread "commons-pool-EvictionTimer" daemon [_thread_blocked, id=11380, stack(0x0000000015950000,0x0000000015a50000)]  
117 - 0x00000000104e5800 JavaThread "Timer-0" daemon [_thread_blocked, id=12924, stack(0x0000000015650000,0x0000000015750000)]  
118 - 0x0000000010084800 JavaThread "container-0" [_thread_blocked, id=9884, stack(0x00000000144f0000,0x00000000145f0000)]  
119 - 0x00000000135e3000 JavaThread "ContainerBackgroundProcessor[StandardEngine[Tomcat].StandardHost[localhost].StandardContext[]]" daemon [_thread_blocked, id=8248, stack(0x0000000013110000,0x0000000013210000)]  
120 - 0x0000000014ac9800 JavaThread "Abandoned connection cleanup thread" daemon [_thread_blocked, id=5796, stack(0x0000000013010000,0x0000000013110000)]  
121 - 0x000000001199d800 JavaThread "Tomcat JDBC Pool Cleaner[169174794:1470299944387]" daemon [_thread_blocked, id=2196, stack(0x0000000012f10000,0x0000000013010000)]  
122 - 0x000000000f1ee800 JavaThread "FileSystemWatcher: files=#243 cl=sun.misc.Launcher$AppClassLoader@a15670a" daemon [_thread_blocked, id=13032, stack(0x00000000109f0000,0x0000000010af0000)]  
123 - 0x000000000eec2000 JavaThread "Service Thread" daemon [_thread_blocked, id=11684, stack(0x000000000f710000,0x000000000f810000)]  
124 - 0x000000000eeca800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=13412, stack(0x000000000f610000,0x000000000f710000)]  
125 - 0x000000000eec9800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=5552, stack(0x000000000f510000,0x000000000f610000)]  
126 - 0x000000000e3ad000 JavaThread "JDWP Command Reader" daemon [_thread_in_native, id=8012, stack(0x000000000ec10000,0x000000000ed10000)]  
127 - 0x000000000e3ac000 JavaThread "JDWP Event Helper Thread" daemon [_thread_blocked, id=6576, stack(0x000000000eb10000,0x000000000ec10000)]  
128 -=>0x000000000e39e800 JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_in_vm, id=4048, stack(0x000000000e960000,0x000000000ea60000)]  
129 - 0x000000000e396800 JavaThread "Attach Listener" daemon [_thread_blocked, id=6340, stack(0x000000000e860000,0x000000000e960000)]  
130 - 0x000000000e391800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=4020, stack(0x000000000e760000,0x000000000e860000)]  
131 - 0x000000000c399000 JavaThread "Finalizer" daemon [_thread_blocked, id=10992, stack(0x000000000e260000,0x000000000e360000)]  
132 - 0x00000000029fe800 JavaThread "Reference Handler" daemon [_thread_blocked, id=9164, stack(0x000000000e160000,0x000000000e260000)]  
133 -  
134 -Other Threads:  
135 - 0x000000000c395000 VMThread [stack: 0x000000000e060000,0x000000000e160000] [id=2068]  
136 - 0x000000000eed9800 WatcherThread [stack: 0x000000000f810000,0x000000000f910000] [id=3876]  
137 -  
138 -VM state:not at safepoint (normal execution)  
139 -  
140 -VM Mutex/Monitor currently owned by a thread: None  
141 -  
142 -Heap  
143 - PSYoungGen total 765440K, used 370K [0x00000007cba80000, 0x00000007ff180000, 0x0000000800000000)  
144 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cbadc9c0,0x00000007f5980000)  
145 - from space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
146 - to space 74752K, 0% used [0x00000007fa880000,0x00000007fa880000,0x00000007ff180000)  
147 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
148 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494d00,0x00000007cba80000)  
149 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
150 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
151 -  
152 -Card table byte_map: [0x0000000005b10000,0x0000000006030000] byte_map_base: 0x0000000002021000  
153 -  
154 -Polling page: 0x0000000000650000  
155 -  
156 -Code Cache [0x0000000002b10000, 0x00000000035e0000, 0x0000000005b10000)  
157 - total_blobs=3304 nmethods=2730 adapters=532 free_code_cache=38289Kb largest_free_block=39047680  
158 -  
159 -Compilation events (10 events):  
160 -Event: 1149.288 Thread 0x000000000eeca800 nmethod 3358 0x0000000003411550 code [0x00000000034116a0, 0x0000000003411868]  
161 -Event: 1149.288 Thread 0x000000000eeca800 3359 org.springsource.loaded.ri.Invoker::getJavaMethod (20 bytes)  
162 -Event: 1149.289 Thread 0x000000000eeca800 nmethod 3359 0x000000000359bad0 code [0x000000000359bc00, 0x000000000359bc78]  
163 -Event: 1149.301 Thread 0x000000000eec9800 nmethod 3353 0x00000000035b0c50 code [0x00000000035b0f60, 0x00000000035b2538]  
164 -Event: 1155.428 Thread 0x000000000eeca800 3360 sl.org.objectweb.asm.ClassReader::b (1124 bytes)  
165 -Event: 1155.431 Thread 0x000000000eec9800 3361 sl.org.objectweb.asm.ClassWriter::toByteArray (1303 bytes)  
166 -Event: 1155.832 Thread 0x000000000eec9800 nmethod 3361 0x00000000035bb890 code [0x00000000035bbea0, 0x00000000035c1bb8]  
167 -Event: 1155.832 Thread 0x000000000eec9800 3362 % org.springsource.loaded.TypeDescriptor::getByDescriptor @ 12 (60 bytes)  
168 -Event: 1155.840 Thread 0x000000000eec9800 nmethod 3362% 0x000000000359d4d0 code [0x000000000359d640, 0x000000000359e458]  
169 -Event: 1155.856 Thread 0x000000000eeca800 nmethod 3360 0x00000000035c74d0 code [0x00000000035c7900, 0x00000000035cc260]  
170 -  
171 -GC Heap History (10 events):  
172 -Event: 1156.624 GC heap before  
173 -{Heap before GC invocations=25 (full 8):  
174 - PSYoungGen total 764416K, used 0K [0x00000007cba80000, 0x00000007ff880000, 0x0000000800000000)  
175 - eden space 680448K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5300000)  
176 - from space 83968K, 0% used [0x00000007f5300000,0x00000007f5300000,0x00000007fa500000)  
177 - to space 81408K, 0% used [0x00000007fa900000,0x00000007fa900000,0x00000007ff880000)  
178 - ParOldGen total 1714688K, used 70830K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
179 - object space 1714688K, 4% used [0x0000000763000000,0x000000076752bac8,0x00000007cba80000)  
180 - PSPermGen total 83968K, used 83967K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
181 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffffd0,0x0000000763000000)  
182 -Event: 1156.734 GC heap after  
183 -Heap after GC invocations=25 (full 8):  
184 - PSYoungGen total 764416K, used 0K [0x00000007cba80000, 0x00000007ff880000, 0x0000000800000000)  
185 - eden space 680448K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5300000)  
186 - from space 83968K, 0% used [0x00000007f5300000,0x00000007f5300000,0x00000007fa500000)  
187 - to space 81408K, 0% used [0x00000007fa900000,0x00000007fa900000,0x00000007ff880000)  
188 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
189 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494e10,0x00000007cba80000)  
190 - PSPermGen total 83968K, used 83950K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
191 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffb848,0x0000000763000000)  
192 -}  
193 -Event: 1156.734 GC heap before  
194 -{Heap before GC invocations=26 (full 8):  
195 - PSYoungGen total 764416K, used 6940K [0x00000007cba80000, 0x00000007ff880000, 0x0000000800000000)  
196 - eden space 680448K, 1% used [0x00000007cba80000,0x00000007cc1472a0,0x00000007f5300000)  
197 - from space 83968K, 0% used [0x00000007f5300000,0x00000007f5300000,0x00000007fa500000)  
198 - to space 81408K, 0% used [0x00000007fa900000,0x00000007fa900000,0x00000007ff880000)  
199 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
200 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494e10,0x00000007cba80000)  
201 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
202 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
203 -Event: 1156.738 GC heap after  
204 -Heap after GC invocations=26 (full 8):  
205 - PSYoungGen total 762368K, used 0K [0x00000007cba80000, 0x00000007ff280000, 0x0000000800000000)  
206 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5980000)  
207 - from space 75264K, 0% used [0x00000007fa900000,0x00000007fa900000,0x00000007ff280000)  
208 - to space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
209 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
210 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494e10,0x00000007cba80000)  
211 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
212 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
213 -}  
214 -Event: 1156.738 GC heap before  
215 -{Heap before GC invocations=27 (full 9):  
216 - PSYoungGen total 762368K, used 0K [0x00000007cba80000, 0x00000007ff280000, 0x0000000800000000)  
217 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5980000)  
218 - from space 75264K, 0% used [0x00000007fa900000,0x00000007fa900000,0x00000007ff280000)  
219 - to space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
220 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
221 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494e10,0x00000007cba80000)  
222 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
223 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
224 -Event: 1156.915 GC heap after  
225 -Heap after GC invocations=27 (full 9):  
226 - PSYoungGen total 762368K, used 0K [0x00000007cba80000, 0x00000007ff280000, 0x0000000800000000)  
227 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5980000)  
228 - from space 75264K, 0% used [0x00000007fa900000,0x00000007fa900000,0x00000007ff280000)  
229 - to space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
230 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
231 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494d00,0x00000007cba80000)  
232 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
233 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
234 -}  
235 -Event: 1156.915 GC heap before  
236 -{Heap before GC invocations=28 (full 9):  
237 - PSYoungGen total 762368K, used 0K [0x00000007cba80000, 0x00000007ff280000, 0x0000000800000000)  
238 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5980000)  
239 - from space 75264K, 0% used [0x00000007fa900000,0x00000007fa900000,0x00000007ff280000)  
240 - to space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
241 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
242 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494d00,0x00000007cba80000)  
243 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
244 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
245 -Event: 1156.918 GC heap after  
246 -Heap after GC invocations=28 (full 9):  
247 - PSYoungGen total 765440K, used 0K [0x00000007cba80000, 0x00000007ff180000, 0x0000000800000000)  
248 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5980000)  
249 - from space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
250 - to space 74752K, 0% used [0x00000007fa880000,0x00000007fa880000,0x00000007ff180000)  
251 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
252 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494d00,0x00000007cba80000)  
253 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
254 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
255 -}  
256 -Event: 1156.918 GC heap before  
257 -{Heap before GC invocations=29 (full 10):  
258 - PSYoungGen total 765440K, used 0K [0x00000007cba80000, 0x00000007ff180000, 0x0000000800000000)  
259 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5980000)  
260 - from space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
261 - to space 74752K, 0% used [0x00000007fa880000,0x00000007fa880000,0x00000007ff180000)  
262 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
263 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494d00,0x00000007cba80000)  
264 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
265 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
266 -Event: 1157.029 GC heap after  
267 -Heap after GC invocations=29 (full 10):  
268 - PSYoungGen total 765440K, used 0K [0x00000007cba80000, 0x00000007ff180000, 0x0000000800000000)  
269 - eden space 687104K, 0% used [0x00000007cba80000,0x00000007cba80000,0x00000007f5980000)  
270 - from space 78336K, 0% used [0x00000007f5980000,0x00000007f5980000,0x00000007fa600000)  
271 - to space 74752K, 0% used [0x00000007fa880000,0x00000007fa880000,0x00000007ff180000)  
272 - ParOldGen total 1714688K, used 70227K [0x0000000763000000, 0x00000007cba80000, 0x00000007cba80000)  
273 - object space 1714688K, 4% used [0x0000000763000000,0x0000000767494d00,0x00000007cba80000)  
274 - PSPermGen total 83968K, used 83963K [0x000000075de00000, 0x0000000763000000, 0x0000000763000000)  
275 - object space 83968K, 99% used [0x000000075de00000,0x0000000762ffec28,0x0000000763000000)  
276 -}  
277 -  
278 -Deoptimization events (10 events):  
279 -Event: 938.332 Thread 0x0000000010d21000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000030b552c method=org.springsource.loaded.ri.ReflectiveInterceptor.getReloadableTypeIfHasBeenReloaded(Ljava/lang/Class;)Lorg/springsource/loaded/ReloadableType; @ 3  
280 -Event: 938.335 Thread 0x0000000010d21000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000030b9028 method=org.springsource.loaded.ri.ReflectiveInterceptor.getReloadableTypeIfHasBeenReloaded(Ljava/lang/Class;)Lorg/springsource/loaded/ReloadableType; @ 3  
281 -Event: 938.339 Thread 0x0000000010d21000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000002f85038 method=org.springsource.loaded.ri.ReflectiveInterceptor.getReloadableTypeIfHasBeenReloaded(Ljava/lang/Class;)Lorg/springsource/loaded/ReloadableType; @ 3  
282 -Event: 942.703 Thread 0x0000000010d15800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000002fd02f4 method=org.springsource.loaded.ri.ReflectiveInterceptor.getReloadableTypeIfHasBeenReloaded(Ljava/lang/Class;)Lorg/springsource/loaded/ReloadableType; @ 3  
283 -Event: 942.703 Thread 0x0000000010d15800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000002d56b88 method=org.springsource.loaded.ri.ReflectiveInterceptor.getReloadableTypeIfHasBeenReloaded(Ljava/lang/Class;)Lorg/springsource/loaded/ReloadableType; @ 3  
284 -Event: 942.703 Thread 0x0000000010d15800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000030f0a64 method=org.springsource.loaded.ri.ReflectiveInterceptor.getReloadableTypeIfHasBeenReloaded(Ljava/lang/Class;)Lorg/springsource/loaded/ReloadableType; @ 3  
285 -Event: 948.331 Thread 0x0000000010d1c800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000002c56894 method=org.springsource.loaded.ri.ReflectiveInterceptor.getReloadableTypeIfHasBeenReloaded(Ljava/lang/Class;)Lorg/springsource/loaded/ReloadableType; @ 3  
286 -Event: 1155.432 Thread 0x000000000f1ee800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003050388 method=sl.org.objectweb.asm.MethodWriter.visitIntInsn(II)V @ 15  
287 -Event: 1155.759 Thread 0x000000000f1ee800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00000000032fe19c method=org.springsource.loaded.TypeRegistry.getTypeRegistryFor(Ljava/lang/ClassLoader;)Lorg/springsource/loaded/TypeRegistry; @ 167  
288 -Event: 1155.759 Thread 0x000000000f1ee800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00000000032fe19c method=org.springsource.loaded.TypeRegistry.getTypeRegistryFor(Ljava/lang/ClassLoader;)Lorg/springsource/loaded/TypeRegistry; @ 167  
289 -  
290 -Internal exceptions (10 events):  
291 -Event: 935.722 Thread 0x000000000f1ee800 Threw 0x00000007cbde06a0 at C:\re\jdk7u80\2329\hotspot\src\share\vm\prims\jvm.cpp:1319  
292 -Event: 935.722 Thread 0x000000000f1ee800 Threw 0x00000007cbdf07b0 at C:\re\jdk7u80\2329\hotspot\src\share\vm\prims\jvm.cpp:1319  
293 -Event: 935.724 Thread 0x000000000f1ee800 Threw 0x00000007cbe22338 at C:\re\jdk7u80\2329\hotspot\src\share\vm\prims\jvm.cpp:1319  
294 -Event: 935.724 Thread 0x000000000f1ee800 Threw 0x00000007cbe2ec08 at C:\re\jdk7u80\2329\hotspot\src\share\vm\prims\jvm.cpp:1319  
295 -Event: 935.726 Thread 0x000000000f1ee800 Threw 0x00000007cbe770f0 at C:\re\jdk7u80\2329\hotspot\src\share\vm\prims\jvm.cpp:1319  
296 -Event: 935.728 Thread 0x000000000f1ee800 Implicit null exception at 0x0000000002de657f to 0x0000000002de6a1d  
297 -Event: 935.729 Thread 0x000000000f1ee800 Threw 0x00000007cbe8bdb8 at C:\re\jdk7u80\2329\hotspot\src\share\vm\prims\jvm.cpp:1319  
298 -Event: 935.730 Thread 0x000000000f1ee800 Implicit null exception at 0x0000000002d52e10 to 0x0000000002d52e5d  
299 -Event: 937.543 Thread 0x000000000fe6c800 Threw 0x00000007ccbe0330 at C:\re\jdk7u80\2329\hotspot\src\share\vm\prims\jvm.cpp:1319  
300 -Event: 1157.029 Thread 0x000000000e39e800 Threw 0x000000075dead638 at C:\re\jdk7u80\2329\hotspot\src\share\vm\gc_interface/collectedHeap.inline.hpp:225  
301 -  
302 -Events (10 events):  
303 -Event: 1155.759 Thread 0x000000000f1ee800 Uncommon trap: trap_request=0xffffffde fr.pc=0x00000000032fe19c  
304 -Event: 1155.759 Thread 0x000000000f1ee800 DEOPT PACKING pc=0x00000000032fe19c sp=0x0000000010aed6b0  
305 -Event: 1155.759 Thread 0x000000000f1ee800 DEOPT UNPACKING pc=0x0000000002b475a4 sp=0x0000000010aed600 mode 2  
306 -Event: 1155.856 Thread 0x000000000eeca800 flushing nmethod 0x0000000002c65150  
307 -Event: 1156.219 Executing VM operation: ParallelGCFailedPermanentAllocation  
308 -Event: 1156.352 Executing VM operation: ParallelGCFailedPermanentAllocation done  
309 -Event: 1156.352 Executing VM operation: ParallelGCFailedPermanentAllocation  
310 -Event: 1156.734 Executing VM operation: ParallelGCFailedPermanentAllocation done  
311 -Event: 1156.734 Executing VM operation: ParallelGCFailedPermanentAllocation  
312 -Event: 1157.029 Executing VM operation: ParallelGCFailedPermanentAllocation done  
313 -  
314 -  
315 -Dynamic libraries:  
316 -0x00007ff7f0560000 - 0x00007ff7f0593000 C:\Program Files\Java\jdk1.7.0_80\bin\javaw.exe  
317 -0x00007fff1e7c0000 - 0x00007fff1e981000 C:\WINDOWS\SYSTEM32\ntdll.dll  
318 -0x00007fff1bbc0000 - 0x00007fff1bc6d000 C:\WINDOWS\system32\KERNEL32.DLL  
319 -0x00007fff1b960000 - 0x00007fff1bb48000 C:\WINDOWS\system32\KERNELBASE.dll  
320 -0x00007fff1bc70000 - 0x00007fff1bd17000 C:\WINDOWS\system32\ADVAPI32.dll  
321 -0x00007fff1da50000 - 0x00007fff1daed000 C:\WINDOWS\system32\msvcrt.dll  
322 -0x00007fff1e490000 - 0x00007fff1e4eb000 C:\WINDOWS\system32\sechost.dll  
323 -0x00007fff1daf0000 - 0x00007fff1dc0c000 C:\WINDOWS\system32\RPCRT4.dll  
324 -0x00007fff1c1b0000 - 0x00007fff1c306000 C:\WINDOWS\system32\USER32.dll  
325 -0x00007fff1e5c0000 - 0x00007fff1e746000 C:\WINDOWS\system32\GDI32.dll  
326 -0x00007fff15b20000 - 0x00007fff15d94000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.10586.494_none_a2d8b04ea53e3145\COMCTL32.dll  
327 -0x00007fff1e1b0000 - 0x00007fff1e42d000 C:\WINDOWS\system32\combase.dll  
328 -0x00007fff1bb50000 - 0x00007fff1bbba000 C:\WINDOWS\system32\bcryptPrimitives.dll  
329 -0x00007fff1e000000 - 0x00007fff1e03b000 C:\WINDOWS\system32\IMM32.DLL  
330 -0x0000000054bb0000 - 0x0000000054c82000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\msvcr100.dll  
331 -0x0000000053420000 - 0x0000000053bf9000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\server\jvm.dll  
332 -0x00007fff1e1a0000 - 0x00007fff1e1a8000 C:\WINDOWS\system32\PSAPI.DLL  
333 -0x00007fff18230000 - 0x00007fff18239000 C:\WINDOWS\SYSTEM32\WSOCK32.dll  
334 -0x00007fff18eb0000 - 0x00007fff18ed3000 C:\WINDOWS\SYSTEM32\WINMM.dll  
335 -0x00007fff1e750000 - 0x00007fff1e7bb000 C:\WINDOWS\system32\WS2_32.dll  
336 -0x00007fff18e30000 - 0x00007fff18e5c000 C:\WINDOWS\SYSTEM32\WINMMBASE.dll  
337 -0x00007fff1b240000 - 0x00007fff1b283000 C:\WINDOWS\system32\cfgmgr32.dll  
338 -0x0000000054ba0000 - 0x0000000054baf000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\verify.dll  
339 -0x0000000054b70000 - 0x0000000054b98000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\java.dll  
340 -0x0000000054b30000 - 0x0000000054b65000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\jdwp.dll  
341 -0x0000000054b20000 - 0x0000000054b28000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\npt.dll  
342 -0x0000000054af0000 - 0x0000000054b13000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\instrument.dll  
343 -0x0000000054ad0000 - 0x0000000054ae6000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\zip.dll  
344 -0x0000000054ac0000 - 0x0000000054ac9000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\dt_socket.dll  
345 -0x00007fff08350000 - 0x00007fff08366000 C:\WINDOWS\system32\napinsp.dll  
346 -0x00007fff08310000 - 0x00007fff0832a000 C:\WINDOWS\system32\pnrpnsp.dll  
347 -0x00007fff18e60000 - 0x00007fff18e78000 C:\WINDOWS\system32\NLAapi.dll  
348 -0x00007fff1a6b0000 - 0x00007fff1a70c000 C:\WINDOWS\System32\mswsock.dll  
349 -0x00007fff19760000 - 0x00007fff1980a000 C:\WINDOWS\SYSTEM32\DNSAPI.dll  
350 -0x00007fff1e500000 - 0x00007fff1e508000 C:\WINDOWS\system32\NSI.dll  
351 -0x00007fff09680000 - 0x00007fff0968d000 C:\WINDOWS\System32\winrnr.dll  
352 -0x00000000553e0000 - 0x0000000055406000 C:\Program Files\Bonjour\mdnsNSP.dll  
353 -0x00007fff12600000 - 0x00007fff12638000 C:\WINDOWS\SYSTEM32\Iphlpapi.DLL  
354 -0x00007fff11f80000 - 0x00007fff11fe7000 C:\WINDOWS\System32\fwpuclnt.dll  
355 -0x00007fff1ad10000 - 0x00007fff1ad39000 C:\WINDOWS\SYSTEM32\bcrypt.dll  
356 -0x00007fff0b3c0000 - 0x00007fff0b3ca000 C:\Windows\System32\rasadhlp.dll  
357 -0x0000000054aa0000 - 0x0000000054aba000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\net.dll  
358 -0x0000000054a80000 - 0x0000000054a91000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\nio.dll  
359 -0x0000000054a70000 - 0x0000000054a7b000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\management.dll  
360 -0x00007fff1a760000 - 0x00007fff1a777000 C:\WINDOWS\SYSTEM32\CRYPTSP.dll  
361 -0x00007fff1a3f0000 - 0x00007fff1a424000 C:\WINDOWS\system32\rsaenh.dll  
362 -0x00007fff1a540000 - 0x00007fff1a55f000 C:\WINDOWS\SYSTEM32\USERENV.dll  
363 -0x00007fff1ade0000 - 0x00007fff1adf4000 C:\WINDOWS\system32\profapi.dll  
364 -0x00007fff1a880000 - 0x00007fff1a88b000 C:\WINDOWS\SYSTEM32\CRYPTBASE.dll  
365 -0x00007fff11c80000 - 0x00007fff11c96000 C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL  
366 -0x00007fff11d40000 - 0x00007fff11d5a000 C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL  
367 -0x0000000054a40000 - 0x0000000054a64000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\sunec.dll  
368 -0x0000000054a30000 - 0x0000000054a3b000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\sunmscapi.dll  
369 -0x00007fff1af30000 - 0x00007fff1b0f8000 C:\WINDOWS\system32\CRYPT32.dll  
370 -0x00007fff1ae50000 - 0x00007fff1ae60000 C:\WINDOWS\system32\MSASN1.dll  
371 -0x0000000054890000 - 0x0000000054a25000 C:\Program Files\Java\jdk1.7.0_80\jre\bin\awt.dll  
372 -0x00007fff1df10000 - 0x00007fff1dfd1000 C:\WINDOWS\system32\OLEAUT32.dll  
373 -0x00007fff195d0000 - 0x00007fff19649000 C:\WINDOWS\system32\apphelp.dll  
374 -0x00007fff17d40000 - 0x00007fff17ecc000 C:\WINDOWS\SYSTEM32\dbghelp.dll  
375 -  
376 -VM Arguments:  
377 -jvm_args: -agentlib:jdwp=transport=dt_socket,suspend=y,address=localhost:61815 -javaagent:G:\springloaded-1.2.5.RELEASE.jar -Xverify:none -Xms1028m -Xmx2512m -Dfile.encoding=UTF-8  
378 -java_command: com.bsth.Application  
379 -Launcher Type: SUN_STANDARD  
380 -  
381 -Environment Variables:  
382 -JAVA_HOME=C:\Program Files\Java\jdk1.7.0_80  
383 -CLASSPATH=.;C:\Program Files\Java\jdk1.7.0_80\lib;C:\Program Files\Java\jdk1.7.0_80\lib\tools.jar  
384 -PATH=C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\windows\system32;C:\windows;C:\windows\System32\Wbem;C:\windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\Intel\IntelSGXPSW\bin\x64\Release\;C:\Program Files\Intel\IntelSGXPSW\bin\win32\Release\;C:\Program Files\Java\jdk1.7.0_80\bin;C:\Program Files\Java\jdk1.7.0_80\jre\bin;G:\apache-maven-3.3.9\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;G:\TortoiseSVN 1.9\bin;G:\Git\cmd;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;D:\openssl\bin;C:\Program Files\nodejs\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Users\panzhao\AppData\Roaming\npm;C:\Program Files (x86)\SSH Communications Security\SSH Secure Shell  
385 -USERNAME=panzhao  
386 -OS=Windows_NT  
387 -PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 94 Stepping 3, GenuineIntel  
388 -  
389 -  
390 -  
391 ---------------- S Y S T E M ---------------  
392 -  
393 -OS: Windows 8.1 , 64 bit Build 9600  
394 -  
395 -CPU:total 8 (4 cores per cpu, 2 threads per core) family 6 model 94 stepping 3, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, erms, ht, tsc, tscinvbit  
396 -  
397 -Memory: 4k page, physical 8223456k(2856092k free), swap 9599712k(1366128k free)  
398 -  
399 -vm_info: Java HotSpot(TM) 64-Bit Server VM (24.80-b11) for windows-amd64 JRE (1.7.0_80-b15), built on Apr 10 2015 11:26:34 by "java_re" with unknown MS VC++:1600  
400 -  
401 -time: Thu Aug 04 16:58:12 2016  
402 -elapsed time: 1157 seconds  
403 -  
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @ce64498
@@ -247,8 +247,10 @@ public class DayOfSchedule implements CommandLineRunner { @@ -247,8 +247,10 @@ public class DayOfSchedule implements CommandLineRunner {
247 } 247 }
248 248
249 for(ScheduleRealInfo sch : remList){ 249 for(ScheduleRealInfo sch : remList){
250 - nbbmScheduleMap.remove(sch.getClZbh(), sch);  
251 - count ++; 250 + if(null != sch){
  251 + nbbmScheduleMap.remove(sch.getClZbh(), sch);
  252 + count ++;
  253 + }
252 } 254 }
253 255
254 logger.info(lineCode + "排班清理 " + count); 256 logger.info(lineCode + "排班清理 " + count);
@@ -298,6 +300,7 @@ public class DayOfSchedule implements CommandLineRunner { @@ -298,6 +300,7 @@ public class DayOfSchedule implements CommandLineRunner {
298 try{ 300 try{
299 sch.setZdsjT(DateUtils.sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000)); 301 sch.setZdsjT(DateUtils.sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000));
300 sch.setZdsj(DateUtils.sdfHHmm.format(sch.getZdsjT())); 302 sch.setZdsj(DateUtils.sdfHHmm.format(sch.getZdsjT()));
  303 + sch.setLate(false);
301 }catch(ParseException pe){ 304 }catch(ParseException pe){
302 logger.error("loadPlanSch... 计算终点时间失败..."); 305 logger.error("loadPlanSch... 计算终点时间失败...");
303 } 306 }
src/main/java/com/bsth/entity/forecast/Sample.java
  View file @ce64498
@@ -37,9 +37,13 @@ public class Sample { @@ -37,9 +37,13 @@ public class Sample {
37 37
38 // 开始站点 38 // 开始站点
39 private String sStation; 39 private String sStation;
  40 + @Transient
  41 + private String sName;
40 42
41 // 结束站点 43 // 结束站点
42 private String eStation; 44 private String eStation;
  45 + @Transient
  46 + private String eName;
43 47
44 // 0：gps分析生成， 1：人工录入 48 // 0：gps分析生成， 1：人工录入
45 private int type; 49 private int type;
@@ -146,4 +150,20 @@ public class Sample { @@ -146,4 +150,20 @@ public class Sample {
146 public void setUpdown(int updown) { 150 public void setUpdown(int updown) {
147 this.updown = updown; 151 this.updown = updown;
148 } 152 }
  153 +
  154 + public String getsName() {
  155 + return sName;
  156 + }
  157 +
  158 + public void setsName(String sName) {
  159 + this.sName = sName;
  160 + }
  161 +
  162 + public String geteName() {
  163 + return eName;
  164 + }
  165 +
  166 + public void seteName(String eName) {
  167 + this.eName = eName;
  168 + }
149 } 169 }
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
  View file @ce64498
@@ -140,6 +140,7 @@ public class ScheduleRealInfo { @@ -140,6 +140,7 @@ public class ScheduleRealInfo {
140 private boolean sflj; 140 private boolean sflj;
141 141
142 /** 是否误点*/ 142 /** 是否误点*/
  143 + @Transient
143 private boolean late; 144 private boolean late;
144 145
145 /**实际里程*/ 146 /**实际里程*/
@@ -541,7 +542,11 @@ public class ScheduleRealInfo { @@ -541,7 +542,11 @@ public class ScheduleRealInfo {
541 542
542 @Override 543 @Override
543 public boolean equals(Object obj) { 544 public boolean equals(Object obj) {
544 - return this.id.equals(((ScheduleRealInfo)obj).getId()); 545 + try{
  546 + return this.id.equals(((ScheduleRealInfo)obj).getId());
  547 + }catch(Exception e){
  548 + return false;
  549 + }
545 } 550 }
546 551
547 public String getQdzArrDateJH() { 552 public String getQdzArrDateJH() {
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
  View file @ce64498
@@ -4,6 +4,7 @@ import com.bsth.entity.Cars; @@ -4,6 +4,7 @@ import com.bsth.entity.Cars;
4 import com.bsth.entity.Line; 4 import com.bsth.entity.Line;
5 import com.bsth.entity.Personnel; 5 import com.bsth.entity.Personnel;
6 import com.bsth.entity.sys.SysUser; 6 import com.bsth.entity.sys.SysUser;
  7 +import org.hibernate.annotations.Formula;
7 8
8 import javax.persistence.*; 9 import javax.persistence.*;
9 import javax.validation.constraints.NotNull; 10 import javax.validation.constraints.NotNull;
@@ -45,6 +46,10 @@ public class EmployeeConfigInfo { @@ -45,6 +46,10 @@ public class EmployeeConfigInfo {
45 @NotNull 46 @NotNull
46 private String dbbm; 47 private String dbbm;
47 48
  49 + @Formula(" dbbm + 0 ")
  50 + private Integer dbbmFormula;
  51 +
  52 +
48 /** 创建人 */ 53 /** 创建人 */
49 @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) 54 @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
50 private SysUser createBy; 55 private SysUser createBy;
@@ -91,6 +96,30 @@ public class EmployeeConfigInfo { @@ -91,6 +96,30 @@ public class EmployeeConfigInfo {
91 this.jsy = jsy; 96 this.jsy = jsy;
92 } 97 }
93 98
  99 + public Integer getDbbmFormula() {
  100 + return dbbmFormula;
  101 + }
  102 +
  103 + public void setDbbmFormula(Integer dbbmFormula) {
  104 + this.dbbmFormula = dbbmFormula;
  105 + }
  106 +
  107 + public SysUser getCreateBy() {
  108 + return createBy;
  109 + }
  110 +
  111 + public void setCreateBy(SysUser createBy) {
  112 + this.createBy = createBy;
  113 + }
  114 +
  115 + public SysUser getUpdateBy() {
  116 + return updateBy;
  117 + }
  118 +
  119 + public void setUpdateBy(SysUser updateBy) {
  120 + this.updateBy = updateBy;
  121 + }
  122 +
94 public Personnel getSpy() { 123 public Personnel getSpy() {
95 return spy; 124 return spy;
96 } 125 }
src/main/java/com/bsth/service/forecast/SampleServiceImpl.java
  View file @ce64498
1 package com.bsth.service.forecast; 1 package com.bsth.service.forecast;
2 2
  3 +import java.util.Iterator;
  4 +import java.util.Map;
  5 +
3 import org.springframework.stereotype.Service; 6 import org.springframework.stereotype.Service;
4 7
  8 +import com.bsth.data.BasicData;
5 import com.bsth.entity.forecast.Sample; 9 import com.bsth.entity.forecast.Sample;
6 import com.bsth.service.impl.BaseServiceImpl; 10 import com.bsth.service.impl.BaseServiceImpl;
7 11
8 @Service 12 @Service
9 public class SampleServiceImpl extends BaseServiceImpl<Sample, Long>{ 13 public class SampleServiceImpl extends BaseServiceImpl<Sample, Long>{
10 14
  15 + @Override
  16 + public Iterable<Sample> list(Map<String, Object> map) {
  17 + Iterable<Sample> rs = super.list(map);
  18 +
  19 + //转换站点名称
  20 + Iterator<Sample> iterator = rs.iterator();
  21 + Sample s;
  22 + while(iterator.hasNext()){
  23 + s = iterator.next();
  24 + s.setsName(BasicData.stationCode2NameMap.get(s.getsStation()));
  25 + s.seteName(BasicData.stationCode2NameMap.get(s.geteStation()));
  26 + }
  27 + return rs;
  28 + }
11 } 29 }
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfoCalcuParam_input.java
  View file @ce64498
1 -package com.bsth.service.schedule.rules.ttinfo;  
2 -  
3 -import org.joda.time.DateTime;  
4 -  
5 -/**  
6 - * 时刻表计算参数_输入。  
7 - */  
8 -public class TTInfoCalcuParam_input {  
9 - /** 开始计算日期 */  
10 - private DateTime fromDate;  
11 - /** 结束计算日期 */  
12 - private DateTime toDate;  
13 - /** 线路Id */  
14 - private String xlId;  
15 -  
16 - public TTInfoCalcuParam_input() {}  
17 -  
18 - public TTInfoCalcuParam_input(DateTime fromDate, DateTime toDate, String xlId) {  
19 - this.fromDate = fromDate;  
20 - this.toDate = toDate;  
21 - this.xlId = xlId;  
22 - }  
23 -  
24 - public DateTime getFromDate() {  
25 - return fromDate;  
26 - }  
27 -  
28 - public void setFromDate(DateTime fromDate) {  
29 - this.fromDate = fromDate;  
30 - }  
31 -  
32 - public DateTime getToDate() {  
33 - return toDate;  
34 - }  
35 -  
36 - public void setToDate(DateTime toDate) {  
37 - this.toDate = toDate;  
38 - }  
39 -  
40 - public String getXlId() {  
41 - return xlId;  
42 - }  
43 -  
44 - public void setXlId(String xlId) {  
45 - this.xlId = xlId;  
46 - }  
47 -} 1 +package com.bsth.service.schedule.rules.ttinfo;
  2 +
  3 +import org.joda.time.DateTime;
  4 +
  5 +/**
  6 + * 时刻表计算参数_输入。
  7 + */
  8 +public class TTInfoCalcuParam_input {
  9 + /** 开始计算日期 */
  10 + private DateTime fromDate;
  11 + /** 结束计算日期 */
  12 + private DateTime toDate;
  13 + /** 线路Id */
  14 + private String xlId;
  15 +
  16 + public TTInfoCalcuParam_input() {}
  17 +
  18 + public TTInfoCalcuParam_input(DateTime fromDate, DateTime toDate, String xlId) {
  19 + this.fromDate = fromDate;
  20 + this.toDate = toDate;
  21 + this.xlId = xlId;
  22 + }
  23 +
  24 + public DateTime getFromDate() {
  25 + return fromDate;
  26 + }
  27 +
  28 + public void setFromDate(DateTime fromDate) {
  29 + this.fromDate = fromDate;
  30 + }
  31 +
  32 + public DateTime getToDate() {
  33 + return toDate;
  34 + }
  35 +
  36 + public void setToDate(DateTime toDate) {
  37 + this.toDate = toDate;
  38 + }
  39 +
  40 + public String getXlId() {
  41 + return xlId;
  42 + }
  43 +
  44 + public void setXlId(String xlId) {
  45 + this.xlId = xlId;
  46 + }
  47 +}
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfoResult_output.java
  View file @ce64498
1 -package com.bsth.service.schedule.rules.ttinfo;  
2 -  
3 -import org.joda.time.DateTime;  
4 -  
5 -/**  
6 - * 时刻表选择规则出的结果_输出。  
7 - */  
8 -public class TTInfoResult_output {  
9 - /** 具体日期 */  
10 - private DateTime dateTime;  
11 - /** 时刻表Id */  
12 - private String ttInfoId;  
13 - /** 线路Id */  
14 - private String xlId;  
15 -  
16 - public DateTime getDateTime() {  
17 - return dateTime;  
18 - }  
19 -  
20 - public void setDateTime(DateTime dateTime) {  
21 - this.dateTime = dateTime;  
22 - }  
23 -  
24 - public String getTtInfoId() {  
25 - return ttInfoId;  
26 - }  
27 -  
28 - public void setTtInfoId(String ttInfoId) {  
29 - this.ttInfoId = ttInfoId;  
30 - }  
31 -  
32 - public String getXlId() {  
33 - return xlId;  
34 - }  
35 -  
36 - public void setXlId(String xlId) {  
37 - this.xlId = xlId;  
38 - }  
39 -  
40 - @Override  
41 - public String toString() {  
42 - return String.format(  
43 - "<日期=%s 线路id=%s 时刻表id=%s>\n",  
44 - dateTime.toString("yyyy-MM-dd"),  
45 - xlId,  
46 - ttInfoId);  
47 - }  
48 -} 1 +package com.bsth.service.schedule.rules.ttinfo;
  2 +
  3 +import org.joda.time.DateTime;
  4 +
  5 +/**
  6 + * 时刻表选择规则出的结果_输出。
  7 + */
  8 +public class TTInfoResult_output {
  9 + /** 具体日期 */
  10 + private DateTime dateTime;
  11 + /** 时刻表Id */
  12 + private String ttInfoId;
  13 + /** 线路Id */
  14 + private String xlId;
  15 +
  16 + public DateTime getDateTime() {
  17 + return dateTime;
  18 + }
  19 +
  20 + public void setDateTime(DateTime dateTime) {
  21 + this.dateTime = dateTime;
  22 + }
  23 +
  24 + public String getTtInfoId() {
  25 + return ttInfoId;
  26 + }
  27 +
  28 + public void setTtInfoId(String ttInfoId) {
  29 + this.ttInfoId = ttInfoId;
  30 + }
  31 +
  32 + public String getXlId() {
  33 + return xlId;
  34 + }
  35 +
  36 + public void setXlId(String xlId) {
  37 + this.xlId = xlId;
  38 + }
  39 +
  40 + @Override
  41 + public String toString() {
  42 + return String.format(
  43 + "<日期=%s 线路id=%s 时刻表id=%s>\n",
  44 + dateTime.toString("yyyy-MM-dd"),
  45 + xlId,
  46 + ttInfoId);
  47 + }
  48 +}
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfoResults_output.java
  View file @ce64498
1 -package com.bsth.service.schedule.rules.ttinfo;  
2 -  
3 -import com.google.common.collect.ArrayListMultimap;  
4 -import com.google.common.collect.Multimap;  
5 -import org.joda.time.DateTime;  
6 -  
7 -import java.util.HashMap;  
8 -import java.util.List;  
9 -import java.util.Map;  
10 -  
11 -/**  
12 - * 输出结果集合。  
13 - */  
14 -public class TTInfoResults_output {  
15 -  
16 - /** 输出列表，key为线路id，value是key为日期，value为排序的时刻表output列表 */  
17 - private Map<String, Multimap<DateTime, TTInfoResult_output>> results = new HashMap<>();  
18 -  
19 - public Map<String, Multimap<DateTime, TTInfoResult_output>> getResults() {  
20 - return results;  
21 - }  
22 -  
23 - public void setResults(Map<String, Multimap<DateTime, TTInfoResult_output>> results) {  
24 - this.results = results;  
25 - }  
26 -  
27 - public void addXlTTInfos(String xlid, DateTime dt, List<TTInfo_input> ttInfo_inputList) {  
28 - Multimap<DateTime, TTInfoResult_output> map;  
29 - if (results.get(xlid) == null) {  
30 - map = ArrayListMultimap.create();  
31 - results.put(xlid, map);  
32 - } else {  
33 - map = results.get(xlid);  
34 - }  
35 -  
36 - for (TTInfo_input ttInfo_input : ttInfo_inputList) {  
37 - TTInfoResult_output ttInfoResult_output = new TTInfoResult_output();  
38 - ttInfoResult_output.setDateTime(dt);  
39 - ttInfoResult_output.setTtInfoId(ttInfo_input.getTtInfoId());  
40 - ttInfoResult_output.setXlId(xlid);  
41 - map.put(dt, ttInfoResult_output);  
42 - }  
43 - }  
44 -  
45 - /**  
46 - * 输出计算后的时刻表  
47 - * @return  
48 - */  
49 - public String showTTInfoDesc1() {  
50 - StringBuilder str = new StringBuilder();  
51 - for (String key : results.keySet()) {  
52 - str.append("线路id=" + key);  
53 - str.append("\n");  
54 - str.append("时刻表=" + results.get(key));  
55 - str.append("\n");  
56 - }  
57 -  
58 - return str.toString();  
59 - }  
60 -  
61 -} 1 +package com.bsth.service.schedule.rules.ttinfo;
  2 +
  3 +import com.google.common.collect.ArrayListMultimap;
  4 +import com.google.common.collect.Multimap;
  5 +import org.joda.time.DateTime;
  6 +
  7 +import java.util.HashMap;
  8 +import java.util.List;
  9 +import java.util.Map;
  10 +
  11 +/**
  12 + * 输出结果集合。
  13 + */
  14 +public class TTInfoResults_output {
  15 +
  16 + /** 输出列表，key为线路id，value是key为日期，value为排序的时刻表output列表 */
  17 + private Map<String, Multimap<DateTime, TTInfoResult_output>> results = new HashMap<>();
  18 +
  19 + public Map<String, Multimap<DateTime, TTInfoResult_output>> getResults() {
  20 + return results;
  21 + }
  22 +
  23 + public void setResults(Map<String, Multimap<DateTime, TTInfoResult_output>> results) {
  24 + this.results = results;
  25 + }
  26 +
  27 + public void addXlTTInfos(String xlid, DateTime dt, List<TTInfo_input> ttInfo_inputList) {
  28 + Multimap<DateTime, TTInfoResult_output> map;
  29 + if (results.get(xlid) == null) {
  30 + map = ArrayListMultimap.create();
  31 + results.put(xlid, map);
  32 + } else {
  33 + map = results.get(xlid);
  34 + }
  35 +
  36 + for (TTInfo_input ttInfo_input : ttInfo_inputList) {
  37 + TTInfoResult_output ttInfoResult_output = new TTInfoResult_output();
  38 + ttInfoResult_output.setDateTime(dt);
  39 + ttInfoResult_output.setTtInfoId(ttInfo_input.getTtInfoId());
  40 + ttInfoResult_output.setXlId(xlid);
  41 + map.put(dt, ttInfoResult_output);
  42 + }
  43 + }
  44 +
  45 + /**
  46 + * 输出计算后的时刻表
  47 + * @return
  48 + */
  49 + public String showTTInfoDesc1() {
  50 + StringBuilder str = new StringBuilder();
  51 + for (String key : results.keySet()) {
  52 + str.append("线路id=" + key);
  53 + str.append("\n");
  54 + str.append("时刻表=" + results.get(key));
  55 + str.append("\n");
  56 + }
  57 +
  58 + return str.toString();
  59 + }
  60 +
  61 +}
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
  View file @ce64498
1 -package com.bsth.service.schedule.rules.ttinfo;  
2 -  
3 -import com.bsth.entity.schedule.TTInfo;  
4 -import org.apache.commons.lang3.StringUtils;  
5 -import org.joda.time.DateTime;  
6 -import org.joda.time.format.DateTimeFormat;  
7 -  
8 -import java.util.ArrayList;  
9 -import java.util.List;  
10 -  
11 -/**  
12 - * 时刻表_输入  
13 - */  
14 -public class TTInfo_input implements Comparable<TTInfo_input> {  
15 - /** 时刻表id */  
16 - private String ttInfoId;  
17 - /** 线路Id */  
18 - private String xlId;  
19 - /** 周一到周日是否启用 */  
20 - private List<Boolean> weekdays = new ArrayList<>();  
21 - /** 特殊节假日 */  
22 - private List<DateTime> specialDays = new ArrayList<>();  
23 - /** 最新修改时间 */  
24 - private DateTime updateDate;  
25 - /** 是否启用 */  
26 - private Boolean isEnable;  
27 - /** 启用日期 */  
28 - private DateTime qyDate;  
29 -  
30 - public TTInfo_input() {  
31 -  
32 - }  
33 -  
34 - @Override  
35 - public int compareTo(TTInfo_input ttInfo_input) {  
36 - if (ttInfo_input != null) {  
37 - if (ttInfo_input.updateDate != null && this.updateDate != null)  
38 - return - this.updateDate.compareTo(ttInfo_input.updateDate);  
39 - }  
40 - return -1;  
41 - }  
42 -  
43 - public TTInfo_input(TTInfo ttInfo) {  
44 - this.ttInfoId = String.valueOf(ttInfo.getId());  
45 - this.xlId = String.valueOf(ttInfo.getXl().getId());  
46 - String[] days = ttInfo.getRule_days().split(",");  
47 - System.out.println(days.length);  
48 - for (int i = 0; i < 7; i++) {  
49 - if ("1".equals(days[i])) {  
50 - weekdays.add(true);  
51 - } else {  
52 - weekdays.add(false);  
53 - }  
54 - }  
55 -  
56 - if (StringUtils.isNotEmpty(ttInfo.getSpecial_days())) {  
57 - String[] sdays = ttInfo.getSpecial_days().split(",");  
58 - for (int i = 0; i < sdays.length; i++) {  
59 - specialDays.add(DateTimeFormat.forPattern("yyyy-MM-dd").  
60 - parseDateTime(sdays[i]));  
61 - }  
62 - }  
63 -  
64 - this.updateDate = new DateTime(ttInfo.getUpdateDate());  
65 - this.isEnable = ttInfo.getIsEnableDisTemplate();  
66 - this.qyDate = new DateTime(ttInfo.getQyrq());  
67 -  
68 - }  
69 -  
70 - public String getTtInfoId() {  
71 - return ttInfoId;  
72 - }  
73 -  
74 - public void setTtInfoId(String ttInfoId) {  
75 - this.ttInfoId = ttInfoId;  
76 - }  
77 -  
78 - public String getXlId() {  
79 - return xlId;  
80 - }  
81 -  
82 - public void setXlId(String xlId) {  
83 - this.xlId = xlId;  
84 - }  
85 -  
86 - public List<Boolean> getWeekdays() {  
87 - return weekdays;  
88 - }  
89 -  
90 - public void setWeekdays(List<Boolean> weekdays) {  
91 - this.weekdays = weekdays;  
92 - }  
93 -  
94 - public List<DateTime> getSpecialDays() {  
95 - return specialDays;  
96 - }  
97 -  
98 - public void setSpecialDays(List<DateTime> specialDays) {  
99 - this.specialDays = specialDays;  
100 - }  
101 -  
102 - public DateTime getUpdateDate() {  
103 - return updateDate;  
104 - }  
105 -  
106 - public void setUpdateDate(DateTime updateDate) {  
107 - this.updateDate = updateDate;  
108 - }  
109 -  
110 - public Boolean getIsEnable() {  
111 - return isEnable;  
112 - }  
113 -  
114 - public void setIsEnable(Boolean isEnable) {  
115 - this.isEnable = isEnable;  
116 - }  
117 -  
118 - public DateTime getQyDate() {  
119 - return qyDate;  
120 - }  
121 -  
122 - public void setQyDate(DateTime qyDate) {  
123 - this.qyDate = qyDate;  
124 - }  
125 -} 1 +package com.bsth.service.schedule.rules.ttinfo;
  2 +
  3 +import com.bsth.entity.schedule.TTInfo;
  4 +import org.apache.commons.lang3.StringUtils;
  5 +import org.joda.time.DateTime;
  6 +import org.joda.time.format.DateTimeFormat;
  7 +
  8 +import java.util.ArrayList;
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * 时刻表_输入
  13 + */
  14 +public class TTInfo_input implements Comparable<TTInfo_input> {
  15 + /** 时刻表id */
  16 + private String ttInfoId;
  17 + /** 线路Id */
  18 + private String xlId;
  19 + /** 周一到周日是否启用 */
  20 + private List<Boolean> weekdays = new ArrayList<>();
  21 + /** 特殊节假日 */
  22 + private List<DateTime> specialDays = new ArrayList<>();
  23 + /** 最新修改时间 */
  24 + private DateTime updateDate;
  25 + /** 是否启用 */
  26 + private Boolean isEnable;
  27 + /** 启用日期 */
  28 + private DateTime qyDate;
  29 +
  30 + public TTInfo_input() {
  31 +
  32 + }
  33 +
  34 + @Override
  35 + public int compareTo(TTInfo_input ttInfo_input) {
  36 + if (ttInfo_input != null) {
  37 + if (ttInfo_input.updateDate != null && this.updateDate != null)
  38 + return - this.updateDate.compareTo(ttInfo_input.updateDate);
  39 + }
  40 + return -1;
  41 + }
  42 +
  43 + public TTInfo_input(TTInfo ttInfo) {
  44 + this.ttInfoId = String.valueOf(ttInfo.getId());
  45 + this.xlId = String.valueOf(ttInfo.getXl().getId());
  46 + String[] days = ttInfo.getRule_days().split(",");
  47 + System.out.println(days.length);
  48 + for (int i = 0; i < 7; i++) {
  49 + if ("1".equals(days[i])) {
  50 + weekdays.add(true);
  51 + } else {
  52 + weekdays.add(false);
  53 + }
  54 + }
  55 + if (StringUtils.isNotEmpty(ttInfo.getSpecial_days())) {
  56 + String[] sdays = ttInfo.getSpecial_days().split(",");
  57 + for (int i = 0; i < sdays.length; i++) {
  58 + specialDays.add(DateTimeFormat.forPattern("yyyy-MM-dd").
  59 + parseDateTime(sdays[i]));
  60 + }
  61 + }
  62 +
  63 + this.updateDate = new DateTime(ttInfo.getUpdateDate());
  64 + this.isEnable = ttInfo.getIsEnableDisTemplate();
  65 + this.qyDate = new DateTime(ttInfo.getQyrq());
  66 +
  67 + }
  68 +
  69 + public String getTtInfoId() {
  70 + return ttInfoId;
  71 + }
  72 +
  73 + public void setTtInfoId(String ttInfoId) {
  74 + this.ttInfoId = ttInfoId;
  75 + }
  76 +
  77 + public String getXlId() {
  78 + return xlId;
  79 + }
  80 +
  81 + public void setXlId(String xlId) {
  82 + this.xlId = xlId;
  83 + }
  84 +
  85 + public List<Boolean> getWeekdays() {
  86 + return weekdays;
  87 + }
  88 +
  89 + public void setWeekdays(List<Boolean> weekdays) {
  90 + this.weekdays = weekdays;
  91 + }
  92 +
  93 + public List<DateTime> getSpecialDays() {
  94 + return specialDays;
  95 + }
  96 +
  97 + public void setSpecialDays(List<DateTime> specialDays) {
  98 + this.specialDays = specialDays;
  99 + }
  100 +
  101 + public DateTime getUpdateDate() {
  102 + return updateDate;
  103 + }
  104 +
  105 + public void setUpdateDate(DateTime updateDate) {
  106 + this.updateDate = updateDate;
  107 + }
  108 +
  109 + public Boolean getIsEnable() {
  110 + return isEnable;
  111 + }
  112 +
  113 + public void setIsEnable(Boolean isEnable) {
  114 + this.isEnable = isEnable;
  115 + }
  116 +
  117 + public DateTime getQyDate() {
  118 + return qyDate;
  119 + }
  120 +
  121 + public void setQyDate(DateTime qyDate) {
  122 + this.qyDate = qyDate;
  123 + }
  124 +}
src/main/resources/application-dev.properties
  View file @ce64498
@@ -26,7 +26,6 @@ spring.datasource.validation-query=select 1 @@ -26,7 +26,6 @@ spring.datasource.validation-query=select 1
26 ## 26 ##
27 #222.66.0.204:5555 27 #222.66.0.204:5555
28 ##\u5B9E\u65F6gps 28 ##\u5B9E\u65F6gps
29 -#27.115.69.123:8800  
30 http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/ 29 http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
31 ##\u6D88\u606F\u4E0B\u53D1 30 ##\u6D88\u606F\u4E0B\u53D1
32 http.send.directive = http://192.168.168.201:9090/transport_server/message/ 31 http.send.directive = http://192.168.168.201:9090/transport_server/message/
33 \ No newline at end of file 32 \ No newline at end of file
src/main/resources/application-prod.properties
  View file @ce64498
@@ -28,4 +28,4 @@ spring.datasource.validation-query=select 1 @@ -28,4 +28,4 @@ spring.datasource.validation-query=select 1
28 ##\u5B9E\u65F6gps 28 ##\u5B9E\u65F6gps
29 http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/ 29 http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
30 ##\u6D88\u606F\u4E0B\u53D1 30 ##\u6D88\u606F\u4E0B\u53D1
31 -http.send.directive = http://192.168.168.171:8080/transport_server/message/ 31 +http.send.directive = http://192.168.168.171:8080/transport_server/message/
32 \ No newline at end of file 32 \ No newline at end of file
src/main/resources/application.properties
  View file @ce64498
1 spring.profiles: dev,prod 1 spring.profiles: dev,prod
2 -spring.profiles.active: dev 2 +spring.profiles.active: prod
3 3
4 spring.view.suffix=.html 4 spring.view.suffix=.html
5 server.session-timeout=-1 5 server.session-timeout=-1
src/main/resources/datatools/config-prod.properties
  View file @ce64498
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
4 datatools.kettle_properties=/datatools/kettle.properties 4 datatools.kettle_properties=/datatools/kettle.properties
5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正） 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 #数据库ip地址 6 #数据库ip地址
7 -datatools.kvars_dbip=192.168.168.171 7 +datatools.kvars_dbip=192.168.40.82
8 #数据库用户名 8 #数据库用户名
9 datatools.kvars_dbuname=root 9 datatools.kvars_dbuname=root
10 #数据库密码 10 #数据库密码
11 -datatools.kvars_dbpwd=root2jsp 11 +datatools.kvars_dbpwd=123456
12 #数据库库名 12 #数据库库名
13 -datatools.kvars_dbdname=control 13 +datatools.kvars_dbdname=qp_control
14 14
15 # 3、上传数据配置信息 15 # 3、上传数据配置信息
16 # 上传文件目录配置（根据不同的环境需要修正） 16 # 上传文件目录配置（根据不同的环境需要修正）
@@ -56,16 +56,4 @@ datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr @@ -56,16 +56,4 @@ datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
56 # 人员信息导出ktr转换 56 # 人员信息导出ktr转换
57 datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr 57 datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
58 58
59 -# TODO：  
60 -  
61 -  
62 -  
63 -  
64 -  
65 -  
66 -  
67 -  
68 -  
69 -  
70 -  
71 - 59 +# TODO：
72 \ No newline at end of file 60 \ No newline at end of file