yansen 4 anni fa
parent
commit
d8577d6f99

+ 337
- 0
hs_err_pid21432.log Vedi File

@@ -0,0 +1,337 @@
1
+#
2
+# There is insufficient memory for the Java Runtime Environment to continue.
3
+# Native memory allocation (malloc) failed to allocate 1163536 bytes for Chunk::new
4
+# Possible reasons:
5
+#   The system is out of physical RAM or swap space
6
+#   In 32 bit mode, the process size limit was hit
7
+# Possible solutions:
8
+#   Reduce memory load on the system
9
+#   Increase physical memory or swap space
10
+#   Check if swap backing store is full
11
+#   Use 64 bit Java on a 64 bit OS
12
+#   Decrease Java heap size (-Xmx/-Xms)
13
+#   Decrease number of Java threads
14
+#   Decrease Java thread stack sizes (-Xss)
15
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
16
+# This output file may be truncated or incomplete.
17
+#
18
+#  Out of Memory Error (allocation.cpp:390), pid=21432, tid=0x0000000000000624
19
+#
20
+# JRE version: Java(TM) SE Runtime Environment (8.0_181-b13) (build 1.8.0_181-b13)
21
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.181-b13 mixed mode windows-amd64 compressed oops)
22
+# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
23
+#
24
+
25
+---------------  T H R E A D  ---------------
26
+
27
+Current thread (0x0000000019b54800):  JavaThread "C2 CompilerThread5" daemon [_thread_in_native, id=1572, stack(0x000000001bbf0000,0x000000001bcf0000)]
28
+
29
+Stack: [0x000000001bbf0000,0x000000001bcf0000]
30
+[error occurred during error reporting (printing stack bounds), id 0xc0000005]
31
+
32
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
33
+
34
+
35
+Current CompileTask:
36
+C2:  38929 7370 %     4       lombok.javac.apt.LombokProcessor::process @ 366 (540 bytes)
37
+
38
+
39
+---------------  P R O C E S S  ---------------
40
+
41
+Java Threads: ( => current thread )
42
+  0x0000000019c32000 JavaThread "Service Thread" daemon [_thread_blocked, id=27076, stack(0x000000001c2f0000,0x000000001c3f0000)]
43
+  0x0000000019bd4000 JavaThread "C1 CompilerThread11" daemon [_thread_blocked, id=16184, stack(0x000000001c1f0000,0x000000001c2f0000)]
44
+  0x0000000019bd1000 JavaThread "C1 CompilerThread10" daemon [_thread_blocked, id=19572, stack(0x000000001c0f0000,0x000000001c1f0000)]
45
+  0x0000000019bb8800 JavaThread "C1 CompilerThread9" daemon [_thread_blocked, id=22288, stack(0x000000001bff0000,0x000000001c0f0000)]
46
+  0x0000000019b9f800 JavaThread "C1 CompilerThread8" daemon [_thread_blocked, id=19548, stack(0x000000001bef0000,0x000000001bff0000)]
47
+  0x0000000019b85000 JavaThread "C2 CompilerThread7" daemon [_thread_blocked, id=25536, stack(0x000000001bdf0000,0x000000001bef0000)]
48
+  0x0000000019b61000 JavaThread "C2 CompilerThread6" daemon [_thread_blocked, id=21360, stack(0x000000001bcf0000,0x000000001bdf0000)]
49
+=>0x0000000019b54800 JavaThread "C2 CompilerThread5" daemon [_thread_in_native, id=1572, stack(0x000000001bbf0000,0x000000001bcf0000)]
50
+  0x0000000019b53800 JavaThread "C2 CompilerThread4" daemon [_thread_in_native, id=16592, stack(0x000000001baf0000,0x000000001bbf0000)]
51
+  0x0000000019b43000 JavaThread "C2 CompilerThread3" daemon [_thread_in_vm, id=19900, stack(0x000000001b9f0000,0x000000001baf0000)]
52
+  0x0000000019b41000 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=12120, stack(0x000000001b8f0000,0x000000001b9f0000)]
53
+  0x0000000019b3d800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=23236, stack(0x000000001b7f0000,0x000000001b8f0000)]
54
+  0x0000000019b36800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=22688, stack(0x000000001b6f0000,0x000000001b7f0000)]
55
+  0x0000000019b16800 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=23452, stack(0x000000001b5f0000,0x000000001b6f0000)]
56
+  0x0000000019afd000 JavaThread "Attach Listener" daemon [_thread_blocked, id=22488, stack(0x000000001b4f0000,0x000000001b5f0000)]
57
+  0x0000000019afc800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=20252, stack(0x000000001b3f0000,0x000000001b4f0000)]
58
+  0x0000000019a86800 JavaThread "Finalizer" daemon [_thread_blocked, id=12740, stack(0x000000001b2f0000,0x000000001b3f0000)]
59
+  0x000000001800b800 JavaThread "Reference Handler" daemon [_thread_blocked, id=23336, stack(0x000000001b1f0000,0x000000001b2f0000)]
60
+  0x0000000002a12800 JavaThread "main" [_thread_in_native, id=25460, stack(0x0000000002650000,0x0000000002750000)]
61
+
62
+Other Threads:
63
+  0x0000000019a63000 VMThread [stack: 0x000000001b0f0000,0x000000001b1f0000] [id=10984]
64
+  0x0000000019c1c800 WatcherThread [stack: 0x000000001c3f0000,0x000000001c4f0000] [id=11000]
65
+
66
+VM state:not at safepoint (normal execution)
67
+
68
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
69
+[0x000000000280d820] CodeCache_lock - owner thread: 0x0000000019b53800
70
+
71
+Heap:
72
+ PSYoungGen      total 358912K, used 166452K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
73
+  eden space 327680K, 49% used [0x00000000d5980000,0x00000000df948fd8,0x00000000e9980000)
74
+  from space 31232K, 9% used [0x00000000e9980000,0x00000000e9c44030,0x00000000eb800000)
75
+  to   space 29696K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed680000)
76
+ ParOldGen       total 163840K, used 146007K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
77
+  object space 163840K, 89% used [0x0000000080c00000,0x0000000089a95f48,0x000000008ac00000)
78
+ Metaspace       used 27172K, capacity 27944K, committed 28160K, reserved 1075200K
79
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
80
+
81
+Card table byte_map: [0x0000000011ed0000,0x00000000122d0000] byte_map_base: 0x0000000011aca000
82
+
83
+Marking Bits: (ParMarkBitMap*) 0x00000000548a2d00
84
+ Begin Bits: [0x0000000013280000, 0x0000000015250000)
85
+ End Bits:   [0x0000000015250000, 0x0000000017220000)
86
+
87
+Polling page: 0x00000000005d0000
88
+
89
+CodeCache: size=245760Kb used=26921Kb max_used=26933Kb free=218838Kb
90
+ bounds [0x0000000002b10000, 0x0000000004580000, 0x0000000011b10000]
91
+ total_blobs=6425 nmethods=5993 adapters=340
92
+ compilation: enabled
93
+
94
+Compilation events (10 events):
95
+Event: 38.378 Thread 0x0000000019b9f800 7383       3       com.sun.tools.javac.jvm.ClassReader::readInnerClasses (183 bytes)
96
+Event: 38.379 Thread 0x0000000019b53800 7384       4       com.sun.tools.javac.jvm.ClassReader::readClass (474 bytes)
97
+Event: 38.380 Thread 0x0000000019b9f800 nmethod 7383 0x000000000455f650 code [0x000000000455f920, 0x0000000004560b38]
98
+Event: 38.463 Thread 0x0000000019b43000 7385   !   4       com.sun.tools.javac.comp.MemberEnter::complete (1573 bytes)
99
+Event: 38.487 Thread 0x0000000019b36800 7386       4       java.util.HashMap::containsKey (18 bytes)
100
+Event: 38.501 Thread 0x0000000019b36800 nmethod 7386 0x0000000004562f50 code [0x00000000045630a0, 0x0000000004563358]
101
+Event: 38.502 Thread 0x0000000019bd4000 7387       1       com.sun.tools.javac.code.Type$JCVoidType::getTag (4 bytes)
102
+Event: 38.502 Thread 0x0000000019bd4000 nmethod 7387 0x000000000455f390 code [0x000000000455f4e0, 0x000000000455f5f0]
103
+Event: 38.657 Thread 0x0000000019b61000 7388       4       com.sun.tools.javac.tree.JCTree$JCCompilationUnit::accept (6 bytes)
104
+Event: 38.698 Thread 0x0000000019b61000 nmethod 7388 0x00000000043ff290 code [0x00000000043ff3c0, 0x00000000043ff438]
105
+
106
+GC Heap History (10 events):
107
+Event: 30.695 GC heap before
108
+{Heap before GC invocations=27 (full 2):
109
+ PSYoungGen      total 264704K, used 241712K [0x00000000d5980000, 0x00000000e7a00000, 0x0000000100000000)
110
+  eden space 236032K, 100% used [0x00000000d5980000,0x00000000e4000000,0x00000000e4000000)
111
+  from space 28672K, 19% used [0x00000000e5e00000,0x00000000e638c0c0,0x00000000e7a00000)
112
+  to   space 29696K, 0% used [0x00000000e4000000,0x00000000e4000000,0x00000000e5d00000)
113
+ ParOldGen       total 163840K, used 106742K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
114
+  object space 163840K, 65% used [0x0000000080c00000,0x000000008743da38,0x000000008ac00000)
115
+ Metaspace       used 27076K, capacity 27880K, committed 28160K, reserved 1075200K
116
+  class space    used 3024K, capacity 3239K, committed 3328K, reserved 1048576K
117
+Event: 30.708 GC heap after
118
+Heap after GC invocations=27 (full 2):
119
+ PSYoungGen      total 265728K, used 5744K [0x00000000d5980000, 0x00000000e9e80000, 0x0000000100000000)
120
+  eden space 236032K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e4000000)
121
+  from space 29696K, 19% used [0x00000000e4000000,0x00000000e459c130,0x00000000e5d00000)
122
+  to   space 29184K, 0% used [0x00000000e8200000,0x00000000e8200000,0x00000000e9e80000)
123
+ ParOldGen       total 163840K, used 112259K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
124
+  object space 163840K, 68% used [0x0000000080c00000,0x00000000879a0c48,0x000000008ac00000)
125
+ Metaspace       used 27076K, capacity 27880K, committed 28160K, reserved 1075200K
126
+  class space    used 3024K, capacity 3239K, committed 3328K, reserved 1048576K
127
+}
128
+Event: 31.975 GC heap before
129
+{Heap before GC invocations=28 (full 2):
130
+ PSYoungGen      total 265728K, used 241776K [0x00000000d5980000, 0x00000000e9e80000, 0x0000000100000000)
131
+  eden space 236032K, 100% used [0x00000000d5980000,0x00000000e4000000,0x00000000e4000000)
132
+  from space 29696K, 19% used [0x00000000e4000000,0x00000000e459c130,0x00000000e5d00000)
133
+  to   space 29184K, 0% used [0x00000000e8200000,0x00000000e8200000,0x00000000e9e80000)
134
+ ParOldGen       total 163840K, used 112259K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
135
+  object space 163840K, 68% used [0x0000000080c00000,0x00000000879a0c48,0x000000008ac00000)
136
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
137
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
138
+Event: 31.992 GC heap after
139
+Heap after GC invocations=28 (full 2):
140
+ PSYoungGen      total 301568K, used 5808K [0x00000000d5980000, 0x00000000e9d00000, 0x0000000100000000)
141
+  eden space 273920K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e6500000)
142
+  from space 27648K, 21% used [0x00000000e8200000,0x00000000e87ac0f0,0x00000000e9d00000)
143
+  to   space 28672K, 0% used [0x00000000e6500000,0x00000000e6500000,0x00000000e8100000)
144
+ ParOldGen       total 163840K, used 117831K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
145
+  object space 163840K, 71% used [0x0000000080c00000,0x0000000087f11eb8,0x000000008ac00000)
146
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
147
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
148
+}
149
+Event: 33.285 GC heap before
150
+{Heap before GC invocations=29 (full 2):
151
+ PSYoungGen      total 301568K, used 279728K [0x00000000d5980000, 0x00000000e9d00000, 0x0000000100000000)
152
+  eden space 273920K, 100% used [0x00000000d5980000,0x00000000e6500000,0x00000000e6500000)
153
+  from space 27648K, 21% used [0x00000000e8200000,0x00000000e87ac0f0,0x00000000e9d00000)
154
+  to   space 28672K, 0% used [0x00000000e6500000,0x00000000e6500000,0x00000000e8100000)
155
+ ParOldGen       total 163840K, used 117831K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
156
+  object space 163840K, 71% used [0x0000000080c00000,0x0000000087f11eb8,0x000000008ac00000)
157
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
158
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
159
+Event: 33.382 GC heap after
160
+Heap after GC invocations=29 (full 2):
161
+ PSYoungGen      total 302592K, used 20881K [0x00000000d5980000, 0x00000000ed700000, 0x0000000100000000)
162
+  eden space 273920K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e6500000)
163
+  from space 28672K, 72% used [0x00000000e6500000,0x00000000e7964760,0x00000000e8100000)
164
+  to   space 30208K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed700000)
165
+ ParOldGen       total 163840K, used 123440K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
166
+  object space 163840K, 75% used [0x0000000080c00000,0x000000008848c1d8,0x000000008ac00000)
167
+ Metaspace       used 27118K, capacity 27880K, committed 28160K, reserved 1075200K
168
+  class space    used 3027K, capacity 3239K, committed 3328K, reserved 1048576K
169
+}
170
+Event: 35.418 GC heap before
171
+{Heap before GC invocations=30 (full 2):
172
+ PSYoungGen      total 302592K, used 294801K [0x00000000d5980000, 0x00000000ed700000, 0x0000000100000000)
173
+  eden space 273920K, 100% used [0x00000000d5980000,0x00000000e6500000,0x00000000e6500000)
174
+  from space 28672K, 72% used [0x00000000e6500000,0x00000000e7964760,0x00000000e8100000)
175
+  to   space 30208K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed700000)
176
+ ParOldGen       total 163840K, used 123440K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
177
+  object space 163840K, 75% used [0x0000000080c00000,0x000000008848c1d8,0x000000008ac00000)
178
+ Metaspace       used 27147K, capacity 27880K, committed 28160K, reserved 1075200K
179
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
180
+Event: 35.444 GC heap after
181
+Heap after GC invocations=30 (full 2):
182
+ PSYoungGen      total 357376K, used 20072K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
183
+  eden space 327680K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e9980000)
184
+  from space 29696K, 67% used [0x00000000eb980000,0x00000000ecd1a288,0x00000000ed680000)
185
+  to   space 31232K, 0% used [0x00000000e9980000,0x00000000e9980000,0x00000000eb800000)
186
+ ParOldGen       total 163840K, used 128825K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
187
+  object space 163840K, 78% used [0x0000000080c00000,0x00000000889ce4e8,0x000000008ac00000)
188
+ Metaspace       used 27147K, capacity 27880K, committed 28160K, reserved 1075200K
189
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
190
+}
191
+Event: 37.040 GC heap before
192
+{Heap before GC invocations=31 (full 2):
193
+ PSYoungGen      total 357376K, used 347752K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
194
+  eden space 327680K, 100% used [0x00000000d5980000,0x00000000e9980000,0x00000000e9980000)
195
+  from space 29696K, 67% used [0x00000000eb980000,0x00000000ecd1a288,0x00000000ed680000)
196
+  to   space 31232K, 0% used [0x00000000e9980000,0x00000000e9980000,0x00000000eb800000)
197
+ ParOldGen       total 163840K, used 128825K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
198
+  object space 163840K, 78% used [0x0000000080c00000,0x00000000889ce4e8,0x000000008ac00000)
199
+ Metaspace       used 27168K, capacity 27944K, committed 28160K, reserved 1075200K
200
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
201
+Event: 37.083 GC heap after
202
+Heap after GC invocations=31 (full 2):
203
+ PSYoungGen      total 358912K, used 2832K [0x00000000d5980000, 0x00000000ed680000, 0x0000000100000000)
204
+  eden space 327680K, 0% used [0x00000000d5980000,0x00000000d5980000,0x00000000e9980000)
205
+  from space 31232K, 9% used [0x00000000e9980000,0x00000000e9c44030,0x00000000eb800000)
206
+  to   space 29696K, 0% used [0x00000000eb980000,0x00000000eb980000,0x00000000ed680000)
207
+ ParOldGen       total 163840K, used 146007K [0x0000000080c00000, 0x000000008ac00000, 0x00000000d5980000)
208
+  object space 163840K, 89% used [0x0000000080c00000,0x0000000089a95f48,0x000000008ac00000)
209
+ Metaspace       used 27168K, capacity 27944K, committed 28160K, reserved 1075200K
210
+  class space    used 3030K, capacity 3239K, committed 3328K, reserved 1048576K
211
+}
212
+
213
+Deoptimization events (10 events):
214
+Event: 36.377 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003bfe850 method=lombok.javac.JavacNode.traverse(Llombok/javac/JavacASTVisitor;)V @ 478
215
+Event: 36.377 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003bfe850 method=lombok.javac.JavacNode.traverse(Llombok/javac/JavacASTVisitor;)V @ 478
216
+Event: 36.401 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
217
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
218
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
219
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003e3a408 method=com.sun.tools.javac.tree.Pretty.print(Ljava/lang/Object;)V @ 5
220
+Event: 36.477 Thread 0x0000000002a12800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x00000000045562c4 method=lombok.javac.JavacNode.traverse(Llombok/javac/JavacASTVisitor;)V @ 623
221
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: reason=null_check action=make_not_entrant pc=0x0000000003b7f21c method=java.lang.Long.equals(Ljava/lang/Object;)Z @ 1
222
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: reason=null_check action=make_not_entrant pc=0x00000000030e3a5c method=java.lang.Long.equals(Ljava/lang/Object;)Z @ 1
223
+Event: 37.567 Thread 0x0000000002a12800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00000000040c2994 method=com.sun.tools.javac.util.ListBuffer.next()Ljava/lang/Object; @ 12
224
+
225
+Classes redefined (0 events):
226
+No events
227
+
228
+Internal exceptions (10 events):
229
+Event: 24.386 Thread 0x0000000002a12800 Implicit null exception at 0x0000000002ef04b6 to 0x0000000002ef05f1
230
+Event: 24.389 Thread 0x0000000002a12800 Implicit null exception at 0x000000000337422e to 0x0000000003374361
231
+Event: 24.391 Thread 0x0000000002a12800 Implicit null exception at 0x00000000034305a6 to 0x0000000003430629
232
+Event: 34.356 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003dc35cf to 0x0000000003dc36cd
233
+Event: 34.383 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003e95e93 to 0x0000000003e95eda
234
+Event: 34.654 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003f9530e to 0x0000000003f9723d
235
+Event: 35.385 Thread 0x0000000002a12800 Implicit null exception at 0x0000000004148b26 to 0x0000000004149fe1
236
+Event: 35.385 Thread 0x0000000002a12800 Implicit null exception at 0x00000000040c2f35 to 0x00000000040c3125
237
+Event: 37.564 Thread 0x0000000002a12800 Implicit null exception at 0x0000000003b7c20e to 0x0000000003b7f1e9
238
+Event: 37.564 Thread 0x0000000002a12800 Implicit null exception at 0x00000000030e3a0c to 0x00000000030e3a4d
239
+
240
+Events (10 events):
241
+Event: 37.083 Executing VM operation: ParallelGCFailedAllocation done
242
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: trap_request=0xfffffff4 fr.pc=0x0000000003b7f21c
243
+Event: 37.564 Thread 0x0000000002a12800 DEOPT PACKING pc=0x0000000003b7f21c sp=0x000000000274d990
244
+Event: 37.564 Thread 0x0000000002a12800 DEOPT UNPACKING pc=0x0000000002b5583b sp=0x000000000274d958 mode 2
245
+Event: 37.564 Thread 0x0000000002a12800 Uncommon trap: trap_request=0xfffffff4 fr.pc=0x00000000030e3a5c
246
+Event: 37.564 Thread 0x0000000002a12800 DEOPT PACKING pc=0x00000000030e3a5c sp=0x000000000274d9a0
247
+Event: 37.564 Thread 0x0000000002a12800 DEOPT UNPACKING pc=0x0000000002b5583b sp=0x000000000274d948 mode 2
248
+Event: 37.566 Thread 0x0000000002a12800 Uncommon trap: trap_request=0xffffffde fr.pc=0x00000000040c2994
249
+Event: 37.567 Thread 0x0000000002a12800 DEOPT PACKING pc=0x00000000040c2994 sp=0x000000000274dcf0
250
+Event: 37.567 Thread 0x0000000002a12800 DEOPT UNPACKING pc=0x0000000002b5583b sp=0x000000000274dc90 mode 2
251
+
252
+
253
+Dynamic libraries:
254
+0x00007ff6d4630000 - 0x00007ff6d4667000 	C:\Program Files\Java\jdk1.8.0_181\bin\java.exe
255
+0x00007ffebc320000 - 0x00007ffebc510000 	C:\WINDOWS\SYSTEM32\ntdll.dll
256
+0x00007ffebacf0000 - 0x00007ffebada2000 	C:\WINDOWS\System32\KERNEL32.DLL
257
+0x00007ffeb97e0000 - 0x00007ffeb9a83000 	C:\WINDOWS\System32\KERNELBASE.dll
258
+0x00007ffebab60000 - 0x00007ffebac03000 	C:\WINDOWS\System32\ADVAPI32.dll
259
+0x00007ffebb9f0000 - 0x00007ffebba8e000 	C:\WINDOWS\System32\msvcrt.dll
260
+0x00007ffeba920000 - 0x00007ffeba9b7000 	C:\WINDOWS\System32\sechost.dll
261
+0x00007ffebc160000 - 0x00007ffebc280000 	C:\WINDOWS\System32\RPCRT4.dll
262
+0x00007ffeba9c0000 - 0x00007ffebab54000 	C:\WINDOWS\System32\USER32.dll
263
+0x00007ffeb9610000 - 0x00007ffeb9631000 	C:\WINDOWS\System32\win32u.dll
264
+0x00007ffebc2b0000 - 0x00007ffebc2d6000 	C:\WINDOWS\System32\GDI32.dll
265
+0x00007ffeb9640000 - 0x00007ffeb97d4000 	C:\WINDOWS\System32\gdi32full.dll
266
+0x00007ffeb9ac0000 - 0x00007ffeb9b5e000 	C:\WINDOWS\System32\msvcp_win.dll
267
+0x00007ffeb9510000 - 0x00007ffeb960a000 	C:\WINDOWS\System32\ucrtbase.dll
268
+0x00007ffeaec30000 - 0x00007ffeaeeb5000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.18362.720_none_e6beb5c51314836b\COMCTL32.dll
269
+0x00007ffebb650000 - 0x00007ffebb986000 	C:\WINDOWS\System32\combase.dll
270
+0x00007ffeb9b60000 - 0x00007ffeb9be0000 	C:\WINDOWS\System32\bcryptPrimitives.dll
271
+0x00007ffebc280000 - 0x00007ffebc2ae000 	C:\WINDOWS\System32\IMM32.DLL
272
+0x0000000054930000 - 0x0000000054a02000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\msvcr100.dll
273
+0x0000000054080000 - 0x0000000054922000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\server\jvm.dll
274
+0x00007ffebbfb0000 - 0x00007ffebbfb8000 	C:\WINDOWS\System32\PSAPI.DLL
275
+0x00007ffeb5b00000 - 0x00007ffeb5b24000 	C:\WINDOWS\SYSTEM32\WINMM.dll
276
+0x00007ffeb1f20000 - 0x00007ffeb1f29000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
277
+0x00007ffeb20b0000 - 0x00007ffeb20ba000 	C:\WINDOWS\SYSTEM32\VERSION.dll
278
+0x00007ffebc0f0000 - 0x00007ffebc15f000 	C:\WINDOWS\System32\WS2_32.dll
279
+0x00007ffeb5ad0000 - 0x00007ffeb5afd000 	C:\WINDOWS\SYSTEM32\winmmbase.dll
280
+0x00007ffeba360000 - 0x00007ffeba3aa000 	C:\WINDOWS\System32\cfgmgr32.dll
281
+0x0000000054070000 - 0x000000005407f000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\verify.dll
282
+0x0000000054040000 - 0x0000000054069000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\java.dll
283
+0x0000000053f30000 - 0x0000000053f53000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\instrument.dll
284
+0x0000000053f10000 - 0x0000000053f26000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\zip.dll
285
+0x00007ffebaf60000 - 0x00007ffebb645000 	C:\WINDOWS\System32\SHELL32.dll
286
+0x00007ffebbf00000 - 0x00007ffebbfa9000 	C:\WINDOWS\System32\shcore.dll
287
+0x00007ffeb9be0000 - 0x00007ffeba360000 	C:\WINDOWS\System32\windows.storage.dll
288
+0x00007ffeb9280000 - 0x00007ffeb92a3000 	C:\WINDOWS\System32\profapi.dll
289
+0x00007ffeb91f0000 - 0x00007ffeb923a000 	C:\WINDOWS\System32\powrprof.dll
290
+0x00007ffeb91e0000 - 0x00007ffeb91f0000 	C:\WINDOWS\System32\UMPDC.dll
291
+0x00007ffebc090000 - 0x00007ffebc0e2000 	C:\WINDOWS\System32\shlwapi.dll
292
+0x00007ffeb9260000 - 0x00007ffeb9271000 	C:\WINDOWS\System32\kernel.appcore.dll
293
+0x00007ffeba3b0000 - 0x00007ffeba3c7000 	C:\WINDOWS\System32\cryptsp.dll
294
+0x0000000053ef0000 - 0x0000000053f0a000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\net.dll
295
+0x00007ffeb8a20000 - 0x00007ffeb8a87000 	C:\WINDOWS\system32\mswsock.dll
296
+0x00007ffeb8590000 - 0x00007ffeb85c3000 	C:\WINDOWS\system32\rsaenh.dll
297
+0x00007ffeb9a90000 - 0x00007ffeb9ab6000 	C:\WINDOWS\System32\bcrypt.dll
298
+0x00007ffeb90d0000 - 0x00007ffeb90f5000 	C:\WINDOWS\SYSTEM32\USERENV.dll
299
+0x00007ffeb8bf0000 - 0x00007ffeb8bfc000 	C:\WINDOWS\SYSTEM32\CRYPTBASE.dll
300
+0x00007ffeb8730000 - 0x00007ffeb876a000 	C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL
301
+0x00007ffeba820000 - 0x00007ffeba828000 	C:\WINDOWS\System32\NSI.dll
302
+0x00007ffeb4b90000 - 0x00007ffeb4ba6000 	C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL
303
+0x00007ffeb4ab0000 - 0x00007ffeb4acc000 	C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL
304
+0x00007ffeb8770000 - 0x00007ffeb883a000 	C:\WINDOWS\SYSTEM32\DNSAPI.dll
305
+0x0000000053ec0000 - 0x0000000053ed1000 	C:\Program Files\Java\jdk1.8.0_181\jre\bin\nio.dll
306
+0x00007ffeb4fb0000 - 0x00007ffeb4fba000 	C:\Users\gusy\AppData\Local\Temp\jansi-1.17.1-290790608197472631.dll
307
+0x00007ffeb1f30000 - 0x00007ffeb1f3a000 	C:\Users\gusy\AppData\Local\Temp\jansi-1.17.1-4597849990247348837.dll
308
+
309
+VM Arguments:
310
+jvm_args: -Dmaven.multiModuleProjectDirectory=D:\workspace\idea\2020\estateagents -Dmaven.home=D:\software\maven\apache-maven-3.6.3 -Dclassworlds.conf=D:\software\maven\apache-maven-3.6.3\bin\m2.conf -Dmaven.ext.class.path=D:\软件安装区\IntelliJ IDEA 2019.3.3\plugins\maven\lib\maven-event-listener.jar -javaagent:D:\软件安装区\IntelliJ IDEA 2019.3.3\lib\idea_rt.jar=53936:D:\软件安装区\IntelliJ IDEA 2019.3.3\bin -Dfile.encoding=UTF-8 
311
+java_command: org.codehaus.classworlds.Launcher -Didea.version2019.3.3 -s D:\software\maven\apache-maven-3.6.3\conf\settings.xml -Dmaven.repo.local=D:\software\maven\apache-maven-3.6.3\maven-rep -DskipTests=true compile -P blue
312
+java_class_path (initial): D:\software\maven\apache-maven-3.6.3\boot\plexus-classworlds-2.6.0.jar;D:\software\maven\apache-maven-3.6.3\boot\plexus-classworlds.license;D:\软件安装区\IntelliJ IDEA 2019.3.3\lib\idea_rt.jar
313
+Launcher Type: SUN_STANDARD
314
+
315
+Environment Variables:
316
+JAVA_HOME=C:\Program Files\Java\jdk1.8.0_181
317
+CLASSPATH=.;C:\Program Files\Java\jdk1.8.0_181\lib\dt.jar;C:\Program Files\Java\jdk1.8.0_181\lib\tools.jar;D:\software\ant\apache-ant-1.10.7\lib
318
+PATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\TortoiseGit\bin;C:\Program Files\Java\jdk1.8.0_181\bin;D:\software\ant\apache-ant-1.10.7\bin;C:\Users\gusy\AppData\Local\Yarn\bin;C:\Program Files\nodejs\;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Users\gusy\AppData\Local\Microsoft\WindowsApps;;D:\软件安装区\Microsoft VS Code\bin;C:\Users\gusy\AppData\Roaming\npm
319
+USERNAME=gusy
320
+OS=Windows_NT
321
+PROCESSOR_IDENTIFIER=AMD64 Family 23 Model 8 Stepping 2, AuthenticAMD
322
+
323
+
324
+
325
+---------------  S Y S T E M  ---------------
326
+
327
+OS: Windows 10.0 , 64 bit Build 18362 (10.0.18362.329)
328
+
329
+CPU:total 16 (initial active 16) (16 cores per cpu, 1 threads per core) family 23 model 8 stepping 2, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, mmxext, 3dnowpref, lzcnt, sse4a, tsc, tscinvbit, tscinv, bmi1
330
+
331
+Memory: 4k page, physical 8338388k(350444k free), swap 23987528k(3008k free)
332
+
333
+vm_info: Java HotSpot(TM) 64-Bit Server VM (25.181-b13) for windows-amd64 JRE (1.8.0_181-b13), built on Jul  7 2018 04:01:33 by "java_re" with MS VC++ 10.0 (VS2010)
334
+
335
+time: Sat Mar 28 14:51:40 2020
336
+elapsed time: 38 seconds (0d 0h 0m 38s)
337
+

