From 3c00fb91eb2f617922730e7d0c56ea0e1ad373e0 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期二, 05 九月 2023 18:23:29 +0800
Subject: [PATCH] 新增数据接入接口
---
src/main/java/com/job/zsc/pojo/DustExceptionData.java | 16 +
src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java | 38 +++
hs_err_pid13764.log | 397 ++++++++++++++++++++++++++++++++++++
src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml | 42 +++
src/main/java/com/job/zsc/pojo/AuditInfo.java | 25 ++
src/main/java/com/job/zsc/controller/FugitiveDustController.java | 33 +++
src/main/java/com/job/zsc/service/FugitiveDustService.java | 11 +
src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java | 20 +
src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java | 27 ++
src/main/java/com/job/zsc/controller/dustAudit/audit | 0
10 files changed, 603 insertions(+), 6 deletions(-)
diff --git a/hs_err_pid13764.log b/hs_err_pid13764.log
new file mode 100644
index 0000000..600bd6f
--- /dev/null
+++ b/hs_err_pid13764.log
@@ -0,0 +1,397 @@
+#
+# A fatal error has been detected by the Java Runtime Environment:
+#
+# EXCEPTION_STACK_OVERFLOW (0xc00000fd) at pc=0x0000000062c45127, pid=13764, tid=0x00000000000069f4
+#
+# JRE version: Java(TM) SE Runtime Environment (8.0_251-b08) (build 1.8.0_251-b08)
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.251-b08 mixed mode windows-amd64 compressed oops)
+# Problematic frame:
+# V [jvm.dll+0x215127]
+#
+# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
+#
+# If you would like to submit a bug report, please visit:
+# http://bugreport.java.com/bugreport/crash.jsp
+#
+
+--------------- T H R E A D ---------------
+
+Current thread (0x0000000019c17800): JavaThread "HikariPool-1 connection adder" daemon [_thread_in_vm, id=27124, stack(0x000000001b5f0000,0x000000001b6f0000)]
+
+siginfo: ExceptionCode=0xc00000fd, ExceptionInformation=0x0000000000000001 0x000000001b6ec4c0
+
+Registers:
+RAX=0x000000001b6ec4c0, RBX=0x0000000000000004, RCX=0x0000000000003000, RDX=0x0000000000000006
+RSP=0x000000001b6ef4c0, RBP=0x0000000000000000, RSI=0x000000001b6ef4c0, RDI=0x0000000000000004
+R8 =0x0000000000000006, R9 =0x000000001ca183b0, R10=0x00000000176ce2f0, R11=0x000000001b5fa148
+R12=0x000000001ca183b0, R13=0x0000000019c17800, R14=0x000000001b6ef588, R15=0x00000000176ce2f0
+RIP=0x0000000062c45127, EFLAGS=0x0000000000010206
+
+Top of Stack: (sp=0x000000001b6ef4c0)
+0x000000001b6ef4c0: 0000b3edd6466fc0 0000000100006c48
+0x000000001b6ef4d0: 0000000019c17800 000000001ca183b0
+0x000000001b6ef4e0: 00000000ffffffff 0000000062c46057
+0x000000001b6ef4f0: 000000001b6ef5f0 00000000176ce2f0
+0x000000001b6ef500: 0000000019c17800 0000000062af1193
+0x000000001b6ef510: 000000001b6ef550 0000000019c17800
+0x000000001b6ef520: 000000001b6ef5e0 0000000019c17800
+0x000000001b6ef530: 00000000176ce2f0 0000000019c17800
+0x000000001b6ef540: 00000000033b3be0 0000000019c17800
+0x000000001b6ef550: 00000000176ce2f0 0000000019c17800
+0x000000001b6ef560: 00000000176ce2f0 0000000019c17800
+0x000000001b6ef570: 0000000000000001 00000000176ce2f0
+0x000000001b6ef580: 0000000019c17800 000000001c734b90
+0x000000001b6ef590: 0000000019c17800 0000000062af28fd
+0x000000001b6ef5a0: 000000001b6ef8a8 0000000100006c48
+0x000000001b6ef5b0: 0000000100006c48 0000000000bbb000
+
+Instructions: (pc=0x0000000062c45127)
+0x0000000062c45107: 48 89 6c 24 30 33 ed 66 90 e8 6b 5e 08 00 ff c3
+0x0000000062c45117: 48 63 c8 48 8b c6 48 0f af cf 48 ff c7 48 2b c1
+0x0000000062c45127: 89 28 48 63 c3 48 3b 05 f5 f8 59 00 7e db 48 8b
+0x0000000062c45137: 6c 24 30 48 8b 5c 24 38 48 8b 74 24 40 48 83 c4
+
+
+Register to memory mapping:
+
+RAX=0x000000001b6ec4c0 is pointing into the stack for thread: 0x0000000019c17800
+RBX=0x0000000000000004 is an unknown value
+RCX=0x0000000000003000 is an unknown value
+RDX=0x0000000000000006 is an unknown value
+RSP=0x000000001b6ef4c0 is pointing into the stack for thread: 0x0000000019c17800
+RBP=0x0000000000000000 is an unknown value
+RSI=0x000000001b6ef4c0 is pointing into the stack for thread: 0x0000000019c17800
+RDI=0x0000000000000004 is an unknown value
+R8 =0x0000000000000006 is an unknown value
+R9 =0x000000001ca183b0 is an unknown value
+R10={method} {0x00000000176ce2f8} 'run' '()V' in 'java/lang/Thread'
+R11=0x000000001b5fa148 is pointing into the stack for thread: 0x0000000019c17800
+R12=0x000000001ca183b0 is an unknown value
+R13=0x0000000019c17800 is a thread
+R14=0x000000001b6ef588 is pointing into the stack for thread: 0x0000000019c17800
+R15={method} {0x00000000176ce2f8} 'run' '()V' in 'java/lang/Thread'
+
+
+Stack: [0x000000001b5f0000,0x000000001b6f0000], sp=0x000000001b6ef4c0, free space=1021k
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+
+
+--------------- P R O C E S S ---------------
+
+Java Threads: ( => current thread )
+=>0x0000000019c17800 JavaThread "HikariPool-1 connection adder" daemon [_thread_in_vm, id=27124, stack(0x000000001b5f0000,0x000000001b6f0000)]
+ 0x0000000019c1e800 JavaThread "HikariPool-1 connection closer" daemon [_thread_blocked, id=11500, stack(0x0000000001160000,0x0000000001260000)]
+ 0x0000000019c1d800 JavaThread "HikariPool-1 housekeeper" daemon [_thread_blocked, id=30208, stack(0x000000001f5c0000,0x000000001f6c0000)]
+ 0x0000000019c1b800 JavaThread "DestroyJavaVM" [_thread_blocked, id=19656, stack(0x0000000002fe0000,0x00000000030e0000)]
+ 0x0000000019c17000 JavaThread "http-nio-8081-Acceptor" daemon [_thread_in_native, id=32528, stack(0x000000001ebc0000,0x000000001ecc0000)]
+ 0x0000000019c1c000 JavaThread "http-nio-8081-Poller" daemon [_thread_blocked, id=21280, stack(0x000000001eac0000,0x000000001ebc0000)]
+ 0x0000000019c1a800 JavaThread "http-nio-8081-exec-10" daemon [_thread_blocked, id=23936, stack(0x000000001e8c0000,0x000000001e9c0000)]
+ 0x0000000019c16000 JavaThread "http-nio-8081-exec-9" daemon [_thread_blocked, id=31076, stack(0x000000001e7c0000,0x000000001e8c0000)]
+ 0x0000000019c13000 JavaThread "http-nio-8081-exec-8" daemon [_thread_blocked, id=23800, stack(0x000000001e6c0000,0x000000001e7c0000)]
+ 0x0000000019c14000 JavaThread "http-nio-8081-exec-7" daemon [_thread_blocked, id=25752, stack(0x000000001e5c0000,0x000000001e6c0000)]
+ 0x0000000019c19000 JavaThread "http-nio-8081-exec-6" daemon [_thread_blocked, id=21020, stack(0x000000001e4c0000,0x000000001e5c0000)]
+ 0x0000000019c18800 JavaThread "http-nio-8081-exec-5" daemon [_thread_blocked, id=23392, stack(0x000000001e3c0000,0x000000001e4c0000)]
+ 0x0000000019c15800 JavaThread "http-nio-8081-exec-4" daemon [_thread_blocked, id=34640, stack(0x000000001e2c0000,0x000000001e3c0000)]
+ 0x0000000019c1a000 JavaThread "http-nio-8081-exec-3" daemon [_thread_blocked, id=20620, stack(0x000000001e1c0000,0x000000001e2c0000)]
+ 0x0000000019c14800 JavaThread "http-nio-8081-exec-2" daemon [_thread_blocked, id=20144, stack(0x000000001e0c0000,0x000000001e1c0000)]
+ 0x000000001c57b000 JavaThread "http-nio-8081-exec-1" daemon [_thread_blocked, id=31808, stack(0x000000001dfc0000,0x000000001e0c0000)]
+ 0x000000001c57a000 JavaThread "mysql-cj-abandoned-connection-cleanup" daemon [_thread_blocked, id=33288, stack(0x000000001d8c0000,0x000000001d9c0000)]
+ 0x000000001c57c800 JavaThread "container-0" [_thread_blocked, id=19248, stack(0x000000001d7c0000,0x000000001d8c0000)]
+ 0x000000001c57b800 JavaThread "Catalina-utility-2" [_thread_blocked, id=26212, stack(0x000000001d6c0000,0x000000001d7c0000)]
+ 0x000000001c57d000 JavaThread "Catalina-utility-1" [_thread_blocked, id=26960, stack(0x000000001b7f0000,0x000000001b8f0000)]
+ 0x000000001add7000 JavaThread "RMI Scheduler(0)" daemon [_thread_blocked, id=29792, stack(0x000000001b6f0000,0x000000001b7f0000)]
+ 0x000000001a9c6800 JavaThread "RMI TCP Accept-0" daemon [_thread_in_native, id=23572, stack(0x000000001aff0000,0x000000001b0f0000)]
+ 0x0000000019dad800 JavaThread "Service Thread" daemon [_thread_blocked, id=6428, stack(0x000000001a400000,0x000000001a500000)]
+ 0x0000000019d0f800 JavaThread "C1 CompilerThread2" daemon [_thread_blocked, id=20288, stack(0x000000001a300000,0x000000001a400000)]
+ 0x0000000019d0c800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=3956, stack(0x000000001a200000,0x000000001a300000)]
+ 0x0000000019d0b000 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=20944, stack(0x000000001a100000,0x000000001a200000)]
+ 0x0000000019ce6800 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=25896, stack(0x000000001a000000,0x000000001a100000)]
+ 0x0000000019a0a800 JavaThread "Attach Listener" daemon [_thread_blocked, id=19256, stack(0x0000000019f00000,0x000000001a000000)]
+ 0x0000000019a56800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=23928, stack(0x0000000019e00000,0x0000000019f00000)]
+ 0x000000000339a000 JavaThread "Finalizer" daemon [_thread_blocked, id=788, stack(0x0000000019900000,0x0000000019a00000)]
+ 0x000000001806b800 JavaThread "Reference Handler" daemon [_thread_blocked, id=22044, stack(0x0000000019800000,0x0000000019900000)]
+
+Other Threads:
+ 0x0000000018047800 VMThread [stack: 0x0000000019700000,0x0000000019800000] [id=8292]
+ 0x000000001a9d1000 WatcherThread [stack: 0x000000001b0f0000,0x000000001b1f0000] [id=24424]
+
+VM state:synchronizing (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
+[0x00000000032a3dc0] Threads_lock - owner thread: 0x0000000018047800
+
+heap address: 0x0000000082800000, size: 2008 MB, Compressed Oops mode: 32-bit
+Narrow klass base: 0x0000000000000000, Narrow klass shift: 3
+Compressed class space size: 1073741824 Address: 0x0000000100000000
+
+Heap:
+ PSYoungGen total 245760K, used 74402K [0x00000000d6300000, 0x00000000ea600000, 0x0000000100000000)
+ eden space 232448K, 31% used [0x00000000d6300000,0x00000000daa9ed68,0x00000000e4600000)
+ from space 13312K, 7% used [0x00000000e4600000,0x00000000e4709ae0,0x00000000e5300000)
+ to space 12800K, 0% used [0x00000000e9980000,0x00000000e9980000,0x00000000ea600000)
+ ParOldGen total 71680K, used 20755K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c44d68,0x0000000086e00000)
+ Metaspace used 45182K, capacity 48103K, committed 48256K, reserved 1091584K
+ class space used 5721K, capacity 6266K, committed 6272K, reserved 1048576K
+
+Card table byte_map: [0x0000000012760000,0x0000000012b50000] byte_map_base: 0x000000001234c000
+
+Marking Bits: (ParMarkBitMap*) 0x000000006325af90
+ Begin Bits: [0x00000000133f0000, 0x0000000015350000)
+ End Bits: [0x0000000015350000, 0x00000000172b0000)
+
+Polling page: 0x0000000000d60000
+
+CodeCache: size=245760Kb used=14669Kb max_used=14669Kb free=231090Kb
+ bounds [0x00000000033a0000, 0x0000000004200000, 0x00000000123a0000]
+ total_blobs=8101 nmethods=7555 adapters=458
+ compilation: enabled
+
+Compilation events (10 events):
+Event: 5363.600 Thread 0x0000000019d0f800 7661 1 java.security.AlgorithmParametersSpi::<init> (5 bytes)
+Event: 5363.600 Thread 0x0000000019d0f800 nmethod 7661 0x00000000041f4590 code [0x00000000041f46e0, 0x00000000041f47f0]
+Event: 5363.600 Thread 0x0000000019d0f800 7660 1 sun.security.ssl.SSLSocketImpl::initHandshaker (260 bytes)
+Event: 5363.606 Thread 0x0000000019d0f800 nmethod 7660 0x00000000041f4850 code [0x00000000041f49e0, 0x00000000041f4ec8]
+Event: 5363.606 Thread 0x0000000019d0f800 7663 1 javax.crypto.spec.SecretKeySpec::<init> (54 bytes)
+Event: 5363.607 Thread 0x0000000019d0f800 nmethod 7663 0x00000000041f5090 code [0x00000000041f5220, 0x00000000041f5528]
+Event: 5363.607 Thread 0x0000000019d0f800 7662 1 sun.security.ssl.HandshakeInStream::digestNow (8 bytes)
+Event: 5363.608 Thread 0x0000000019d0f800 nmethod 7662 0x00000000041f56d0 code [0x00000000041f5820, 0x00000000041f5968]
+Event: 5363.608 Thread 0x0000000019d0f800 7664 1 com.mysql.cj.protocol.a.NativeProtocol::versionMeetsMinimum (21 bytes)
+Event: 5363.612 Thread 0x0000000019d0f800 nmethod 7664 0x00000000041f5a10 code [0x00000000041f5b80, 0x00000000041f5d78]
+
+GC Heap History (10 events):
+Event: 231.996 GC heap before
+{Heap before GC invocations=13 (full 2):
+ PSYoungGen total 128000K, used 127645K [0x00000000d6300000, 0x00000000df000000, 0x0000000100000000)
+ eden space 117248K, 100% used [0x00000000d6300000,0x00000000dd580000,0x00000000dd580000)
+ from space 10752K, 96% used [0x00000000de580000,0x00000000defa7730,0x00000000df000000)
+ to space 12288K, 0% used [0x00000000dd800000,0x00000000dd800000,0x00000000de400000)
+ ParOldGen total 71680K, used 13180K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 18% used [0x0000000082800000,0x00000000834df138,0x0000000086e00000)
+ Metaspace used 44934K, capacity 47715K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+Event: 232.049 GC heap after
+Heap after GC invocations=13 (full 2):
+ PSYoungGen total 132096K, used 4096K [0x00000000d6300000, 0x00000000e2300000, 0x0000000100000000)
+ eden space 119808K, 0% used [0x00000000d6300000,0x00000000d6300000,0x00000000dd800000)
+ from space 12288K, 33% used [0x00000000dd800000,0x00000000ddc00030,0x00000000de400000)
+ to space 12288K, 0% used [0x00000000e1700000,0x00000000e1700000,0x00000000e2300000)
+ ParOldGen total 71680K, used 18187K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 25% used [0x0000000082800000,0x00000000839c2dd8,0x0000000086e00000)
+ Metaspace used 44934K, capacity 47715K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+}
+Event: 596.955 GC heap before
+{Heap before GC invocations=14 (full 2):
+ PSYoungGen total 132096K, used 123904K [0x00000000d6300000, 0x00000000e2300000, 0x0000000100000000)
+ eden space 119808K, 100% used [0x00000000d6300000,0x00000000dd800000,0x00000000dd800000)
+ from space 12288K, 33% used [0x00000000dd800000,0x00000000ddc00030,0x00000000de400000)
+ to space 12288K, 0% used [0x00000000e1700000,0x00000000e1700000,0x00000000e2300000)
+ ParOldGen total 71680K, used 18187K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 25% used [0x0000000082800000,0x00000000839c2dd8,0x0000000086e00000)
+ Metaspace used 44959K, capacity 47779K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+Event: 597.062 GC heap after
+Heap after GC invocations=14 (full 2):
+ PSYoungGen total 183808K, used 256K [0x00000000d6300000, 0x00000000e2400000, 0x0000000100000000)
+ eden space 171520K, 0% used [0x00000000d6300000,0x00000000d6300000,0x00000000e0a80000)
+ from space 12288K, 2% used [0x00000000e1700000,0x00000000e1740000,0x00000000e2300000)
+ to space 12800K, 0% used [0x00000000e0a80000,0x00000000e0a80000,0x00000000e1700000)
+ ParOldGen total 71680K, used 20667K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c2ed68,0x0000000086e00000)
+ Metaspace used 44959K, capacity 47779K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+}
+Event: 797.267 GC heap before
+{Heap before GC invocations=15 (full 2):
+ PSYoungGen total 183808K, used 171776K [0x00000000d6300000, 0x00000000e2400000, 0x0000000100000000)
+ eden space 171520K, 100% used [0x00000000d6300000,0x00000000e0a80000,0x00000000e0a80000)
+ from space 12288K, 2% used [0x00000000e1700000,0x00000000e1740000,0x00000000e2300000)
+ to space 12800K, 0% used [0x00000000e0a80000,0x00000000e0a80000,0x00000000e1700000)
+ ParOldGen total 71680K, used 20667K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c2ed68,0x0000000086e00000)
+ Metaspace used 44969K, capacity 47779K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+Event: 797.288 GC heap after
+Heap after GC invocations=15 (full 2):
+ PSYoungGen total 184320K, used 224K [0x00000000d6300000, 0x00000000e6580000, 0x0000000100000000)
+ eden space 171520K, 0% used [0x00000000d6300000,0x00000000d6300000,0x00000000e0a80000)
+ from space 12800K, 1% used [0x00000000e0a80000,0x00000000e0ab8000,0x00000000e1700000)
+ to space 12800K, 0% used [0x00000000e5900000,0x00000000e5900000,0x00000000e6580000)
+ ParOldGen total 71680K, used 20707K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c38d68,0x0000000086e00000)
+ Metaspace used 44969K, capacity 47779K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+}
+Event: 1159.330 GC heap before
+{Heap before GC invocations=16 (full 2):
+ PSYoungGen total 184320K, used 171744K [0x00000000d6300000, 0x00000000e6580000, 0x0000000100000000)
+ eden space 171520K, 100% used [0x00000000d6300000,0x00000000e0a80000,0x00000000e0a80000)
+ from space 12800K, 1% used [0x00000000e0a80000,0x00000000e0ab8000,0x00000000e1700000)
+ to space 12800K, 0% used [0x00000000e5900000,0x00000000e5900000,0x00000000e6580000)
+ ParOldGen total 71680K, used 20707K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c38d68,0x0000000086e00000)
+ Metaspace used 44972K, capacity 47779K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+Event: 1159.359 GC heap after
+Heap after GC invocations=16 (full 2):
+ PSYoungGen total 239616K, used 288K [0x00000000d6300000, 0x00000000e6000000, 0x0000000100000000)
+ eden space 232448K, 0% used [0x00000000d6300000,0x00000000d6300000,0x00000000e4600000)
+ from space 7168K, 4% used [0x00000000e5900000,0x00000000e5948000,0x00000000e6000000)
+ to space 13312K, 0% used [0x00000000e4600000,0x00000000e4600000,0x00000000e5300000)
+ ParOldGen total 71680K, used 20739K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c40d68,0x0000000086e00000)
+ Metaspace used 44972K, capacity 47779K, committed 48000K, reserved 1091584K
+ class space used 5701K, capacity 6232K, committed 6272K, reserved 1048576K
+}
+Event: 2661.073 GC heap before
+{Heap before GC invocations=17 (full 2):
+ PSYoungGen total 239616K, used 232736K [0x00000000d6300000, 0x00000000e6000000, 0x0000000100000000)
+ eden space 232448K, 100% used [0x00000000d6300000,0x00000000e4600000,0x00000000e4600000)
+ from space 7168K, 4% used [0x00000000e5900000,0x00000000e5948000,0x00000000e6000000)
+ to space 13312K, 0% used [0x00000000e4600000,0x00000000e4600000,0x00000000e5300000)
+ ParOldGen total 71680K, used 20739K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c40d68,0x0000000086e00000)
+ Metaspace used 45084K, capacity 47919K, committed 48000K, reserved 1091584K
+ class space used 5708K, capacity 6246K, committed 6272K, reserved 1048576K
+Event: 2661.196 GC heap after
+Heap after GC invocations=17 (full 2):
+ PSYoungGen total 245760K, used 1062K [0x00000000d6300000, 0x00000000ea600000, 0x0000000100000000)
+ eden space 232448K, 0% used [0x00000000d6300000,0x00000000d6300000,0x00000000e4600000)
+ from space 13312K, 7% used [0x00000000e4600000,0x00000000e4709ae0,0x00000000e5300000)
+ to space 12800K, 0% used [0x00000000e9980000,0x00000000e9980000,0x00000000ea600000)
+ ParOldGen total 71680K, used 20755K [0x0000000082800000, 0x0000000086e00000, 0x00000000d6300000)
+ object space 71680K, 28% used [0x0000000082800000,0x0000000083c44d68,0x0000000086e00000)
+ Metaspace used 45084K, capacity 47919K, committed 48000K, reserved 1091584K
+ class space used 5708K, capacity 6246K, committed 6272K, reserved 1048576K
+}
+
+Deoptimization events (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (10 events):
+Event: 17.107 Thread 0x000000001c57b000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d7845720) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 17.110 Thread 0x000000001c57b000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d789cf10) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 17.114 Thread 0x000000001c57b000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d7903eb0) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 17.114 Thread 0x000000001c57b000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d7906488) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 17.114 Thread 0x000000001c57b000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d7908788) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 50.763 Thread 0x0000000019c14800 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d7b390c8) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 50.809 Thread 0x0000000019c1a000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d7d21a60) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 50.899 Thread 0x0000000019c18800 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d7f0c118) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 3502.619 Thread 0x0000000019c19000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d9277ce0) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 3550.783 Thread 0x0000000019c14000 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x00000000d98dafb0) thrown at [C:\jenkins\workspace\8-2-build-windows-amd64-cygwin\jdk8u251\737\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+
+Events (10 events):
+Event: 5363.575 Thread 0x0000000019c17800 Thread added: 0x0000000019c17800
+Event: 5368.608 Executing VM operation: RevokeBias
+Event: 5368.639 Executing VM operation: RevokeBias done
+Event: 5368.639 Executing VM operation: RevokeBias
+Event: 5368.640 Executing VM operation: RevokeBias done
+Event: 5368.640 Thread 0x0000000019c1e800 Thread exited: 0x0000000019c1e800
+Event: 5368.640 Thread 0x0000000019c17800 Thread exited: 0x0000000019c17800
+Event: 5368.952 Thread 0x0000000019c1e800 Thread added: 0x0000000019c1e800
+Event: 5368.964 Thread 0x0000000019c17800 Thread added: 0x0000000019c17800
+Event: 5369.135 Executing VM operation: RevokeBias
+
+
+Dynamic libraries:
+0x00007ff761ca0000 - 0x00007ff761cd7000 E:\ruanjian\JDK-1.8\bin\java.exe
+0x00007ff981410000 - 0x00007ff981608000 C:\Windows\SYSTEM32\ntdll.dll
+0x00007ff97f4d0000 - 0x00007ff97f58f000 C:\Windows\System32\KERNEL32.DLL
+0x00007ff97eeb0000 - 0x00007ff97f1a6000 C:\Windows\System32\KERNELBASE.dll
+0x00007ff980e30000 - 0x00007ff980edf000 C:\Windows\System32\ADVAPI32.dll
+0x00007ff981280000 - 0x00007ff98131e000 C:\Windows\System32\msvcrt.dll
+0x00007ff9802e0000 - 0x00007ff98037c000 C:\Windows\System32\sechost.dll
+0x00007ff97f770000 - 0x00007ff97f896000 C:\Windows\System32\RPCRT4.dll
+0x00007ff981080000 - 0x00007ff98121d000 C:\Windows\System32\USER32.dll
+0x00007ff97e9f0000 - 0x00007ff97ea12000 C:\Windows\System32\win32u.dll
+0x00007ff980380000 - 0x00007ff9803ac000 C:\Windows\System32\GDI32.dll
+0x00007ff97eaf0000 - 0x00007ff97ec05000 C:\Windows\System32\gdi32full.dll
+0x00007ff97e8e0000 - 0x00007ff97e97d000 C:\Windows\System32\msvcp_win.dll
+0x00007ff97ec10000 - 0x00007ff97ed10000 C:\Windows\System32\ucrtbase.dll
+0x00007ff95bde0000 - 0x00007ff95c07a000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
+0x00007ff981330000 - 0x00007ff981360000 C:\Windows\System32\IMM32.DLL
+0x00000000632e0000 - 0x00000000633b2000 E:\ruanjian\JDK-1.8\jre\bin\msvcr100.dll
+0x0000000062a30000 - 0x00000000632db000 E:\ruanjian\JDK-1.8\jre\bin\server\jvm.dll
+0x00007ff9813c0000 - 0x00007ff9813c8000 C:\Windows\System32\PSAPI.DLL
+0x00007ff967ae0000 - 0x00007ff967ae9000 C:\Windows\SYSTEM32\WSOCK32.dll
+0x00007ff967a80000 - 0x00007ff967aa7000 C:\Windows\SYSTEM32\WINMM.dll
+0x00007ff9781e0000 - 0x00007ff9781ea000 C:\Windows\SYSTEM32\VERSION.dll
+0x00007ff981010000 - 0x00007ff98107b000 C:\Windows\System32\WS2_32.dll
+0x00007ff96b050000 - 0x00007ff96b05f000 E:\ruanjian\JDK-1.8\jre\bin\verify.dll
+0x00007ff959f20000 - 0x00007ff959f49000 E:\ruanjian\JDK-1.8\jre\bin\java.dll
+0x00007ff96d590000 - 0x00007ff96d5b3000 E:\ruanjian\JDK-1.8\jre\bin\instrument.dll
+0x00007ff95dd00000 - 0x00007ff95dd16000 E:\ruanjian\JDK-1.8\jre\bin\zip.dll
+0x00007ff97fa50000 - 0x00007ff980194000 C:\Windows\System32\SHELL32.dll
+0x00007ff97c9a0000 - 0x00007ff97d133000 C:\Windows\SYSTEM32\windows.storage.dll
+0x00007ff9803b0000 - 0x00007ff980704000 C:\Windows\System32\combase.dll
+0x00007ff97e1b0000 - 0x00007ff97e1de000 C:\Windows\SYSTEM32\Wldp.dll
+0x00007ff97f8a0000 - 0x00007ff97f94d000 C:\Windows\System32\SHCORE.dll
+0x00007ff9801a0000 - 0x00007ff9801f5000 C:\Windows\System32\shlwapi.dll
+0x00007ff97e6c0000 - 0x00007ff97e6df000 C:\Windows\SYSTEM32\profapi.dll
+0x00007ff977390000 - 0x00007ff9773aa000 E:\ruanjian\IntelliJ IDEA 2022.2.2\bin\breakgen64.dll
+0x00007ff959c40000 - 0x00007ff959c5a000 E:\ruanjian\JDK-1.8\jre\bin\net.dll
+0x00007ff97dea0000 - 0x00007ff97df0a000 C:\Windows\system32\mswsock.dll
+0x00007ff97dbd0000 - 0x00007ff97dc9a000 C:\Windows\SYSTEM32\DNSAPI.dll
+0x00007ff97db90000 - 0x00007ff97dbcc000 C:\Windows\SYSTEM32\IPHLPAPI.DLL
+0x00007ff981320000 - 0x00007ff981328000 C:\Windows\System32\NSI.dll
+0x00007ff976ab0000 - 0x00007ff976aba000 C:\Windows\System32\rasadhlp.dll
+0x00007ff96e200000 - 0x00007ff96e30e000 C:\Windows\SSLVPNRedirector64.dll
+0x00007ff980bb0000 - 0x00007ff980c7d000 C:\Windows\System32\OLEAUT32.dll
+0x00007ff974dc0000 - 0x00007ff974e26000 C:\Windows\SYSTEM32\OLEACC.dll
+0x00007ff96e160000 - 0x00007ff96e1fd000 C:\Windows\SYSTEM32\WINSPOOL.DRV
+0x00007ff974b00000 - 0x00007ff974b17000 C:\Windows\SYSTEM32\dhcpcsvc6.DLL
+0x00007ff976830000 - 0x00007ff97684d000 C:\Windows\SYSTEM32\dhcpcsvc.DLL
+0x00007ff975790000 - 0x00007ff975812000 C:\Windows\System32\fwpuclnt.dll
+0x00007ff97f1b0000 - 0x00007ff97f1d7000 C:\Windows\System32\bcrypt.dll
+0x00007ff963ed0000 - 0x00007ff963edd000 E:\ruanjian\JDK-1.8\jre\bin\management.dll
+0x00007ff9564f0000 - 0x00007ff956502000 E:\ruanjian\JDK-1.8\jre\bin\nio.dll
+0x00007ff97e090000 - 0x00007ff97e0a8000 C:\Windows\SYSTEM32\CRYPTSP.dll
+0x00007ff97d7c0000 - 0x00007ff97d7f4000 C:\Windows\system32\rsaenh.dll
+0x00007ff97e680000 - 0x00007ff97e6ae000 C:\Windows\SYSTEM32\USERENV.dll
+0x00007ff97ed10000 - 0x00007ff97ed92000 C:\Windows\System32\bcryptprimitives.dll
+0x00007ff97e0b0000 - 0x00007ff97e0bc000 C:\Windows\SYSTEM32\CRYPTBASE.dll
+0x00007ff964100000 - 0x00007ff964117000 C:\Windows\system32\napinsp.dll
+0x00007ff963db0000 - 0x00007ff963dcb000 C:\Windows\system32\pnrpnsp.dll
+0x00007ff979b00000 - 0x00007ff979b15000 C:\Windows\system32\wshbth.dll
+0x00007ff97a2b0000 - 0x00007ff97a2cd000 C:\Windows\system32\NLAapi.dll
+0x00007ff963d90000 - 0x00007ff963da2000 C:\Windows\System32\winrnr.dll
+0x00007ff96c170000 - 0x00007ff96c194000 E:\ruanjian\JDK-1.8\jre\bin\sunec.dll
+0x00007ff97a300000 - 0x00007ff97a30c000 E:\ruanjian\JDK-1.8\jre\bin\sunmscapi.dll
+0x00007ff97e780000 - 0x00007ff97e8de000 C:\Windows\System32\CRYPT32.dll
+0x00007ff97e220000 - 0x00007ff97e248000 C:\Windows\SYSTEM32\ncrypt.dll
+0x00007ff97e1e0000 - 0x00007ff97e21b000 C:\Windows\SYSTEM32\NTASN1.dll
+0x00007ff96cca0000 - 0x00007ff96ce84000 C:\Windows\SYSTEM32\dbghelp.dll
+
+VM Arguments:
+jvm_args: -XX:TieredStopAtLevel=1 -Xverify:none -Dspring.output.ansi.enabled=always -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -javaagent:E:\ruanjian\IntelliJ IDEA 2022.2.2\lib\idea_rt.jar=60341:E:\ruanjian\IntelliJ IDEA 2022.2.2\bin -Dfile.encoding=UTF-8
+java_command: com.job.zsc.QianduanApplication
+java_class_path (initial): E:\ruanjian\JDK-1.8\jre\lib\charsets.jar;E:\ruanjian\JDK-1.8\jre\lib\deploy.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\access-bridge-64.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\cldrdata.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\dnsns.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\jaccess.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\jfxrt.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\localedata.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\nashorn.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunec.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunjce_provider.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunmscapi.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\sunpkcs11.jar;E:\ruanjian\JDK-1.8\jre\lib\ext\zipfs.jar;E:\ruanjian\JDK-1.8\jre\lib\javaws.jar;E:\ruanjian\JDK-1.8\jre\lib\jce.jar;E:\ruanjian\JDK-1.8\jre\lib\jfr.jar;E:\ruanjian\JDK-1.8\jre\lib\jfxswt.jar;E:\ruanjian\JDK-1.8\jre\lib\jsse.jar;E:\ruanjian\JDK-1.8\jre\lib\management-agent.jar;E:\ruanjian\JDK-1.8\jre\lib\plugin.jar;E:\ruanjian\JDK-1.8\jre\lib\resources.jar;E:\ruanjian\JDK-1.8\jre\lib\rt.jar;D:\z\workplace\qianduan\target\classes;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-starter-web\2.5.15\spring-boot-starter-web-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-starter\2.5.15\spring-boot-starter-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot\2.5.15\spring-boot-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-autoconfigure\2.5.15\spring-boot-autoconfigure-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\org\springframework\boot\spring-boot-starter-logging\2.5.15\spring-boot-starter-logging-2.5.15.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\ch\qos\logback\logback-classic\1.2.12\logback-classic-1.2.12.jar;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\mvn_repo\ch\qos\logback\logback-core\1.2.12\logback-core-1.2.12.jar;E:\ruanjian\maven-3.9.2\apache-m
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+JAVA_HOME=E:\ruanjian\JDK-1.8
+PATH=C:\Program Files (x86)\Common Files\Oracle\Java\javapath;E:\ruanjian\Python\Scripts\;E:\ruanjian\Python\;E:\ruanjian\JDK-1.8\bin;E:\ruanjian\maven-3.9.2\apache-maven-3.9.2\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;E:\ruanjian\NodeJs\;E:\ruanjian\MySql\mysql-8.0.33-winx64\bin\;E:\ruanjian\Git\cmd;E:\ruanjian\Python\Scripts;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;;E:\ruanjian\IntelliJ IDEA 2022.2.2\bin;;C:\Users\Administrator\AppData\Roaming\npm;E:\ruanjian\VsCode\Microsoft VS Code\bin;E:\ruanjian\qudongjinning\DriverGenius;E:\ruanjian\qudongjinning\DriverGenius\ksoft
+USERNAME=Administrator
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 10, GenuineIntel
+
+
+
+--------------- S Y S T E M ---------------
+
+OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.3031)
+
+CPU:total 6 (initial active 6) (6 cores per cpu, 1 threads per core) family 6 model 158 stepping 10, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, tsc, tscinvbit, bmi1, bmi2, adx
+
+Memory: 4k page, physical 8219024k(1225892k free), swap 23748536k(1066908k free)
+
+vm_info: Java HotSpot(TM) 64-Bit Server VM (25.251-b08) for windows-amd64 JRE (1.8.0_251-b08), built on Mar 12 2020 06:31:49 by "" with MS VC++ 10.0 (VS2010)
+
+time: Fri Sep 01 16:09:54 2023
+timezone: 中国标准时间
+elapsed time: 5369 seconds (0d 1h 29m 29s)
+
diff --git a/src/main/java/com/job/zsc/controller/FugitiveDustController.java b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
index ef0ce13..9cd105f 100644
--- a/src/main/java/com/job/zsc/controller/FugitiveDustController.java
+++ b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
@@ -112,10 +112,43 @@
}
// 杩斿洖寮傚父鐨勫簵閾烘�绘暟
+
@GetMapping("/exceptionsitenum")
public Result exceptionSiteNum(){
List<DustExceptionData> list = fugitiveDustService.exceptionSiteNum();
return Result.success(list);
}
+ /*鏂板瀹¤鍐呭*/
+ @PostMapping("/audit")
+ public Result addAuditNotes(@RequestBody AuditInfo auditInfo){
+ fugitiveDustService.addAuditNotes(auditInfo);
+ return Result.success();
+ }
+ /*杩斿洖瀹℃牳琛ㄦ墍鏈夋暟鎹�*/
+ @PostMapping("/auditAllData")
+ public Result getAuditAllData(){
+ List<AuditInfo> list = fugitiveDustService.getAuditAllData();
+ return Result.success(list);
+ }
+
+ /*鏇存柊寮傚父琛ㄦ牸*/
+ @PutMapping("/auditUpdate")
+ public Result getAuditAllData(@RequestBody AuditInfo auditInfo){
+ fugitiveDustService.update(auditInfo);
+ return Result.success();
+ }
+
+ /*鏍规嵁寮傚父鏃堕棿杩斿洖鏃堕棿鍐呭凡瀹℃牳鐨勫紓甯�*/
+ @GetMapping("/auditnum")
+ public Result getHasAuditedData(String beginTime, String endTime){
+ List<DustExceptionData> list = fugitiveDustService.getHasAuditedData(beginTime,endTime);
+ return Result.success(list);
+ }
+
+ @PostMapping("setting")
+ public Result setting(@RequestBody DustDataAccessSetting dustDataAccessSetting){
+ fugitiveDustService.setting(dustDataAccessSetting);
+ return Result.success();
+ }
}
diff --git a/src/main/java/com/job/zsc/controller/dustAudit/audit b/src/main/java/com/job/zsc/controller/dustAudit/audit
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/main/java/com/job/zsc/controller/dustAudit/audit
diff --git a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java b/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
index 78094de..7598ab1 100644
--- a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
+++ b/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
@@ -1,9 +1,7 @@
package com.job.zsc.mapper;
-import com.job.zsc.pojo.AnalysisDustData;
-import com.job.zsc.pojo.DustExceptionData;
-import com.job.zsc.pojo.DustExceptionType;
-import com.job.zsc.pojo.DustSiteData;
+import com.job.zsc.pojo.*;
+import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -39,4 +37,18 @@
@Select("select DISTINCT mn_code from dust_exception_data")
List<DustExceptionData> exceptionSiteNum();
+
+ /*鏂板瀹¤鍐呭*/
+ @Insert("insert into audit_info(exception_id,checker,checker_content,enterprise_content,audit_status,create_time,update_time) values(#{exceptionId},#{checker},#{checkerContent},#{enterpriseContent},#{auditStatus},#{createTime},#{updateTime})")
+ void insert(AuditInfo auditInfo);
+
+ @Select("select * from audit_info")
+ List<AuditInfo> getAuditAllData();
+ void update(AuditInfo auditInfo);
+
+
+ List<DustExceptionData> getHasAuditedData(String beginTime, String endTime);
+
+ @Insert("insert into dust_global_setting(user,create_time,begin_time,end_time,region,is_regular_time) values( #{user},#{createTime},#{beginTime},#{endTime},#{region},#{isRegularTime})")
+ void setting(DustDataAccessSetting dustDataAccessSetting);
}
diff --git a/src/main/java/com/job/zsc/pojo/AuditInfo.java b/src/main/java/com/job/zsc/pojo/AuditInfo.java
new file mode 100644
index 0000000..1ed0fc5
--- /dev/null
+++ b/src/main/java/com/job/zsc/pojo/AuditInfo.java
@@ -0,0 +1,25 @@
+package com.job.zsc.pojo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AuditInfo {
+ private String auditId;
+ private int exceptionId;
+ private String checker;
+ private String checkerContent;
+ private String enterpriseContent;
+ private int auditStatus;
+ private LocalDateTime createTime;
+ private LocalDateTime updateTime;
+
+}
+
diff --git a/src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java b/src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java
new file mode 100644
index 0000000..b09e72a
--- /dev/null
+++ b/src/main/java/com/job/zsc/pojo/DustDataAccessSetting.java
@@ -0,0 +1,27 @@
+package com.job.zsc.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DustDataAccessSetting {
+
+ private int id;
+ private String user;
+ private LocalDateTime createTime;
+ private LocalDateTime updateTime;
+
+ private String type;
+ private String exceeding;
+ private String beginTime;
+ private String endTime;
+ private String region;
+ private String isRegularTime;
+
+
+}
diff --git a/src/main/java/com/job/zsc/pojo/DustExceptionData.java b/src/main/java/com/job/zsc/pojo/DustExceptionData.java
index 583c7a0..403b458 100644
--- a/src/main/java/com/job/zsc/pojo/DustExceptionData.java
+++ b/src/main/java/com/job/zsc/pojo/DustExceptionData.java
@@ -6,12 +6,13 @@
import lombok.NoArgsConstructor;
import javax.xml.ws.soap.Addressing;
+import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class DustExceptionData {
-
+ /*寮傚父琛�*/
private String id;
private String name; //绔欑偣鍚嶅瓧
private String mnCode; //璁惧缂栧彿
@@ -32,4 +33,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String endTime;
+
+ /*瀹℃牳缁撴灉琛�*/
+ private String auditId;
+ private String exceptionId;
+ private String checker;
+ private String checkerContent;
+ private String enterpriseContent;
+ private int auditStatus;
+
+ private LocalDateTime createTime;
+ private LocalDateTime updateTime;
+
+
}
diff --git a/src/main/java/com/job/zsc/service/FugitiveDustService.java b/src/main/java/com/job/zsc/service/FugitiveDustService.java
index 486956a..70a8981 100644
--- a/src/main/java/com/job/zsc/service/FugitiveDustService.java
+++ b/src/main/java/com/job/zsc/service/FugitiveDustService.java
@@ -36,4 +36,15 @@
List<AnalysisDustData> analysisAll(String siteName, String beginTime, String endTime);
List<DustSiteData> conditonQueryhistoryallData(String siteName, String mnCode, String beginTime, String endTime, String[] scenarioType);
+ /*鏂板瀹¤淇℃伅*/
+ void addAuditNotes(AuditInfo auditInfo);
+
+ List<AuditInfo> getAuditAllData();
+
+ void update(AuditInfo auditInfo);
+
+ List<DustExceptionData> getHasAuditedData(String beginTime, String endTime);
+
+
+ void setting(DustDataAccessSetting dustDataAccessSetting);
}
diff --git a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
index 92d2393..4193d73 100644
--- a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
+++ b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.List;
@Slf4j
@@ -133,5 +134,42 @@
return list;
}
+ @Override
+ public void addAuditNotes(AuditInfo auditInfo) {
+ if(auditInfo.getAuditStatus()==3){
+ auditInfo.setUpdateTime(LocalDateTime.now());
+ auditInfo.setCreateTime(LocalDateTime.now());
+ }else{
+ auditInfo.setCreateTime(LocalDateTime.now());
+
+ }
+ fugitiveDustMapper.insert(auditInfo);
+ }
+
+ @Override
+ public List<AuditInfo> getAuditAllData() {
+ List<AuditInfo> list = fugitiveDustMapper.getAuditAllData();
+ return list;
+ }
+
+ @Override
+ public void update(AuditInfo auditInfo) {
+ auditInfo.setUpdateTime(LocalDateTime.now());
+ fugitiveDustMapper.update(auditInfo);
+ }
+
+
+ @Override
+ public List<DustExceptionData> getHasAuditedData(String beginTime, String endTime) {
+ List<DustExceptionData> list = fugitiveDustMapper.getHasAuditedData(beginTime,endTime);
+ return list;
+ }
+
+ @Override
+ public void setting(DustDataAccessSetting dustDataAccessSetting) {
+ dustDataAccessSetting.setCreateTime(LocalDateTime.now());
+ fugitiveDustMapper.setting(dustDataAccessSetting);
+ }
+
}
diff --git a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
index 04cc427..f6b8a7d 100644
--- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
@@ -3,6 +3,32 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.job.zsc.mapper.FugitiveDustMapper">
+ <update id="update">
+ update audit_info
+ <set>
+ <if test="exceptionId != null and exceptionId!=''" >
+ exception_id = #{exceptionId},
+ </if>
+ <if test="checker != null and checker!=''" >
+ checker = #{checker},
+ </if>
+
+ <if test="checkerContent != null and checkerContent!=''" >
+ checker_content = #{checkerContent} ,
+ </if>
+ <if test="enterpriseContent != null and enterpriseContent!=''" >
+ enterprise_content = #{enterpriseContent},
+ </if>
+ <if test="auditStatus != null and auditStatus!=''" >
+ audit_status = #{auditStatus},
+ </if>
+ <if test="updateTime != null" >
+ update_time = #{updateTime}
+ </if>
+
+ </set>
+ where exception_id = #{exceptionId}
+ </update>
<select id="conditonQueryDustHistoryData" resultType="com.job.zsc.pojo.DustSiteData">
select a.*,b.*
@@ -72,7 +98,8 @@
<!--鏉′欢鏌ヨ寮傚父鏁版嵁-->
<select id="getExceptionData" resultType="com.job.zsc.pojo.DustExceptionData">
- select b.name,b.typename,b.address,b.duty_company,a.*
+ select *
+ from (select a.* ,b.name,b.typename,b.address,b.duty_company
from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
<where>
<if test="siteName !=null and siteName != ''">
@@ -90,6 +117,8 @@
and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
</if>
</where>
+ )
+ as c left join audit_info as d on c.id = d.exception_id
</select>
@@ -123,4 +152,15 @@
</where>
order by a.lst asc
</select>
+ <select id="getHasAuditedData" resultType="com.job.zsc.pojo.DustExceptionData">
+ select *
+ from dust_exception_data as a left join audit_info as b on a.id = b.exception_id
+ <where>
+ <if test="beginTime != null and endTime != null">
+ (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime}) and b.audit_status != 0
+
+ </if>
+ </where>
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3