+ 4130
- 0
replay_pid21432.log
File diff suppressed because it is too large
Vedi File


+ 6
- 1
src/main/java/com/huiju/estateagents/common/CommConstant.java Vedi File

@@ -905,7 +905,12 @@ public class CommConstant {
905 905
     /**
906 906
      * 人员类型---财务
907 907
      */
908
-    public static final String FINANCE = "finance";
908
+    public static final String CONTACT_FINANCE = "finance";
909
+
910
+    /**
911
+     * 人员类型---售前
912
+     */
913
+    public static final String CONTACT_PRESALE = "pre-sale";
909 914
 
910 915
     /**
911 916
      * 人员类型---销售

+ 31
- 0
src/main/java/com/huiju/estateagents/common/SMSUtils.java Vedi File

@@ -1,6 +1,9 @@
1 1
 package com.huiju.estateagents.common;
2 2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 4
 import com.huiju.estateagents.config.SMSProperties;
5
+import com.huiju.estateagents.entity.SysSmsSetting;
6
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
4 7
 import lombok.Data;
5 8
 import lombok.extern.slf4j.Slf4j;
6 9
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +24,9 @@ public class SMSUtils {
21 24
 
22 25
     Hashtable<String, Phone> allPhones;
23 26
 
27
+    @Autowired
28
+    SysSmsSettingMapper sysSmsSettingMapper;
29
+
24 30
     @Autowired
25 31
     public SMSUtils(SMSProperties properties) {
26 32
         smsProperties = properties;
@@ -146,6 +152,31 @@ public class SMSUtils {
146 152
         return true;
147 153
     }
148 154
 
155
+    public void sendMessage(String tel, List<String> params, String type) throws Exception {
156
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
157
+            throw new Exception("短信发送失败: 没有手机号或者短信模板");
158
+        }
159
+
160
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
161
+        query.eq("sms_type", type);
162
+        query.eq("status", CommConstant.STATUS_NORMAL);
163
+        query.last("limit 1");
164
+
165
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
166
+        if (null == smsSetting) {
167
+            throw new Exception("没有设置有效的【" + type + "】短信模板");
168
+        }
169
+
170
+        params.add("橙蕉"); // 短信签名
171
+        String[] paramArr = new String[params.size()];
172
+        params.toArray(paramArr);
173
+
174
+        boolean success = sendMessage(smsSetting.getTplCode(), tel, paramArr);
175
+        if (!success) {
176
+            throw new Exception("短信发送失败");
177
+        }
178
+    }
179
+
149 180
     @Data
150 181
     public static class Phone {
151 182
         String tel;

+ 2
- 6
src/main/java/com/huiju/estateagents/controller/TaOfficeContactController.java Vedi File

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
-import com.huiju.estateagents.common.CommConstant;
9
-import com.huiju.estateagents.common.DBUtils;
10
-import com.huiju.estateagents.common.DateUtils;
11
-import com.huiju.estateagents.common.StringUtils;
8
+import com.huiju.estateagents.common.*;
12 9
 import com.huiju.estateagents.entity.TaOfficeContact;
13 10
 import com.huiju.estateagents.service.ITaOfficeContactService;
14 11
 import org.slf4j.Logger;
@@ -40,7 +37,6 @@ public class TaOfficeContactController extends BaseController {
40 37
     @Autowired
41 38
     public DBUtils dbUtils;
42 39
 
43
-
44 40
     /**
45 41
      * 分页查询列表
46 42
      * @param pageNum
@@ -94,7 +90,7 @@ public class TaOfficeContactController extends BaseController {
94 90
             taOfficeContact.setStatus(2);   // 待跟进
95 91
             if (iTaOfficeContactService.save(taOfficeContact)){
96 92
                 responseBean.addSuccess(taOfficeContact);
97
-
93
+                iTaOfficeContactService.sendNotice(taOfficeContact);
98 94
             }else {
99 95
                 responseBean.addError("fail");
100 96
             }

+ 2
- 0
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Vedi File

@@ -269,9 +269,11 @@ public class TaRecommendCustomerController extends BaseController {
269 269
             // 2020-4-1 yansen realty_consultant 可能是 person_id, 可能是 user_id
270 270
 //            queryWrapper.eq("realty_consultant",person.getPersonId());
271 271
             queryWrapper.eq("org_id", person.getOrgId());   // 主要是为了走索引
272
+
272 273
             queryWrapper.nested(query -> query.eq("realty_consultant", person.getPersonId()).or().eq("realty_consultant", person.getUserId()));
273 274
             // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
274 275
             queryWrapper.gt("status", CommConstant.STATUS_UNACCALIMED);
276
+
275 277
             queryWrapper.orderByDesc("create_date");
276 278
             IPage<TaRecommendCustomer> result = taRecommendCustomerService.page(pg, queryWrapper);
277 279
             return ResponseBean.success(result);

+ 1
- 1
src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java Vedi File

@@ -93,7 +93,7 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
93 93
         taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
94 94
 
95 95
         // 3.判断是否从h5样例入口创建
96
-        if (taDrainage.getFromH5Sample() && taDrainage.getH5SampleId() != null) {
96
+        if (taDrainage.getFromH5Sample() != null && taDrainage.getFromH5Sample() && taDrainage.getH5SampleId() != null) {
97 97
 
98 98
             // 5.查询h5样例是否配置默认模板
99 99
             TaH5Sample taH5Sample = taH5SampleMapper.selectById(taDrainage.getH5SampleId());

+ 1
- 1
src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java Vedi File

@@ -77,7 +77,7 @@ public class AccessInterceptor implements HandlerInterceptor {
77 77
             "/api/fadd/",//所有的法大大回调放过
78 78
             "/api/third",
79 79
             "/api/third/redirect/",
80
-            "/api/official"
80
+            "/api/official/" // 官网接口
81 81
     };
82 82
 
83 83
     /*

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgAccountServiceImpl.java Vedi File

@@ -424,7 +424,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
424 424
     @Override
425 425
     public List<TaContact> selectSmsContactUser(){
426 426
         QueryWrapper<TaContact> taContactQueryWrapper = new QueryWrapper<>();
427
-        taContactQueryWrapper.eq("contact_Type", CommConstant.FINANCE);
427
+        taContactQueryWrapper.eq("contact_Type", CommConstant.CONTACT_FINANCE);
428 428
         taContactQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
429 429
         List<TaContact> taContacts = taContactMapper.selectList(taContactQueryWrapper);
430 430
         return taContacts;

+ 1
- 1
src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java Vedi File

@@ -306,7 +306,7 @@ public class TaContactController extends BaseController {
306 306
         ResponseBean responseBean = new ResponseBean();
307 307
         try {
308 308
             String replaceType = CommConstant.CONCAT_TYPE_PROMOTE;
309
-            if (contactType.equals(CommConstant.FINANCE)){
309
+            if (contactType.equals(CommConstant.CONTACT_FINANCE)){
310 310
                 replaceType = CommConstant.CONCAT_TYPE_FINANCE;
311 311
             }else if (contactType.equals(CommConstant.SELL)){
312 312
                 replaceType = CommConstant.SELL;

+ 1
- 0
src/main/java/com/huiju/estateagents/service/ITaOfficeContactService.java Vedi File

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
13 13
  */
14 14
 public interface ITaOfficeContactService extends IService<TaOfficeContact> {
15 15
 
16
+    void sendNotice(TaOfficeContact taOfficeContact);
16 17
 }

+ 40
- 0
src/main/java/com/huiju/estateagents/service/impl/TaOfficeContactServiceImpl.java Vedi File

@@ -1,11 +1,21 @@
1 1
 package com.huiju.estateagents.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.huiju.estateagents.common.CommConstant;
5
+import com.huiju.estateagents.common.SMSUtils;
6
+import com.huiju.estateagents.common.StringUtils;
3 7
 import com.huiju.estateagents.entity.TaOfficeContact;
4 8
 import com.huiju.estateagents.mapper.TaOfficeContactMapper;
9
+import com.huiju.estateagents.sample.entity.TaContact;
10
+import com.huiju.estateagents.sample.mapper.TaContactMapper;
5 11
 import com.huiju.estateagents.service.ITaOfficeContactService;
6 12
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13
+import org.springframework.beans.factory.annotation.Autowired;
7 14
 import org.springframework.stereotype.Service;
8 15
 
16
+import java.util.ArrayList;
17
+import java.util.List;
18
+
9 19
 /**
10 20
  * <p>
11 21
  * 联系咨询  服务实现类
@@ -17,4 +27,34 @@ import org.springframework.stereotype.Service;
17 27
 @Service
18 28
 public class TaOfficeContactServiceImpl extends ServiceImpl<TaOfficeContactMapper, TaOfficeContact> implements ITaOfficeContactService {
19 29
 
30
+    @Autowired
31
+    public SMSUtils smsUtils;
32
+
33
+    @Autowired
34
+    TaContactMapper taContactMapper;
35
+
36
+    @Override
37
+    public void sendNotice(TaOfficeContact taOfficeContact) {
38
+        List<String> params = new ArrayList<String>(){{
39
+            add(taOfficeContact.getName());
40
+            add(taOfficeContact.getPhone());
41
+            add(taOfficeContact.getCompany());
42
+        }};
43
+
44
+        QueryWrapper<TaContact> query = new QueryWrapper<>();
45
+        query.eq("contact_type", CommConstant.CONTACT_PRESALE);
46
+        query.eq("status", CommConstant.STATUS_NORMAL);
47
+
48
+        List<TaContact> taContacts = taContactMapper.selectList(query);
49
+        for (TaContact taContact : taContacts) {
50
+            String phone = taContact.getPhone();
51
+            if (!StringUtils.isEmpty(phone)) {
52
+                try {
53
+                    smsUtils.sendMessage(phone, params, "office-promotion");
54
+                } catch (Exception e) {
55
+                    e.printStackTrace();
56
+                }
57
+            }
58
+        }
59
+    }
20 60
 }

+ 47
- 78
src/main/resources/mapper/TaRecommendCustomerMapper.xml Vedi File

@@ -3,32 +3,32 @@
3 3
 <mapper namespace="com.huiju.estateagents.mapper.TaRecommendCustomerMapper">
4 4
     <select id="getMyCutsomerNum" resultType="int">
5 5
         SELECT
6
-        count(*) AS total
6
+            count(*) AS total
7 7
         FROM
8
-        ta_recommend_customer t
8
+            ta_recommend_customer t
9 9
         WHERE
10
-        t.recommend_person = #{personId}
11
-        AND t.status &gt; -1
10
+            t.recommend_person = #{personId}
11
+            AND t.status &gt; -1
12 12
     </select>
13 13
     <select id="getCustomerPersonId" resultType="java.lang.String">
14 14
         SELECT
15
-        person_id
16
-        FROM
17
-        ta_customer_person
18
-        WHERE
19
-        customer_id = #{customerId}
15
+	person_id
16
+FROM
17
+	ta_customer_person
18
+WHERE
19
+	customer_id = #{customerId}
20 20
     </select>
21 21
 
22 22
     <select id="getCustomerDetail" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
23
-        SELECT
24
-        a.*,
25
-        (select c.visit_time FROM ta_person_visit_record c where c.person_id = #{personId} ORDER BY c.visit_time asc LIMIT 1) as visitTime,
26
-        (SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE d.person_id= #{personId}) as duration
27
-        FROM
28
-        ta_recommend_customer a
29
-        LEFT JOIN ta_person_visit_record c ON a.person_id = c.person_id
30
-        where a.customer_id = #{customerId}
31
-        GROUP BY a.customer_id
23
+      SELECT
24
+	a.*,
25
+	(select c.visit_time FROM ta_person_visit_record c where c.person_id = #{personId} ORDER BY c.visit_time asc LIMIT 1) as visitTime,
26
+	(SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE d.person_id= #{personId}) as duration
27
+FROM
28
+	ta_recommend_customer a
29
+	LEFT JOIN ta_person_visit_record c ON a.person_id = c.person_id
30
+	where a.customer_id = #{customerId}
31
+	GROUP BY a.customer_id
32 32
     </select>
33 33
 
34 34
     <select id="getRecCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -86,19 +86,16 @@
86 86
         tc.channel_name as channelName
87 87
         FROM
88 88
         ta_person a
89
-        left join ta_channel_person tcp on a.person_id = tcp.person_id and tcp.status = 1
89
+        left join ta_channel_person tcp on a.person_id = tcp.person_id
90 90
         left join ta_channel tc on tc.channel_id = tcp.channel_id
91 91
         <where>
92 92
             a.person_type in ('estate agent', 'channel agent')
93 93
             and a.status >0
94 94
             <if test="name != null and name !=''">
95
-                and (a.nickname like concat('%', #{name}, '%') or  a.name like concat('%', #{name}, '%'))
95
+                and a.nickname = #{name}
96 96
             </if>
97 97
             <if test="tel != null and tel!=''">
98
-                and a.phone like concat('%', #{tel}, '%')
99
-            </if>
100
-            <if test="channelId != null and channelId != '' ">
101
-                and tc.channel_id = #{channelId}
98
+                and a.phone = #{tel}
102 99
             </if>
103 100
             <if test="orgId != null">
104 101
                 and a.org_id = #{orgId}
@@ -179,8 +176,8 @@
179 176
         <if test="orgId != null">
180 177
             and p.org_id = #{orgId}
181 178
         </if>
182
-        --         LEFT JOIN ta_person c on p.share_person_id = c.person_id
183
-        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
179
+--         LEFT JOIN ta_person c on p.share_person_id = c.person_id
180
+--         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
184 181
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
185 182
         LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
186 183
         LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
@@ -243,13 +240,13 @@
243 240
         order by a.create_date desc
244 241
     </select>
245 242
     <select id="getCustomerById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
246
-        SELECT
247
-        a.*,
248
-        b.name as consultantName
249
-        FROM
250
-        ta_recommend_customer a
251
-        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
252
-        WHERE a.customer_id = #{customerId}
243
+         SELECT
244
+	a.*,
245
+	b.name as consultantName
246
+FROM
247
+	ta_recommend_customer a
248
+	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
249
+	WHERE a.customer_id = #{customerId}
253 250
     </select>
254 251
 
255 252
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -309,9 +306,6 @@
309 306
             <if test="belongStatus == 0">
310 307
                 and (t.building_id = ''  OR t.building_id is null )
311 308
             </if>
312
-            <if test="belongStatus == 1">
313
-                and t.building_id is not null
314
-            </if>
315 309
         </where>
316 310
         order by t.create_date desc
317 311
     </select>
@@ -493,10 +487,10 @@
493 487
 
494 488
     <select id="getIndependentAgentsExport" resultType="com.huiju.estateagents.excel.AgentsRecommendCustomer">
495 489
         SELECT
496
-        ifnull( a.name, a.nickname) as nickname,
490
+        a.nickname as nickname,
497 491
         a.phone as phone,
498 492
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
499
-        '专业经纪人' as personType,
493
+        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
500 494
         tc.channel_name as channelName,
501 495
         (
502 496
         SELECT
@@ -513,11 +507,12 @@
513 507
         ta_recommend_customer tarc
514 508
         WHERE
515 509
         tarc.recommend_person = a.person_id
510
+        and tarc.status = 1
516 511
         and tarc.org_id = #{orgId}
517 512
         ) AS recommedCount
518 513
         FROM
519 514
         ta_person a
520
-        left join ta_channel_person tcp on a.person_id = tcp.person_id and tcp.status = 1
515
+        left join ta_channel_person tcp on a.person_id = tcp.person_id
521 516
         left join ta_channel tc on tc.channel_id = tcp.channel_id
522 517
         <where>
523 518
             ifnull(a.person_type, '') in ('channel agent', 'estate agent')
@@ -525,15 +520,6 @@
525 520
             <if test="orgId != null">
526 521
                 and a.org_id = #{orgId}
527 522
             </if>
528
-            <if test="name != null and name != ''">
529
-                and (a.nickname like concat('%', #{name}, '%') or  a.name like concat('%', #{name}, '%'))
530
-            </if>
531
-            <if test="tel != null and tel != null">
532
-                and a.phone like concat('%', #{tel}, '%')
533
-            </if>
534
-            <if test="channelId != null and channelId != ''">
535
-                and tc.channel_id = #{channelId}
536
-            </if>
537 523
 
538 524
         </where>
539 525
 
@@ -582,8 +568,8 @@
582 568
         IF( t.sex = 1, '男', IF ( t.sex = 2, '女', '未知' ) ) AS sex,
583 569
         t.create_date,
584 570
         concat( t.country, t.province ) AS province,
585
-        z.intention,
586
-        IF(t.building_id is null or t.building_id = '','否','是') AS belongStatus,
571
+        t.intention,
572
+        IF(t.building_id = null or t.building_id = '','否','是') AS belongStatus,
587 573
         IFNULL( t2.building_name, '暂无' ) AS buildingName,
588 574
         t5.scene_alias as sceneType,
589 575
         ifnull( t3.nickname, t3.NAME ) AS sharePersonName ,
@@ -598,7 +584,6 @@
598 584
         LEFT JOIN td_wx_dict t5 ON t4.scene_id = t5.scene_id
599 585
         LEFT JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
600 586
         person_id) t6 on t.person_id = t6.person_id
601
-        left join (select sum(ti.intention) as intention,ti.person_id From ta_person_intention_record ti where ti.org_id = #{orgId} group by ti.person_id) z on z.person_id = t.person_id
602 587
         WHERE
603 588
         t.`status` > 0
604 589
         AND t.verify_status = 1
@@ -640,10 +625,6 @@
640 625
         <if test="belongStatus == 0">
641 626
             and (t.building_id = ''  OR t.building_id is null )
642 627
         </if>
643
-        <if test="belongStatus == 1">
644
-            and t.building_id is not null
645
-        </if>
646
-        order by t.create_date desc
647 628
     </select>
648 629
     <!--    limit #{pageCode}, #{pageSize}-->
649 630
 
@@ -735,6 +716,9 @@
735 716
         LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
736 717
         LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
737 718
         left join ta_building t on a.building_id = t.building_id
719
+--         LEFT JOIN ta_person c ON p.share_person_id = c.person_id
720
+--         left join ta_building t on a.building_id = t.building_id
721
+--         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
738 722
         left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
739 723
         person_id) s on a.person_id = s.person_id
740 724
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id =
@@ -850,9 +834,9 @@
850 834
 
851 835
     <select id="getMyCustDetailById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
852 836
         SELECT
853
-        *
837
+            *
854 838
         FROM
855
-        ta_recommend_customer
839
+            ta_recommend_customer
856 840
         where customer_id = #{customerId}
857 841
     </select>
858 842
 
@@ -911,31 +895,16 @@
911 895
         order by s.report_date desc
912 896
     </select>
913 897
 
914
-    <select id="getCustomerByProjectOrOrg" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
915
-        SELECT
916
-        *
917
-        FROM
918
-        ta_recommend_customer t
919
-        WHERE
920
-        t.org_id = #{orgId}
921
-        AND t.person_id = #{personId}
922
-        ORDER BY
923
-        IF( t.building_id = #{buildingId}, 0, 1 ) ASC,
924
-        IF( ifnull( t.building_id, '' ) = '', 0, 1 ) ASC,
925
-        t.create_date ASC
926
-        LIMIT 1
927
-    </select>
928
-
929 898
     <select id="getConsultantCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
930 899
         SELECT
931
-        *
900
+            *
932 901
         FROM
933
-        ta_recommend_customer t
902
+            ta_recommend_customer t
934 903
         WHERE
935
-        t.org_id = #{orgId}
936
-        AND t.STATUS > 0
937
-        AND t.verify_status = 1
938
-        AND t.realty_consultant IN ( #{userId}, #{personId})
904
+            t.org_id = #{orgId}
905
+            AND t.STATUS > 0
906
+            AND t.verify_status = 1
907
+            AND t.realty_consultant IN ( #{userId}, #{personId})
939 908
     </select>
940 909
 
941 910
     <select id="checkCustomerBy" resultType="java.util.Map">

+ 0
- 1
src/main/resources/mapper/TaShareMapper.xml Vedi File

@@ -78,7 +78,6 @@
78 78
                 <if test="endDate != null and endDate != ''">
79 79
                     and  date_format(t.create_date,'%Y-%m-%d %H:%i:%S') &lt;= #{endDate}
80 80
                 </if>
81
-
82 81
             GROUP BY
83 82
                 t.share_person
84 83
             ORDER BY