Merge branch '0206czks' into 0205cmt
# Conflicts: # pom.xml # src/main/java/com/zcloud/aspect/DockingAspect.java # src/main/java/com/zcloud/config/ShiroConfiguration.java # src/main/java/com/zcloud/config/StartWebsocketServer.java # src/main/java/com/zcloud/controller/app/AppPromiseController.java # src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java # src/main/java/com/zcloud/controller/bus/CorpPromiseController.java # src/main/java/com/zcloud/controller/bus/HiddenExamineController.java # src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java # src/main/java/com/zcloud/controller/bus/RiskPointController.java # src/main/java/com/zcloud/controller/bus/RiskUnitController.java # src/main/java/com/zcloud/controller/filemanager/MfolderController.java # src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java # src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java # src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java # src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java # src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java # src/main/java/com/zcloud/controller/map/MapController.java # src/main/java/com/zcloud/controller/map/MapEightController.java # src/main/java/com/zcloud/controller/map/MapKeyProjectController.java # src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java # src/main/java/com/zcloud/controller/system/HeadController.java # src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java # src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java # src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java # src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java # src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java # src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java # src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java # src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java # src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java # src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java # src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java # src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java # src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java # src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java # src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java # src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java # src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java # src/main/java/com/zcloud/service/system/UsersService.java # src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java # src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java # src/main/java/com/zcloud/util/Const.java # src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java # src/main/java/com/zcloud/util/HiddenExcelImgView.java # src/main/java/com/zcloud/util/HttpClientService.java # src/main/java/com/zcloud/util/HttpRequestUtil.java # src/main/java/com/zcloud/util/MD5.java # src/main/java/com/zcloud/util/ReturnMap.java # src/main/java/com/zcloud/util/Smb.java # src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java # src/main/java/com/zcloud/util/hk/HKUtil.java # src/main/resources/application-dev.properties # src/main/resources/application.properties # src/main/resources/config/sysSet.ini # src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml # src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml # src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml # src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml # src/main/resources/mybatis/datasource/bus/HiddenMapper.xml # src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml # src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml # src/main/resources/mybatis/datasource/bus/PromiseMapper.xml # src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml # src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml # src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml # src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml # src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml # src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml # src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml # src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml # src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml # src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml # src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml # src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml # src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml # src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml # src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml # src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml # src/main/resources/mybatis/datasource/mysql1.sql # src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml # src/main/resources/mybatis/datasource/system/CorpPathMapper.xml # src/main/resources/mybatis/datasource/system/DepartmentMapper.xml # src/main/resources/mybatis/datasource/system/PoliceMapper.xml # src/main/resources/mybatis/datasource/system/UsersMapper.xml # src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml # src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml # src/main/resources/mybatis/dsno2/bus/NoticeRegulatoryMapper.xml # src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml # src/main/resources/mybatis/dsno2/keyProjects/AIWarningMapper.xml # src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml # src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml # src/main/resources/mybatis/dsno2/keyProjects/PersonnelManagementMapper.xml # src/main/resources/mybatis/dsno2/keyProjects/UnitsMapper.xml # src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml # src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml # src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml # src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml # src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml # src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml0927cmt
zhaoyu
commit
5deb7d2b03
|
|
@ -0,0 +1,26 @@
|
|||
/target/
|
||||
!.mvn/wrapper/maven-wrapper.jar
|
||||
|
||||
### STS ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/build/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
/catalina.base_IS_UNDEFINED/
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
|
|
@ -0,0 +1,218 @@
|
|||
#
|
||||
# There is insufficient memory for the Java Runtime Environment to continue.
|
||||
# Native memory allocation (malloc) failed to allocate 222816 bytes for Chunk::new
|
||||
# Possible reasons:
|
||||
# The system is out of physical RAM or swap space
|
||||
# The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
|
||||
# Possible solutions:
|
||||
# Reduce memory load on the system
|
||||
# Increase physical memory or swap space
|
||||
# Check if swap backing store is full
|
||||
# Decrease Java heap size (-Xmx/-Xms)
|
||||
# Decrease number of Java threads
|
||||
# Decrease Java thread stack sizes (-Xss)
|
||||
# Set larger code cache with -XX:ReservedCodeCacheSize=
|
||||
# JVM is running with Zero Based Compressed Oops mode in which the Java heap is
|
||||
# placed in the first 32GB address space. The Java Heap base address is the
|
||||
# maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
|
||||
# to set the Java Heap base and to place the Java Heap above 32GB virtual address.
|
||||
# This output file may be truncated or incomplete.
|
||||
#
|
||||
# Out of Memory Error (allocation.cpp:390), pid=21732, tid=0x0000000000001d68
|
||||
#
|
||||
# JRE version: Java(TM) SE Runtime Environment (8.0_192-b12) (build 1.8.0_192-b12)
|
||||
# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.192-b12 mixed mode windows-amd64 compressed oops)
|
||||
# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
|
||||
#
|
||||
|
||||
--------------- T H R E A D ---------------
|
||||
|
||||
Current thread (0x000000001e877000): JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=7528, stack(0x000000001f1c0000,0x000000001f2c0000)]
|
||||
|
||||
Stack: [0x000000001f1c0000,0x000000001f2c0000]
|
||||
[error occurred during error reporting (printing stack bounds), id 0xc0000005]
|
||||
|
||||
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
|
||||
|
||||
|
||||
Current CompileTask:
|
||||
C2: 570 563 % 4 sun.nio.cs.UTF_8$Decoder::decode @ 20 (779 bytes)
|
||||
|
||||
|
||||
--------------- P R O C E S S ---------------
|
||||
|
||||
Java Threads: ( => current thread )
|
||||
0x000000001e919000 JavaThread "Service Thread" daemon [_thread_blocked, id=42376, stack(0x000000001f4c0000,0x000000001f5c0000)]
|
||||
0x000000001e882000 JavaThread "C1 CompilerThread3" daemon [_thread_blocked, id=42792, stack(0x000000001f3c0000,0x000000001f4c0000)]
|
||||
0x000000001e87d800 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=35264, stack(0x000000001f2c0000,0x000000001f3c0000)]
|
||||
=>0x000000001e877000 JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=7528, stack(0x000000001f1c0000,0x000000001f2c0000)]
|
||||
0x000000001e876000 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=13828, stack(0x000000001f0c0000,0x000000001f1c0000)]
|
||||
0x000000001e873800 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=42772, stack(0x000000001efc0000,0x000000001f0c0000)]
|
||||
0x000000001e7fa800 JavaThread "Attach Listener" daemon [_thread_blocked, id=37452, stack(0x000000001eec0000,0x000000001efc0000)]
|
||||
0x000000001e7f8000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=20612, stack(0x000000001edc0000,0x000000001eec0000)]
|
||||
0x000000001e7e1000 JavaThread "Finalizer" daemon [_thread_blocked, id=14560, stack(0x000000001ecc0000,0x000000001edc0000)]
|
||||
0x0000000003158800 JavaThread "Reference Handler" daemon [_thread_blocked, id=16868, stack(0x000000001ebc0000,0x000000001ecc0000)]
|
||||
0x0000000003063800 JavaThread "main" [_thread_in_vm, id=42864, stack(0x0000000002d80000,0x0000000002e80000)]
|
||||
|
||||
Other Threads:
|
||||
0x000000001c9f8000 VMThread [stack: 0x000000001e6c0000,0x000000001e7c0000] [id=13340]
|
||||
0x000000001e970000 WatcherThread [stack: 0x000000001f5c0000,0x000000001f6c0000] [id=43464]
|
||||
|
||||
VM state:not at safepoint (normal execution)
|
||||
|
||||
VM Mutex/Monitor currently owned by a thread: None
|
||||
|
||||
heap address: 0x00000006c4200000, size: 4030 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
|
||||
Narrow klass base: 0x0000000000000000, Narrow klass shift: 3
|
||||
Compressed class space size: 1073741824 Address: 0x00000007c0000000
|
||||
|
||||
Heap:
|
||||
PSYoungGen total 75264K, used 29705K [0x000000076c100000, 0x0000000771500000, 0x00000007c0000000)
|
||||
eden space 64512K, 46% used [0x000000076c100000,0x000000076de02540,0x0000000770000000)
|
||||
from space 10752K, 0% used [0x0000000770a80000,0x0000000770a80000,0x0000000771500000)
|
||||
to space 10752K, 0% used [0x0000000770000000,0x0000000770000000,0x0000000770a80000)
|
||||
ParOldGen total 172032K, used 0K [0x00000006c4200000, 0x00000006cea00000, 0x000000076c100000)
|
||||
object space 172032K, 0% used [0x00000006c4200000,0x00000006c4200000,0x00000006cea00000)
|
||||
Metaspace used 8414K, capacity 8584K, committed 8832K, reserved 1058816K
|
||||
class space used 1003K, capacity 1052K, committed 1152K, reserved 1048576K
|
||||
|
||||
Card table byte_map: [0x0000000012520000,0x0000000012d00000] byte_map_base: 0x000000000eeff000
|
||||
|
||||
Marking Bits: (ParMarkBitMap*) 0x0000000075013ce0
|
||||
Begin Bits: [0x0000000013a40000, 0x0000000017938000)
|
||||
End Bits: [0x0000000017938000, 0x000000001b830000)
|
||||
|
||||
Polling page: 0x0000000001180000
|
||||
|
||||
CodeCache: size=245760Kb used=2609Kb max_used=2619Kb free=243151Kb
|
||||
bounds [0x0000000003160000, 0x0000000003400000, 0x0000000012160000]
|
||||
total_blobs=890 nmethods=563 adapters=240
|
||||
compilation: enabled
|
||||
|
||||
Compilation events (10 events):
|
||||
Event: 0.559 Thread 0x000000001e882000 559 3 java.util.TreeMap$PrivateEntryIterator::hasNext (13 bytes)
|
||||
Event: 0.560 Thread 0x000000001e882000 nmethod 559 0x00000000033e8290 code [0x00000000033e83e0, 0x00000000033e8590]
|
||||
Event: 0.560 Thread 0x000000001e87d800 nmethod 553 0x00000000033ea550 code [0x00000000033ea6a0, 0x00000000033ea8f8]
|
||||
Event: 0.560 Thread 0x000000001e882000 560 3 java.lang.ClassLoader::preDefineClass (109 bytes)
|
||||
Event: 0.561 Thread 0x000000001e882000 nmethod 560 0x00000000033ec2d0 code [0x00000000033ec5a0, 0x00000000033edae8]
|
||||
Event: 0.561 Thread 0x000000001e882000 561 3 java.util.TreeMap$PrivateEntryIterator::<init> (28 bytes)
|
||||
Event: 0.561 Thread 0x000000001e882000 nmethod 561 0x00000000033ea0d0 code [0x00000000033ea240, 0x00000000033ea450]
|
||||
Event: 0.563 Thread 0x000000001e876000 562 4 java.util.HashMap::get (23 bytes)
|
||||
Event: 0.565 Thread 0x000000001e876000 nmethod 562 0x00000000033e99d0 code [0x00000000033e9b20, 0x00000000033e9d98]
|
||||
Event: 0.565 Thread 0x000000001e877000 563 % 4 sun.nio.cs.UTF_8$Decoder::decode @ 20 (779 bytes)
|
||||
|
||||
GC Heap History (0 events):
|
||||
No events
|
||||
|
||||
Deoptimization events (3 events):
|
||||
Event: 0.176 Thread 0x0000000003063800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000032d9898 method=sun.nio.cs.UTF_8$Encoder.encode([CII[B)I @ 33
|
||||
Event: 0.401 Thread 0x0000000003063800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003354068 method=org.codehaus.plexus.util.xml.pull.MXParser.more()C @ 8
|
||||
Event: 0.402 Thread 0x0000000003063800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003286508 method=java.net.URI.match(CJJ)Z @ 19
|
||||
|
||||
Classes redefined (0 events):
|
||||
No events
|
||||
|
||||
Internal exceptions (6 events):
|
||||
Event: 0.031 Thread 0x0000000003063800 Exception <a 'java/lang/NoSuchMethodError': Method sun.misc.Unsafe.defineClass(Ljava/lang/String;[BII)Ljava/lang/Class; name or signature does not match> (0x000000076c107cb0) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\sr
|
||||
Event: 0.031 Thread 0x0000000003063800 Exception <a 'java/lang/NoSuchMethodError': Method sun.misc.Unsafe.prefetchRead(Ljava/lang/Object;J)V name or signature does not match> (0x000000076c107f98) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\prims\j
|
||||
Event: 0.162 Thread 0x0000000003063800 Exception <a 'java/security/PrivilegedActionException'> (0x000000076c760650) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\prims\jvm.cpp, line 1435]
|
||||
Event: 0.162 Thread 0x0000000003063800 Exception <a 'java/security/PrivilegedActionException'> (0x000000076c760a48) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\prims\jvm.cpp, line 1435]
|
||||
Event: 0.162 Thread 0x0000000003063800 Exception <a 'java/security/PrivilegedActionException'> (0x000000076c764b40) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\prims\jvm.cpp, line 1435]
|
||||
Event: 0.162 Thread 0x0000000003063800 Exception <a 'java/security/PrivilegedActionException'> (0x000000076c764f38) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\prims\jvm.cpp, line 1435]
|
||||
|
||||
Events (10 events):
|
||||
Event: 0.567 loading class com/google/inject/internal/MoreTypes$CompositeType
|
||||
Event: 0.567 loading class com/google/inject/internal/MoreTypes$CompositeType done
|
||||
Event: 0.567 loading class java/lang/reflect/ParameterizedType
|
||||
Event: 0.567 loading class java/lang/reflect/ParameterizedType done
|
||||
Event: 0.568 loading class com/google/inject/spi/InjectionPoint
|
||||
Event: 0.568 loading class com/google/inject/spi/InjectionPoint done
|
||||
Event: 0.568 loading class com/google/common/collect/Ordering
|
||||
Event: 0.568 loading class com/google/common/collect/Ordering done
|
||||
Event: 0.569 loading class com/google/inject/spi/InjectionPoint$1
|
||||
Event: 0.569 loading class com/google/inject/spi/InjectionPoint$1 done
|
||||
|
||||
|
||||
Dynamic libraries:
|
||||
0x00007ff6a5390000 - 0x00007ff6a53c7000 C:\Program Files\Java\jdk1.8.0_192\bin\java.exe
|
||||
0x00007ffc43ad0000 - 0x00007ffc43ce7000 C:\WINDOWS\SYSTEM32\ntdll.dll
|
||||
0x00007ffc42b70000 - 0x00007ffc42c34000 C:\WINDOWS\System32\KERNEL32.DLL
|
||||
0x00007ffc412c0000 - 0x00007ffc41666000 C:\WINDOWS\System32\KERNELBASE.dll
|
||||
0x00007ffc43940000 - 0x00007ffc439f1000 C:\WINDOWS\System32\ADVAPI32.dll
|
||||
0x00007ffc432b0000 - 0x00007ffc43357000 C:\WINDOWS\System32\msvcrt.dll
|
||||
0x00007ffc41820000 - 0x00007ffc418c5000 C:\WINDOWS\System32\sechost.dll
|
||||
0x00007ffc42670000 - 0x00007ffc42787000 C:\WINDOWS\System32\RPCRT4.dll
|
||||
0x00007ffc42810000 - 0x00007ffc429be000 C:\WINDOWS\System32\USER32.dll
|
||||
0x00007ffc41080000 - 0x00007ffc410a6000 C:\WINDOWS\System32\win32u.dll
|
||||
0x00007ffc43a60000 - 0x00007ffc43a89000 C:\WINDOWS\System32\GDI32.dll
|
||||
0x00007ffc40f60000 - 0x00007ffc41078000 C:\WINDOWS\System32\gdi32full.dll
|
||||
0x00007ffc410b0000 - 0x00007ffc4114a000 C:\WINDOWS\System32\msvcp_win.dll
|
||||
0x00007ffc40e40000 - 0x00007ffc40f51000 C:\WINDOWS\System32\ucrtbase.dll
|
||||
0x00007ffc2b2d0000 - 0x00007ffc2b563000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.2506_none_270c5ae97388e100\COMCTL32.dll
|
||||
0x00007ffc429c0000 - 0x00007ffc429f1000 C:\WINDOWS\System32\IMM32.DLL
|
||||
0x0000000075300000 - 0x00000000753d1000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\msvcr100.dll
|
||||
0x00000000747f0000 - 0x0000000075093000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\server\jvm.dll
|
||||
0x00007ffc41c60000 - 0x00007ffc41c68000 C:\WINDOWS\System32\PSAPI.DLL
|
||||
0x00007ffc3a7d0000 - 0x00007ffc3a7da000 C:\WINDOWS\SYSTEM32\VERSION.dll
|
||||
0x00007ffc39de0000 - 0x00007ffc39e14000 C:\WINDOWS\SYSTEM32\WINMM.dll
|
||||
0x00007ffc398e0000 - 0x00007ffc398e9000 C:\WINDOWS\SYSTEM32\WSOCK32.dll
|
||||
0x00007ffc42790000 - 0x00007ffc42801000 C:\WINDOWS\System32\WS2_32.dll
|
||||
0x00007ffc32a40000 - 0x00007ffc32a4f000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\verify.dll
|
||||
0x00007ffc26640000 - 0x00007ffc26669000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\java.dll
|
||||
0x00007ffc31e90000 - 0x00007ffc31eb3000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\instrument.dll
|
||||
0x00007ffc329d0000 - 0x00007ffc329e6000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\zip.dll
|
||||
0x00007ffc41e10000 - 0x00007ffc4266a000 C:\WINDOWS\System32\SHELL32.dll
|
||||
0x00007ffc3ed60000 - 0x00007ffc3f656000 C:\WINDOWS\SYSTEM32\windows.storage.dll
|
||||
0x00007ffc418d0000 - 0x00007ffc41c59000 C:\WINDOWS\System32\combase.dll
|
||||
0x00007ffc3ec20000 - 0x00007ffc3ed5e000 C:\WINDOWS\SYSTEM32\wintypes.dll
|
||||
0x00007ffc42c40000 - 0x00007ffc42d33000 C:\WINDOWS\System32\SHCORE.dll
|
||||
0x00007ffc42a00000 - 0x00007ffc42a5e000 C:\WINDOWS\System32\shlwapi.dll
|
||||
0x00007ffc40d70000 - 0x00007ffc40d96000 C:\WINDOWS\SYSTEM32\profapi.dll
|
||||
0x00007ffc32870000 - 0x00007ffc3288a000 D:\JetBrains\IntelliJ IDEA 2022.2.3\bin\breakgen64.dll
|
||||
0x00007ffc26620000 - 0x00007ffc2663a000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\net.dll
|
||||
0x00007ffc402c0000 - 0x00007ffc40329000 C:\WINDOWS\system32\mswsock.dll
|
||||
0x00007ffc40520000 - 0x00007ffc4053b000 C:\WINDOWS\SYSTEM32\CRYPTSP.dll
|
||||
0x00007ffc3fda0000 - 0x00007ffc3fdd5000 C:\WINDOWS\system32\rsaenh.dll
|
||||
0x00007ffc403b0000 - 0x00007ffc403dc000 C:\WINDOWS\SYSTEM32\USERENV.dll
|
||||
0x00007ffc40700000 - 0x00007ffc40728000 C:\WINDOWS\SYSTEM32\bcrypt.dll
|
||||
0x00007ffc41670000 - 0x00007ffc416ea000 C:\WINDOWS\System32\bcryptprimitives.dll
|
||||
0x00007ffc40510000 - 0x00007ffc4051c000 C:\WINDOWS\SYSTEM32\CRYPTBASE.dll
|
||||
0x00007ffc3f8c0000 - 0x00007ffc3f8ed000 C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL
|
||||
0x00007ffc432a0000 - 0x00007ffc432a9000 C:\WINDOWS\System32\NSI.dll
|
||||
0x00007ffc3b5a0000 - 0x00007ffc3b5b9000 C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL
|
||||
0x00007ffc3b550000 - 0x00007ffc3b56f000 C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL
|
||||
0x00007ffc3f930000 - 0x00007ffc3fa29000 C:\WINDOWS\SYSTEM32\DNSAPI.dll
|
||||
0x00007ffc25960000 - 0x00007ffc25971000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\nio.dll
|
||||
0x00007ffc3b080000 - 0x00007ffc3b08a000 C:\Users\Administrator\AppData\Local\Temp\jansi-1.17.1-8523629448547339641.dll
|
||||
0x00007ffc38e30000 - 0x00007ffc38e3a000 C:\Users\Administrator\AppData\Local\Temp\jansi-1.17.1-2341166011803186222.dll
|
||||
|
||||
VM Arguments:
|
||||
jvm_args: -Dmaven.multiModuleProjectDirectory=D:\czks1.0\qa-prevention-czks-b -Dmaven.home=C:\Users\Administrator\.m2\wrapper\dists\apache-maven-3.5.4-bin\jl1qqhdeineh9qg83dtj7i91c\apache-maven-3.5.4 -Dclassworlds.conf=C:\Users\Administrator\.m2\wrapper\dists\apache-maven-3.5.4-bin\jl1qqhdeineh9qg83dtj7i91c\apache-maven-3.5.4\bin\m2.conf -Dmaven.ext.class.path=D:\JetBrains\IntelliJ IDEA 2022.2.3\plugins\maven\lib\maven-event-listener.jar -javaagent:D:\JetBrains\IntelliJ IDEA 2022.2.3\lib\idea_rt.jar=50705:D:\JetBrains\IntelliJ IDEA 2022.2.3\bin -Dfile.encoding=UTF-8
|
||||
java_command: org.codehaus.classworlds.Launcher -Didea.version=2022.2.3 clean
|
||||
java_class_path (initial): C:\Users\Administrator\.m2\wrapper\dists\apache-maven-3.5.4-bin\jl1qqhdeineh9qg83dtj7i91c\apache-maven-3.5.4\boot\plexus-classworlds-2.5.2.jar;D:\JetBrains\IntelliJ IDEA 2022.2.3\lib\idea_rt.jar
|
||||
Launcher Type: SUN_STANDARD
|
||||
|
||||
Environment Variables:
|
||||
JAVA_HOME=C:\Program Files\Java\jdk1.8.0_192\
|
||||
CLASSPATH= .;C:\Program Files\Java\jdk1.8.0_192\\lib;C:\Program Files\Java\jdk1.8.0_192\\lib\tools.jar
|
||||
PATH=C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files (x86)\Tencent\微信web开发者工具\dll;D:\Tor;oiseSVN\bin;D:\Program Files\nodejs\;D:\Program Files (x86)\NetSarang\Xshell 7\;D:\Program Files (x86)\NetSarang\Xftp 7\;D:\Program Files\Git\cmd;C:\Program Files\Java\jdk1.8.0_192\\bin;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;C:\Users\Administrator\AppData\Roaming\npm
|
||||
USERNAME=Administrator
|
||||
OS=Windows_NT
|
||||
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 140 Stepping 1, GenuineIntel
|
||||
|
||||
|
||||
|
||||
--------------- S Y S T E M ---------------
|
||||
|
||||
OS: Windows 10.0 , 64 bit Build 22621 (10.0.22621.2506)
|
||||
|
||||
CPU:total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 140 stepping 1, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx
|
||||
|
||||
Memory: 4k page, physical 16505636k(669124k free), swap 30187388k(4236k free)
|
||||
|
||||
vm_info: Java HotSpot(TM) 64-Bit Server VM (25.192-b12) for windows-amd64 JRE (1.8.0_192-b12), built on Oct 6 2018 17:12:23 by "java_re" with MS VC++ 10.0 (VS2010)
|
||||
|
||||
time: Fri Jan 05 11:11:32 2024
|
||||
timezone: 中国标准时间
|
||||
elapsed time: 0 seconds (0d 0h 0m 0s)
|
||||
|
||||
|
|
@ -0,0 +1,291 @@
|
|||
#
|
||||
# There is insufficient memory for the Java Runtime Environment to continue.
|
||||
# Native memory allocation (malloc) failed to allocate 262160 bytes for Chunk::new
|
||||
# Possible reasons:
|
||||
# The system is out of physical RAM or swap space
|
||||
# The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
|
||||
# Possible solutions:
|
||||
# Reduce memory load on the system
|
||||
# Increase physical memory or swap space
|
||||
# Check if swap backing store is full
|
||||
# Decrease Java heap size (-Xmx/-Xms)
|
||||
# Decrease number of Java threads
|
||||
# Decrease Java thread stack sizes (-Xss)
|
||||
# Set larger code cache with -XX:ReservedCodeCacheSize=
|
||||
# JVM is running with Zero Based Compressed Oops mode in which the Java heap is
|
||||
# placed in the first 32GB address space. The Java Heap base address is the
|
||||
# maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
|
||||
# to set the Java Heap base and to place the Java Heap above 32GB virtual address.
|
||||
# This output file may be truncated or incomplete.
|
||||
#
|
||||
# Out of Memory Error (allocation.cpp:390), pid=46004, tid=0x0000000000004b9c
|
||||
#
|
||||
# JRE version: Java(TM) SE Runtime Environment (8.0_192-b12) (build 1.8.0_192-b12)
|
||||
# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.192-b12 mixed mode windows-amd64 compressed oops)
|
||||
# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
|
||||
#
|
||||
|
||||
--------------- T H R E A D ---------------
|
||||
|
||||
Current thread (0x000000001e626800): JavaThread "C2 CompilerThread0" daemon [_thread_in_native, id=19356, stack(0x000000001eee0000,0x000000001efe0000)]
|
||||
|
||||
Stack: [0x000000001eee0000,0x000000001efe0000]
|
||||
[error occurred during error reporting (printing stack bounds), id 0xc0000005]
|
||||
|
||||
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
|
||||
|
||||
|
||||
Current CompileTask:
|
||||
C2: 1207 1453 4 java.net.URLClassLoader$1::run (5 bytes)
|
||||
|
||||
|
||||
--------------- P R O C E S S ---------------
|
||||
|
||||
Java Threads: ( => current thread )
|
||||
0x000000001e654000 JavaThread "Service Thread" daemon [_thread_blocked, id=29480, stack(0x000000001f2e0000,0x000000001f3e0000)]
|
||||
0x000000001e634000 JavaThread "C1 CompilerThread3" daemon [_thread_blocked, id=14620, stack(0x000000001f1e0000,0x000000001f2e0000)]
|
||||
0x000000001e62f800 JavaThread "C2 CompilerThread2" daemon [_thread_in_native, id=36868, stack(0x000000001f0e0000,0x000000001f1e0000)]
|
||||
0x000000001e62b000 JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=9344, stack(0x000000001efe0000,0x000000001f0e0000)]
|
||||
=>0x000000001e626800 JavaThread "C2 CompilerThread0" daemon [_thread_in_native, id=19356, stack(0x000000001eee0000,0x000000001efe0000)]
|
||||
0x000000001e624000 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=25452, stack(0x000000001ede0000,0x000000001eee0000)]
|
||||
0x000000001e5ab000 JavaThread "Attach Listener" daemon [_thread_blocked, id=30780, stack(0x000000001ece0000,0x000000001ede0000)]
|
||||
0x000000001e5a8000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=14524, stack(0x000000001ebe0000,0x000000001ece0000)]
|
||||
0x000000001c7b3800 JavaThread "Finalizer" daemon [_thread_blocked, id=30184, stack(0x000000001ea70000,0x000000001eb70000)]
|
||||
0x000000001c7ac800 JavaThread "Reference Handler" daemon [_thread_blocked, id=36824, stack(0x000000001e970000,0x000000001ea70000)]
|
||||
0x0000000002dc3800 JavaThread "main" [_thread_in_vm, id=4904, stack(0x0000000002830000,0x0000000002930000)]
|
||||
|
||||
Other Threads:
|
||||
0x000000001c7a8800 VMThread [stack: 0x000000001e470000,0x000000001e570000] [id=19620]
|
||||
0x000000001e72c000 WatcherThread [stack: 0x000000001f3e0000,0x000000001f4e0000] [id=37696]
|
||||
|
||||
VM state:not at safepoint (normal execution)
|
||||
|
||||
VM Mutex/Monitor currently owned by a thread: None
|
||||
|
||||
heap address: 0x00000006c4200000, size: 4030 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
|
||||
Narrow klass base: 0x0000000000000000, Narrow klass shift: 3
|
||||
Compressed class space size: 1073741824 Address: 0x00000007c0000000
|
||||
|
||||
Heap:
|
||||
PSYoungGen total 75264K, used 25209K [0x000000076c100000, 0x0000000772c00000, 0x00000007c0000000)
|
||||
eden space 64512K, 26% used [0x000000076c100000,0x000000076d1db538,0x0000000770000000)
|
||||
from space 10752K, 73% used [0x0000000770a80000,0x0000000771243168,0x0000000771500000)
|
||||
to space 10752K, 0% used [0x0000000770000000,0x0000000770000000,0x0000000770a80000)
|
||||
ParOldGen total 113152K, used 3543K [0x00000006c4200000, 0x00000006cb080000, 0x000000076c100000)
|
||||
object space 113152K, 3% used [0x00000006c4200000,0x00000006c4575c88,0x00000006cb080000)
|
||||
Metaspace used 14836K, capacity 15108K, committed 15232K, reserved 1062912K
|
||||
class space used 1829K, capacity 1909K, committed 1920K, reserved 1048576K
|
||||
|
||||
Card table byte_map: [0x0000000012280000,0x0000000012a60000] byte_map_base: 0x000000000ec5f000
|
||||
|
||||
Marking Bits: (ParMarkBitMap*) 0x0000000075013ce0
|
||||
Begin Bits: [0x00000000137a0000, 0x0000000017698000)
|
||||
End Bits: [0x0000000017698000, 0x000000001b590000)
|
||||
|
||||
Polling page: 0x0000000000fe0000
|
||||
|
||||
CodeCache: size=245760Kb used=5676Kb max_used=5676Kb free=240083Kb
|
||||
bounds [0x0000000002ec0000, 0x0000000003460000, 0x0000000011ec0000]
|
||||
total_blobs=2028 nmethods=1668 adapters=272
|
||||
compilation: enabled
|
||||
|
||||
Compilation events (10 events):
|
||||
Event: 1.195 Thread 0x000000001e634000 1666 1 org.apache.maven.model.Dependency::getScope (5 bytes)
|
||||
Event: 1.195 Thread 0x000000001e634000 nmethod 1666 0x000000000344a790 code [0x000000000344a8e0, 0x000000000344a9f0]
|
||||
Event: 1.199 Thread 0x000000001e634000 1671 ! 3 org.codehaus.plexus.util.xml.pull.MXParser::parseComment (486 bytes)
|
||||
Event: 1.200 Thread 0x000000001e634000 nmethod 1671 0x000000000344aa50 code [0x000000000344ae00, 0x000000000344cd88]
|
||||
Event: 1.200 Thread 0x000000001e634000 1672 3 org.apache.maven.model.io.xpp3.MavenXpp3Reader::checkFieldWithDuplicate (75 bytes)
|
||||
Event: 1.201 Thread 0x000000001e634000 nmethod 1672 0x000000000344e0d0 code [0x000000000344e320, 0x000000000344f098]
|
||||
Event: 1.201 Thread 0x000000001e634000 1673 3 java.util.LinkedHashMap$LinkedEntrySet::iterator (12 bytes)
|
||||
Event: 1.201 Thread 0x000000001e634000 nmethod 1673 0x000000000344f710 code [0x000000000344f880, 0x000000000344fbb0]
|
||||
Event: 1.201 Thread 0x000000001e634000 1674 3 java.util.LinkedHashMap$LinkedEntryIterator::<init> (11 bytes)
|
||||
Event: 1.201 Thread 0x000000001e634000 nmethod 1674 0x000000000344fd50 code [0x000000000344fec0, 0x0000000003450150]
|
||||
|
||||
GC Heap History (6 events):
|
||||
Event: 0.518 GC heap before
|
||||
{Heap before GC invocations=1 (full 0):
|
||||
PSYoungGen total 75264K, used 23253K [0x000000076c100000, 0x0000000771500000, 0x00000007c0000000)
|
||||
eden space 64512K, 36% used [0x000000076c100000,0x000000076d7b54d0,0x0000000770000000)
|
||||
from space 10752K, 0% used [0x0000000770a80000,0x0000000770a80000,0x0000000771500000)
|
||||
to space 10752K, 0% used [0x0000000770000000,0x0000000770000000,0x0000000770a80000)
|
||||
ParOldGen total 172032K, used 0K [0x00000006c4200000, 0x00000006cea00000, 0x000000076c100000)
|
||||
object space 172032K, 0% used [0x00000006c4200000,0x00000006c4200000,0x00000006cea00000)
|
||||
Metaspace used 7385K, capacity 7528K, committed 7552K, reserved 1056768K
|
||||
class space used 836K, capacity 892K, committed 896K, reserved 1048576K
|
||||
Event: 0.522 GC heap after
|
||||
Heap after GC invocations=1 (full 0):
|
||||
PSYoungGen total 75264K, used 3814K [0x000000076c100000, 0x0000000771500000, 0x00000007c0000000)
|
||||
eden space 64512K, 0% used [0x000000076c100000,0x000000076c100000,0x0000000770000000)
|
||||
from space 10752K, 35% used [0x0000000770000000,0x00000007703b9af0,0x0000000770a80000)
|
||||
to space 10752K, 0% used [0x0000000770a80000,0x0000000770a80000,0x0000000771500000)
|
||||
ParOldGen total 172032K, used 8K [0x00000006c4200000, 0x00000006cea00000, 0x000000076c100000)
|
||||
object space 172032K, 0% used [0x00000006c4200000,0x00000006c4202000,0x00000006cea00000)
|
||||
Metaspace used 7385K, capacity 7528K, committed 7552K, reserved 1056768K
|
||||
class space used 836K, capacity 892K, committed 896K, reserved 1048576K
|
||||
}
|
||||
Event: 0.522 GC heap before
|
||||
{Heap before GC invocations=2 (full 1):
|
||||
PSYoungGen total 75264K, used 3814K [0x000000076c100000, 0x0000000771500000, 0x00000007c0000000)
|
||||
eden space 64512K, 0% used [0x000000076c100000,0x000000076c100000,0x0000000770000000)
|
||||
from space 10752K, 35% used [0x0000000770000000,0x00000007703b9af0,0x0000000770a80000)
|
||||
to space 10752K, 0% used [0x0000000770a80000,0x0000000770a80000,0x0000000771500000)
|
||||
ParOldGen total 172032K, used 8K [0x00000006c4200000, 0x00000006cea00000, 0x000000076c100000)
|
||||
object space 172032K, 0% used [0x00000006c4200000,0x00000006c4202000,0x00000006cea00000)
|
||||
Metaspace used 7385K, capacity 7528K, committed 7552K, reserved 1056768K
|
||||
class space used 836K, capacity 892K, committed 896K, reserved 1048576K
|
||||
Event: 0.529 GC heap after
|
||||
Heap after GC invocations=2 (full 1):
|
||||
PSYoungGen total 75264K, used 0K [0x000000076c100000, 0x0000000771500000, 0x00000007c0000000)
|
||||
eden space 64512K, 0% used [0x000000076c100000,0x000000076c100000,0x0000000770000000)
|
||||
from space 10752K, 0% used [0x0000000770000000,0x0000000770000000,0x0000000770a80000)
|
||||
to space 10752K, 0% used [0x0000000770a80000,0x0000000770a80000,0x0000000771500000)
|
||||
ParOldGen total 113152K, used 3535K [0x00000006c4200000, 0x00000006cb080000, 0x000000076c100000)
|
||||
object space 113152K, 3% used [0x00000006c4200000,0x00000006c4573c88,0x00000006cb080000)
|
||||
Metaspace used 7385K, capacity 7528K, committed 7552K, reserved 1056768K
|
||||
class space used 836K, capacity 892K, committed 896K, reserved 1048576K
|
||||
}
|
||||
Event: 1.000 GC heap before
|
||||
{Heap before GC invocations=3 (full 1):
|
||||
PSYoungGen total 75264K, used 64512K [0x000000076c100000, 0x0000000771500000, 0x00000007c0000000)
|
||||
eden space 64512K, 100% used [0x000000076c100000,0x0000000770000000,0x0000000770000000)
|
||||
from space 10752K, 0% used [0x0000000770000000,0x0000000770000000,0x0000000770a80000)
|
||||
to space 10752K, 0% used [0x0000000770a80000,0x0000000770a80000,0x0000000771500000)
|
||||
ParOldGen total 113152K, used 3535K [0x00000006c4200000, 0x00000006cb080000, 0x000000076c100000)
|
||||
object space 113152K, 3% used [0x00000006c4200000,0x00000006c4573c88,0x00000006cb080000)
|
||||
Metaspace used 13028K, capacity 13316K, committed 13568K, reserved 1060864K
|
||||
class space used 1630K, capacity 1707K, committed 1792K, reserved 1048576K
|
||||
Event: 1.005 GC heap after
|
||||
Heap after GC invocations=3 (full 1):
|
||||
PSYoungGen total 75264K, used 7948K [0x000000076c100000, 0x0000000772c00000, 0x00000007c0000000)
|
||||
eden space 64512K, 0% used [0x000000076c100000,0x000000076c100000,0x0000000770000000)
|
||||
from space 10752K, 73% used [0x0000000770a80000,0x0000000771243168,0x0000000771500000)
|
||||
to space 10752K, 0% used [0x0000000770000000,0x0000000770000000,0x0000000770a80000)
|
||||
ParOldGen total 113152K, used 3543K [0x00000006c4200000, 0x00000006cb080000, 0x000000076c100000)
|
||||
object space 113152K, 3% used [0x00000006c4200000,0x00000006c4575c88,0x00000006cb080000)
|
||||
Metaspace used 13028K, capacity 13316K, committed 13568K, reserved 1060864K
|
||||
class space used 1630K, capacity 1707K, committed 1792K, reserved 1048576K
|
||||
}
|
||||
|
||||
Deoptimization events (10 events):
|
||||
Event: 0.702 Thread 0x0000000002dc3800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x000000000314dec8 method=java.util.HashMap.getNode(ILjava/lang/Object;)Ljava/util/HashMap$Node; @ 129
|
||||
Event: 0.704 Thread 0x0000000002dc3800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x000000000315515c method=java.util.HashMap.getNode(ILjava/lang/Object;)Ljava/util/HashMap$Node; @ 129
|
||||
Event: 1.047 Thread 0x0000000002dc3800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003266fa8 method=java.util.HashMap.putVal(ILjava/lang/Object;Ljava/lang/Object;ZZ)Ljava/lang/Object; @ 203
|
||||
Event: 1.047 Thread 0x0000000002dc3800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003266fa8 method=java.util.HashMap.putVal(ILjava/lang/Object;Ljava/lang/Object;ZZ)Ljava/lang/Object; @ 203
|
||||
Event: 1.047 Thread 0x0000000002dc3800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003266fa8 method=java.util.HashMap.putVal(ILjava/lang/Object;Ljava/lang/Object;ZZ)Ljava/lang/Object; @ 203
|
||||
Event: 1.047 Thread 0x0000000002dc3800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003266fa8 method=java.util.HashMap.putVal(ILjava/lang/Object;Ljava/lang/Object;ZZ)Ljava/lang/Object; @ 203
|
||||
Event: 1.115 Thread 0x0000000002dc3800 Uncommon trap: reason=null_check action=make_not_entrant pc=0x000000000305f088 method=java.lang.String.equals(Ljava/lang/Object;)Z @ 8
|
||||
Event: 1.189 Thread 0x0000000002dc3800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000031af6c4 method=sun.nio.cs.UTF_8$Decoder.decodeArrayLoop(Ljava/nio/ByteBuffer;Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult; @ 84
|
||||
Event: 1.195 Thread 0x0000000002dc3800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000030c8298 method=java.lang.AbstractStringBuilder.append(Ljava/lang/String;)Ljava/lang/AbstractStringBuilder; @ 1
|
||||
Event: 1.195 Thread 0x0000000002dc3800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000030b6290 method=java.lang.AbstractStringBuilder.append(Ljava/lang/String;)Ljava/lang/AbstractStringBuilder; @ 1
|
||||
|
||||
Classes redefined (0 events):
|
||||
No events
|
||||
|
||||
Internal exceptions (10 events):
|
||||
Event: 0.584 Thread 0x0000000002dc3800 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x000000076c8f9ca0) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
|
||||
Event: 0.670 Thread 0x0000000002dc3800 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x000000076d5b5f38) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
|
||||
Event: 0.671 Thread 0x0000000002dc3800 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x000000076d5ba898) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
|
||||
Event: 0.701 Thread 0x0000000002dc3800 Exception <a 'java/lang/ArrayIndexOutOfBoundsException': 66> (0x000000076d8e0dc0) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 368]
|
||||
Event: 1.042 Thread 0x0000000002dc3800 Exception <a 'java/lang/NoClassDefFoundError': com/google/inject/servlet/ServletModuleTargetVisitor> (0x000000076c49c128) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 199]
|
||||
Event: 1.042 Thread 0x0000000002dc3800 Exception <a 'java/lang/NoClassDefFoundError'> (0x000000076c49c128) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\prims\jvm.cpp, line 1439]
|
||||
Event: 1.042 Thread 0x0000000002dc3800 Exception <a 'java/lang/NoClassDefFoundError': javax/annotation/Priority> (0x000000076c4a11d0) thrown at [C:\workspace\8-2-build-windows-amd64-cygwin\jdk8u192\11897\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 199]
|
||||
Event: 1.115 Thread 0x0000000002dc3800 Implicit null exception at 0x000000000305ee98 to 0x000000000305f079
|
||||
Event: 1.194 Thread 0x0000000002dc3800 Implicit null exception at 0x00000000030c7ed6 to 0x00000000030c8281
|
||||
Event: 1.195 Thread 0x0000000002dc3800 Implicit null exception at 0x00000000030b5ed6 to 0x00000000030b6279
|
||||
|
||||
Events (10 events):
|
||||
Event: 1.204 loading class org/eclipse/aether/version/VersionRange
|
||||
Event: 1.204 loading class org/eclipse/aether/version/VersionRange done
|
||||
Event: 1.204 loading class org/eclipse/aether/util/version/GenericVersionConstraint
|
||||
Event: 1.204 loading class org/eclipse/aether/util/version/GenericVersionConstraint done
|
||||
Event: 1.204 loading class org/eclipse/aether/util/version/GenericVersion
|
||||
Event: 1.204 loading class org/eclipse/aether/util/version/GenericVersion done
|
||||
Event: 1.204 loading class org/eclipse/aether/util/version/GenericVersion$Tokenizer
|
||||
Event: 1.204 loading class org/eclipse/aether/util/version/GenericVersion$Tokenizer done
|
||||
Event: 1.205 loading class org/eclipse/aether/util/version/GenericVersion$Item
|
||||
Event: 1.205 loading class org/eclipse/aether/util/version/GenericVersion$Item done
|
||||
|
||||
|
||||
Dynamic libraries:
|
||||
0x00007ff6a5390000 - 0x00007ff6a53c7000 C:\Program Files\Java\jdk1.8.0_192\bin\java.exe
|
||||
0x00007ffc43ad0000 - 0x00007ffc43ce7000 C:\WINDOWS\SYSTEM32\ntdll.dll
|
||||
0x00007ffc42b70000 - 0x00007ffc42c34000 C:\WINDOWS\System32\KERNEL32.DLL
|
||||
0x00007ffc412c0000 - 0x00007ffc41666000 C:\WINDOWS\System32\KERNELBASE.dll
|
||||
0x00007ffc43940000 - 0x00007ffc439f1000 C:\WINDOWS\System32\ADVAPI32.dll
|
||||
0x00007ffc432b0000 - 0x00007ffc43357000 C:\WINDOWS\System32\msvcrt.dll
|
||||
0x00007ffc41820000 - 0x00007ffc418c5000 C:\WINDOWS\System32\sechost.dll
|
||||
0x00007ffc42670000 - 0x00007ffc42787000 C:\WINDOWS\System32\RPCRT4.dll
|
||||
0x00007ffc42810000 - 0x00007ffc429be000 C:\WINDOWS\System32\USER32.dll
|
||||
0x00007ffc41080000 - 0x00007ffc410a6000 C:\WINDOWS\System32\win32u.dll
|
||||
0x00007ffc43a60000 - 0x00007ffc43a89000 C:\WINDOWS\System32\GDI32.dll
|
||||
0x00007ffc40f60000 - 0x00007ffc41078000 C:\WINDOWS\System32\gdi32full.dll
|
||||
0x00007ffc410b0000 - 0x00007ffc4114a000 C:\WINDOWS\System32\msvcp_win.dll
|
||||
0x00007ffc40e40000 - 0x00007ffc40f51000 C:\WINDOWS\System32\ucrtbase.dll
|
||||
0x00007ffc2b2d0000 - 0x00007ffc2b563000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.2506_none_270c5ae97388e100\COMCTL32.dll
|
||||
0x00007ffc429c0000 - 0x00007ffc429f1000 C:\WINDOWS\System32\IMM32.DLL
|
||||
0x0000000075300000 - 0x00000000753d1000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\msvcr100.dll
|
||||
0x00000000747f0000 - 0x0000000075093000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\server\jvm.dll
|
||||
0x00007ffc41c60000 - 0x00007ffc41c68000 C:\WINDOWS\System32\PSAPI.DLL
|
||||
0x00007ffc39de0000 - 0x00007ffc39e14000 C:\WINDOWS\SYSTEM32\WINMM.dll
|
||||
0x00007ffc398e0000 - 0x00007ffc398e9000 C:\WINDOWS\SYSTEM32\WSOCK32.dll
|
||||
0x00007ffc3a7d0000 - 0x00007ffc3a7da000 C:\WINDOWS\SYSTEM32\VERSION.dll
|
||||
0x00007ffc42790000 - 0x00007ffc42801000 C:\WINDOWS\System32\WS2_32.dll
|
||||
0x00007ffc32a40000 - 0x00007ffc32a4f000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\verify.dll
|
||||
0x00007ffc26640000 - 0x00007ffc26669000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\java.dll
|
||||
0x00007ffc31e90000 - 0x00007ffc31eb3000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\instrument.dll
|
||||
0x00007ffc329d0000 - 0x00007ffc329e6000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\zip.dll
|
||||
0x00007ffc41e10000 - 0x00007ffc4266a000 C:\WINDOWS\System32\SHELL32.dll
|
||||
0x00007ffc3ed60000 - 0x00007ffc3f656000 C:\WINDOWS\SYSTEM32\windows.storage.dll
|
||||
0x00007ffc418d0000 - 0x00007ffc41c59000 C:\WINDOWS\System32\combase.dll
|
||||
0x00007ffc3ec20000 - 0x00007ffc3ed5e000 C:\WINDOWS\SYSTEM32\wintypes.dll
|
||||
0x00007ffc42c40000 - 0x00007ffc42d33000 C:\WINDOWS\System32\SHCORE.dll
|
||||
0x00007ffc42a00000 - 0x00007ffc42a5e000 C:\WINDOWS\System32\shlwapi.dll
|
||||
0x00007ffc40d70000 - 0x00007ffc40d96000 C:\WINDOWS\SYSTEM32\profapi.dll
|
||||
0x00007ffc32870000 - 0x00007ffc3288a000 D:\JetBrains\IntelliJ IDEA 2022.2.3\bin\breakgen64.dll
|
||||
0x00007ffc26620000 - 0x00007ffc2663a000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\net.dll
|
||||
0x00007ffc402c0000 - 0x00007ffc40329000 C:\WINDOWS\system32\mswsock.dll
|
||||
0x00007ffc40520000 - 0x00007ffc4053b000 C:\WINDOWS\SYSTEM32\CRYPTSP.dll
|
||||
0x00007ffc3fda0000 - 0x00007ffc3fdd5000 C:\WINDOWS\system32\rsaenh.dll
|
||||
0x00007ffc403b0000 - 0x00007ffc403dc000 C:\WINDOWS\SYSTEM32\USERENV.dll
|
||||
0x00007ffc40700000 - 0x00007ffc40728000 C:\WINDOWS\SYSTEM32\bcrypt.dll
|
||||
0x00007ffc41670000 - 0x00007ffc416ea000 C:\WINDOWS\System32\bcryptprimitives.dll
|
||||
0x00007ffc40510000 - 0x00007ffc4051c000 C:\WINDOWS\SYSTEM32\CRYPTBASE.dll
|
||||
0x00007ffc3f8c0000 - 0x00007ffc3f8ed000 C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL
|
||||
0x00007ffc432a0000 - 0x00007ffc432a9000 C:\WINDOWS\System32\NSI.dll
|
||||
0x00007ffc3b5a0000 - 0x00007ffc3b5b9000 C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL
|
||||
0x00007ffc3b550000 - 0x00007ffc3b56f000 C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL
|
||||
0x00007ffc3f930000 - 0x00007ffc3fa29000 C:\WINDOWS\SYSTEM32\DNSAPI.dll
|
||||
0x00007ffc25960000 - 0x00007ffc25971000 C:\Program Files\Java\jdk1.8.0_192\jre\bin\nio.dll
|
||||
0x00007ffc3b080000 - 0x00007ffc3b08a000 C:\Users\Administrator\AppData\Local\Temp\jansi-1.17.1-5130026548928314024.dll
|
||||
0x00007ffc38e30000 - 0x00007ffc38e3a000 C:\Users\Administrator\AppData\Local\Temp\jansi-1.17.1-6601733267714388726.dll
|
||||
|
||||
VM Arguments:
|
||||
jvm_args: -Dmaven.multiModuleProjectDirectory=D:\czks1.0\qa-prevention-czks-b -Dmaven.home=C:\Users\Administrator\.m2\wrapper\dists\apache-maven-3.5.4-bin\jl1qqhdeineh9qg83dtj7i91c\apache-maven-3.5.4 -Dclassworlds.conf=C:\Users\Administrator\.m2\wrapper\dists\apache-maven-3.5.4-bin\jl1qqhdeineh9qg83dtj7i91c\apache-maven-3.5.4\bin\m2.conf -Dmaven.ext.class.path=D:\JetBrains\IntelliJ IDEA 2022.2.3\plugins\maven\lib\maven-event-listener.jar -javaagent:D:\JetBrains\IntelliJ IDEA 2022.2.3\lib\idea_rt.jar=50707:D:\JetBrains\IntelliJ IDEA 2022.2.3\bin -Dfile.encoding=UTF-8
|
||||
java_command: org.codehaus.classworlds.Launcher -Didea.version=2022.2.3 clean
|
||||
java_class_path (initial): C:\Users\Administrator\.m2\wrapper\dists\apache-maven-3.5.4-bin\jl1qqhdeineh9qg83dtj7i91c\apache-maven-3.5.4\boot\plexus-classworlds-2.5.2.jar;D:\JetBrains\IntelliJ IDEA 2022.2.3\lib\idea_rt.jar
|
||||
Launcher Type: SUN_STANDARD
|
||||
|
||||
Environment Variables:
|
||||
JAVA_HOME=C:\Program Files\Java\jdk1.8.0_192\
|
||||
CLASSPATH= .;C:\Program Files\Java\jdk1.8.0_192\\lib;C:\Program Files\Java\jdk1.8.0_192\\lib\tools.jar
|
||||
PATH=C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files (x86)\Tencent\微信web开发者工具\dll;D:\Tor;oiseSVN\bin;D:\Program Files\nodejs\;D:\Program Files (x86)\NetSarang\Xshell 7\;D:\Program Files (x86)\NetSarang\Xftp 7\;D:\Program Files\Git\cmd;C:\Program Files\Java\jdk1.8.0_192\\bin;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;C:\Users\Administrator\AppData\Roaming\npm
|
||||
USERNAME=Administrator
|
||||
OS=Windows_NT
|
||||
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 140 Stepping 1, GenuineIntel
|
||||
|
||||
|
||||
|
||||
--------------- S Y S T E M ---------------
|
||||
|
||||
OS: Windows 10.0 , 64 bit Build 22621 (10.0.22621.2506)
|
||||
|
||||
CPU:total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 140 stepping 1, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx
|
||||
|
||||
Memory: 4k page, physical 16505636k(574280k free), swap 30187388k(5132k free)
|
||||
|
||||
vm_info: Java HotSpot(TM) 64-Bit Server VM (25.192-b12) for windows-amd64 JRE (1.8.0_192-b12), built on Oct 6 2018 17:12:23 by "java_re" with MS VC++ 10.0 (VS2010)
|
||||
|
||||
time: Fri Jan 05 11:11:40 2024
|
||||
timezone: 中国标准时间
|
||||
elapsed time: 1 seconds (0d 0h 0m 1s)
|
||||
|
||||
36
pom.xml
36
pom.xml
|
|
@ -494,42 +494,6 @@
|
|||
<artifactId>lombok</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<!--多环境⽂件配置-->
|
||||
<profiles>
|
||||
<!--开发环境-->
|
||||
<profile>
|
||||
<id>dev</id>
|
||||
<activation>
|
||||
<!--默认激活-->
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<properties>
|
||||
<spring.profiles.active>dev</spring.profiles.active>
|
||||
</properties>
|
||||
</profile>
|
||||
<!--测试环境-->
|
||||
<profile>
|
||||
<id>test</id>
|
||||
<properties>
|
||||
<spring.profiles.active>test</spring.profiles.active>
|
||||
</properties>
|
||||
</profile>
|
||||
<!--正式环境-->
|
||||
<profile>
|
||||
<id>prod</id>
|
||||
<properties>
|
||||
<spring.profiles.active>prod</spring.profiles.active>
|
||||
</properties>
|
||||
</profile>
|
||||
<!--本地测试-->
|
||||
<profile>
|
||||
<id>localtest</id>
|
||||
<properties>
|
||||
<spring.profiles.active>localtest</spring.profiles.active>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
<build>
|
||||
<!-- <finalName>qa-prevention-gwj</finalName>
|
||||
<plugins>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
|
@ -26,8 +26,8 @@ import java.util.Date;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
//@Component
|
||||
//@Aspect
|
||||
@Component
|
||||
@Aspect
|
||||
public class DockingAspect {
|
||||
@Autowired
|
||||
private DockSendMessageService sendMessageService;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.zcloud.controller.app;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.zcloud.aspect.DockAnnotation;
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
|
@ -61,6 +63,7 @@ public class AppPromiseController extends BaseController {
|
|||
}else {
|
||||
map.put("ISSIGN", 0);
|
||||
}
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
|
@ -98,12 +101,14 @@ public class AppPromiseController extends BaseController {
|
|||
*/
|
||||
@RequestMapping(value="/editpeople")
|
||||
@ResponseBody
|
||||
@DockAnnotation(hasAnnex = true)
|
||||
public Object editpeople(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
String ffile = DateUtil.getDays();
|
||||
List<String> sendPicturesList = new ArrayList<>();
|
||||
if (file != null){
|
||||
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
|
||||
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
|
||||
|
|
@ -115,6 +120,7 @@ public class AppPromiseController extends BaseController {
|
|||
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
||||
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
|
||||
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
sendPicturesList.add(pd.getString("FILEPATH") + "@@" + fileName);
|
||||
pd.put("SIGNTIME", pd.getString("SIGNTIME"));
|
||||
pd.put("ISSIGN",1);
|
||||
pd.put("ISREAD","0");
|
||||
|
|
@ -141,6 +147,8 @@ public class AppPromiseController extends BaseController {
|
|||
}
|
||||
}
|
||||
}
|
||||
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
|
@ -213,6 +221,7 @@ public class AppPromiseController extends BaseController {
|
|||
*/
|
||||
@RequestMapping(value="/editIsRead")
|
||||
@ResponseBody
|
||||
@DockAnnotation
|
||||
public Object editIsRead() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
|
|
@ -221,6 +230,7 @@ public class AppPromiseController extends BaseController {
|
|||
pd.put("ISREAD","1");
|
||||
corpPromisePeopleService.editIsRead(pd); //阅读状态修改为已阅
|
||||
map.put("result", errInfo);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,13 +95,11 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController {
|
|||
uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
strings.add(uBean.getString("INSPECTION_USER_SIGN_IMG")+"@@"+fileName);
|
||||
}
|
||||
pd.put("uBean", JSON.toJSONString(uBean));
|
||||
PageData verify = safetyenvironmentalinspectorService.verify(uBean);
|
||||
pd.put("verify",JSON.toJSONString(verify));
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
map.put("sendPicturesList",JSON.toJSONString(strings));
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
map.put("dockData", JSON.toJSONString(verify));
|
||||
return map;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -429,6 +429,7 @@ public class HiddenExamineController extends BaseController {
|
|||
pd = this.getPageData();
|
||||
PageData hiddenExa = hiddenexamineService.findById(pd); // 获取该隐患的未通过的隐患信息
|
||||
PageData hidden = hiddenService.findById(hiddenExa);
|
||||
ArrayList<String> strings = new ArrayList<>();
|
||||
if (Tools.isEmpty(hiddenExa)) {
|
||||
errInfo = "ERROR";
|
||||
map.put("pd", pd);
|
||||
|
|
@ -449,6 +450,7 @@ public class HiddenExamineController extends BaseController {
|
|||
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
||||
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
|
||||
hiddenExa.put("DISPOSAL_FILE", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
|
||||
strings.add(hiddenExa.getString("DISPOSAL_FILE")+"@@"+fileName);
|
||||
}
|
||||
hiddenExa.put("DISPOSAL_PLAN", pd.get("disposalPlan"));
|
||||
hiddenExa.put("STATE", "2");
|
||||
|
|
@ -487,6 +489,7 @@ public class HiddenExamineController extends BaseController {
|
|||
inspection.put("OPERATOR", Jurisdiction.getUSER_ID());
|
||||
inspection.put("HIDDEN_vector", hidden.getString("HIDDEN_ID"));
|
||||
noticeUtil.SE_ThreeStepUtil(inspection);
|
||||
pd.put("inspection",inspection);
|
||||
}
|
||||
} else if ("2".equals(pd.getString("TYPE"))) { // 不通过
|
||||
hiddenExa.put("spare1", "0");
|
||||
|
|
@ -516,6 +519,8 @@ public class HiddenExamineController extends BaseController {
|
|||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
pd.put("hiddenExa",hiddenExa);
|
||||
map.put("sendPicturesList",JSON.toJSONString(strings));
|
||||
map.put("dockData",JSON.toJSONString(pd));
|
||||
return map;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -427,6 +427,7 @@ public class RiskPointController extends BaseController {
|
|||
}else{
|
||||
errInfo = "fail";
|
||||
}
|
||||
pd.put("DATA_IDS",DATA_IDS);
|
||||
map.put("result", errInfo); //返回结果
|
||||
map.put("dockData",JSON.toJSONString(pd));
|
||||
return map;
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ public class RiskUnitController extends BaseController {
|
|||
@DockAnnotation
|
||||
public Object deleteAll() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
String errInfo = "fail";
|
||||
String err="";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
|
|
@ -288,12 +288,11 @@ public class RiskUnitController extends BaseController {
|
|||
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
riskunitService.delete(pd);
|
||||
errInfo = "success";
|
||||
}
|
||||
// riskunitService.deleteAll(ArrayDATA_IDS);
|
||||
errInfo = "success";
|
||||
}else{
|
||||
errInfo = "fail";
|
||||
}
|
||||
pd.put("DATA_IDS",DATA_IDS);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
map.put("result", errInfo); //返回结果
|
||||
return map;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,185 @@
|
|||
package com.zcloud.controller.czksmap;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.system.DepartmentService;
|
||||
import com.zcloud.service.system.UsersService;
|
||||
import com.zcloud.util.HttpRequestUtil;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import com.zcloud.util.examUntil.ErrorOperation;
|
||||
import com.zcloud.util.hk.HKUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明：沧州矿石地图,摄像头同步数据
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/api/czks/map")
|
||||
@ErrorOperation
|
||||
public class ApiCzksMapController extends BaseController {
|
||||
@Autowired
|
||||
private UsersService usersService;
|
||||
@Autowired
|
||||
private DepartmentService departmentService;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 今日进出港数据
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/15/015 17:22
|
||||
* @Param: [] []
|
||||
* @Return: com.zcloud.util.ReturnMap
|
||||
*/
|
||||
@RequestMapping(value = "carInOutToday")
|
||||
@ResponseBody
|
||||
public ReturnMap carInOutToday() throws Exception {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
HashMap<String, String> hashMap = new HashMap<>();
|
||||
hashMap.put("oreIn", "3252");
|
||||
hashMap.put("oreOut", "2356");
|
||||
hashMap.put("groceryIn", "200");
|
||||
hashMap.put("groceryOut", "125");
|
||||
hashMap.put("oreInAll", "33252");
|
||||
hashMap.put("oreOutAll", "32356");
|
||||
hashMap.put("groceryInAll", "2200");
|
||||
hashMap.put("groceryOutAll", "1125");
|
||||
returnMap.put("czksCarToday", hashMap);
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 定位在线人员数
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/15/015 17:22
|
||||
* @Param: [] []
|
||||
* @Return: com.zcloud.util.ReturnMap
|
||||
*/
|
||||
@RequestMapping(value = "allPersonList")
|
||||
@ResponseBody
|
||||
public ReturnMap getOlinePersonCount() throws Exception {
|
||||
PageData pageData = this.getPageData();
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", 1);
|
||||
request.put("pageSize", 10);
|
||||
request.put("online", "true");
|
||||
// 人员定位在线
|
||||
ReturnMap online = HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString());
|
||||
pageData.put("CORPINFO_ID", "f8da1790b1034058ae2efefd69af3284");
|
||||
// 系统人员数
|
||||
int userCount = usersService.getUserCount(pageData);
|
||||
// 系统部门数
|
||||
int departCount = departmentService.getDepartmentCount(pageData);
|
||||
online.put("userCount", userCount);
|
||||
online.put("departCount", departCount);
|
||||
return online;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 定位基础信息
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/15/015 17:22
|
||||
* @Param: [] []
|
||||
* @Return: com.zcloud.util.ReturnMap
|
||||
*/
|
||||
@RequestMapping(value = "/getCzksBasicLocationInfoData")
|
||||
@ResponseBody
|
||||
public ReturnMap getCzksBasicLocationInfoData() {
|
||||
return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", "");
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 定位标签状态
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/15/015 17:28
|
||||
* @Param: [] []
|
||||
* @Return: com.zcloud.util.ReturnMap
|
||||
*/
|
||||
@RequestMapping(value = "/personStaffList")
|
||||
@ResponseBody
|
||||
public ReturnMap getCzksPersonStaffListPage() {
|
||||
PageData pageData = this.getPageData();
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", pageData.getString("pageNum"));
|
||||
request.put("pageSize", pageData.getString("pageSize"));
|
||||
// 普通员工
|
||||
if ("1".equals(pageData.getString("type"))) {
|
||||
return HttpRequestUtil.getPeopleApi("/person/staff/listPage", request.toString());
|
||||
} else {
|
||||
// 相关方 员工
|
||||
return HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 人员定位告警数据
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/15/015 17:22
|
||||
* @Param: [] []
|
||||
* @Return: com.zcloud.util.ReturnMap
|
||||
*/
|
||||
@RequestMapping(value = "/getAlarmData")
|
||||
@ResponseBody
|
||||
public Object getAlarmData() {
|
||||
return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm", "");
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 摄像头列表
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/17/017 13:44
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value="/platformList")
|
||||
@ResponseBody
|
||||
public Object platformList() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
PageData pd =this.getPageData();
|
||||
map = HKUtil.cameraSearch(pd);
|
||||
if(ObjectUtils.isEmpty(map)){
|
||||
map = new HashMap<String,Object>();
|
||||
}
|
||||
map.put("result", "success");
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 解析摄像头播放地址
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/15/015 17:22
|
||||
* @Param: [] []
|
||||
* @Return: com.zcloud.util.ReturnMap
|
||||
*/
|
||||
@RequestMapping(value = "/getCameraHlsPath")
|
||||
@ResponseBody
|
||||
public ReturnMap getCameraHlsPath() {
|
||||
PageData pageData = this.getPageData();
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("INDEXCODE", pageData.getString("INDEXCODE"));
|
||||
return HttpRequestUtil.getCameraHlsPathApi("/platformvideomanagement/getHlsPath", request.toString());
|
||||
}
|
||||
@RequestMapping(value="/getHlsPath")
|
||||
@ResponseBody
|
||||
public Object getHlsPath() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
PageData pd =this.getPageData();
|
||||
map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
|
||||
if(ObjectUtils.isEmpty(map)){
|
||||
map = new HashMap<String,Object>();
|
||||
}
|
||||
map.put("result", "success");
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,556 @@
|
|||
package com.zcloud.controller.czksmap;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.czksbimap.CzksBiMapService;
|
||||
import com.zcloud.service.bus.CorpInfoService;
|
||||
import com.zcloud.service.fireresources.CzksFireResourcesService;
|
||||
import com.zcloud.service.gatemachine.GateMachineService;
|
||||
//import com.zcloud.service.keyProjects.MeteorologicalService;
|
||||
//import com.zcloud.service.keyProjects.MeteorologicalinfoService;
|
||||
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
|
||||
import com.zcloud.service.keyProjects.VideoManagerService;
|
||||
import com.zcloud.service.system.DepartmentService;
|
||||
import com.zcloud.service.system.UsersService;
|
||||
import com.zcloud.util.HttpRequestUtil;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import com.zcloud.util.Tools;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明：实时地图
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/czks/map")
|
||||
public class CzksMapController extends BaseController {
|
||||
|
||||
@Resource
|
||||
private CzksBiMapService biMapService;
|
||||
|
||||
@Autowired
|
||||
private VideoManagerService videomanagerService;
|
||||
@Autowired
|
||||
private CorpInfoService corpInfoService;
|
||||
|
||||
@Autowired
|
||||
private PlatformvideomanagementService platformvideomanagementService;
|
||||
@Autowired
|
||||
private UsersService usersService;
|
||||
|
||||
// @Autowired
|
||||
// private MeteorologicalinfoService meteorologicalinfoService;
|
||||
|
||||
@Autowired
|
||||
private RestTemplate restTemplate;
|
||||
|
||||
@Autowired
|
||||
private CzksFireResourcesService fireResourcesService;
|
||||
|
||||
@Autowired
|
||||
private DepartmentService departmentService;
|
||||
|
||||
@Autowired
|
||||
private GateMachineService gateMachineService;
|
||||
|
||||
|
||||
@RequestMapping("/getPointInfoADeviceByPid")
|
||||
@ResponseBody
|
||||
public Object getPointInfoADeviceByPid() {
|
||||
PageData pd = this.getPageData();
|
||||
PageData map = fireResourcesService.getPointInfoADeviceByPid(pd);
|
||||
map.put("result", "success");
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/getPointQualifiedPhotos")
|
||||
@ResponseBody
|
||||
public Object getPointQualifiedPhotos() {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
PageData pd = this.getPageData();
|
||||
map.put("result", "success");
|
||||
map.put("varList", fireResourcesService.getPointQualifiedPhotos(pd));
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 消防管控
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/9/20/020 15:30
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping("/getFireControl")
|
||||
@ResponseBody
|
||||
public Object getFireControl() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
PageData pageData = this.getPageData();
|
||||
LinkedList<PageData> value = biMapService.getFireControl(pageData);
|
||||
for (PageData data : value) {
|
||||
data.put("MAP_POINT_NAME", data.getString("NAME"));
|
||||
}
|
||||
map.put("result", "success");
|
||||
map.put("varList", value);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 消防资源
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/9/26/026 17:36
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping("/getFireResourceById")
|
||||
@ResponseBody
|
||||
public Object getFireResourceById() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pddata = this.getPageData();
|
||||
//获取当前人的公司id
|
||||
PageData pd = fireResourcesService.getDataById(pddata);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 消防救援队
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/9/20/020 15:30
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping("/getFireRescueTeam")
|
||||
@ResponseBody
|
||||
public Object getFireRescueTeam() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
PageData pageData = this.getPageData();
|
||||
LinkedList<PageData> data = biMapService.getFireRescueTeam(pageData);
|
||||
map.put("result", "success");
|
||||
map.put("varList", data);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 气象信息对接接口
|
||||
*
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
// @RequestMapping(value = "/tongMeteorologicalinfoList")
|
||||
// @ResponseBody
|
||||
// public ReturnMap tongMeteorologicalinfoList(@RequestBody List<PageData> list) throws Exception {
|
||||
// ReturnMap r = new ReturnMap();
|
||||
// r = meteorologicalinfoService.tongbuMeteorologicalinfo(list);
|
||||
// return r;
|
||||
// }
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 闸机设备在线情况 只有人车闸机
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/9/23/023 9:04
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
@RequestMapping("/getOnlineGateEquipment")
|
||||
@ResponseBody
|
||||
public ReturnMap getOnlineGateEquipment() {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pageData = this.getPageData();
|
||||
PageData value = gateMachineService.getOnlineGateMachine(pageData);
|
||||
returnMap.put("pd", value);
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 闸机位置
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/9/23/023 9:04
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
// @RequestMapping("/getGatePosition")
|
||||
// @ResponseBody
|
||||
// public ReturnMap getGatePosition() {
|
||||
// ReturnMap returnMap = new ReturnMap();
|
||||
// PageData pageData = this.getPageData();
|
||||
// //
|
||||
// List<PageData> value = gateMachineService.getGatePosition(pageData);
|
||||
// // 添加标点上的统一的title
|
||||
// for (PageData data : value) {
|
||||
// if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) {
|
||||
// data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME"));
|
||||
// } else {
|
||||
// data.put("MAP_POINT_NAME", data.getString("NAME"));
|
||||
// }
|
||||
// }
|
||||
// returnMap.put("varList", value);
|
||||
// return returnMap;
|
||||
// }
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 口门进出记录列表
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/9/23/023 9:04
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
@RequestMapping("/getDoorWayRecords")
|
||||
@ResponseBody
|
||||
public ReturnMap getDoorWayRecords(Page page) {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pageData = this.getPageData();
|
||||
page.setPd(pageData);
|
||||
if ("0".equals(pageData.getString("INDEX"))) {
|
||||
// 人
|
||||
List<PageData> value = biMapService.getDoorWayPeopleRecords(page);
|
||||
returnMap.put("varList", value);
|
||||
return returnMap;
|
||||
} else {
|
||||
// 车
|
||||
List<PageData> value = biMapService.getDoorWayCarRecords(page);
|
||||
returnMap.put("varList", value);
|
||||
return returnMap;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 闸机进出车、人的数量
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/9/23/023 9:04
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
@RequestMapping("/getGatesInAndOutNumById")
|
||||
@ResponseBody
|
||||
public ReturnMap getGatesInAndOutNumById() {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pageData = this.getPageData();
|
||||
Map<String, Object> data = biMapService.getGatesInAndOutNumById(pageData);
|
||||
returnMap.put("pd", data);
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 人员进出记录列表
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("/getGatesInAndOutListById")
|
||||
@ResponseBody
|
||||
public ReturnMap getGatesInAndOutListById(Page page) {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pd = this.getPageData();
|
||||
page.setPd(pd);
|
||||
List<PageData> recordAllList = gateMachineService.getPersonRecordListAllByEId(page);
|
||||
returnMap.put("recordAllList", recordAllList);
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping(value = "/fireResource/list")
|
||||
@ResponseBody
|
||||
public Object page(Page page) {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
//获取当前人的公司id
|
||||
page.setPd(pd);
|
||||
|
||||
List<PageData> varList = fireResourcesService.datalistPage(page);
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/fireDevice/listByMap")
|
||||
@ResponseBody
|
||||
public Object devicelistByMap(Page page) {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
String corpinfoId = Jurisdiction.getCORPINFO_ID();
|
||||
pd.put("CORPINFO_ID", corpinfoId);
|
||||
|
||||
//获取当前人的公司id
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = fireResourcesService.devicelistPage(page);
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取人员、车辆进出记录
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getPerpleCarGateMachineCount")
|
||||
@ResponseBody
|
||||
public Object getPerpleCarGateMachineCount() {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/getMachineTodayInOutCount")
|
||||
@ResponseBody
|
||||
public Object getMachineTodayInOutCount() {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
List<PageData> value = gateMachineService.getTodayInOutCount(pd);
|
||||
map.put("varList", value);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 沧州矿石人员定位，告警数据 Alarm data
|
||||
*/
|
||||
@RequestMapping(value = "/getAlarmData")
|
||||
@ResponseBody
|
||||
public Object getAlarmData() {
|
||||
return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm", "");
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 定位基础信息
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/6/006 11:15
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/getCzksBasicLocationInfoData")
|
||||
@ResponseBody
|
||||
public Object getCzksBasicLocationInfoData() {
|
||||
return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", "");
|
||||
}
|
||||
|
||||
@RequestMapping("/getGatePosition")
|
||||
@ResponseBody
|
||||
public ReturnMap getCzksGatePosition() {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pageData = this.getPageData();
|
||||
//
|
||||
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
List<PageData> value = gateMachineService.getGatePosition(pageData);
|
||||
// 添加标点上的统一的title
|
||||
for (PageData data : value) {
|
||||
if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) {
|
||||
data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME"));
|
||||
} else {
|
||||
data.put("MAP_POINT_NAME", data.getString("NAME"));
|
||||
}
|
||||
}
|
||||
returnMap.put("varList", value);
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 人员定位信息
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/6/006 17:33
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "person/allPerson/listPage")
|
||||
@ResponseBody
|
||||
public Object getCzksOnlinePersion() throws Exception {
|
||||
PageData pageData = this.getPageData();
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", 1);
|
||||
request.put("pageSize", 10);
|
||||
request.put("online", "true");
|
||||
// 人员定位在线
|
||||
ReturnMap online = HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString());
|
||||
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
// 系统人员数
|
||||
int userCount = usersService.getUserCount(pageData);
|
||||
// 系统部门数
|
||||
int departCount = departmentService.getDepartmentCount(pageData);
|
||||
online.put("userCount",userCount);
|
||||
online.put("departCount",departCount);
|
||||
return online;
|
||||
}
|
||||
/**
|
||||
* @Description: 电子围栏报警 Electronic fence
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/6/006 11:15
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/getFenceAlarmList")
|
||||
@ResponseBody
|
||||
public Object getFenceAlarmList() {
|
||||
PageData pageData = this.getPageData();
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", pageData.getString("currentPage"));
|
||||
request.put("pageSize", pageData.getString("showCount"));
|
||||
request.put("beginTime", pageData.getString("beginTime"));
|
||||
request.put("endTime", pageData.getString("endTime"));
|
||||
request.put("alarmType", pageData.getString("alarmType"));
|
||||
request.put("alarmStatus", pageData.getString("alarmStatus"));
|
||||
request.put("realName", pageData.getString("realName"));
|
||||
// 标签卡
|
||||
return HttpRequestUtil.getPeopleApi("/system/alarm/person/listPage", request.toString());
|
||||
}
|
||||
/**
|
||||
* @Description: 电子围栏报警 Electronic fence
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/6/006 11:15
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/getElectronicFenceList")
|
||||
@ResponseBody
|
||||
public Object getElectronicFenceList() {
|
||||
PageData pageData = this.getPageData();
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", pageData.getString("currentPage"));
|
||||
request.put("pageSize", pageData.getString("showCount"));
|
||||
request.put("railName", pageData.getString("railName"));
|
||||
// 标签卡
|
||||
return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 获取摄像头定位
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/6/006 11:15
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/getCameraPositioning")
|
||||
@ResponseBody
|
||||
public Object getCameraPositioning() {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pageData = new PageData();
|
||||
pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
List<PageData> dataList = platformvideomanagementService.listAllForMap(pageData);
|
||||
returnMap.put("varList",dataList);
|
||||
return returnMap;
|
||||
}
|
||||
/**
|
||||
* @Description: 设备在线情况
|
||||
* @Author: dearLin
|
||||
* @Date: 2024/1/6/006 11:15
|
||||
* @Param: [] []
|
||||
* @Return: java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/getListMapSluiceCount")
|
||||
@ResponseBody
|
||||
public Object getListMapSluiceCount() {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pageData = new PageData();
|
||||
pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
List<PageData> dataList = platformvideomanagementService.getListMapSluiceCount(pageData);
|
||||
returnMap.put("varList",dataList);
|
||||
return returnMap;
|
||||
}
|
||||
@RequestMapping(value = "/person/staff/listPage")
|
||||
@ResponseBody
|
||||
public Object getCzksPersonStaffListPage() {
|
||||
PageData pageData = this.getPageData();
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", pageData.getString("pageNum"));
|
||||
request.put("pageSize", pageData.getString("pageSize"));
|
||||
// 普通员工
|
||||
if ("1".equals(pageData.getString("type"))) {
|
||||
return HttpRequestUtil.getPeopleApi("/person/staff/listPage", request.toString());
|
||||
} else {
|
||||
// 相关方 员工
|
||||
return HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString());
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 沧州矿石人员定位结束 定位基础信息
|
||||
*/
|
||||
/**
|
||||
* 获取人员、车辆进出记录
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getCurrentLocationOnline")
|
||||
@ResponseBody
|
||||
public Object getCurrentLocationOnline() {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
// 获取人员定位信息 根据定位卡(身份证)编码
|
||||
@RequestMapping(value = "/getPersonByCardNo")
|
||||
@ResponseBody
|
||||
public Object getPersonByCardNo() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
PageData pd = this.getPageData();
|
||||
PageData value = usersService.getPersonByCardNo(pd);
|
||||
map.put("result", "success");
|
||||
map.put("pd", value);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取摄像头播放路径(曹妃甸使用）
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/getHlsPath")
|
||||
@ResponseBody
|
||||
public Object getHlsPath() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询人员在线及统计数据(曹妃甸使用）
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/getCurrentPersonnelData")
|
||||
@ResponseBody
|
||||
public Object getCurrentPersonnelData() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
PageData pd = this.getPageData();
|
||||
return map;
|
||||
}
|
||||
|
||||
@RequestMapping("/getUserMapInfo")
|
||||
@ResponseBody
|
||||
public ReturnMap getUserMapInfo() throws Exception {
|
||||
PageData pd = this.getPageData();
|
||||
pd = usersService.findByCardNo(pd); //列出HotWorkApplicationDelayed列表
|
||||
ReturnMap r = ReturnMap.ok();
|
||||
r.put("pd", pd);
|
||||
return r;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,191 @@
|
|||
package com.zcloud.controller.czksmap;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.czksbimap.CzksMapEightService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明：实时地图八项工作内容
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/czks/map/Eight")
|
||||
public class CzksMapEightController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private CzksMapEightService mapEightService;
|
||||
|
||||
/**
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/getEcharts")
|
||||
@ResponseBody
|
||||
public Object getEcharts() throws Exception {
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
|
||||
return mapEightService.getEchartsOrder(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可视化首页统计数据
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/findFormCount")
|
||||
@ResponseBody
|
||||
public Object findFormCount() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
|
||||
PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd);
|
||||
map.put("pd", data);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 作业实时情况展示（最新18条）
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/listHighRiskWork")
|
||||
@ResponseBody
|
||||
public Object listHighRiskWork(Page page) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = mapEightService.listHighRiskWorkOrder(page);
|
||||
map.put("varList", varList);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有高危作业的位置坐标（有坐标数据）
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/listAllHighRiskWorkLocation")
|
||||
@ResponseBody
|
||||
public Object listAllHighRiskWorkLocation() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
List<PageData> varList;
|
||||
if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { //一公司
|
||||
varList = mapEightService.listAllHighRiskWorkLocation(pd);
|
||||
} else {
|
||||
varList = mapEightService.listAllHighRiskWorkLocationOrder(pd);
|
||||
}
|
||||
// 处理一下 name 的问题
|
||||
if (varList != null) {
|
||||
varList.forEach(item -> {
|
||||
item.put("MAP_POINT_NAME", item.getString("NAME"));
|
||||
});
|
||||
}
|
||||
map.put("varList", varList);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id以及类型获取数据 一公司
|
||||
*
|
||||
* @param id 数据id
|
||||
* @param type 数据类型 动火 等等
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getById")
|
||||
@ResponseBody
|
||||
public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
|
||||
return mapEightService.getById(pd);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id以及类型获取数据 其他公司
|
||||
*
|
||||
* @param id 数据id
|
||||
* @param type 数据类型 动火 等等
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getByIdOrder")
|
||||
@ResponseBody
|
||||
public Object getByIdOrder(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
|
||||
return mapEightService.getByIdOrder(pd);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/list")
|
||||
@ResponseBody
|
||||
public Object list(Page page) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
|
||||
List<PageData> varList = mapEightService.listAll(pd); //列出HotWorkApplicationDelayed列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取动火防护措施
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/listAllMeasures")
|
||||
@ResponseBody
|
||||
public Object listAllMeasures() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
|
||||
List<PageData> varList = mapEightService.listAllMeasures(pd); //根据ID读取
|
||||
map.put("varList", varList);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
package com.zcloud.controller.czksmap;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
//import com.zcloud.service.keyProjects.PlatformelectronicService;
|
||||
//import com.zcloud.util.hk.HKPostUtil;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/czks/map/mapPlatformelectronic")
|
||||
public class CzksMapPlatFormElectronicController extends BaseController {
|
||||
// @Autowired
|
||||
// private PlatformelectronicService platformelectronicService;
|
||||
|
||||
/**总摄像头数
|
||||
* @throws Exception
|
||||
*/
|
||||
// @RequestMapping(value="/listAll")
|
||||
// @ResponseBody
|
||||
// public Object listAll() throws Exception{
|
||||
// Map<String,Object> map = new HashMap<String,Object>();
|
||||
// String errInfo = "success";
|
||||
// PageData pd = new PageData();
|
||||
// pd = this.getPageData();
|
||||
// Integer allForMap = platformelectronicService.countAllForMap(pd); //列出Platformelectronic列表
|
||||
// map.put("allForMap", allForMap);
|
||||
// map.put("result", errInfo);
|
||||
// return map;
|
||||
// }
|
||||
|
||||
|
||||
/**根据区域统计摄像头总数
|
||||
* @throws Exception
|
||||
*/
|
||||
// @RequestMapping(value="/listAllByArea")
|
||||
// @ResponseBody
|
||||
// public Object listAllByArea() throws Exception{
|
||||
// Map<String,Object> map = new HashMap<String,Object>();
|
||||
// String errInfo = "success";
|
||||
// PageData pd = new PageData();
|
||||
// pd = this.getPageData();
|
||||
// List<PageData> countAllByArea = platformelectronicService.countAllByArea(pd); //列出Platformelectronic列表
|
||||
// map.put("varList", countAllByArea);
|
||||
// map.put("result", errInfo);
|
||||
// return map;
|
||||
// }
|
||||
|
||||
|
||||
/**地图插点
|
||||
* @throws Exception
|
||||
*/
|
||||
// @RequestMapping(value="/listAllLocation")
|
||||
// @ResponseBody
|
||||
// public Object listAllLocation() throws Exception{
|
||||
// Map<String,Object> map = new HashMap<String,Object>();
|
||||
// String errInfo = "success";
|
||||
// PageData pd = new PageData();
|
||||
// pd = this.getPageData();
|
||||
// pd.put("forMap","1");
|
||||
// List<PageData> varList = platformelectronicService.listAll(pd); //列出Platformelectronic列表
|
||||
// for (PageData data : varList) {
|
||||
// data.put("MAP_POINT_NAME", data.getString("NAME"));
|
||||
// }
|
||||
// map.put("varList", varList);
|
||||
// map.put("result", errInfo);
|
||||
// return map;
|
||||
// }
|
||||
|
||||
/**列表
|
||||
* @throws Exception
|
||||
*/
|
||||
// @RequestMapping(value="/getHlsPathById")
|
||||
// @ResponseBody
|
||||
// public Object getHlsPath() throws Exception{
|
||||
// Map<String,Object> map = new HashMap<String,Object>();
|
||||
// PageData pd =this.getPageData();
|
||||
// pd = platformelectronicService.findById(pd);
|
||||
// map = HKPostUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
|
||||
// map.put("pd",pd);
|
||||
// map.put("result", "success");
|
||||
// return map;
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.controller.czksmap;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.bus.RiskUnitService;
|
||||
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/czks/ObtainDisplayData")
|
||||
public class CzksObtainDisplayDataController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private RiskUnitService riskUnitService;
|
||||
@Autowired
|
||||
private PlatformvideomanagementService platformvideomanagementService;
|
||||
|
||||
@RequestMapping(value="/getRiskList")
|
||||
@ResponseBody
|
||||
public Object getRiskList() throws Exception{
|
||||
PageData pd = this.getPageData();
|
||||
return riskUnitService.listAllForMap(pd);
|
||||
}
|
||||
|
||||
@RequestMapping(value="/listAllCameraForMap")
|
||||
@ResponseBody
|
||||
public Object listAllCameraForMap() throws Exception{
|
||||
PageData pd = this.getPageData();
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
returnMap.put("data", platformvideomanagementService.listAllForMap(pd));
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
package com.zcloud.controller.czksmap;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.system.UsersService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/czks/UserPosition")
|
||||
public class CzksUserPositionController extends BaseController {
|
||||
@Autowired
|
||||
private UsersService usersService;
|
||||
|
||||
@RequestMapping(value="/getCurrentLocationOnline")
|
||||
@ResponseBody
|
||||
public Object getCurrentLocationOnline() throws Exception{
|
||||
PageData pd = this.getPageData();
|
||||
return usersService.getCurrentLocation(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询人员在线及统计数据
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/getCurrentPersonnelData")
|
||||
@ResponseBody
|
||||
public Object getCurrentPersonnelData() throws Exception{
|
||||
PageData pd = this.getPageData();
|
||||
return usersService.getCurrentPersonnelData(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取人员定位统计列表
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/personPositioningStatistics")
|
||||
@ResponseBody
|
||||
public Object getPersonPositioningStatistics() throws Exception{
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
return usersService.getPersonPositioningStatistics(pd);
|
||||
}
|
||||
|
||||
@RequestMapping(value="/getCurrentLocationOnlineCount")
|
||||
@ResponseBody
|
||||
public Object getCurrentLocationOnlineCount() throws Exception{
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
return usersService.getCurrentLocationCount(pd);
|
||||
}
|
||||
}
|
||||
|
|
@ -138,7 +138,9 @@ public class MfolderController extends BaseController {
|
|||
@RequestParam(value = "PARENT_ID", required = false) String PARENT_ID,
|
||||
@RequestParam(value = "REMARKS", required = false) String REMARKS,
|
||||
@RequestParam(value = "SHARE", required = false) String SHARE) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
ArrayList<String> pictureList = new ArrayList<>();
|
||||
List<PageData> mfolderServiceList = new ArrayList();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
if (files != null && files.length > 0) {
|
||||
|
|
@ -155,8 +157,7 @@ public class MfolderController extends BaseController {
|
|||
MultipartFile file = files[i];
|
||||
String ffile = DateUtil.getDays(), fileName = "";
|
||||
if (null != file && !file.isEmpty()) {
|
||||
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
|
||||
// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
|
||||
String MFOLDER_ID = this.get32UUID();
|
||||
Long size = file.getSize()/1024;
|
||||
fileName = this.get32UUID()
|
||||
+ file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
||||
|
|
@ -173,18 +174,38 @@ public class MfolderController extends BaseController {
|
|||
pd.put("CTIME", DateUtil.date2Str(new Date())); // 创建时间
|
||||
pd.put("UNAME", Jurisdiction.getName()); // 上传者,当前用户的姓名
|
||||
pd.put("MASTER", Jurisdiction.getUsername()); // 用户名
|
||||
// pd.put("FILESIZE", FileUtil.getFilesize(Const.FILEURL + Const.FILEPATHFILE
|
||||
// + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName)); // 文件大小
|
||||
pd.put("REMARKS", REMARKS); // 备注
|
||||
pd.put("SHARE", SHARE); // 是否共享
|
||||
pd.put("MFOLDER_ID", this.get32UUID()); // 主键
|
||||
pd.put("MFOLDER_ID", MFOLDER_ID); // 主键
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
|
||||
"@@"
|
||||
+fileName);
|
||||
|
||||
PageData pageData = new PageData();
|
||||
pd.put("FILEPATH",
|
||||
Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); // 文件路径
|
||||
pageData.put("FILESIZE", size);
|
||||
pageData.put("NAME", realName2); // 文件名
|
||||
pageData.put("PARENT_ID", PARENT_ID); // 目录ID
|
||||
pageData.put("CTIME", DateUtil.date2Str(new Date())); // 创建时间
|
||||
pageData.put("UNAME", Jurisdiction.getName()); // 上传者,当前用户的姓名
|
||||
pageData.put("MASTER", Jurisdiction.getUsername()); // 用户名
|
||||
pageData.put("REMARKS", REMARKS); // 备注
|
||||
pageData.put("SHARE", SHARE); // 是否共享
|
||||
pageData.put("MFOLDER_ID", MFOLDER_ID); // 主键
|
||||
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
|
||||
mfolderServiceList.add(pageData);
|
||||
|
||||
mfolderService.save(pd); // 存入数据库表
|
||||
} else {
|
||||
errInfo = "fail";
|
||||
}
|
||||
}
|
||||
}
|
||||
pd.put("sendPicturesList", JSON.toJSONString(mfolderServiceList));
|
||||
map.put("mfolderServiceList", JSON.toJSONString(pictureList));
|
||||
pd.put("mfolderServiceList",pictureList);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
map.put("result", errInfo); // 返回结果
|
||||
return map;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,104 @@
|
|||
package com.zcloud.controller.gatemachine;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.gatemachine.GateCarIOService;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 闸机车辆管理
|
||||
* LLX
|
||||
* 2024-01-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/gateCar")
|
||||
public class GateCarIOController extends BaseController {
|
||||
|
||||
@Resource
|
||||
private GateCarIOService gateCarIOService;
|
||||
|
||||
/**
|
||||
* 出入闸机车辆记录
|
||||
* @param page
|
||||
* @return 记录
|
||||
*/
|
||||
@RequestMapping(value = "/page")
|
||||
public ReturnMap page(Page page) {
|
||||
ReturnMap returnMap = new ReturnMap();
|
||||
PageData pageData = this.getPageData();
|
||||
page.setPd(pageData);
|
||||
List<PageData> data = gateCarIOService.getDatalistpage(page);
|
||||
returnMap.put("varList", data);
|
||||
returnMap.put("page", page);
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑出入闸机车辆记录
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/edit")
|
||||
public ReturnMap edit() {
|
||||
PageData pd = this.getPageData();
|
||||
gateCarIOService.edit(pd);
|
||||
return ReturnMap.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除出入闸机车辆记录
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/removeByIds")
|
||||
public ReturnMap removeByIds() {
|
||||
PageData pageData = this.getPageData();
|
||||
gateCarIOService.removeByIds(pageData);
|
||||
return ReturnMap.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加出入闸机车辆记录
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/add")
|
||||
public ReturnMap add() {
|
||||
PageData pageData = this.getPageData();
|
||||
gateCarIOService.save(pageData);
|
||||
return ReturnMap.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据条件获取杂货/矿区闸机出入记录
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getIORecords")
|
||||
public ReturnMap getIORecord(Page page) {
|
||||
PageData pd = this.getPageData();
|
||||
page.setPd(pd);
|
||||
return ReturnMap.ok().put("data", gateCarIOService.getIORecord(page));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当日计数
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getEQCount")
|
||||
public ReturnMap getTodayEQCount() {
|
||||
return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(this.getPageData()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取在场，离场，总量计数
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getEQCountAll")
|
||||
public ReturnMap getTodayEQCountAll() {
|
||||
return ReturnMap.ok().put("data", gateCarIOService.getAllEQCount(this.getPageData()));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
|
|||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.gatemachine.GateMachineService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
|
@ -52,6 +53,7 @@ public class GateMachineController extends BaseController {
|
|||
@RequestMapping(value = "/add")
|
||||
public ReturnMap add() {
|
||||
PageData pageData = this.getPageData();
|
||||
pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
gateMachineService.save(pageData);
|
||||
return ReturnMap.ok();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public class GateVideoController extends BaseController {
|
|||
pd.put("GATEVIDEO_ID", this.get32UUID()); //主键
|
||||
pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期
|
||||
pd.put("OPUSER", Jurisdiction.getUsername()); //操作人
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人
|
||||
pd.put("ISDELETE", "0"); //是否删除
|
||||
gateVideoService.save(pd);
|
||||
map.put("result", errInfo);
|
||||
|
|
|
|||
|
|
@ -113,13 +113,11 @@ public class SafetyEnvironmentalInspectorController extends BaseController {
|
|||
uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
strings.add(uBean.getString("INSPECTION_USER_SIGN_IMG")+"@@"+fileName);
|
||||
}
|
||||
pd.put("uBean",JSON.toJSONString(uBean));
|
||||
PageData verify = safetyenvironmentalinspectorService.verify(uBean);
|
||||
pd.put("verify",JSON.toJSONString(verify));
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
map.put("sendPicturesList",JSON.toJSONString(strings));
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
map.put("dockData", JSON.toJSONString(verify));
|
||||
return map;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.zcloud.controller.keyProjects;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.zcloud.aspect.DockAnnotation;
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
|
@ -33,6 +35,7 @@ public class PlatformvideomanagementController extends BaseController {
|
|||
|
||||
@RequestMapping(value="/savePosition")
|
||||
@ResponseBody
|
||||
@DockAnnotation
|
||||
public Object savePosition() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
|
|
@ -46,10 +49,12 @@ public class PlatformvideomanagementController extends BaseController {
|
|||
}
|
||||
|
||||
map.put("result", errInfo);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
return map;
|
||||
}
|
||||
@RequestMapping(value="/delLocation")
|
||||
@ResponseBody
|
||||
@DockAnnotation
|
||||
public Object delLocation() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
|
|
@ -57,6 +62,8 @@ public class PlatformvideomanagementController extends BaseController {
|
|||
pd = this.getPageData();
|
||||
platformvideomanagementService.delLocation(pd);
|
||||
map.put("result", errInfo);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
|
||||
return map;
|
||||
}
|
||||
/**新增
|
||||
|
|
@ -65,15 +72,16 @@ public class PlatformvideomanagementController extends BaseController {
|
|||
*/
|
||||
@RequestMapping(value="/add")
|
||||
@ResponseBody
|
||||
@DockAnnotation
|
||||
public Object add() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID()); //主键
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键
|
||||
platformvideomanagementService.save(pd);
|
||||
map.put("result", errInfo);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
return map;
|
||||
}
|
||||
|
||||
|
|
@ -121,6 +129,8 @@ public class PlatformvideomanagementController extends BaseController {
|
|||
if(ObjectUtils.isEmpty(map)){
|
||||
map = new HashMap<String,Object>();
|
||||
}
|
||||
HashMap<Object, Object> data = new HashMap<>();
|
||||
map.put("data", data);
|
||||
map.put("result", "success");
|
||||
return map;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
package com.zcloud.controller.map;
|
||||
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.map.MapEightCfdService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明：实时地图八项工作内容
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/map/Eight/cfd")
|
||||
public class MapEightCfdController extends BaseController {
|
||||
@Autowired
|
||||
private MapEightCfdService mapEightCfdService;
|
||||
|
||||
/**
|
||||
* 根据id以及类型获取数据
|
||||
* @param id 数据id
|
||||
* @param type 数据类型 动火 等等
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getByIdOrder")
|
||||
@ResponseBody
|
||||
public Object getByIdOrder(@RequestParam(value = "id")String id,@RequestParam("TYPE") String type) throws Exception {
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
return mapEightCfdService.getByIdOrder(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/list")
|
||||
@ResponseBody
|
||||
public Object list(Page page) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> varList = mapEightCfdService.listAll(pd); //列出HotWorkApplicationDelayed列表
|
||||
map.put("varList", varList);
|
||||
map.put("page", page);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**获取动火防护措施
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/listAllMeasures")
|
||||
@ResponseBody
|
||||
public Object listAllMeasures() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
List<PageData> varList = mapEightCfdService.listAllMeasures(pd); //根据ID读取
|
||||
map.put("varList", varList);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4,6 +4,13 @@ import com.zcloud.controller.base.BaseController;
|
|||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.map.MapEightService;
|
||||
import com.zcloud.service.map.util.ReturnMap;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.util.LinkedMultiValueMap;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
import com.zcloud.service.system.UsersService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
|
@ -14,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -208,4 +216,80 @@ public class MapEightController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据id以及类型获取数据 //曹妃甸东
|
||||
*
|
||||
* @param id 数据id
|
||||
* @param type 数据类型 动火 等等
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getByIdCfdD")
|
||||
@ResponseBody
|
||||
public Object getByIdCfdD(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
|
||||
PageData pd = this.getPageData();
|
||||
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
|
||||
paramMap.add("id", pd.getString("id"));
|
||||
paramMap.add("TYPE", pd.getString("TYPE"));
|
||||
paramMap.add("HOTWORK_ID", pd.getString("HOTWORK_ID"));
|
||||
Map<String, Object> result =
|
||||
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getByIdOrder", paramMap, Map.class);
|
||||
return result;
|
||||
}
|
||||
|
||||
/*曹妃甸专用接口-开始*/
|
||||
|
||||
/**
|
||||
* @Description: 获取八项作业所有作业人员
|
||||
* @Date: 2023/9/23/023 9:04
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
@RequestMapping("/getAllWorkUserCards")
|
||||
@ResponseBody
|
||||
public ReturnMap getAllWorkUserCards() {
|
||||
PageData pageData = this.getPageData();
|
||||
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
|
||||
Map<String, Object> result =
|
||||
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllWorkUserCards", paramMap, Map.class);
|
||||
return ReturnMap.ok(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 获取八项作业所有作业人员
|
||||
* @Date: 2023/9/23/023 9:04
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
@RequestMapping("/getAllTickets")
|
||||
@ResponseBody
|
||||
public ReturnMap getAllTickets() {
|
||||
PageData pageData = this.getPageData();
|
||||
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
|
||||
Map<String, Object> result =
|
||||
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllTickets", paramMap, Map.class);
|
||||
return ReturnMap.ok(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description: 获取八项作业所有作业人员
|
||||
* @Date: 2023/9/23/023 9:04
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
@RequestMapping("/findEightsByUserId")
|
||||
@ResponseBody
|
||||
public ReturnMap findEightsByUserId() {
|
||||
PageData pageData = this.getPageData();
|
||||
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
|
||||
paramMap.add("empNo", pageData.getString("empNo"));
|
||||
paramMap.add("TYPE", pageData.getString("TYPE"));
|
||||
Map<String, Object> result =
|
||||
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/findEightsByUserId", paramMap, Map.class);
|
||||
return ReturnMap.ok(result);
|
||||
}
|
||||
|
||||
|
||||
/*曹妃甸专用接口-结束*/
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.zcloud.entity.Page;
|
|||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.map.MapEightService;
|
||||
import com.zcloud.service.map.MapKetProjectService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
|
|
@ -73,6 +74,7 @@ public class MapKeyProjectController extends BaseController {
|
|||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
//根据条件增加参数或减少参数 都没有 直接返回空
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) {
|
||||
List<String> ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd);
|
||||
if (ArrayDATA_IDS.size() == 0) {
|
||||
|
|
|
|||
|
|
@ -287,6 +287,9 @@ public interface CzksMapEightMapper {
|
|||
*/
|
||||
List<PageData> listAllMeasuresELECTRICITYOrder(PageData pd);
|
||||
|
||||
|
||||
List<PageData> listAllGasELECTRICTITYOrder(PageData pd);
|
||||
|
||||
/**盲板查询数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
|
|
@ -356,14 +359,44 @@ public interface CzksMapEightMapper {
|
|||
*/
|
||||
List<PageData> listAllMeasuresCUTROADOrder(PageData pd);
|
||||
|
||||
/**
|
||||
* 动火获取字典展示
|
||||
* @param shuzu
|
||||
* @return
|
||||
*/
|
||||
/**
|
||||
* 动火获取字典展示
|
||||
* @param shuzu
|
||||
* @return
|
||||
*/
|
||||
List<String> getListDongHuo(List<String> shuzu);
|
||||
|
||||
PageData getAllWorkUserIds(PageData pd);
|
||||
/**
|
||||
* 获取cfd动火作业高危作业坐标统计
|
||||
* @param pd
|
||||
* @return
|
||||
*/
|
||||
List<PageData> getHOTWORKHighRiskWorkLocationCfd(PageData pd);
|
||||
|
||||
|
||||
List<PageData> findByELECTRICTITYAcceptuserId(PageData pd);
|
||||
|
||||
List<PageData> findByELECTRICTITYAcceptuserIds(PageData pd);
|
||||
|
||||
List<PageData> findByBLINDBOARDAcceptuserId(PageData pd);
|
||||
|
||||
List<PageData> findByBLINDBOARDAcceptuserIds(PageData pd);
|
||||
|
||||
List<PageData> findByCUTROADAcceptuserId(PageData pd);
|
||||
|
||||
List<PageData> findByCUTROADAcceptuserIds(PageData pd);
|
||||
|
||||
List<PageData> findByBREAKGROUNDAcceptuserId(PageData pd);
|
||||
|
||||
List<PageData> findByBREAKGROUNDAcceptuserIds(PageData pd);
|
||||
|
||||
List<PageData> findByHIGHWORKAcceptuserId(PageData pd);
|
||||
|
||||
List<PageData> findByHIGHWORKAcceptuserIds(PageData pd);
|
||||
|
||||
List<PageData> findByHOISTINGAcceptuserId(PageData pd);
|
||||
|
||||
List<PageData> findByHOISTINGAcceptuserIds(PageData pd);
|
||||
|
||||
/**有限空间作业查询
|
||||
* @param pd
|
||||
|
|
@ -404,5 +437,8 @@ public interface CzksMapEightMapper {
|
|||
* @return
|
||||
*/
|
||||
PageData findByIdCONFINEDSPACEGasWH(PageData pd);
|
||||
|
||||
|
||||
PageData getAllWorkUserIds(PageData pd);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
package com.zcloud.mapper.datasource.gatemachine;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Mapper
|
||||
public interface CzksGateAreaMapper {
|
||||
List<PageData> getDatalistPage(Page page);
|
||||
|
||||
void edit(PageData pd);
|
||||
|
||||
void removeByIds(PageData pageData);
|
||||
|
||||
void save(PageData pageData);
|
||||
|
||||
List<PageData> getGatePosition(PageData pageData);
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package com.zcloud.mapper.datasource.gatemachine;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface CzksGateCarIOMapper {
|
||||
List<PageData> getMineralDatalistPage(Page page);
|
||||
|
||||
List<PageData> getGroceryDatalistPage(Page page);
|
||||
|
||||
int editGrocery(PageData pd);
|
||||
|
||||
int editMineral(PageData pd);
|
||||
|
||||
void saveMineral(PageData pageData);
|
||||
|
||||
PageData countGroceryEnterAndQuit(PageData pd);
|
||||
PageData countGroceryEnterAndQuitAll(PageData pd);
|
||||
|
||||
PageData countMineralEnterAndQuit(PageData pd);
|
||||
PageData countMineralEnterAndQuitAll(PageData pd);
|
||||
|
||||
List<PageData> getGroceryIORecords(Page page);
|
||||
List<PageData> getMineralIORecords(Page page);
|
||||
|
||||
void removeGroceryRecordByIds(PageData pageData);
|
||||
|
||||
void removeMineralRecordByIds(PageData pageData);
|
||||
|
||||
int saveGrocery(PageData pageData);
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
package com.zcloud.mapper.datasource.gatemachine;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Mapper
|
||||
public interface CzksGateMachineMapper {
|
||||
ArrayList<PageData> getDatalistPage(Page page);
|
||||
|
||||
void edit(PageData pd);
|
||||
|
||||
void removeByIds(PageData pageData);
|
||||
|
||||
void save(PageData pageData);
|
||||
|
||||
List<PageData> getOnlineGateMachine(PageData pageData);
|
||||
|
||||
List<PageData> getTodayInOutCount(PageData pageData);
|
||||
|
||||
// 弃用 因需求变更
|
||||
List<PageData> getGatePosition(PageData pageData);
|
||||
|
||||
PageData getGateMachineInfoById(PageData pageData);
|
||||
|
||||
List<PageData> getPersonRecordCountByEId(PageData gateMachineInfo);
|
||||
|
||||
List<PageData> getCarRecordCountByEId(PageData gateMachineInfo);
|
||||
|
||||
List<PageData> getCarRecordCountByCorpId(PageData gateMachineInfo);
|
||||
|
||||
/**
|
||||
* 今天闸机的进出记录
|
||||
* @param gateMachineInfo
|
||||
* @return
|
||||
*/
|
||||
List<PageData> getPersonRecordListAllByIdlistPage(Page page);
|
||||
}
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
package com.zcloud.mapper.datasource.gatemachine;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：视频管理
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2021-05-10
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public interface CzksGateVideoMapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
void savePosition(PageData pd);
|
||||
void editIsShow(PageData pd);
|
||||
void editIsShowBycorpinfoid(PageData pd);
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listBo(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
void deleteAll(String[] ArrayDATA_IDS);
|
||||
|
||||
PageData findByCode(PageData pd);
|
||||
|
||||
List<PageData> listAllForMap(PageData pd);
|
||||
|
||||
List<PageData> getPointsInfo(PageData pd);
|
||||
|
||||
List<PageData> getCameraPosition(PageData pageData);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
package com.zcloud.mapper.dsno2.fireresources;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface CzksFireResourcesMapper {
|
||||
/**新增
|
||||
* @param pd
|
||||
*/
|
||||
void save(PageData pd);
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
*/
|
||||
void edit(PageData pd);
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
*/
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
LinkedList<PageData> getControlRoomDataList(PageData pageData);
|
||||
LinkedList<PageData> getPumpRoomDataList(PageData pageData);
|
||||
LinkedList<PageData> getRescueTeamDataList(PageData pageData);
|
||||
LinkedList<PageData> getWaterSourceDataList(PageData pageData);
|
||||
|
||||
LinkedList<PageData> getPointDataList(PageData pageData);
|
||||
|
||||
PageData getDataById(PageData pddata);
|
||||
|
||||
|
||||
List<PageData> getCheckRecordByPid(PageData pageData);
|
||||
|
||||
|
||||
PageData findPointById(PageData pageData);
|
||||
|
||||
List<PageData> listAll4H5(PageData pageData);
|
||||
|
||||
List<PageData> getPointQualifiedPhotosByEpid(PageData pageData);
|
||||
|
||||
List<PageData> getPointQualifiedPhotos(PageData pageData);
|
||||
|
||||
List<PageData> goRecordDeviceByPid(PageData pd);
|
||||
|
||||
List<PageData> devicelistPage(Page page);
|
||||
|
||||
List<PageData> getPointCheckPhotoById(PageData pageData);
|
||||
}
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
package com.zcloud.mapper.dsno2.system;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.entity.system.Department;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明： 组织机构接Mapper
|
||||
* 作者：luoxiaobao
|
||||
* 官网：www.qdkjchina.com
|
||||
*/
|
||||
public interface Department2Mapper {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> datalistPage(Page page)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
/**通过编码获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByBianma(PageData pd)throws Exception;
|
||||
|
||||
/**
|
||||
* 通过ID获取其子级列表
|
||||
* @param parentId
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listSubDepartmentByParentId(String parentId) throws Exception;
|
||||
|
||||
/**
|
||||
* 通过ID获取其子级列表
|
||||
* @param parentId
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listByCorpInfoId(String parentId,String CORPINFO_ID) throws Exception;
|
||||
List<PageData> deptinformation(PageData pageData) throws Exception;
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)
|
||||
* @param MENU_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listAllDepartment(String parentId) throws Exception;
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
|
||||
* @param MENU_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAllDepartmentToSelect(String parentId, List<PageData> zdepartmentPdList) throws Exception;
|
||||
|
||||
/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式)
|
||||
* @param DEPARTMENT_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception;
|
||||
|
||||
public List<PageData> listAll(PageData pd);
|
||||
|
||||
public List<PageData> listAllMent (PageData pd);
|
||||
|
||||
public List<Department> listAllDepartmentByType(PageData pd) throws Exception;
|
||||
|
||||
void saveCorpdept(PageData pd);
|
||||
|
||||
List<PageData> saftpersonlist(PageData pd) throws Exception;
|
||||
|
||||
List<PageData> saftmanagelist(PageData pd);
|
||||
|
||||
List<PageData> findbyCorpIdtoDeptlistPage(Page page);
|
||||
|
||||
List<PageData> findByDeptIdlistPage(Page page);
|
||||
|
||||
public PageData findCorpDeptDetail(PageData pd);
|
||||
|
||||
void editNameBDId(PageData deptPageData);
|
||||
|
||||
//从管理端修改部门 新
|
||||
void editCorpdeptNew(PageData pd);
|
||||
|
||||
List<PageData> listTreeCorpDept(PageData pd);
|
||||
}
|
||||
|
||||
|
|
@ -6,6 +6,7 @@ import java.util.Map;
|
|||
|
||||
import com.zcloud.mapper.datasource.bus.IdentificationPartsMapper;
|
||||
import com.zcloud.mapper.datasource.bus.RiskPointMapper;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
|
@ -118,6 +119,7 @@ public class RiskUnitServiceImpl implements RiskUnitService{
|
|||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
String errInfo = "success";
|
||||
//获取风险单元数、辨识部位数和风险因素数
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
List<PageData> riskUnit = riskunitMapper.listAll(pd);
|
||||
List<PageData> identificationParts = identificationPartsMapper.listAll(pd);
|
||||
List<PageData> riskPoint = riskPointMapper.listAll(pd);
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 说明：实时地图八项工作
|
||||
|
|
@ -112,27 +113,28 @@ public class CzksMapEightServiceImpl implements CzksMapEightService {
|
|||
|
||||
@Override
|
||||
public List<PageData> listAllHighRiskWorkLocation(PageData pd) throws Exception {
|
||||
List<PageData> r = new ArrayList<>();
|
||||
String typeStr = pd.getString("TYPE");
|
||||
//动火
|
||||
if(StringUtils.equals(typeStr,"HOTWORK")){
|
||||
r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd);
|
||||
//临时用电
|
||||
}else if(StringUtils.equals(typeStr,"ELECTRICITY")){
|
||||
r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd);
|
||||
//盲板
|
||||
}else if(StringUtils.equals(typeStr,"BLINDBOARD")){
|
||||
r = mapEightMapper.getBLINDBOARDHighRiskWorkLocation(pd);
|
||||
// 高处
|
||||
}else if(StringUtils.equals(typeStr,"HIGHWORK")){
|
||||
r = mapEightMapper.getHIGHWORKHighRiskWorkLocation(pd);
|
||||
//有限空间
|
||||
}else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
|
||||
r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocation(pd);
|
||||
//吊装
|
||||
}else if(StringUtils.equals(typeStr,"HOISTING")){
|
||||
r = mapEightMapper.getHOISTINGHighRiskWorkLocation(pd);
|
||||
}
|
||||
List<PageData> r = new ArrayList<>();
|
||||
String typeStr = pd.getString("TYPE");
|
||||
//动火
|
||||
if(StringUtils.equals(typeStr,"HOTWORK")){
|
||||
// r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd);
|
||||
r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd);
|
||||
//临时用电
|
||||
}else if(StringUtils.equals(typeStr,"ELECTRICITY")){
|
||||
r = mapEightMapper.getELECTRICITYHighRiskWorkLocationOrder(pd);
|
||||
//盲板
|
||||
}else if(StringUtils.equals(typeStr,"BLINDBOARD")){
|
||||
r = mapEightMapper.getBLINDBOARDHighRiskWorkLocationOrder(pd);
|
||||
// 高处
|
||||
}else if(StringUtils.equals(typeStr,"HIGHWORK")){
|
||||
r = mapEightMapper.getHIGHWORKHighRiskWorkLocationOrder(pd);
|
||||
//有限空间
|
||||
}else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
|
||||
r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocationOrder(pd);
|
||||
//吊装
|
||||
}else if(StringUtils.equals(typeStr,"HOISTING")){
|
||||
r = mapEightMapper.getHOISTINGHighRiskWorkLocationOrder(pd);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
|
|
@ -327,20 +329,27 @@ public class CzksMapEightServiceImpl implements CzksMapEightService {
|
|||
pd.put("ELECTRICITY_ID",idStr);
|
||||
pd = mapEightMapper.findByIdELECTRICITYOrder(pd);
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresELECTRICITYOrder(pd));
|
||||
map.put("gasList", mapEightMapper.listAllGasELECTRICTITYOrder(pd));
|
||||
map.put("imgList1",mapEightMapper.findByELECTRICTITYAcceptuserId(pd));
|
||||
map.put("imgList",mapEightMapper.findByELECTRICTITYAcceptuserIds(pd));
|
||||
}else if(StringUtils.equals(typeStr,"BLINDBOARD")){
|
||||
pd.put("BLINDBOARD_ID",idStr);
|
||||
pd = mapEightMapper.findByIdBLINDBOARDOrder(pd);
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd));
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd));
|
||||
PageData Info = mapEightMapper.findByIdJWDOrder(pd);
|
||||
pd.put("TYPE",105);//盲板位置图
|
||||
pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID"));
|
||||
List<PageData> ImgList = mapEightMapper.listAllBLINDBOARD(pd);
|
||||
map.put("Info",Info);//获取经纬度
|
||||
map.put("ImgList",ImgList);
|
||||
map.put("imgList1",mapEightMapper.findByBLINDBOARDAcceptuserId(pd));
|
||||
map.put("imgList",mapEightMapper.findByBLINDBOARDAcceptuserIds(pd));
|
||||
}else if(StringUtils.equals(typeStr,"HIGHWORK")){
|
||||
pd.put("HIGHWORK_ID",idStr);
|
||||
pd = mapEightMapper.findByIdHIGHWORKOrder(pd);
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORKOrder(pd));
|
||||
map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd));
|
||||
map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd));
|
||||
}else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
|
||||
pd.put("CONFINEDSPACE_ID",idStr);
|
||||
pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd); //根据ID读取
|
||||
|
|
@ -353,14 +362,20 @@ public class CzksMapEightServiceImpl implements CzksMapEightService {
|
|||
pd.put("HOISTING_ID",idStr);
|
||||
pd = mapEightMapper.findByIdHOISTINGOrder(pd);
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresHOISTINGOrder(pd));
|
||||
map.put("imgList1",mapEightMapper.findByHOISTINGAcceptuserId(pd));
|
||||
map.put("imgList",mapEightMapper.findByHOISTINGAcceptuserIds(pd));
|
||||
}else if(StringUtils.equals(typeStr,"BREAKGROUND")){
|
||||
pd.put("BREAKGROUND_ID",idStr);
|
||||
pd = mapEightMapper.findByIdBREAKGROUNDOrder(pd);
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresBREAKGROUNDOrder(pd));
|
||||
map.put("imgList1",mapEightMapper.findByBREAKGROUNDAcceptuserId(pd));
|
||||
map.put("imgList",mapEightMapper.findByBREAKGROUNDAcceptuserIds(pd));
|
||||
}else if(StringUtils.equals(typeStr,"CUTROAD")){
|
||||
pd.put("CUTROAD_ID",idStr);
|
||||
pd = mapEightMapper.findByIdCUTROADOrder(pd);
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresCUTROADOrder(pd));
|
||||
map.put("imgList1",mapEightMapper.findByCUTROADAcceptuserId(pd));
|
||||
map.put("imgList",mapEightMapper.findByCUTROADAcceptuserIds(pd));
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
|
|
@ -420,6 +435,7 @@ public class CzksMapEightServiceImpl implements CzksMapEightService {
|
|||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
private PageData shenpi(PageData pd,List<PageData> list){
|
||||
List<PageData> specialUserList = new ArrayList<>();
|
||||
for (PageData userPageData : list){
|
||||
|
|
@ -591,18 +607,18 @@ public class CzksMapEightServiceImpl implements CzksMapEightService {
|
|||
}
|
||||
}
|
||||
pd.put("specialUserList", specialUserList);
|
||||
return pd;
|
||||
return pd;
|
||||
}
|
||||
|
||||
private PageData dianhuo(PageData pd){
|
||||
if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){
|
||||
String zidian = pd.getString("HOT_WORK_METHOD_ID");
|
||||
List<String> shuzu = Arrays.asList(zidian.split(","));
|
||||
private PageData dianhuo(PageData pd){
|
||||
if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){
|
||||
String zidian = pd.getString("HOT_WORK_METHOD_ID");
|
||||
List<String> shuzu = Arrays.asList(zidian.split(","));
|
||||
List<String> wenzi = mapEightMapper.getListDongHuo(shuzu);
|
||||
String pinjie = String.join(",",wenzi);
|
||||
pd.put("HOT_WORK_METHOD_NAME",pinjie);
|
||||
}
|
||||
return pd;
|
||||
}
|
||||
return pd;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
package com.zcloud.service.fireresources;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 点检标准
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/3/8/008 17:21
|
||||
* @Param:
|
||||
* @Return:
|
||||
*/
|
||||
public interface CzksFireResourcesService {
|
||||
/**新增
|
||||
* @param pd
|
||||
*/
|
||||
void save(PageData pd, MultipartFile[] files) throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
*/
|
||||
void delete(PageData pd);
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
*/
|
||||
void edit(PageData pd, MultipartFile[] files) throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
*/
|
||||
List<PageData> datalistPage(Page page);
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
*/
|
||||
PageData findById(PageData pd);
|
||||
|
||||
//消防控制室
|
||||
LinkedList<PageData> getControlRoomDataList(PageData pageData);
|
||||
|
||||
PageData getDataById(PageData pddata);
|
||||
|
||||
List<PageData> getCheckRecordByPid(PageData pageData);
|
||||
|
||||
PageData getPointInfoADeviceByPid(PageData pageData);
|
||||
|
||||
List<PageData> getPointQualifiedPhotos(PageData pageData);
|
||||
|
||||
List<PageData> goRecordDeviceByPid(PageData pd);
|
||||
|
||||
List<PageData> devicelistPage(Page page);
|
||||
}
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
package com.zcloud.service.fireresources.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper;
|
||||
import com.zcloud.service.bus.ImgFilesService;
|
||||
import com.zcloud.service.fireresources.CzksFireResourcesService;
|
||||
import com.zcloud.util.Tools;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class CzksFireResourcesServiceImpl implements CzksFireResourcesService {
|
||||
@Resource
|
||||
public CzksFireResourcesMapper czksfireResourcesMapper;
|
||||
@Resource
|
||||
private ImgFilesService imgFilesService;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void save(PageData pd, MultipartFile[] files) throws Exception {
|
||||
if (files != null && files.length > 0) {
|
||||
imgFilesService.uploadPicture(files, "xfbf01".equals(pd.getString("FIRERESOURCES_TYPE")) ? "117" : "116", pd.getString("FIRERESOURCES_ID"));
|
||||
}
|
||||
String deleteIds = pd.getString("DELETE_IDS");
|
||||
if (Tools.notEmpty(deleteIds)) {
|
||||
String[] split = deleteIds.split(",");
|
||||
imgFilesService.deleteAll(split);
|
||||
}
|
||||
czksfireResourcesMapper.save(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delete(PageData pd) {
|
||||
czksfireResourcesMapper.delete(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void edit(PageData pd, MultipartFile[] files) throws Exception {
|
||||
if (files != null && files.length > 0) {
|
||||
imgFilesService.uploadPicture(files, "xfbf01".equals(pd.getString("FIRERESOURCES_TYPE")) ? "117" : "116", pd.getString("FIRERESOURCES_ID"));
|
||||
}
|
||||
String deleteIds = pd.getString("DELETE_IDS");
|
||||
if (Tools.notEmpty(deleteIds)) {
|
||||
String[] split = deleteIds.split(",");
|
||||
imgFilesService.deleteAll(split);
|
||||
}
|
||||
czksfireResourcesMapper.edit(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> datalistPage(Page page) {
|
||||
return czksfireResourcesMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAll(PageData pd) {
|
||||
return czksfireResourcesMapper.listAll(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData findById(PageData pd) {
|
||||
return czksfireResourcesMapper.findById(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LinkedList<PageData> getControlRoomDataList(PageData pageData) {
|
||||
return czksfireResourcesMapper.getControlRoomDataList(pageData);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData getDataById(PageData pddata) {
|
||||
return czksfireResourcesMapper.getDataById(pddata);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> getCheckRecordByPid(PageData pageData) {
|
||||
return czksfireResourcesMapper.getCheckRecordByPid(pageData);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData getPointInfoADeviceByPid(PageData pageData) {
|
||||
PageData resData = new PageData();
|
||||
PageData pointInfo = czksfireResourcesMapper.findPointById(pageData);
|
||||
// 只取最新的信息
|
||||
List<PageData> checkImages = czksfireResourcesMapper.getPointCheckPhotoById(pageData);
|
||||
if (checkImages != null && checkImages.size() > 0) {
|
||||
checkImages.forEach(item -> {
|
||||
String[] checkImagesItems = item.getString("FILEPATHLIST").split("@@");
|
||||
item.put("FILEPATH_LIST", checkImagesItems);
|
||||
});
|
||||
}
|
||||
List<PageData> deviceListByPointId = czksfireResourcesMapper.listAll4H5(pageData);
|
||||
if (deviceListByPointId.size() > 0) {
|
||||
deviceListByPointId.forEach(item -> {
|
||||
String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@");
|
||||
item.put("FIRE_CHECK_STANDARD_ITEM", fireCheckStandardItems);
|
||||
});
|
||||
}
|
||||
resData.put("deviceList", deviceListByPointId);
|
||||
resData.put("checkImages", checkImages);
|
||||
resData.put("pointInfo", pointInfo);
|
||||
return resData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> getPointQualifiedPhotos(PageData pageData) {
|
||||
if (pageData.getString("ISLOG").equals("1")) {
|
||||
// 记录 EQUIPMENT_POINT_ID
|
||||
return czksfireResourcesMapper.getPointQualifiedPhotosByEpid(pageData);
|
||||
}
|
||||
return czksfireResourcesMapper.getPointQualifiedPhotos(pageData);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> goRecordDeviceByPid(PageData pd) {
|
||||
List<PageData> list = czksfireResourcesMapper.goRecordDeviceByPid(pd);
|
||||
list.forEach(item -> {
|
||||
String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@");
|
||||
item.put("fireDeviceTypeList", fireCheckStandardItems);
|
||||
});
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> devicelistPage(Page page) {
|
||||
return czksfireResourcesMapper.devicelistPage(page);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package com.zcloud.service.gatemachine;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface GateCarIOService {
|
||||
|
||||
List<PageData> getDatalistpage(Page page);
|
||||
|
||||
List<PageData> getIORecord(Page page);
|
||||
|
||||
void edit(PageData pd);
|
||||
|
||||
void removeByIds(PageData pageData);
|
||||
|
||||
void save(PageData pageData);
|
||||
|
||||
PageData getTodayEQCount(PageData pageData);
|
||||
PageData getAllEQCount(PageData pageData);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,131 @@
|
|||
package com.zcloud.service.gatemachine.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.gatemachine.CzksGateCarIOMapper;
|
||||
import com.zcloud.service.gatemachine.GateCarIOService;
|
||||
import com.zcloud.util.InitPageDataUtil;
|
||||
import com.zcloud.util.UuidUtil;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* GateCarIOService IMPL
|
||||
*/
|
||||
@Service
|
||||
public class GateCarIOServiceImpl implements GateCarIOService {
|
||||
|
||||
@Resource
|
||||
private CzksGateCarIOMapper czksGateCarIOMapper;
|
||||
|
||||
@Resource
|
||||
private InitPageDataUtil initPageDataUtil;
|
||||
|
||||
/**
|
||||
* 出入闸机车辆记录
|
||||
*
|
||||
* @param page
|
||||
* @return 记录
|
||||
*/
|
||||
@Override
|
||||
public List<PageData> getDatalistpage(Page page) {
|
||||
if (page.getPd().get("GATE_AREA_TYPE") != null && "1".equals(page.getPd().get("GATE_AREA_TYPE"))) {
|
||||
return czksGateCarIOMapper.getGroceryDatalistPage(page);
|
||||
} else if (page.getPd().get("GATE_AREA_TYPE") != null && "2".equals(page.getPd().get("GATE_AREA_TYPE"))) {
|
||||
return czksGateCarIOMapper.getMineralDatalistPage(page);
|
||||
}
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据条件获取杂货/矿区闸机出入记录
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<PageData> getIORecord(Page page) {
|
||||
PageData pd = page.getPd();
|
||||
String o = (String) pd.get("type");
|
||||
if ("1".equals(o)) {
|
||||
return czksGateCarIOMapper.getMineralIORecords(page);
|
||||
}
|
||||
return czksGateCarIOMapper.getGroceryIORecords(page);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑出入闸机车辆记录
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void edit(PageData pd) {
|
||||
initPageDataUtil.initEdit(pd);
|
||||
if (pd.get("GATE_AREA_TYPE") != null && "1".equals(pd.get("GATE_AREA_TYPE"))) {
|
||||
czksGateCarIOMapper.editGrocery(pd);
|
||||
} else if (pd.get("GATE_AREA_TYPE") != null) {
|
||||
czksGateCarIOMapper.editMineral(pd);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除出入闸机车辆记录
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void removeByIds(PageData pd) {
|
||||
initPageDataUtil.initEdit(pd);
|
||||
if (pd.get("GATE_AREA_TYPE") != null && "1".equals(pd.get("GATE_AREA_TYPE"))) {
|
||||
pd.put("ISDELETE", new Integer(1));
|
||||
czksGateCarIOMapper.removeGroceryRecordByIds(pd);
|
||||
} else if (pd.get("GATE_AREA_TYPE") != null) {
|
||||
pd.put("ISDELETE", new Integer(1));
|
||||
czksGateCarIOMapper.removeMineralRecordByIds(pd);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加出入闸机车辆记录
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void save(PageData pageData) {
|
||||
initPageDataUtil.initSave(pageData, "RECORD_ID");
|
||||
if (pageData.get("GATE_AREA_TYPE") != null && "1".equals(pageData.get("GATE_AREA_TYPE"))) {
|
||||
pageData.put("GROCERY_RECORD_ID", UuidUtil.get32UUID());
|
||||
czksGateCarIOMapper.saveGrocery(pageData);
|
||||
} else if (pageData.get("GATE_AREA_TYPE") != null) {
|
||||
pageData.put("MINERAL_RECORD_ID", UuidUtil.get32UUID());
|
||||
czksGateCarIOMapper.saveMineral(pageData);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取在场，离场，总量计数
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public PageData getTodayEQCount(PageData pd) {
|
||||
PageData pageData = new PageData();
|
||||
pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuit(pd));
|
||||
pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuit(pd));
|
||||
return pageData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageData getAllEQCount(PageData pd) {
|
||||
PageData pageData = new PageData();
|
||||
pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuitAll(pd));
|
||||
pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuitAll(pd));
|
||||
return pageData;
|
||||
}
|
||||
}
|
||||
|
|
@ -100,8 +100,6 @@ public class GateMachineServiceImpl implements GateMachineService {
|
|||
return gateAreaMapper.getGatePosition(pageData);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public PageData getGateMachineInfoById(PageData pageData) {
|
||||
return gateMachineMapper.getGateMachineInfoById(pageData);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ public class SafetyEnvironmentalInspectorServiceImpl implements SafetyEnvironmen
|
|||
|
||||
@Override
|
||||
public PageData verify(PageData pd) throws Exception {
|
||||
PageData pageData = new PageData();
|
||||
if ("1".equals(pd.getString("INSPECTION_STATUS"))) { //检查进度状态 1.部分检查人员已核实
|
||||
List<PageData> list = safetyenvironmentalinspectorMapper.listOtherNotVerify(pd);
|
||||
if (list.size() == 0) {
|
||||
|
|
@ -58,10 +57,10 @@ public class SafetyEnvironmentalInspectorServiceImpl implements SafetyEnvironmen
|
|||
log.put("ACTION", "安全环保检查申请"); //操作内容
|
||||
log.put("CREATTIME", pd.getString("OPERATTIME")); //添加时间
|
||||
log.put("CREATOR", pd.getString("ACTION_USER")); //添加人姓名
|
||||
pageData.put("log", JSON.toJSONString(log));
|
||||
safetyenvironmentallogService.save(log);
|
||||
safetyenvironmentalinspectorMapper.edit(pd);
|
||||
return pageData;
|
||||
pd.put("log", JSON.toJSONString(log));
|
||||
return pd;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
|
|||
|
||||
@Override
|
||||
public List<PageData> listAllForMap(PageData pd) {
|
||||
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
return platformvideomanagementMapper.listAllForMap(pd);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
package com.zcloud.service.map;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
/**
|
||||
* @desc 对象返回到前端以及异常抛出的接口类
|
||||
*/
|
||||
public interface BaseResultInterface {
|
||||
|
||||
|
||||
String getCode();
|
||||
|
||||
|
||||
String getMessage();
|
||||
}
|
||||
|
|
@ -0,0 +1,164 @@
|
|||
package com.zcloud.service.map;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.entity.system.Department;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明： 组织机构接接口
|
||||
* 创建人：FH Q313596790
|
||||
* 官网：
|
||||
*/
|
||||
public interface CorpDepartmentService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
/**通过名称获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByName(PageData pd)throws Exception;
|
||||
|
||||
/**通过编码获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByBianma(PageData pd)throws Exception;
|
||||
|
||||
/**
|
||||
* 通过ID获取其子级列表
|
||||
* @param parentId
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listSubDepartmentByParentId(String parentId) throws Exception;
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)
|
||||
* @param MENU_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listAllDepartment(String parentId) throws Exception;
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)
|
||||
* @param MENU_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listAllDepartment(String parentId,String url) throws Exception;
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
|
||||
* @param MENU_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAllDepartmentToSelect(String parentId, List<PageData> zdepartmentPdList) throws Exception;
|
||||
|
||||
/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式)
|
||||
* @param DEPARTMENT_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception;
|
||||
|
||||
/**通过条件获取全部
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception;
|
||||
|
||||
/**通过企业主部门
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByCorpId(PageData pd)throws Exception;
|
||||
/**列表 关联 部门级别名称
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listForLevelName(Page page)throws Exception;
|
||||
|
||||
/**
|
||||
* 向下递归查询企业部门
|
||||
* @param pd
|
||||
* @return
|
||||
*/
|
||||
List<PageData> listTreeCorpDept(PageData pd)throws Exception;
|
||||
|
||||
/**
|
||||
* 向下递归查询企业部门（集团部门+子公司部门）
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listTreeManageAndCorp(PageData pd)throws Exception;
|
||||
|
||||
/**
|
||||
* pc新增需求，重点工程中添加处罚人功能所用的 根据企业ID查询部门的service
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd)throws Exception;
|
||||
/**
|
||||
* 向下递归查询企业部门（只查监管端部门）
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listTreeManageAndCorp1(PageData pd)throws Exception;
|
||||
/**
|
||||
* 向下递归查询企业部门（只查企业端部门）
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listTreeManageAndCorp2(PageData pd)throws Exception;
|
||||
|
||||
List<PageData> listTreeManageAndCorpHasOrder(PageData pd)throws Exception;
|
||||
List<PageData> listDept(PageData pd)throws Exception;
|
||||
|
||||
public List<Department> listTreeCorp(String s)throws Exception;
|
||||
|
||||
/**
|
||||
* 使用数据库中的函数
|
||||
* 获取pid下的所有子集id
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> getSonIdsByParid(PageData pd)throws Exception;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.service.map;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：曹妃甸数据对接日志
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2023-09-11
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public interface DataDockingLogService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception;
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
package com.zcloud.service.map;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明：实施地图八项作业
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2022-09-21
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public interface MapEightCfdService {
|
||||
|
||||
/**动火
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAll(PageData pd);
|
||||
|
||||
/**动火
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
List<PageData> listAllMeasures(PageData pd);
|
||||
|
||||
/**
|
||||
* 获取其他公司详细数据
|
||||
* @param pd
|
||||
* @return
|
||||
*/
|
||||
Map<String, Object> getByIdOrder(PageData pd) throws Exception;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
package com.zcloud.service.map;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：视频管理
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2021-05-10
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public interface MeteorologicalService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
public void savePosition(PageData pd)throws Exception;
|
||||
public void editIsShowBycorpinfoid(PageData pd)throws Exception;
|
||||
public void editIsShow(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception;
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listBo(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listByEquipment(Page page)throws Exception;
|
||||
|
||||
List<PageData> listbyTypeLocation(PageData pd)throws Exception;
|
||||
|
||||
public List<PageData> listbyType(Page page)throws Exception;
|
||||
|
||||
public PageData listbyequipmentcount(PageData pd)throws Exception;
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
|
||||
|
||||
public PageData findByCode(PageData video)throws Exception;
|
||||
|
||||
public List<PageData> listAllForMap(PageData pd)throws Exception;
|
||||
|
||||
public List<PageData> getPointsInfo(PageData pd)throws Exception;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,103 @@
|
|||
package com.zcloud.service.map;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.service.map.util.ReturnMap;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：视频管理
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2021-05-10
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public interface MeteorologicalinfoService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
public void savePosition(PageData pd)throws Exception;
|
||||
public void editIsShowBycorpinfoid(PageData pd)throws Exception;
|
||||
public void editIsShow(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData listbymeteorological(PageData pd)throws Exception;
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listBo(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listbyinfo(Page page)throws Exception;
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
|
||||
|
||||
public PageData findByCode(PageData video)throws Exception;
|
||||
|
||||
public List<PageData> listAllForMap(PageData pd)throws Exception;
|
||||
|
||||
public List<PageData> getPointsInfo(PageData pd)throws Exception;
|
||||
|
||||
/**同步气象数据
|
||||
* @param list
|
||||
* @throws Exception
|
||||
*/
|
||||
ReturnMap tongbuMeteorologicalinfo(List<PageData> list) throws Exception;
|
||||
|
||||
/**批量新增
|
||||
* @param list
|
||||
* @throws Exception
|
||||
*/
|
||||
Integer saveMeteorologicalinfo(List<PageData> list);
|
||||
|
||||
/**修改气象数据
|
||||
* @param pageData
|
||||
* @throws Exception
|
||||
*/
|
||||
Integer updateMeteorologicalinfo(PageData pageData);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
package com.zcloud.service.map;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：平台视频管理
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2023-07-21
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public interface PlatformelectronicService {
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception;
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception;
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception;
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception;
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception;
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception;
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
|
||||
|
||||
|
||||
Integer countAllForMap(PageData pd)throws Exception;
|
||||
|
||||
|
||||
List<PageData> countAllByArea(PageData pd);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -3,6 +3,7 @@ package com.zcloud.service.map.impl;
|
|||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.map.BiTongjiMapper;
|
||||
import com.zcloud.service.map.BiTongjiService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,267 @@
|
|||
package com.zcloud.service.map.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.entity.system.Department;
|
||||
import com.zcloud.mapper.datasource.system.DepartmentMapper;
|
||||
import com.zcloud.service.map.CorpDepartmentService;
|
||||
import com.zcloud.util.Tools;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明： 组织机构
|
||||
* 创建人：FH Q313596790
|
||||
* 官网：
|
||||
*/
|
||||
@Service(value="corpDepartmentService")
|
||||
@Transactional //开启事物
|
||||
public class CorpDepartmentServiceImpl implements CorpDepartmentService {
|
||||
|
||||
@Autowired
|
||||
private DepartmentMapper departmentMapper;
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception{
|
||||
departmentMapper.save(pd);
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception{
|
||||
departmentMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception{
|
||||
departmentMapper.edit(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception{
|
||||
return (List<PageData>)departmentMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception{
|
||||
return (PageData)departmentMapper.findById(pd);
|
||||
}
|
||||
/**通过名称获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByName(PageData pd)throws Exception{
|
||||
List<PageData> dept = departmentMapper.findByName(pd);
|
||||
if(dept != null && dept.size() > 0) {
|
||||
return dept.get(0);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**通过编码获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByBianma(PageData pd)throws Exception{
|
||||
return (PageData)departmentMapper.findByBianma(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过ID获取其子级列表
|
||||
* @param parentId
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listSubDepartmentByParentId(String parentId) throws Exception {
|
||||
return (List<Department>)departmentMapper.listSubDepartmentByParentId(parentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listAllDepartment(String parentId) throws Exception {
|
||||
List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
|
||||
for(Department depar : departmentList){
|
||||
depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID());
|
||||
depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID()));
|
||||
depar.setTarget("treeFrame");
|
||||
depar.setIcon("../../../assets/images/user.gif");
|
||||
}
|
||||
return departmentList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listAllDepartment(String parentId,String url) throws Exception {
|
||||
List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
|
||||
for(Department depar : departmentList){
|
||||
depar.setTreeurl(url+depar.getDEPARTMENT_ID());
|
||||
depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID(),url));
|
||||
depar.setTarget("treeFrame");
|
||||
depar.setIcon("../../../assets/images/user.gif");
|
||||
}
|
||||
return departmentList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAllDepartmentToSelect(String parentId,List<PageData> zdepartmentPdList) throws Exception {
|
||||
List<PageData>[] arrayDep = this.listAllbyPd(parentId,zdepartmentPdList);
|
||||
List<PageData> departmentPdList = arrayDep[1];
|
||||
for(PageData pd : departmentPdList){
|
||||
this.listAllDepartmentToSelect(pd.getString("id"),arrayDep[0]);
|
||||
}
|
||||
return arrayDep[0];
|
||||
}
|
||||
|
||||
/**下拉ztree用
|
||||
* @param parentId
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<PageData>[] listAllbyPd(String parentId,List<PageData> zdepartmentPdList) throws Exception {
|
||||
List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
|
||||
List<PageData> departmentPdList = new ArrayList<PageData>();
|
||||
for(Department depar : departmentList){
|
||||
PageData pd = new PageData();
|
||||
pd.put("id", depar.getDEPARTMENT_ID());
|
||||
pd.put("parentId", depar.getPARENT_ID());
|
||||
pd.put("name", depar.getNAME());
|
||||
pd.put("icon", "../../../assets/images/user.gif");
|
||||
departmentPdList.add(pd);
|
||||
zdepartmentPdList.add(pd);
|
||||
}
|
||||
List<PageData>[] arrayDep = new List[2];
|
||||
arrayDep[0] = zdepartmentPdList;
|
||||
arrayDep[1] = departmentPdList;
|
||||
return arrayDep;
|
||||
}
|
||||
|
||||
/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式， ('a','b','c'))
|
||||
* @param DEPARTMENT_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception {
|
||||
DEPARTMENT_ID = Tools.notEmpty(DEPARTMENT_ID)?DEPARTMENT_ID:"0";
|
||||
List<PageData> zdepartmentPdList = new ArrayList<PageData>();
|
||||
zdepartmentPdList = this.listAllDepartmentToSelect(DEPARTMENT_ID,zdepartmentPdList);
|
||||
StringBuffer sb = new StringBuffer();
|
||||
sb.append("");
|
||||
for(PageData dpd : zdepartmentPdList){
|
||||
sb.append(dpd.getString("id"));
|
||||
sb.append(",");
|
||||
}
|
||||
sb.append("'fh'");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**通过条件获取全部
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception{
|
||||
return (List<PageData>)departmentMapper.listAll(pd);
|
||||
}
|
||||
|
||||
/**通过企业主部门
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByCorpId(PageData pd)throws Exception{
|
||||
return departmentMapper.findByCorpId(pd);
|
||||
}
|
||||
/**列表 关联 部门级别名称
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public List<PageData> listForLevelName(Page page) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
return departmentMapper.forLevelNamedatalistPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listTreeCorpDept(PageData pd) throws Exception {
|
||||
return departmentMapper.listTreeCorpDept(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listTreeManageAndCorp(PageData pd) throws Exception {
|
||||
return departmentMapper.listTreeManageAndCorp(pd);
|
||||
}
|
||||
@Override
|
||||
public List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception {
|
||||
return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd);
|
||||
}
|
||||
@Override
|
||||
public List<PageData> listTreeManageAndCorp1(PageData pd) throws Exception {
|
||||
return departmentMapper.listTreeManageAndCorp1(pd);
|
||||
}
|
||||
@Override
|
||||
public List<PageData> listTreeManageAndCorp2(PageData pd) throws Exception {
|
||||
return departmentMapper.listTreeManageAndCorp2(pd);
|
||||
}
|
||||
@Override
|
||||
public List<PageData> listTreeManageAndCorpHasOrder(PageData pd) throws Exception {
|
||||
return departmentMapper.listTreeManageAndCorpHasOrder(pd);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<PageData> listDept(PageData pd) throws Exception {
|
||||
return departmentMapper.listDept(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有数据并填充每条数据的子级列表(递归处理)
|
||||
* @param MENU_ID
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<Department> listTreeCorp(String parentId) throws Exception {
|
||||
List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
|
||||
for(Department depar : departmentList){
|
||||
depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID());
|
||||
depar.setSubDepartment(this.listTreeCorp(depar.getDEPARTMENT_ID()));
|
||||
depar.setTarget("treeFrame");
|
||||
depar.setIcon("../../../assets/images/user.gif");
|
||||
}
|
||||
return departmentList;
|
||||
}
|
||||
|
||||
public List<PageData> getSonIdsByParid(PageData pd) throws Exception {
|
||||
return departmentMapper.getSonIdsByParid(pd);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.zcloud.service.map.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.dsno2.map.DataDockingLogMapper;
|
||||
import com.zcloud.service.map.DataDockingLogService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：曹妃甸数据对接日志
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2023-09-11
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class DataDockingLogServiceImpl implements DataDockingLogService {
|
||||
|
||||
@Autowired
|
||||
private DataDockingLogMapper datadockinglogMapper;
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception{
|
||||
datadockinglogMapper.save(pd);
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception{
|
||||
datadockinglogMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception{
|
||||
datadockinglogMapper.edit(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception{
|
||||
return datadockinglogMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception{
|
||||
return datadockinglogMapper.listAll(pd);
|
||||
}
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception{
|
||||
return datadockinglogMapper.findById(pd);
|
||||
}
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
|
||||
datadockinglogMapper.deleteAll(ArrayDATA_IDS);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
package com.zcloud.service.map.impl;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.datasource.map.MapEightMapper;
|
||||
import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService;
|
||||
import com.zcloud.service.highriskwork.HotworkCfdService;
|
||||
import com.zcloud.service.highriskwork.HotworkGasCfdService;
|
||||
import com.zcloud.service.map.MapEightCfdService;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明：实时地图八项工作
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2022-09-21
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class MapEightCfdServiceImpl implements MapEightCfdService {
|
||||
@Autowired
|
||||
private MapEightMapper mapEightMapper;
|
||||
@Autowired
|
||||
private HotworkCfdService hotworkCfdService;
|
||||
@Autowired
|
||||
private HotworkGasCfdService hotworkGasCfdService;
|
||||
@Autowired
|
||||
private HotworkAcceptUserCfdService hotworkacceptuserCfdService;
|
||||
|
||||
@Override
|
||||
public List<PageData> listAll(PageData pd) {
|
||||
return mapEightMapper.listAll(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listAllMeasures(PageData pd) {
|
||||
return mapEightMapper.listAllMeasures(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getByIdOrder(PageData pd) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
String typeStr = pd.getString("TYPE");
|
||||
String idStr = pd.getString("id");
|
||||
List<PageData> pageDataList = new ArrayList<>();
|
||||
if(StringUtils.equals(typeStr,"HOTWORK")){
|
||||
//动火作业√
|
||||
pd.put("HOTWORKAPPLICATION_ID",idStr);
|
||||
pd = hotworkCfdService.findById(pd); //根据ID读取
|
||||
map.put("pd", pd);
|
||||
map.put("measuresList", hotworkCfdService.listAllMeasures(pd));
|
||||
map.put("gasList", hotworkGasCfdService.listAll(pd));
|
||||
map.put("imgList", hotworkacceptuserCfdService.findByIds(pd));
|
||||
map.put("imgList1", hotworkacceptuserCfdService.findById(pd));
|
||||
}else if(StringUtils.equals(typeStr,"ELECTRICITY")){
|
||||
//用电作业√
|
||||
// pd.put("ELECTRICITY_ID",idStr);
|
||||
// pd = electricityService.findById(pd); //根据ID读取
|
||||
// map.put("pd", pd);
|
||||
// map.put("measuresList", electricityService.listAllMeasures(pd));
|
||||
// map.put("imgList",electricityacceptuserService.findByIds(pd));
|
||||
// map.put("imgList1",electricityacceptuserService.findById(pd));
|
||||
// map.put("gasList", electricityGasService.listAll(pd));
|
||||
}else if(StringUtils.equals(typeStr,"BLINDBOARD")){
|
||||
//盲板作业√
|
||||
// pd.put("BLINDBOARD_ID",idStr);
|
||||
// pd = blindboardService.findById(pd); //根据ID读取
|
||||
// map.put("pd", pd);
|
||||
// map.put("measuresList", blindboardService.listAllMeasures(pd));
|
||||
// map.put("imgList",blindboardacceptuserService.findByIds(pd));
|
||||
// map.put("imgList1",blindboardacceptuserService.findById(pd));
|
||||
// map.put("boardList", blindBoardInfoService.listAll(pd));
|
||||
}else if(StringUtils.equals(typeStr,"HIGHWORK")){
|
||||
//高空作业√
|
||||
// pd.put("HIGHWORK_ID",idStr);
|
||||
// pd = highworkService.findById(pd); //根据ID读取
|
||||
// map.put("pd", pd);
|
||||
// map.put("measuresList", highworkService.listAllMeasures(pd));
|
||||
// map.put("imgList",highworkacceptuserService.findByIds(pd));
|
||||
// map.put("imgList1",highworkacceptuserService.findById(pd));
|
||||
}else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
|
||||
//有限空间√
|
||||
// pd.put("CONFINEDSPACE_ID",idStr);
|
||||
// pd = confinedspaceService.findById(pd); //根据ID读取
|
||||
// map.put("pd", pd);
|
||||
// map.put("measuresList", confinedspaceService.listAllMeasures(pd));
|
||||
// map.put("imgList",confinedspaceacceptuserService.findByIds(pd));
|
||||
// map.put("imgList1",confinedspaceacceptuserService.findById(pd));
|
||||
// map.put("gasList", confinedspaceGasService.listAll(pd));
|
||||
// map.put("gas", confinedspacegaswhService.findById(pd));
|
||||
}else if(StringUtils.equals(typeStr,"HOISTING")){
|
||||
//吊装作业√
|
||||
// pd.put("HOISTING_ID",idStr);
|
||||
// pd = hoistingService.findById(pd); //根据ID读取
|
||||
// map.put("pd", pd);
|
||||
// map.put("measuresList", hoistingService.listAllMeasures(pd));
|
||||
// map.put("imgList",hoistingacceptuserService.findByIds(pd));
|
||||
// map.put("imgList1",hoistingacceptuserService.findById(pd));
|
||||
}else if(StringUtils.equals(typeStr,"BREAKGROUND")){
|
||||
//破土作业√
|
||||
// pd.put("BREAKGROUND_ID",idStr);
|
||||
// pd = breakgroundService.findById(pd); //根据ID读取
|
||||
// map.put("pd", pd);
|
||||
// map.put("measuresList", breakgroundService.listAllMeasures(pd));
|
||||
// map.put("imgList",breakgroundacceptuserService.findByIds(pd));
|
||||
// map.put("imgList1",breakgroundacceptuserService.findById(pd));
|
||||
}else if(StringUtils.equals(typeStr,"CUTROAD")){
|
||||
//断路作业√
|
||||
// pd.put("CUTROAD_ID",idStr);
|
||||
// pd = cutroadService.findById(pd); //根据ID读取
|
||||
// map.put("pd", pd);
|
||||
// map.put("measuresList", cutroadService.listAllMeasures(pd));
|
||||
// map.put("imgList",cutroadacceptuserService.findByIds(pd));
|
||||
// map.put("imgList1",cutroadacceptuserService.findById(pd));
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -115,7 +115,8 @@ public class MapEightServiceImpl implements MapEightService {
|
|||
String typeStr = pd.getString("TYPE");
|
||||
//动火
|
||||
if(StringUtils.equals(typeStr,"HOTWORK")){
|
||||
r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd);
|
||||
// r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd);
|
||||
r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd);
|
||||
//临时用电
|
||||
}else if(StringUtils.equals(typeStr,"ELECTRICITY")){
|
||||
r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd);
|
||||
|
|
@ -352,7 +353,6 @@ public class MapEightServiceImpl implements MapEightService {
|
|||
pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd); //根据ID读取
|
||||
map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd));
|
||||
map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd));
|
||||
map.put("gas", mapEightMapper.findByIdCONFINEDSPACEGasWH(pd));
|
||||
map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd));
|
||||
map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd));
|
||||
}else if(StringUtils.equals(typeStr,"HOISTING")){
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import com.zcloud.service.bus.ImgFilesService;
|
|||
import com.zcloud.service.map.MapEightService;
|
||||
import com.zcloud.service.map.MapKetProjectService;
|
||||
import com.zcloud.service.system.UsersService;
|
||||
import com.zcloud.service.map.CorpDepartmentService;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.Tools;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
@ -61,6 +63,7 @@ public class MapKeyProjectServiceImpl implements MapKetProjectService {
|
|||
pd.remove("CORPINFO_ID");
|
||||
}
|
||||
}
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = keyProjectMapper.findFormCount(pd);
|
||||
returnMap.put("pd", pageData);
|
||||
returnMap.put("result", errInfo);
|
||||
|
|
@ -72,16 +75,7 @@ public class MapKeyProjectServiceImpl implements MapKetProjectService {
|
|||
Map<String,Object> returnMap = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
//根据条件增加参数或减少参数 都没有 直接返回空
|
||||
if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) {
|
||||
List<String> ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd);
|
||||
if (ArrayDATA_IDS.size() == 0) {
|
||||
returnMap.put("result", errInfo);
|
||||
return returnMap;
|
||||
}
|
||||
ArrayDATA_IDS.add("1");
|
||||
pd.put("ids", ArrayDATA_IDS);
|
||||
pd.remove("CORPINFO_ID");
|
||||
}
|
||||
pd.getString("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
|
||||
String typeStr = pd.getString("TYPE");
|
||||
List<PageData> r = new ArrayList<>();
|
||||
//重点工程
|
||||
|
|
|
|||
|
|
@ -0,0 +1,154 @@
|
|||
package com.zcloud.service.map.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.dsno2.map.MeteorologicalMapper;
|
||||
import com.zcloud.service.map.MeteorologicalService;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：视频管理
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2021-05-10
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class MeteorologicalServiceImpl implements MeteorologicalService {
|
||||
|
||||
@Autowired
|
||||
private MeteorologicalMapper meteorologicalMapper;
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception{
|
||||
meteorologicalMapper.save(pd);
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception{
|
||||
meteorologicalMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception{
|
||||
meteorologicalMapper.edit(pd);
|
||||
}
|
||||
public void savePosition(PageData pd)throws Exception{
|
||||
meteorologicalMapper.savePosition(pd);
|
||||
}
|
||||
public void editIsShowBycorpinfoid(PageData pd)throws Exception{
|
||||
meteorologicalMapper.editIsShowBycorpinfoid(pd);
|
||||
}
|
||||
public void editIsShow(PageData pd)throws Exception{
|
||||
meteorologicalMapper.editIsShow(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception{
|
||||
return meteorologicalMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listBo(PageData pd)throws Exception{
|
||||
return meteorologicalMapper.listBo(pd);
|
||||
}
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listByEquipment(Page page)throws Exception{
|
||||
return meteorologicalMapper.listByEquipmentdatalistPage(page);
|
||||
}
|
||||
|
||||
public List<PageData> listbyType(Page page)throws Exception{
|
||||
return meteorologicalMapper.listbyType(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listbyTypeLocation(PageData pd) throws Exception {
|
||||
List<PageData> r = new ArrayList<>();
|
||||
String typeStr = pd.getString("TYPE");
|
||||
//动火
|
||||
if(StringUtils.equals(typeStr,"293187ddfd984c9ab3fd716aef58da0e")){
|
||||
r = meteorologicalMapper.listbyTypeLocation(pd);
|
||||
//风向站
|
||||
}else if(StringUtils.equals(typeStr,"561347f0cff641dba8b2b22c0f443348")){
|
||||
r = meteorologicalMapper.listbyTypeLocation(pd);
|
||||
//温度站
|
||||
}else if(StringUtils.equals(typeStr,"2da29f00852a4653ba3e760b9de57412")){
|
||||
r = meteorologicalMapper.listbyTypeLocation(pd);
|
||||
// 风速站
|
||||
}else if(StringUtils.equals(typeStr,"732fe73933b845c6b1e2aee06a38ed31")){
|
||||
r = meteorologicalMapper.listbyTypeLocation(pd);
|
||||
// 湿度站
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
public PageData listbyequipmentcount(PageData pd)throws Exception{
|
||||
return meteorologicalMapper.listbyequipmentcount(pd);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception{
|
||||
return meteorologicalMapper.listAll(pd);
|
||||
}
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception{
|
||||
return meteorologicalMapper.findById(pd);
|
||||
}
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
|
||||
meteorologicalMapper.deleteAll(ArrayDATA_IDS);
|
||||
}
|
||||
|
||||
/**通过CODE获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByCode(PageData pd)throws Exception{
|
||||
return meteorologicalMapper.findByCode(pd);
|
||||
}
|
||||
|
||||
public List<PageData> listAllForMap(PageData pd)throws Exception{
|
||||
return meteorologicalMapper.listAllForMap(pd);
|
||||
}
|
||||
|
||||
public List<PageData> getPointsInfo(PageData pd)throws Exception{
|
||||
return meteorologicalMapper.getPointsInfo(pd);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,222 @@
|
|||
package com.zcloud.service.map.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.dsno2.map.MeteorologicalinfoMapper;
|
||||
import com.zcloud.service.map.DataDockingLogService;
|
||||
import com.zcloud.service.map.MeteorologicalinfoService;
|
||||
import com.zcloud.service.map.util.ReturnMap;
|
||||
import com.zcloud.util.DateUtil;
|
||||
import com.zcloud.util.UuidUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：视频管理
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2021-05-10
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService {
|
||||
|
||||
@Autowired
|
||||
private MeteorologicalinfoMapper meteorologicalinfoMapper;
|
||||
|
||||
@Autowired
|
||||
private DataDockingLogService dataDockingLogService;
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception{
|
||||
meteorologicalinfoMapper.save(pd);
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception{
|
||||
meteorologicalinfoMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception{
|
||||
meteorologicalinfoMapper.edit(pd);
|
||||
}
|
||||
public void savePosition(PageData pd)throws Exception{
|
||||
meteorologicalinfoMapper.savePosition(pd);
|
||||
}
|
||||
public void editIsShowBycorpinfoid(PageData pd)throws Exception{
|
||||
meteorologicalinfoMapper.editIsShowBycorpinfoid(pd);
|
||||
}
|
||||
public void editIsShow(PageData pd)throws Exception{
|
||||
meteorologicalinfoMapper.editIsShow(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception{
|
||||
return meteorologicalinfoMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData listbymeteorological(PageData pd)throws Exception{
|
||||
return meteorologicalinfoMapper.listbymeteorological(pd);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listBo(PageData pd)throws Exception{
|
||||
return meteorologicalinfoMapper.listBo(pd);
|
||||
}
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listbyinfo(Page page)throws Exception{
|
||||
return meteorologicalinfoMapper.listbyinfodatalistPage(page);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception{
|
||||
return meteorologicalinfoMapper.listAll(pd);
|
||||
}
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception{
|
||||
return meteorologicalinfoMapper.findById(pd);
|
||||
}
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
|
||||
meteorologicalinfoMapper.deleteAll(ArrayDATA_IDS);
|
||||
}
|
||||
|
||||
/**通过CODE获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByCode(PageData pd)throws Exception{
|
||||
return meteorologicalinfoMapper.findByCode(pd);
|
||||
}
|
||||
|
||||
public List<PageData> listAllForMap(PageData pd)throws Exception{
|
||||
return meteorologicalinfoMapper.listAllForMap(pd);
|
||||
}
|
||||
|
||||
public List<PageData> getPointsInfo(PageData pd)throws Exception{
|
||||
return meteorologicalinfoMapper.getPointsInfo(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReturnMap tongbuMeteorologicalinfo(List<PageData> list) throws Exception {
|
||||
PageData info = new PageData();
|
||||
list.forEach(weather ->{
|
||||
if(weather.get("variableName").equals("风速")){
|
||||
info.put("WINDSPEED", weather.get("value").toString());
|
||||
}else if(weather.get("variableName").equals("风向")){
|
||||
info.put("WINDDIRECTION", weather.get("value").toString());
|
||||
}else if(weather.get("variableName").equals("迎风角度")){
|
||||
info.put("WINDDIRECTION", weather.get("value").toString());
|
||||
}else if(weather.get("variableName").equals("雨量")){
|
||||
info.put("RAINFALL", weather.get("value").toString());
|
||||
}
|
||||
info.put("CODE",weather.get("cusdeviceNo").toString());
|
||||
info.put("OPERATTIME",DateUtil.date2Str(new Date(Long.parseLong(weather.get("time").toString() + "000"))));
|
||||
});
|
||||
if(info.get("WINDSPEED") == null && info.get("WINDDIRECTION") == null && info.get("RAINFALL") == null){ //都没有值 不保存
|
||||
return ReturnMap.error(200,"操作成功");
|
||||
}
|
||||
List<PageData> tenSList = meteorologicalinfoMapper.tensList(info); //10秒内相同设备的数据
|
||||
if(tenSList.size()>0){
|
||||
PageData old = tenSList.get(0);
|
||||
old.putAll(info);
|
||||
edit(old);
|
||||
}else{
|
||||
info.put("METEOROLOGICALINFO_ID", UuidUtil.get32UUID());
|
||||
save(info);
|
||||
}
|
||||
System.out.println("---------------------保存对接数据------------------");
|
||||
System.out.println(info);
|
||||
return ReturnMap.error(200,"操作成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存新增数据对接日志
|
||||
* @param saveMeteorologicalinfoCount
|
||||
* @throws Exception
|
||||
*/
|
||||
public void saveMeteorologicalinfoDataDocking(Integer saveMeteorologicalinfoCount) throws Exception {
|
||||
PageData savePd = new PageData();
|
||||
savePd.put("BUS_DATA_DOCKING_ID", UuidUtil.get32UUID());
|
||||
savePd.put("DOCKING_TYPE",0);
|
||||
savePd.put("DOCKING_MODULE","气象信息");
|
||||
savePd.put("NUMBER",saveMeteorologicalinfoCount);
|
||||
savePd.put("DOCKING_TIME", DateUtil.date2Str(new Date()));
|
||||
dataDockingLogService.save(savePd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存修改数据对接日志
|
||||
* @param updateMeteorologicalinfoCount
|
||||
* @throws Exception
|
||||
*/
|
||||
public void updateMeteorologicalinfoDataDocking(Integer updateMeteorologicalinfoCount) throws Exception {
|
||||
PageData updatePd = new PageData();
|
||||
updatePd.put("BUS_DATA_DOCKING_ID", UuidUtil.get32UUID());
|
||||
updatePd.put("DOCKING_TYPE",1);
|
||||
updatePd.put("DOCKING_MODULE","气象信息");
|
||||
updatePd.put("NUMBER",updateMeteorologicalinfoCount);
|
||||
updatePd.put("DOCKING_TIME", DateUtil.date2Str(new Date()));
|
||||
dataDockingLogService.save(updatePd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据用户IDS 获取气象信息
|
||||
* @param MeteorologicalinfoIds 气象ids
|
||||
* @return
|
||||
*/
|
||||
public List<PageData> getMeteorologicalinfoListByIds (List<String> MeteorologicalinfoIds) {
|
||||
PageData pd = new PageData();
|
||||
pd.put("MeteorologicalinfoIds",MeteorologicalinfoIds);
|
||||
return meteorologicalinfoMapper.getMeteorologicalinfoListByIds(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer saveMeteorologicalinfo(List<PageData> list) {
|
||||
if (list.size() < 1) return 0;
|
||||
return meteorologicalinfoMapper.insertAll(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer updateMeteorologicalinfo(PageData pageData) {
|
||||
return meteorologicalinfoMapper.updateMeteorologicalinfo(pageData);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
package com.zcloud.service.map.impl;
|
||||
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.mapper.dsno2.map.PlatformelectronicMapper;
|
||||
import com.zcloud.service.map.PlatformelectronicService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 说明：平台视频管理
|
||||
* 作者：luoxiaobao
|
||||
* 时间：2023-07-21
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
@Service
|
||||
@Transactional //开启事物
|
||||
public class PlatformelectronicServiceImpl implements PlatformelectronicService {
|
||||
|
||||
@Autowired
|
||||
private PlatformelectronicMapper platformelectronicMapper;
|
||||
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void save(PageData pd)throws Exception{
|
||||
platformelectronicMapper.save(pd);
|
||||
}
|
||||
|
||||
/**删除
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(PageData pd)throws Exception{
|
||||
platformelectronicMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void edit(PageData pd)throws Exception{
|
||||
platformelectronicMapper.edit(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> list(Page page)throws Exception{
|
||||
return platformelectronicMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd)throws Exception{
|
||||
return platformelectronicMapper.listAll(pd);
|
||||
}
|
||||
|
||||
/**通过id获取数据
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd)throws Exception{
|
||||
return platformelectronicMapper.findById(pd);
|
||||
}
|
||||
|
||||
/**批量删除
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
|
||||
platformelectronicMapper.deleteAll(ArrayDATA_IDS);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer countAllForMap(PageData pd) throws Exception {
|
||||
return platformelectronicMapper.countAllForMap(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> countAllByArea(PageData pd) {
|
||||
return platformelectronicMapper.countAllByArea(pd);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,199 @@
|
|||
package com.zcloud.service.map.util;
|
||||
|
||||
import com.zcloud.service.map.BaseResultInterface;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public enum CodeMessageEnum implements BaseResultInterface {
|
||||
|
||||
/** ********* 0000成功 *************** */
|
||||
SUCCESS("0000", "成功!"),
|
||||
SUCCESS_LOGIN("0001", "用户登录成功"),
|
||||
SUCCESS_LOGOUT("0002", "用户退出成功"),
|
||||
|
||||
/* 默认失败 */
|
||||
COMMON_FAIL("999", "失败"),
|
||||
|
||||
/** ********* 1xxx系统错误 *************** */
|
||||
SERVER_BUSY("1001", "服务器正忙，请稍后再试!"),
|
||||
INTERNAL_SERVER_ERROR("1002", "服务器内部错误"),
|
||||
NOT_FOUND("1003", "未找到该资源!"),
|
||||
REQUEST_METHOD_ERROR("1004", "接口请求方法异常"),
|
||||
SQL_SYNTAX_ERROR_EXCEPTION("1005", "SQL语法错误异常"),
|
||||
NULL_POINT_ERROR_EXCEPTION("1006", "空指针异常信息"),
|
||||
INNER_FRAME_EXCEPTION("1007", "内部框架执行异常"),
|
||||
PARSE_TOKEN_EXCEPTION("1008", "解析token异常"),
|
||||
TOKEN_NOT_EXIST("1009", "token不存在"),
|
||||
TOKEN_SIGNATURE_EXCEPTION("1010", "token签名异常"),
|
||||
TOKEN_EXPIRE("1011", "token过期，请重新登录"),
|
||||
IMG_TYPE_NOT_CONFIG("1012", "请配置图片类型"),
|
||||
NOT_CONFIG_FILE_DIR("1013", "请配置文件路径"),
|
||||
UPLOAD_FILE_ERROR("1014", "文件上传失败"),
|
||||
FILE_NOT_EXIST("1015", "文件不存在"),
|
||||
FILE_HAS_DELETED("1016", "文件已被删除"),
|
||||
DRIVER_CLASS_NOT_FOUND("1017", "数据库的连接驱动正在加载中..."),
|
||||
TRY_CONNECT_DATABASE_ERROR("1018", "尝试连接数据库失败"),
|
||||
CLOSE_CONNECT_DATABASE_ERROR("1019", "关闭数据库连接失败"),
|
||||
DATABASE_NAME_NOT_EXIST("1020", "数据库名称不存在"),
|
||||
CLOSE_DATASOURCE_ERROR("1021", "释放数据库资源异常"),
|
||||
DRUID_DATASOURCE_ERROR("1022", "数据源创建中..."),
|
||||
CREATE_DATABASE_ERROR("1023", "创建数据库失败"),
|
||||
CREATE_TABLE_ERROR("1024", "创建表失败"),
|
||||
UPDATE_TABLE_FIELD_ERROR("1025", "更新表字段失败"),
|
||||
DELETE_TABLE_FIELD_ERROR("1026", "删除表字段失败"),
|
||||
QUERY_ROLE_ERROR("1027", "查询角色失败"),
|
||||
UPDATE_GROUP_ERROR("1028", "更新接口组失败"),
|
||||
DELETE_GROUP_ERROR("1029", "删除接口组失败"),
|
||||
SAVE_INTERFACE_ERROR("1030", "保存接口信息失败"),
|
||||
|
||||
/**
|
||||
* ******2xxx参数错误 *********************
|
||||
*/
|
||||
BODY_NOT_MATCH("2001", "请求的数据格式不符"),
|
||||
SIGNATURE_NOT_MATCH("2002", "请求的数字签名不匹配!"),
|
||||
REQUEST_PATH_NOT_MATCH("2003", "当前请求路径没有权限!"),
|
||||
NOT_UPLOAD_FILE_NAME_ERROR("2004", "上传的文件名不存在，请重新上传"),
|
||||
NOT_SUPPORT_IMG_TYPE("2005", "图片格式不正确，请重新上传"),
|
||||
NOT_SUPPORT_USERNAME_TYPE("2006", "excel用户名不能为空"),
|
||||
NOT_SUPPORT_ROLE_TYPE("2007", "角色不存在"),
|
||||
NOT_SUPPORT_DEPT_TYPE("2008", "部门不存在"),
|
||||
SQL_INJECT_NOT_ALLOWED("2009", "参数中存在数据库关键字，请修改"),
|
||||
TABLE_FIELD_NOT_EXIST("2010", "表字段不存在"),
|
||||
FILE_PICTURE_IS_NULL("2011", "附件不存在"),
|
||||
FILE_PICTURE_DELETE("2012", "删除附件失败"),
|
||||
DIC_BIANMA_REPEAT("2013", "字典编码重复"),
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/** *********** 3xxx用户错误 ******************* */
|
||||
USER_NOT_LOGIN("3001", "用户未登录"),
|
||||
USER_ACCOUNT_EXPIRED("3002", "账号已过期"),
|
||||
USER_CREDENTIALS_ERROR("3003", "用户名或密码错误"),
|
||||
USER_CREDENTIALS_EXPIRED("3004", "密码过期"),
|
||||
USER_ACCOUNT_NOT_BIND_ENTERPRISE("3005", "当前账号未绑定企业"),
|
||||
USER_ACCOUNT_LOCKED("3006", "账号被锁定"),
|
||||
USER_ACCOUNT_NOT_EXIST("3007", "账号不存在"),
|
||||
USER_ACCOUNT_ALREADY_EXIST("3008", "账号已存在"),
|
||||
USER_ACCOUNT_USE_BY_OTHERS("3009", "账号下线"),
|
||||
USER_NO_PERMISSION("3010", "当前账号没有此权限"),
|
||||
USERNAME_NOT_BLANK("3011", "用户不能为空"),
|
||||
USER_LOGIN_ERROR("3012", "用户登录失败"),
|
||||
USER_LOGOUT_ERROR("3013", "用户退出失败"),
|
||||
USER_ACCOUNT_USE_BY_OTHERS_ERROR("3014", "账号下线异常"),
|
||||
USER_ACCESS_DENIED("3015", "权限认证失败"),
|
||||
USERNAME_EXIST_ERROR("3016", "用户名重名"),
|
||||
|
||||
ROLE_NAME_ALREADY_EXIST("3101", "角色已存在"),
|
||||
|
||||
/** ********** 4xxx业务错误 *********************** */
|
||||
ENTERPRISE_NOT_EXIST("4001", "当前企业不存在"),
|
||||
APP_KEY_EXIST("4002", "应用key已存在"),
|
||||
APP_NOT_EXIST("4003", "应用不存在"),
|
||||
APP_PAGE_NAME_EXIST("4004", "当前页面名称已存在"),
|
||||
APP_PAGE_KEY_EXIST("4005", "当前页面key已存在"),
|
||||
APP_PAGE_NOT_EXIST("4006", "当前页面不存在，或已删除"),
|
||||
APP_PAGE_TYPE_ERROR("4007", "页面类型有误"),
|
||||
APP_PAGE_HOME_IS_NOT_EXIST("4008", "请设置首页"),
|
||||
CAN_NOT_DELETE_HOME_PAGE("4009", "请勿删除首页"),
|
||||
DELETE_PAGE_ERROR("4010", "删除页面失败"),
|
||||
CONFIG_CUSTOM_ERROR("4011", "配置自定义页面失败"),
|
||||
APP_PAGE_PARENT_NOT_EXIST("4012", "当前页面的父级页面不存在，或已删除"),
|
||||
DATASOURCE_NAME_EXIST("4013", "当前数据源名称已经存在，请修改后重试"),
|
||||
DATASOURCE_NOT_EXIST("4014", "当前数据源不存在"),
|
||||
DATASOURCE_HAS_DELETED("4015", "当前数据源已删除"),
|
||||
MODEL_NOT_EXIST("4016", "当前模型不存在"),
|
||||
MODEL_HAS_DELETED("4017", "当前模型已删除"),
|
||||
MODEL_NAME_HAS_EXIST("4018", "当前模型名称已存在"),
|
||||
DATASOURCE_NOT_CONFIG("4019", "数据源配置为空，请联系管理员"),
|
||||
DATASOURCE_NOT_CONFIG_DIALECT("4020", "未配置数据源的类型"),
|
||||
DATASOURCE_NOT_CONFIG_DRIVER_CLASS_NAME("4021", "未配置数据源的驱动"),
|
||||
DEPT_USER_EXIST("4022", "部门下存在用户"),
|
||||
NOT_CONFIG_PAGE_BUTTON_TYPE("4023", "未配置按钮雷星"),
|
||||
MODEL_PAGE_RELATION_MODEL("4024", "已关联当前模型页面"),
|
||||
MODEL_PAGE_NOT_EXIST("4025", "模型页面不存在或已被删除"),
|
||||
MODEL_HAS_RELATION_MODEL_PAGE("4026", "当前模型已关联模型页面，不允许删除"),
|
||||
FORM_NOT_EXIST("4027", "模型表单不存在"),
|
||||
READ_FILE_ERROR("4028", "读取模型页面的模板文件失败"),
|
||||
MODEL_PAGE_CONTENT_NULL("4029", "未配置模型页面的模板文件"),
|
||||
NOT_CONFIG_QUERY_SQL("4030", "未配置查询语句"),
|
||||
APP_PAGE_BUTTON_OPTION_VALUE_ERROR("4031", "未配置接口"),
|
||||
DELETE_COLUMN_ERROR("4032", "删除当前失败"),
|
||||
INSERT_DATA_ERROR("4033", "新建数据失败"),
|
||||
EDIT_DATA_ERROR("4034", "编辑数据失败"),
|
||||
DATASOURCE_HAS_MODELS("4035", "当前数据源存在模型，不允许删除"),
|
||||
NOT_CONFIG_FORM_API("4036", "未配置模型表单页的接口信息"),
|
||||
PLEASE_WRITE_AT_LEAST_DATA("4037", "请至少填写一行数据"),
|
||||
AMIS_PAGE_ERROR("4038", "分页参数异常"),
|
||||
QUERY_APP_PAGE_QUERY_FIELD_ERROR("4039", "查询搜素参数异常"),
|
||||
REQUEST_PARAM_NOT_IN_APP_PAGE_QUERY_FIELD("4040", "请求参数不在查询数据表中"),
|
||||
STYLE_LANGUAGE_ON_CSS("4041", "自定义css中的样式语言不能为空"),
|
||||
APP_CONFIG_TYPE_NOT_EXIST("4042", "不支持当前应用设置的类型"),
|
||||
APP_CONFIG_NOT_EXIST_OR_DELETED("4043", "当前设置不存在或已被删除"),
|
||||
APP_HAS_CONFIG_ON_THIS_TYPE("4044", "当前应用设置的类型已存在，请更新"),
|
||||
NOT_SUPPORT_COMPONENT_FRAME("4045", "不支持当前组件框架"),
|
||||
NOT_SUPPORT_COMPONENT_TYPE("4046", "不支持当前组件类型"),
|
||||
CURRENT_APP_KEY_EXIST("4047", "当前应用的组件key已存在"),
|
||||
CREATE_CUSTOM_COMPONENT_ERROR("4048", "新增自定义组件失败"),
|
||||
APP_CUSTOM_COMPONENT_NOT_EXIST("4049", "当前组件不存在或已被删除"),
|
||||
UPDATE_CUSTOM_COMPONENT_ERROR("4050", "更新自定义组件失败"),
|
||||
DELETED_CUSTOM_COMPONENT_ERROR("4051", "删除自定义组件失败"),
|
||||
INSERT_COMPONENT_DEPENDENCE_ERROR("4052", "新增自定义组件依赖项失败"),
|
||||
DELETE_COMPONENT_DEPENDENCE_ERROR("4053", "删除自定义组件依赖项失败"),
|
||||
CURRENT_COMPONENT_DEPENDENCE_NOT_EXIST("4054", "当前自定义组件依赖项不存在或已被删除"),
|
||||
CURRENT_APP_NAME_EXIST("4055", "当前应用的组件名称已存在"),
|
||||
NOT_SUPPORT_DATASOURCE_FROM("4056", "不支持当前的数据库来源"),
|
||||
JDBC_CONFIG_ERROR("4057", "平台内置的数据源配置有误"),
|
||||
NOT_SUPPORT_MODEL_TYPE("4058", "不支持当前的页面模板"),
|
||||
NOT_SUPPORT_CUSTOM_PAGE("4059", "暂不支持自定义页面"),
|
||||
FORM_PAGE_ON_DEVELOPING("4060", "自定义页面的该功能正在开发中..."),
|
||||
APP_PAGE_QUERY_FIELD_NOT_EXIST("4061", "当前查询条件不存在，或已被删除"),
|
||||
APP_PAGE_BUTTON_NOT_EXIST("4062", "当前页面按钮不存在，或已被删除"),
|
||||
TABLE_KEY_MORE_THEN_ONE("4063", "主键超过一个"),
|
||||
TABLE_KEY_LESS_THEN_ONE("4064", "主键必须存在"),
|
||||
TABLE_KEY_MUST_BE_INT("4065", "主键必须为整数类型"),
|
||||
TABLE_FIELD_MUST_EXIST("4066", "必须存在表字段"),
|
||||
CURRENT_MODEL_PAGE_HAS_CONVERSION_CUSTOM_PAGE("4067", "当前模型页面已转成自定义页面"),
|
||||
NOT_SUPPORT_RELEASE_STATUS("4068", "发布版本状态有误"),
|
||||
APP_FORM_BUTTON_NOT_EXIST("4067", "当前表单按钮不存在，或已被删除"),
|
||||
DATASOURCE_KEY_EXIST_ERROR("4068","数据源key已存在")
|
||||
;
|
||||
|
||||
CodeMessageEnum(String code, String message) {
|
||||
this.code = code;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
/** 返回到前端的code值 */
|
||||
private String code;
|
||||
|
||||
/** 返回到前端的code对应的message值 */
|
||||
private String message;
|
||||
|
||||
@Override
|
||||
public String getCode() {
|
||||
return this.code;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMessage() {
|
||||
return this.message;
|
||||
}
|
||||
|
||||
// public static CodeVo getJsonObjectByCode(String code) {
|
||||
// CodeVo codeVo = new CodeVo();
|
||||
// if (Tools.isEmpty(code)) {
|
||||
// return codeVo;
|
||||
// }
|
||||
// for (CodeMessageEnum enumObj : CodeMessageEnum.values()) {
|
||||
// if (enumObj.getCode().equals(code)) {
|
||||
// return new CodeVo(code, enumObj.message);
|
||||
// }
|
||||
// }
|
||||
// return codeVo;
|
||||
// }
|
||||
}
|
||||
|
|
@ -0,0 +1,190 @@
|
|||
package com.zcloud.service.map.util;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.hikvision.artemis.sdk.Client;
|
||||
import com.hikvision.artemis.sdk.Request;
|
||||
import com.hikvision.artemis.sdk.Response;
|
||||
import com.hikvision.artemis.sdk.constant.Constants;
|
||||
import com.hikvision.artemis.sdk.enums.Method;
|
||||
import com.zcloud.entity.PageData;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2023/09/12 10:16
|
||||
*/
|
||||
public class HKPostUtil {
|
||||
// 代理API网关nginx服务器ip端口
|
||||
// private static final String host = "192.168.211.185:443";
|
||||
// // 秘钥appkey
|
||||
// private static final String appKey = "21830372";
|
||||
// // 秘钥appSecret
|
||||
// private static final String appSecret = "vBZ89ltwQjHhFHLfg61V";
|
||||
private static final String host = "192.168.150.80:5443";
|
||||
// 秘钥appkey
|
||||
private static final String appKey = "25448524";
|
||||
// 秘钥appSecret
|
||||
private static final String appSecret = "DoHeB3gR2dxgaEvANqNr";
|
||||
/**
|
||||
* 能力开放平台的网站路径
|
||||
* TODO 路径不用修改，就是/artemis
|
||||
*/
|
||||
private static final String ARTEMIS_PATH = "/artemis";
|
||||
|
||||
/**
|
||||
* 通用海康接口
|
||||
* 调用POST请求类型(application/json)接口*
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> publicHkInterface(JSONObject jsonBody, String url){
|
||||
final String getCamsApi = ARTEMIS_PATH +url;
|
||||
Map<String, String> path = new HashMap<String, String>(2);
|
||||
path.put("https://", getCamsApi);
|
||||
// post请求application/json类型参数
|
||||
String result = doPostStringArtemis(path,jsonBody.toJSONString(),null,null,"application/json",null);
|
||||
JSONObject parseObject = JSONArray.parseObject(result);
|
||||
return parseObject;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取监控点预览取流URL
|
||||
* @param id 设备编号
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> camerasPreviewURLs(String id,String type){
|
||||
JSONObject jsonBody = new JSONObject();
|
||||
jsonBody.put("cameraIndexCode", id);
|
||||
jsonBody.put("netZoneCode", "1");
|
||||
jsonBody.put("transmode", 1);
|
||||
jsonBody.put("streamType", 0);
|
||||
jsonBody.put("protocol",type);
|
||||
jsonBody.put("expireTime", -1);
|
||||
jsonBody.put("expand","transcode=1&streamform=rtp");
|
||||
Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/video/v1/cameras/previewURLs");
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有区域数
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> getAllArea(){
|
||||
JSONObject jsonBody = new JSONObject();
|
||||
jsonBody.put("parentIndexCode", "root000000");
|
||||
jsonBody.put("resourceType", "camera");
|
||||
jsonBody.put("pageNo", 1);
|
||||
jsonBody.put("pageSize", 100);
|
||||
jsonBody.put("cascadeFlag",0);
|
||||
Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/resource/v2/regions/subRegions");
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取区域内摄像头数
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> getAreaCamera(String indexCode){
|
||||
JSONObject jsonBody = new JSONObject();
|
||||
jsonBody.put("regionIndexCode", indexCode);
|
||||
jsonBody.put("resourceType", "camera");
|
||||
jsonBody.put("pageNo", 1);
|
||||
jsonBody.put("pageSize", 100);
|
||||
Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/irds/v2/resource/subResources");
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* API名称：
|
||||
* 查询监控点列表v2
|
||||
* 分组：
|
||||
* 视频资源接口
|
||||
* 提供方名称：
|
||||
* 资源目录服务
|
||||
* qps：
|
||||
* 描述：根据条件查询目录下有权限的监控点列表
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> cameraSearch(PageData pd){
|
||||
JSONObject jsonBody = new JSONObject();
|
||||
jsonBody.put("pageNo", pd.get("pageNo"));
|
||||
jsonBody.put("pageSize", pd.get("pageSize"));
|
||||
if(pd.get("name")!=null && !"".equals(pd.getString("name")))
|
||||
jsonBody.put("name", pd.get("name"));
|
||||
jsonBody.put("orderBy", "name");
|
||||
jsonBody.put("orderType", "desc");
|
||||
jsonBody.put("resourceType", "camera");
|
||||
Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/irds/v2/deviceResource/resources");
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 订阅事件
|
||||
* @param ids 事件编号 131588
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> subscribeEvent(String[] ids){
|
||||
JSONObject jsonBody = new JSONObject();
|
||||
jsonBody.put("eventTypes", ids);
|
||||
jsonBody.put("eventDest", "1");
|
||||
Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/eventService/v1/eventSubscriptionByEventTypes");
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
public static String doPostStringArtemis(Map<String, String> path, String body, Map<String, String> querys, String accept, String contentType, Map<String, String> header) {
|
||||
String httpSchema = (String)path.keySet().toArray()[0];
|
||||
if (httpSchema != null && !StringUtils.isEmpty(httpSchema)) {
|
||||
String responseStr = null;
|
||||
|
||||
try {
|
||||
Map<String, String> headers = new HashMap();
|
||||
if (StringUtils.isNotBlank(accept)) {
|
||||
headers.put("Accept", accept);
|
||||
} else {
|
||||
headers.put("Accept", "*/*");
|
||||
}
|
||||
|
||||
if (StringUtils.isNotBlank(contentType)) {
|
||||
headers.put("Content-Type", contentType);
|
||||
} else {
|
||||
headers.put("Content-Type", "application/text;charset=UTF-8");
|
||||
}
|
||||
|
||||
if (header != null) {
|
||||
headers.putAll(header);
|
||||
}
|
||||
|
||||
Request request = new Request(Method.POST_STRING, httpSchema + host, (String)path.get(httpSchema), appKey, appSecret, Constants.DEFAULT_TIMEOUT);
|
||||
request.setHeaders(headers);
|
||||
request.setQuerys(querys);
|
||||
request.setStringBody(body);
|
||||
Response response = Client.execute(request);
|
||||
responseStr = getResponseResult(response);
|
||||
} catch (Exception var11) {
|
||||
var11.printStackTrace();
|
||||
}
|
||||
return responseStr;
|
||||
} else {
|
||||
throw new RuntimeException("http和https参数错误httpSchema: " + httpSchema);
|
||||
}
|
||||
}
|
||||
|
||||
private static String getResponseResult(Response response) {
|
||||
String responseStr = null;
|
||||
int statusCode = response.getStatusCode();
|
||||
if (!String.valueOf(statusCode).startsWith("2") && !String.valueOf(statusCode).startsWith("3")) {
|
||||
String msg = response.getErrorMessage();
|
||||
responseStr = response.getBody();
|
||||
System.out.println("the Artemis Request is Failed,statusCode:" + statusCode + " errorMsg:" + msg);
|
||||
} else {
|
||||
responseStr = response.getBody();
|
||||
System.out.println("the Artemis Request is Success,statusCode:" + statusCode + " SuccessMsg:" + response.getBody());
|
||||
}
|
||||
|
||||
return responseStr;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
package com.zcloud.service.map.util;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
|
||||
import com.hikvision.artemis.sdk.config.ArtemisConfig;
|
||||
import com.zcloud.entity.PageData;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 海康工具类
|
||||
*/
|
||||
public class HKUtil {
|
||||
static {
|
||||
// 代理API网关nginx服务器ip端口
|
||||
ArtemisConfig.host = "192.168.150.80:5443";
|
||||
// 秘钥appkey
|
||||
ArtemisConfig.appKey = "25448524";
|
||||
// 秘钥appSecret
|
||||
ArtemisConfig.appSecret = "DoHeB3gR2dxgaEvANqNr";
|
||||
}
|
||||
/**
|
||||
* 能力开放平台的网站路径
|
||||
* TODO 路径不用修改，就是/artemis
|
||||
*/
|
||||
private static final String ARTEMIS_PATH = "/artemis";
|
||||
/**
|
||||
* 通用海康接口
|
||||
* 调用POST请求类型(application/json)接口*
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> publicHkInterface(JSONObject jsonBody,String url){
|
||||
final String getCamsApi = ARTEMIS_PATH +url;
|
||||
Map<String, String> path = new HashMap<String, String>(2);
|
||||
path.put("https://", getCamsApi);
|
||||
// post请求application/json类型参数
|
||||
String result =ArtemisHttpUtil.doPostStringArtemis(path,jsonBody.toJSONString(),null,null,"application/json",null);
|
||||
JSONObject parseObject = JSONArray.parseObject(result);
|
||||
return parseObject;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取监控点预览取流URL
|
||||
* @param id 设备编号
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> camerasPreviewURLs(String id,String type){
|
||||
JSONObject jsonBody = new JSONObject();
|
||||
jsonBody.put("indexCode", id);
|
||||
jsonBody.put("netZoneCode", "1");
|
||||
jsonBody.put("transmode", 1);
|
||||
jsonBody.put("streamType", 0);
|
||||
jsonBody.put("protocol",type);
|
||||
jsonBody.put("expireTime", -1);
|
||||
jsonBody.put("expand","transcode=1&streamform=rtp");
|
||||
Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/vnsc/mls/v1/preview/openApi/getPreviewParam");
|
||||
/*/api/video/v1/cameras/previewURLs*/
|
||||
return returnMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* API名称：
|
||||
* 查询监控点列表v2
|
||||
* 分组：
|
||||
* 视频资源接口
|
||||
* 提供方名称：
|
||||
* 资源目录服务
|
||||
* qps：
|
||||
* 描述：根据条件查询目录下有权限的监控点列表
|
||||
* @return
|
||||
*/
|
||||
public static Map<String,Object> cameraSearch(PageData pd){
|
||||
JSONObject jsonBody = new JSONObject();
|
||||
jsonBody.put("pageNo", pd.get("pageNo"));
|
||||
jsonBody.put("pageSize", pd.get("pageSize"));
|
||||
if(pd.get("name")!=null && !"".equals(pd.getString("name")))
|
||||
jsonBody.put("name", pd.get("name"));
|
||||
jsonBody.put("orderBy", "name");
|
||||
jsonBody.put("orderType", "desc");
|
||||
Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/resource/v2/camera/search");
|
||||
return returnMap;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,145 @@
|
|||
package com.zcloud.service.map.util;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
|
||||
import org.apache.http.HttpStatus;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @description: R类
|
||||
**/
|
||||
public class ReturnMap extends HashMap<String, Object> {
|
||||
/**
|
||||
* 序列ID
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* R的无参构造, 初始化信息
|
||||
*/
|
||||
public ReturnMap() {
|
||||
put("code", 0);
|
||||
put("msg", "success");
|
||||
put("result", "success");
|
||||
}
|
||||
|
||||
/**
|
||||
* error1: 返回默认error
|
||||
*
|
||||
* @return 返回默认error
|
||||
*/
|
||||
public static ReturnMap error() {
|
||||
return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常, 请联系管理员");
|
||||
}
|
||||
|
||||
/**
|
||||
* error2
|
||||
*
|
||||
* @param msg 错误信息
|
||||
* @return 返回自定义信息的error
|
||||
*/
|
||||
public static ReturnMap error(String msg) {
|
||||
return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg);
|
||||
}
|
||||
|
||||
public static ReturnMap error(CodeMessageEnum codeMessageEnum, String uri) {
|
||||
return error(codeMessageEnum.getCode(), codeMessageEnum.getMessage(), uri);
|
||||
}
|
||||
|
||||
/**
|
||||
* 原先R的code和msg被覆盖
|
||||
*
|
||||
* @param code 错误码
|
||||
* @param msg 错误信息
|
||||
* @return 自定义的错误码和错误信息
|
||||
*/
|
||||
public static ReturnMap error(int code, String msg) {
|
||||
ReturnMap r = new ReturnMap();
|
||||
r.put("code", code);
|
||||
r.put("result", "error");
|
||||
r.put("msg", msg);
|
||||
return r;
|
||||
}
|
||||
|
||||
public static ReturnMap error(String code, String msg) {
|
||||
ReturnMap r = new ReturnMap();
|
||||
r.put("code", code);
|
||||
r.put("result", "error");
|
||||
r.put("msg", msg);
|
||||
return r;
|
||||
}
|
||||
|
||||
public static ReturnMap error(String code, String msg, String uri) {
|
||||
ReturnMap r = new ReturnMap();
|
||||
r.put("code", code);
|
||||
r.put("result", "error");
|
||||
r.put("msg", msg);
|
||||
r.put("uri", uri);
|
||||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
* ok1
|
||||
* 加入了msg
|
||||
*
|
||||
* @param msg
|
||||
* @return
|
||||
*/
|
||||
public static ReturnMap ok(String msg) {
|
||||
ReturnMap r = new ReturnMap();
|
||||
r.put("msg", msg);
|
||||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
* ok2: 加入了map
|
||||
*
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
public static ReturnMap ok(Map<String, Object> map) {
|
||||
ReturnMap r = new ReturnMap();
|
||||
r.putAll(map);
|
||||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
* ok3: 直接返回"0", "success"
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public static ReturnMap ok() {
|
||||
return new ReturnMap();
|
||||
}
|
||||
|
||||
/**
|
||||
* 放入自定义的key和value, 然后返回
|
||||
*
|
||||
* @param key
|
||||
* @param value
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public ReturnMap put(String key, Object value) {
|
||||
super.put(key, value);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 得到这个对象的code
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Integer getCode() {
|
||||
return (Integer) this.get("code");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
package com.zcloud.service.map.util;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.util.UuidUtil;
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||
import org.apache.http.client.methods.HttpPost;
|
||||
import org.apache.http.impl.client.CloseableHttpClient;
|
||||
import org.apache.http.impl.client.HttpClients;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author fangjiakai
|
||||
* @date 2023/09/08 11:32
|
||||
*/
|
||||
@Component
|
||||
public class WeatherUtil {
|
||||
private static final String WEATHER_PATH = "http://yunlink.027010.cn/OpenAPI/GetAllReal";
|
||||
private static final String sn="01803353066";
|
||||
private static final String pwd="353066";
|
||||
|
||||
public static Map<String,Object> getWeatherInfo() throws IOException {
|
||||
CloseableHttpClient client = null;
|
||||
CloseableHttpResponse response = null;
|
||||
HttpPost httpPost = new HttpPost(buildUrl(WEATHER_PATH,sn,pwd));
|
||||
|
||||
client = HttpClients.createDefault();
|
||||
response = client.execute(httpPost);
|
||||
HttpEntity entity = response.getEntity();
|
||||
String result = EntityUtils.toString(entity);
|
||||
return JSON.parseObject(result, HashMap.class);//返回结果转换为map
|
||||
}
|
||||
|
||||
private static String buildUrl(String uri,String sn,String pwd) {
|
||||
StringBuilder urlBuilder = new StringBuilder(uri+"?");
|
||||
try {
|
||||
urlBuilder.append("sn=").append(URLEncoder.encode(sn, "UTF-8"));
|
||||
urlBuilder.append("&pwd=").append(URLEncoder.encode(pwd, "UTF-8"));
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return urlBuilder.toString();
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
Map<String,Object> map = getWeatherInfo();
|
||||
List<Map<String,Object>> datas = (List<Map<String,Object>>)map.get("Datas");
|
||||
datas.forEach(item -> {
|
||||
List<Map<String,Object>> weathers = (List<Map<String,Object>>)item.get("Weathers");
|
||||
if(weathers.size()>0){
|
||||
PageData info = new PageData();
|
||||
info.put("METEOROLOGICALINFO_ID", UuidUtil.get32UUID());
|
||||
info.put("OPERATTIME", item.get("DateTime"));
|
||||
info.put("CODE", item.get("ID"));
|
||||
weathers.forEach(weather ->{
|
||||
if(weather.get("Index").equals(3)){
|
||||
info.put("TEMPERATURE", weather.get("Value").toString());
|
||||
}
|
||||
if(weather.get("Index").equals(6)){
|
||||
info.put("WINDSPEED", weather.get("Value").toString());
|
||||
}
|
||||
if(weather.get("Index").equals(7)){
|
||||
info.put("WINDDIRECTION", weather.get("Value").toString());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -356,7 +356,9 @@ public interface UsersService {
|
|||
|
||||
Object getCurrentLocation(PageData pd);
|
||||
|
||||
Object getCurrentPersonnelData(PageData pd) throws Exception;
|
||||
|
||||
Object getPersonPositioningStatistics(PageData pd) throws Exception;
|
||||
|
||||
Object getCurrentLocationCount(PageData pd);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,13 @@ import java.math.BigDecimal;
|
|||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.zcloud.entity.system.Menu;
|
||||
import com.zcloud.mapper.datasource.system.SupervisionDepartmentMapper;
|
||||
import com.zcloud.mapper.dsno2.system.Department2Mapper;
|
||||
import com.zcloud.util.DateUtil;
|
||||
import com.zcloud.util.Jurisdiction;
|
||||
import com.zcloud.util.UuidUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
|
@ -29,6 +35,8 @@ public class DepartmentServiceImpl implements DepartmentService{
|
|||
@Resource
|
||||
private DepartmentMapper departmentMapper;
|
||||
|
||||
@Resource
|
||||
private Department2Mapper department2Mapper;
|
||||
/**新增
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
|
|
|
|||
|
|
@ -0,0 +1,71 @@
|
|||
package com.zcloud.util;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 人员定位系统工具类
|
||||
* @author zhangyue
|
||||
* @date 2023/9/20/020 17:33
|
||||
*/
|
||||
@Component
|
||||
public class CzksPerLocUtil {
|
||||
|
||||
// @Value("${perLoc.url}")
|
||||
// 线上地址
|
||||
// public static String perLocUrl = "http://172.16.130.86/gateway-service";
|
||||
// 线上外网映射
|
||||
public static String perLocUrl = "http://221.195.199.13:7811/gateway-service";
|
||||
// @Value("${perLoc.userName}")
|
||||
// private String userName;
|
||||
// @Value("${perLoc.pwd}")
|
||||
private static String username = "qinan";
|
||||
private static String password = "ZBo7pZ6UKDGLXq/xc87WB/J84jk0B7jpujsQZFcGbG4NrNN0CuWSiImfNln0nloVYC0BOp+9bnCq7MEFpzJXy11z2iYnlOA8B7MM5YDi2dpI+bHO0+lfL57eH6IXP7rrSjiKWCBDjNPgYGETkSgXNRVb8L9LnwX6qbHDri4ARTI=";
|
||||
private static String userName = "n3Q3nVlzQ/8wVC0CObso2H+i8Y3g8q7k0DGZrZY4ofqnAv1wgfFst7AnlTYu7Rw1aJv36cPD/nrWARmNqP+UghX17K5iutwmKLVwC4EZaVmVABQGLjYdCekj2ePHpGjDFyHYaGQrIVJ651WxFZfKtdBexSL7b9sm7FRbpievNmA=";
|
||||
private static String source = "API";
|
||||
private static String code = "1";
|
||||
// token
|
||||
private static String perLocToken = "";
|
||||
public static String CameraHlsUrl = "http://221.195.199.13:7811";
|
||||
|
||||
|
||||
public static String getToken(){
|
||||
// token 不为空。验证token是否失效
|
||||
if (Tools.notEmpty(perLocToken)) {
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", 1);
|
||||
request.put("pageSize", 10);
|
||||
String httpResponseStr = HttpRequestUtil.doPost(perLocToken, perLocUrl + "/system/menu/menuTree",request.toJSONString());
|
||||
JSONObject httpResponse = JSONObject.parseObject(httpResponseStr);
|
||||
// token 有效
|
||||
if (Tools.notEmpty(httpResponseStr) && httpResponse != null && httpResponse.get("code") != null && httpResponse.getInteger("code") == 200) {
|
||||
return perLocToken;
|
||||
} else { // token 失效 或者报错
|
||||
perLocToken = goToLogin();
|
||||
}
|
||||
} else {
|
||||
perLocToken = goToLogin();
|
||||
}
|
||||
return perLocToken;
|
||||
}
|
||||
|
||||
|
||||
private static String goToLogin(){
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("username", username);
|
||||
request.put("password", password);
|
||||
request.put("userName", userName);
|
||||
request.put("source", source);
|
||||
request.put("code", code);
|
||||
String loginResStr = HttpRequestUtil.doPost(perLocUrl + "/auth/encryptLogin", request.toJSONString());
|
||||
JSONObject loginResponse = JSONObject.parseObject(loginResStr);
|
||||
// 登录成功
|
||||
if(Tools.notEmpty(loginResStr) && loginResponse != null
|
||||
&& loginResponse.get("code") != null && loginResponse.getInteger("code") == 200
|
||||
&& loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("token") != null){
|
||||
return loginResponse.getJSONObject("data").getString("token");
|
||||
} else { // 登录失败
|
||||
throw new RuntimeException("人员定位第三方登录失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -19,6 +19,7 @@ import org.apache.poi.ss.usermodel.VerticalAlignment;
|
|||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.apache.shiro.session.Session;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.servlet.view.document.AbstractXlsView;
|
||||
|
||||
import com.zcloud.entity.PageData;
|
||||
|
|
@ -30,11 +31,11 @@ import net.coobird.thumbnailator.Thumbnails;
|
|||
* 作者：luoxiaobao
|
||||
* 官网：www.qdkjchina.com
|
||||
*/
|
||||
@Component
|
||||
public class HiddenExcelImgToSessionView extends AbstractXlsView{
|
||||
|
||||
@Value("${http.file.url}")
|
||||
private String fileUrl;
|
||||
|
||||
@Value("${http.file.url}")
|
||||
private String fileUrl;
|
||||
@Override
|
||||
protected void buildExcelDocument(Map<String, Object> model,
|
||||
Workbook workbook, HttpServletRequest request,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.zcloud.util;
|
||||
|
||||
|
||||
import com.zcloud.util.examUntil.CodeMessageEnum;
|
||||
import org.apache.http.HttpStatus;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
|
@ -42,7 +43,9 @@ public class ReturnMap extends HashMap<String, Object> {
|
|||
return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg);
|
||||
}
|
||||
|
||||
|
||||
public static ReturnMap error(CodeMessageEnum codeMessageEnum, String url) {
|
||||
return error(codeMessageEnum.getCode(),codeMessageEnum.getMessage(), url);
|
||||
}
|
||||
/**
|
||||
* 原先R的code和msg被覆盖
|
||||
*
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
package com.zcloud.util.examUntil;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
/**
|
||||
* @desc 对象返回到前端以及异常抛出的接口类
|
||||
*/
|
||||
public interface BaseResultInterface {
|
||||
|
||||
|
||||
String getCode();
|
||||
|
||||
|
||||
String getMessage();
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
package com.zcloud.util.examUntil;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
|
||||
public class BizException extends RuntimeException implements BaseResultInterface {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/**
|
||||
* 错误码
|
||||
*/
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 错误信息
|
||||
*/
|
||||
private String message;
|
||||
|
||||
public BizException() {
|
||||
super();
|
||||
}
|
||||
|
||||
public BizException(CodeMessageEnum codeMessageEnum) {
|
||||
super(codeMessageEnum.getCode(),new Throwable());
|
||||
this.code = codeMessageEnum.getCode();
|
||||
this.message = codeMessageEnum.getMessage();
|
||||
}
|
||||
|
||||
public BizException(CodeMessageEnum codeMessageEnum, Throwable cause) {
|
||||
super(codeMessageEnum.getCode(), cause);
|
||||
this.code = codeMessageEnum.getCode();
|
||||
this.message = codeMessageEnum.getMessage();
|
||||
}
|
||||
public BizException (CodeMessageEnum codeMessageEnum, Throwable cause,String details) {
|
||||
super(codeMessageEnum.getCode(), cause);
|
||||
this.code = codeMessageEnum.getCode();
|
||||
this.message = codeMessageEnum.getMessage() + details;
|
||||
}
|
||||
public BizException(CodeMessageEnum codeMessageEnum, String message, Throwable cause) {
|
||||
super(codeMessageEnum.getCode(), cause);
|
||||
this.code = codeMessageEnum.getCode();
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public BizException(String message) {
|
||||
super(message);
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public BizException(String code, String message) {
|
||||
super(code);
|
||||
this.code = code;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public BizException(String code, String message, Throwable cause) {
|
||||
super(code, cause);
|
||||
this.code = code;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Throwable fillInStackTrace() {
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getCode() {
|
||||
return this.code;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMessage() {
|
||||
return this.message;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,197 @@
|
|||
package com.zcloud.util.examUntil;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public enum CodeMessageEnum implements BaseResultInterface {
|
||||
|
||||
/** ********* 0000成功 *************** */
|
||||
SUCCESS("0000", "成功!"),
|
||||
SUCCESS_LOGIN("0001", "用户登录成功"),
|
||||
SUCCESS_LOGOUT("0002", "用户退出成功"),
|
||||
|
||||
/* 默认失败 */
|
||||
COMMON_FAIL("999", "失败"),
|
||||
|
||||
/** ********* 1xxx系统错误 *************** */
|
||||
SERVER_BUSY("1001", "服务器正忙，请稍后再试!"),
|
||||
INTERNAL_SERVER_ERROR("1002", "服务器内部错误"),
|
||||
NOT_FOUND("1003", "未找到该资源!"),
|
||||
REQUEST_METHOD_ERROR("1004", "接口请求方法异常"),
|
||||
SQL_SYNTAX_ERROR_EXCEPTION("1005", "SQL语法错误异常"),
|
||||
NULL_POINT_ERROR_EXCEPTION("1006", "空指针异常信息"),
|
||||
INNER_FRAME_EXCEPTION("1007", "内部框架执行异常"),
|
||||
PARSE_TOKEN_EXCEPTION("1008", "解析token异常"),
|
||||
TOKEN_NOT_EXIST("1009", "token不存在"),
|
||||
TOKEN_SIGNATURE_EXCEPTION("1010", "token签名异常"),
|
||||
TOKEN_EXPIRE("1011", "token过期，请重新登录"),
|
||||
IMG_TYPE_NOT_CONFIG("1012", "请配置图片类型"),
|
||||
NOT_CONFIG_FILE_DIR("1013", "请配置文件路径"),
|
||||
UPLOAD_FILE_ERROR("1014", "文件上传失败"),
|
||||
FILE_NOT_EXIST("1015", "文件不存在"),
|
||||
FILE_HAS_DELETED("1016", "文件已被删除"),
|
||||
DRIVER_CLASS_NOT_FOUND("1017", "数据库的连接驱动正在加载中..."),
|
||||
TRY_CONNECT_DATABASE_ERROR("1018", "尝试连接数据库失败"),
|
||||
CLOSE_CONNECT_DATABASE_ERROR("1019", "关闭数据库连接失败"),
|
||||
DATABASE_NAME_NOT_EXIST("1020", "数据库名称不存在"),
|
||||
CLOSE_DATASOURCE_ERROR("1021", "释放数据库资源异常"),
|
||||
DRUID_DATASOURCE_ERROR("1022", "数据源创建中..."),
|
||||
CREATE_DATABASE_ERROR("1023", "创建数据库失败"),
|
||||
CREATE_TABLE_ERROR("1024", "创建表失败"),
|
||||
UPDATE_TABLE_FIELD_ERROR("1025", "更新表字段失败"),
|
||||
DELETE_TABLE_FIELD_ERROR("1026", "删除表字段失败"),
|
||||
QUERY_ROLE_ERROR("1027", "查询角色失败"),
|
||||
UPDATE_GROUP_ERROR("1028", "更新接口组失败"),
|
||||
DELETE_GROUP_ERROR("1029", "删除接口组失败"),
|
||||
SAVE_INTERFACE_ERROR("1030", "保存接口信息失败"),
|
||||
|
||||
/**
|
||||
* ******2xxx参数错误 *********************
|
||||
*/
|
||||
BODY_NOT_MATCH("2001", "请求的数据格式不符"),
|
||||
SIGNATURE_NOT_MATCH("2002", "请求的数字签名不匹配!"),
|
||||
REQUEST_PATH_NOT_MATCH("2003", "当前请求路径没有权限!"),
|
||||
NOT_UPLOAD_FILE_NAME_ERROR("2004", "上传的文件名不存在，请重新上传"),
|
||||
NOT_SUPPORT_IMG_TYPE("2005", "图片格式不正确，请重新上传"),
|
||||
NOT_SUPPORT_USERNAME_TYPE("2006", "excel用户名不能为空"),
|
||||
NOT_SUPPORT_ROLE_TYPE("2007", "角色不存在"),
|
||||
NOT_SUPPORT_DEPT_TYPE("2008", "部门不存在"),
|
||||
SQL_INJECT_NOT_ALLOWED("2009", "参数中存在数据库关键字，请修改"),
|
||||
TABLE_FIELD_NOT_EXIST("2010", "表字段不存在"),
|
||||
FILE_PICTURE_IS_NULL("2011", "附件不存在"),
|
||||
FILE_PICTURE_DELETE("2012", "删除附件失败"),
|
||||
DIC_BIANMA_REPEAT("2013", "字典编码重复"),
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/** *********** 3xxx用户错误 ******************* */
|
||||
USER_NOT_LOGIN("3001", "用户未登录"),
|
||||
USER_ACCOUNT_EXPIRED("3002", "账号已过期"),
|
||||
USER_CREDENTIALS_ERROR("3003", "用户名或密码错误"),
|
||||
USER_CREDENTIALS_EXPIRED("3004", "密码过期"),
|
||||
USER_ACCOUNT_NOT_BIND_ENTERPRISE("3005", "当前账号未绑定企业"),
|
||||
USER_ACCOUNT_LOCKED("3006", "账号被锁定"),
|
||||
USER_ACCOUNT_NOT_EXIST("3007", "账号不存在"),
|
||||
USER_ACCOUNT_ALREADY_EXIST("3008", "账号已存在"),
|
||||
USER_ACCOUNT_USE_BY_OTHERS("3009", "账号下线"),
|
||||
USER_NO_PERMISSION("3010", "当前账号没有此权限"),
|
||||
USERNAME_NOT_BLANK("3011", "用户不能为空"),
|
||||
USER_LOGIN_ERROR("3012", "用户登录失败"),
|
||||
USER_LOGOUT_ERROR("3013", "用户退出失败"),
|
||||
USER_ACCOUNT_USE_BY_OTHERS_ERROR("3014", "账号下线异常"),
|
||||
USER_ACCESS_DENIED("3015", "权限认证失败"),
|
||||
USERNAME_EXIST_ERROR("3016", "用户名重名"),
|
||||
|
||||
ROLE_NAME_ALREADY_EXIST("3101", "角色已存在"),
|
||||
|
||||
/** ********** 4xxx业务错误 *********************** */
|
||||
ENTERPRISE_NOT_EXIST("4001", "当前企业不存在"),
|
||||
APP_KEY_EXIST("4002", "应用key已存在"),
|
||||
APP_NOT_EXIST("4003", "应用不存在"),
|
||||
APP_PAGE_NAME_EXIST("4004", "当前页面名称已存在"),
|
||||
APP_PAGE_KEY_EXIST("4005", "当前页面key已存在"),
|
||||
APP_PAGE_NOT_EXIST("4006", "当前页面不存在，或已删除"),
|
||||
APP_PAGE_TYPE_ERROR("4007", "页面类型有误"),
|
||||
APP_PAGE_HOME_IS_NOT_EXIST("4008", "请设置首页"),
|
||||
CAN_NOT_DELETE_HOME_PAGE("4009", "请勿删除首页"),
|
||||
DELETE_PAGE_ERROR("4010", "删除页面失败"),
|
||||
CONFIG_CUSTOM_ERROR("4011", "配置自定义页面失败"),
|
||||
APP_PAGE_PARENT_NOT_EXIST("4012", "当前页面的父级页面不存在，或已删除"),
|
||||
DATASOURCE_NAME_EXIST("4013", "当前数据源名称已经存在，请修改后重试"),
|
||||
DATASOURCE_NOT_EXIST("4014", "当前数据源不存在"),
|
||||
DATASOURCE_HAS_DELETED("4015", "当前数据源已删除"),
|
||||
MODEL_NOT_EXIST("4016", "当前模型不存在"),
|
||||
MODEL_HAS_DELETED("4017", "当前模型已删除"),
|
||||
MODEL_NAME_HAS_EXIST("4018", "当前模型名称已存在"),
|
||||
DATASOURCE_NOT_CONFIG("4019", "数据源配置为空，请联系管理员"),
|
||||
DATASOURCE_NOT_CONFIG_DIALECT("4020", "未配置数据源的类型"),
|
||||
DATASOURCE_NOT_CONFIG_DRIVER_CLASS_NAME("4021", "未配置数据源的驱动"),
|
||||
DEPT_USER_EXIST("4022", "部门下存在用户"),
|
||||
NOT_CONFIG_PAGE_BUTTON_TYPE("4023", "未配置按钮雷星"),
|
||||
MODEL_PAGE_RELATION_MODEL("4024", "已关联当前模型页面"),
|
||||
MODEL_PAGE_NOT_EXIST("4025", "模型页面不存在或已被删除"),
|
||||
MODEL_HAS_RELATION_MODEL_PAGE("4026", "当前模型已关联模型页面，不允许删除"),
|
||||
FORM_NOT_EXIST("4027", "模型表单不存在"),
|
||||
READ_FILE_ERROR("4028", "读取模型页面的模板文件失败"),
|
||||
MODEL_PAGE_CONTENT_NULL("4029", "未配置模型页面的模板文件"),
|
||||
NOT_CONFIG_QUERY_SQL("4030", "未配置查询语句"),
|
||||
APP_PAGE_BUTTON_OPTION_VALUE_ERROR("4031", "未配置接口"),
|
||||
DELETE_COLUMN_ERROR("4032", "删除当前失败"),
|
||||
INSERT_DATA_ERROR("4033", "新建数据失败"),
|
||||
EDIT_DATA_ERROR("4034", "编辑数据失败"),
|
||||
DATASOURCE_HAS_MODELS("4035", "当前数据源存在模型，不允许删除"),
|
||||
NOT_CONFIG_FORM_API("4036", "未配置模型表单页的接口信息"),
|
||||
PLEASE_WRITE_AT_LEAST_DATA("4037", "请至少填写一行数据"),
|
||||
AMIS_PAGE_ERROR("4038", "分页参数异常"),
|
||||
QUERY_APP_PAGE_QUERY_FIELD_ERROR("4039", "查询搜素参数异常"),
|
||||
REQUEST_PARAM_NOT_IN_APP_PAGE_QUERY_FIELD("4040", "请求参数不在查询数据表中"),
|
||||
STYLE_LANGUAGE_ON_CSS("4041", "自定义css中的样式语言不能为空"),
|
||||
APP_CONFIG_TYPE_NOT_EXIST("4042", "不支持当前应用设置的类型"),
|
||||
APP_CONFIG_NOT_EXIST_OR_DELETED("4043", "当前设置不存在或已被删除"),
|
||||
APP_HAS_CONFIG_ON_THIS_TYPE("4044", "当前应用设置的类型已存在，请更新"),
|
||||
NOT_SUPPORT_COMPONENT_FRAME("4045", "不支持当前组件框架"),
|
||||
NOT_SUPPORT_COMPONENT_TYPE("4046", "不支持当前组件类型"),
|
||||
CURRENT_APP_KEY_EXIST("4047", "当前应用的组件key已存在"),
|
||||
CREATE_CUSTOM_COMPONENT_ERROR("4048", "新增自定义组件失败"),
|
||||
APP_CUSTOM_COMPONENT_NOT_EXIST("4049", "当前组件不存在或已被删除"),
|
||||
UPDATE_CUSTOM_COMPONENT_ERROR("4050", "更新自定义组件失败"),
|
||||
DELETED_CUSTOM_COMPONENT_ERROR("4051", "删除自定义组件失败"),
|
||||
INSERT_COMPONENT_DEPENDENCE_ERROR("4052", "新增自定义组件依赖项失败"),
|
||||
DELETE_COMPONENT_DEPENDENCE_ERROR("4053", "删除自定义组件依赖项失败"),
|
||||
CURRENT_COMPONENT_DEPENDENCE_NOT_EXIST("4054", "当前自定义组件依赖项不存在或已被删除"),
|
||||
CURRENT_APP_NAME_EXIST("4055", "当前应用的组件名称已存在"),
|
||||
NOT_SUPPORT_DATASOURCE_FROM("4056", "不支持当前的数据库来源"),
|
||||
JDBC_CONFIG_ERROR("4057", "平台内置的数据源配置有误"),
|
||||
NOT_SUPPORT_MODEL_TYPE("4058", "不支持当前的页面模板"),
|
||||
NOT_SUPPORT_CUSTOM_PAGE("4059", "暂不支持自定义页面"),
|
||||
FORM_PAGE_ON_DEVELOPING("4060", "自定义页面的该功能正在开发中..."),
|
||||
APP_PAGE_QUERY_FIELD_NOT_EXIST("4061", "当前查询条件不存在，或已被删除"),
|
||||
APP_PAGE_BUTTON_NOT_EXIST("4062", "当前页面按钮不存在，或已被删除"),
|
||||
TABLE_KEY_MORE_THEN_ONE("4063", "主键超过一个"),
|
||||
TABLE_KEY_LESS_THEN_ONE("4064", "主键必须存在"),
|
||||
TABLE_KEY_MUST_BE_INT("4065", "主键必须为整数类型"),
|
||||
TABLE_FIELD_MUST_EXIST("4066", "必须存在表字段"),
|
||||
CURRENT_MODEL_PAGE_HAS_CONVERSION_CUSTOM_PAGE("4067", "当前模型页面已转成自定义页面"),
|
||||
NOT_SUPPORT_RELEASE_STATUS("4068", "发布版本状态有误"),
|
||||
APP_FORM_BUTTON_NOT_EXIST("4067", "当前表单按钮不存在，或已被删除"),
|
||||
DATASOURCE_KEY_EXIST_ERROR("4068","数据源key已存在")
|
||||
;
|
||||
|
||||
CodeMessageEnum(String code, String message) {
|
||||
this.code = code;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
/** 返回到前端的code值 */
|
||||
private String code;
|
||||
|
||||
/** 返回到前端的code对应的message值 */
|
||||
private String message;
|
||||
|
||||
@Override
|
||||
public String getCode() {
|
||||
return this.code;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMessage() {
|
||||
return this.message;
|
||||
}
|
||||
|
||||
// public static CodeVo getJsonObjectByCode(String code) {
|
||||
// CodeVo codeVo = new CodeVo();
|
||||
// if (Tools.isEmpty(code)) {
|
||||
// return codeVo;
|
||||
// }
|
||||
// for (CodeMessageEnum enumObj : CodeMessageEnum.values()) {
|
||||
// if (enumObj.getCode().equals(code)) {
|
||||
// return new CodeVo(code, enumObj.message);
|
||||
// }
|
||||
// }
|
||||
// return codeVo;
|
||||
// }
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package com.zcloud.util.examUntil;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* @Description: 异常拦截接口
|
||||
* @Author: dearLin
|
||||
* @Date: 2023/3/8
|
||||
*/
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Documented
|
||||
public @interface ErrorOperation {
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
package com.zcloud.util.examUntil;
|
||||
|
||||
/**
|
||||
* 说明：TODO
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
|
||||
|
||||
import com.zcloud.util.ReturnMap;
|
||||
import org.mybatis.spring.MyBatisSystemException;
|
||||
import org.springframework.web.HttpRequestMethodNotSupportedException;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import static com.zcloud.util.examUntil.CodeMessageEnum.SERVER_BUSY;
|
||||
|
||||
|
||||
/**
|
||||
* 全局异常
|
||||
*/
|
||||
@RestControllerAdvice(annotations = {ErrorOperation.class})
|
||||
//@Slf4j
|
||||
public class GlobalExceptionHandler {
|
||||
|
||||
/**
|
||||
* 业务异常类
|
||||
*
|
||||
*/
|
||||
@ExceptionHandler(value = BizException.class)
|
||||
@ResponseBody
|
||||
public ReturnMap bizExceptionHandler(HttpServletRequest req, BizException e) {
|
||||
e.printStackTrace();
|
||||
// log.error("发生业务异常: {}, 请求接口: {}", e.getMessage(), req.getRequestURI());
|
||||
return ReturnMap.error("2001" ,e.getMessage(), req.getRequestURI());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 空指针异常
|
||||
*
|
||||
* @param e 异常信息
|
||||
* @param req 请求
|
||||
*/
|
||||
@ExceptionHandler(value = NullPointerException.class)
|
||||
@ResponseBody
|
||||
public ReturnMap exceptionHandler(HttpServletRequest req, NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
// log.error("空指针异常信息: {}, 请求接口: {}", e, req.getRequestURI());
|
||||
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
|
||||
}
|
||||
|
||||
/**
|
||||
* 接口请求方法异常
|
||||
*
|
||||
*/
|
||||
@ExceptionHandler(value = HttpRequestMethodNotSupportedException.class)
|
||||
@ResponseBody
|
||||
public ReturnMap methodNotSupportedExceptionHandler(HttpServletRequest req, Exception e) {
|
||||
e.printStackTrace();
|
||||
// log.error("请求方法异常信息: {}，请求接口: {}", e, req.getRequestURI());
|
||||
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
|
||||
}
|
||||
|
||||
/**
|
||||
* SQL 语法错误异常
|
||||
*/
|
||||
@ExceptionHandler(value = MyBatisSystemException.class)
|
||||
@ResponseBody
|
||||
public ReturnMap sqlSyntaxErrorExceptionHandler(HttpServletRequest req, Exception e) {
|
||||
e.printStackTrace();
|
||||
// log.error("MyBatis系统异常信息: {}，请求接口: {}", e, req.getRequestURI());
|
||||
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 其他异常信息
|
||||
*
|
||||
* @param req
|
||||
* @param e
|
||||
*/
|
||||
@ExceptionHandler(value = Exception.class)
|
||||
@ResponseBody
|
||||
public ReturnMap exceptionHandler(HttpServletRequest req, Exception e) {
|
||||
e.printStackTrace();
|
||||
// log.error("未知异常: {}, 请求接口: {}", e, req.getRequestURI());
|
||||
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
package com.zcloud.util.examUntil;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.web.context.request.RequestAttributes;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 说明：获取请求参数工具类
|
||||
* 作者：wangxuan
|
||||
* 官网：www.zcloudchina.com
|
||||
*/
|
||||
public class HttpContextUtils {
|
||||
public static HttpServletRequest getHttpServletRequest() {
|
||||
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
|
||||
if(requestAttributes == null){
|
||||
return null;
|
||||
}
|
||||
|
||||
return ((ServletRequestAttributes) requestAttributes).getRequest();
|
||||
}
|
||||
|
||||
public static Map<String, String> getParameterMap(HttpServletRequest request) {
|
||||
Enumeration<String> parameters = request.getParameterNames();
|
||||
|
||||
Map<String, String> params = new HashMap<>();
|
||||
while (parameters.hasMoreElements()) {
|
||||
String parameter = parameters.nextElement();
|
||||
String value = request.getParameter(parameter);
|
||||
if (StringUtils.isNotBlank(value)) {
|
||||
params.put(parameter, value);
|
||||
}
|
||||
}
|
||||
|
||||
return params;
|
||||
}
|
||||
|
||||
public static String getDomain(){
|
||||
HttpServletRequest request = getHttpServletRequest();
|
||||
StringBuffer url = request.getRequestURL();
|
||||
return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
|
||||
}
|
||||
|
||||
public static String getOrigin(){
|
||||
HttpServletRequest request = getHttpServletRequest();
|
||||
return request.getHeader(HttpHeaders.ORIGIN);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
|
||||
|
||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
datasource.no1.password=Mysql@zcloud88888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.username=root
|
||||
datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
|
||||
#druid???
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#?????
|
||||
spring.datasource.maxActive: 20
|
||||
#?????
|
||||
spring.datasource.initialSize: 1
|
||||
#??????????
|
||||
spring.datasource.maxWait: 60000
|
||||
#??PSCache?????????PSCache???
|
||||
spring.datasource.poolPreparedStatements: true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
|
||||
#??connectionProperties?????mergeSql????SQL??
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle: 1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis: 60000
|
||||
spring.datasource.minEvictableIdleTimeMillis: 300000
|
||||
spring.datasource.validationQuery: select 1 from dual
|
||||
spring.datasource.testWhileIdle: true
|
||||
spring.datasource.testOnBorrow: false
|
||||
spring.datasource.testOnReturn: false
|
||||
#?????????filters????????sql?????,'wall'?????
|
||||
filters: stat, wall, log4j
|
||||
|
||||
#????????
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
|
||||
#?????,?????sql??
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
|
||||
#????????
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
|
||||
#activiti????
|
||||
spring.activiti.check-process-definitions=false
|
||||
|
||||
#??
|
||||
spring.http.encoding.charset=UTF-8
|
||||
spring.http.encoding.force=true
|
||||
spring.http.encoding.enabled=true
|
||||
# ??springboot????banner
|
||||
spring.main.banner-mode=off
|
||||
#jar????????
|
||||
#web.upload-path=h:/
|
||||
#web.front-path=h:/
|
||||
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
|
||||
|
||||
#preventionxgf.api.url=http://192.168.0.79:8088
|
||||
#
|
||||
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
||||
|
||||
preventionxgf.api.url=http://192.168.0.79:8088/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.79:8092/
|
||||
|
||||
|
||||
#????????????
|
||||
baseimgpath = https://qgqy.qhdsafety.com/
|
||||
|
||||
#?????
|
||||
smb.host=39.103.224.166
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/qgfile/file/
|
||||
# 沧州矿石用户标识
|
||||
|
||||
#Mq\u914D\u7F6E
|
||||
rocketmq.consumer.group2=edu-admin-edit
|
||||
rocketmq.consumer.group1=edu-admin-add
|
||||
#rocketmq.name-server=10.0.140.141:9876
|
||||
#rocketmq.name-server=192.168.0.70:9876
|
||||
rocketmq.name-server=192.168.151.57:9876
|
||||
rocketmq.producer.group=libmiddle
|
||||
rocketmq.producer.send-message-timeout=3000
|
||||
rocketmq.producer.compress-message-body-threshold=4096
|
||||
rocketmq.producer.max-message-size=4194304
|
||||
rocketmq.producer.retry-times-when-send-failed=3
|
||||
rocketmq.producer.retry-next-server=true
|
||||
rocketmq.producer.retry-times-when-send-async-failed=3
|
||||
## topic \u524D\u7F00
|
||||
|
||||
mq.topic.info=info
|
||||
mq.topic.eightWork=eightWork
|
||||
mq.group.info=scheduled_tasks
|
||||
mq.group.eightWork=scheduled_tasks_eightWork
|
||||
|
||||
corp.default.pic-path=https://qgqy.qhdsafety.com/file/
|
||||
corp.default.back-end-path=http://192.168.151.57:8092/
|
||||
#对接人员定位
|
||||
perLoc.url=http://192.168.210.32:8084
|
||||
perLoc.userName=qaaqadmin
|
||||
perLoc.pwd=Cfd2023@
|
||||
#数据同步
|
||||
mq.topic.docking=docking
|
||||
mq.group.docking=scheduled_tasks_docking
|
||||
|
||||
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
datasource.no1.password=Zcloud@888888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.username=root
|
||||
datasource.no2.password=Zcloud@888888
|
||||
|
||||
#druid???
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#?????
|
||||
spring.datasource.maxActive: 20
|
||||
#?????
|
||||
spring.datasource.initialSize: 1
|
||||
#??????????
|
||||
spring.datasource.maxWait: 60000
|
||||
#??PSCache?????????PSCache???
|
||||
spring.datasource.poolPreparedStatements: true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
|
||||
#??connectionProperties?????mergeSql????SQL??
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle: 1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis: 60000
|
||||
spring.datasource.minEvictableIdleTimeMillis: 300000
|
||||
spring.datasource.validationQuery: select 1 from dual
|
||||
spring.datasource.testWhileIdle: true
|
||||
spring.datasource.testOnBorrow: false
|
||||
spring.datasource.testOnReturn: false
|
||||
#?????????filters????????sql?????,'wall'?????
|
||||
filters: stat, wall, log4j
|
||||
|
||||
#????????
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
|
||||
#?????,?????sql??
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
|
||||
#????????
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
|
||||
#activiti????
|
||||
spring.activiti.check-process-definitions=false
|
||||
|
||||
#??
|
||||
spring.http.encoding.charset=UTF-8
|
||||
spring.http.encoding.force=true
|
||||
spring.http.encoding.enabled=true
|
||||
# ??springboot????banner
|
||||
spring.main.banner-mode=off
|
||||
|
||||
#????????????
|
||||
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
||||
|
||||
smb.host=39.101.130.96
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/wwag/file/
|
||||
|
||||
#mq???????????
|
||||
rocketmq.name-server=172.16.130.91:9876
|
||||
rocketmq.producer.group=libmiddle
|
||||
rocketmq.producer.send-message-timeout=300000
|
||||
rocketmq.producer.compress-message-body-threshold=4096
|
||||
rocketmq.producer.max-message-size=4194304
|
||||
rocketmq.producer.retry-times-when-send-failed=3
|
||||
rocketmq.producer.retry-next-server=true
|
||||
rocketmq.producer.retry-times-when-send-async-failed=3
|
||||
## topic ????
|
||||
|
||||
mq.topic.info=info
|
||||
mq.topic.eightWork=eightWork
|
||||
mq.group.info=scheduled_tasks
|
||||
mq.group.eightWork=scheduled_tasks_eightWork
|
||||
|
||||
# topic ????
|
||||
mq.topic.docking=docking
|
||||
mq.topic.dockingPicture=dockingPicture
|
||||
mq.group.docking=scheduled_tasks_docking
|
||||
|
||||
#???? ??????
|
||||
perLoc.url=http://172.16.130.86/gateway-service
|
||||
perLoc.userName=qaaqadmin
|
||||
perLoc.pwd=Cfd2023@
|
||||
|
||||
#????? ??????
|
||||
corp.default.pic-path=https://qgqy.qhdsafety.com/
|
||||
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
|
||||
|
||||
#??????
|
||||
http.file.url=http://172.16.130.91:9004/file/
|
||||
#??????
|
||||
baseimgpath =http://172.16.130.91:9004/file/
|
||||
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
|
||||
|
|
@ -297,6 +297,9 @@
|
|||
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
|
||||
left join bus_identificationparts id on id.IDENTIFICATIONPARTS_ID = f.IDENTIFICATION_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
<if test="CHECK_IDENTIFICATION_ID != null and CHECK_IDENTIFICATION_ID != ''">
|
||||
and f.IDENTIFICATION_ID=#{CHECK_IDENTIFICATION_ID}
|
||||
</if>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -64,15 +64,14 @@
|
|||
cl.FIRE_CHECK_STANDARD_NAME,
|
||||
cl.FIRE_CHECK_TYPE AS FIRE_CHECK_TYPE_ID,
|
||||
IFNULL( FINISHED, 0 ) FINISHED,
|
||||
d.`NAME` AS DEPARTMENTNAME,
|
||||
od.`NAME` AS DEPARTMENTNAME,
|
||||
su.`NAME` AS USERNAME,
|
||||
cl.STATE,
|
||||
sys_dictionaries.`NAME` AS FIRE_CHECK_TYPE,
|
||||
cl.FIRE_CHECK_ID,
|
||||
ifnull(tt.CHECK_NUM,0) CHECK_NUM
|
||||
FROM
|
||||
bus_fire_checklist AS cl
|
||||
left JOIN oa_department AS d ON cl.DEPARTMENT_ID = d.DEPARTMENT_ID
|
||||
bus_fire_checklist as cl
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
FIRE_CHECK_ID,
|
||||
|
|
@ -86,6 +85,8 @@
|
|||
AND CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
GROUP BY FIRE_CHECK_ID,PERIODSTART,PERIODEND ) AS t ON cl.FIRE_CHECK_ID = t.FIRE_CHECK_ID
|
||||
LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID
|
||||
left join oa_department od
|
||||
on od.DEPARTMENT_ID = su.DEPARTMENT_ID
|
||||
LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA
|
||||
LEFT JOIN (SELECT FIRE_CHECK_ID, count(1) CHECK_NUM from bus_fire_record GROUP BY FIRE_CHECK_ID ) tt on cl.FIRE_CHECK_ID = tt.FIRE_CHECK_ID
|
||||
where cl.ISDELETE = 0 and cl.STATE != 2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,111 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.gatemachine.CzksGateAreaMapper">
|
||||
<sql id="table"> mk_gate_area </sql>
|
||||
|
||||
<sql id="filed">
|
||||
f
|
||||
.
|
||||
GATE_AREA_ID
|
||||
,
|
||||
f.GATE_AREA_NAME,
|
||||
f.GATE_AREA_TYPE,
|
||||
f.LATITUDE,
|
||||
f.LONGITUDE,
|
||||
f.CORPINFO_ID,
|
||||
f.ISDELETE,
|
||||
f.CREATOR,
|
||||
f.CREATTIME,
|
||||
f.OPERATOR,
|
||||
f.OPERATTIME
|
||||
</sql>
|
||||
<insert id="save">
|
||||
INSERT INTO
|
||||
<include refid="table"></include>
|
||||
(
|
||||
GATE_AREA_ID,
|
||||
GATE_AREA_NAME,
|
||||
GATE_AREA_TYPE,
|
||||
LATITUDE,
|
||||
LONGITUDE,
|
||||
CORPINFO_ID,
|
||||
ISDELETE,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME
|
||||
)
|
||||
VALUES (
|
||||
#{GATE_AREA_ID},
|
||||
#{GATE_AREA_NAME},
|
||||
#{GATE_AREA_TYPE},
|
||||
#{LATITUDE},
|
||||
#{LONGITUDE},
|
||||
#{CORPINFO_ID},
|
||||
#{ISDELETE},
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME}
|
||||
)
|
||||
</insert>
|
||||
<select id="getDatalistPage" resultType="com.zcloud.entity.PageData">
|
||||
select <include refid="filed"></include>, CONCAT_WS('--', f.LATITUDE,f.LONGITUDE) LONGTITUDEANDLATITUDE,
|
||||
(select count(1) from BUS_GATEVIDEO v where v.GATE_AREA_ID = f.GATE_AREA_ID and v.ISDELETE = '0') as
|
||||
VIDEO_COUNT,
|
||||
(select count(1) from mk_gate_machine m where m.GATE_AREA_ID = f.GATE_AREA_ID and m.ISDELETE = '0') as
|
||||
GATE_COUNT
|
||||
from
|
||||
<include refid="table"></include>
|
||||
f where f.ISDELETE = 0
|
||||
<if test="pd.GATE_AREA_NAME != null and pd.GATE_AREA_NAME != ''">
|
||||
and f.GATE_AREA_NAME like CONCAT(CONCAT('%', #{pd.GATE_AREA_NAME}),'%')
|
||||
</if>
|
||||
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
|
||||
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
</if>
|
||||
<if test="pd.GATE_AREA_TYPE != null and pd.GATE_AREA_TYPE != ''">
|
||||
and f.GATE_AREA_TYPE = #{pd.GATE_AREA_TYPE}
|
||||
</if>
|
||||
order by f.OPERATTIME desc
|
||||
</select>
|
||||
<select id="getGatePosition" resultType="com.zcloud.entity.PageData">
|
||||
select LONGITUDE,
|
||||
LATITUDE,
|
||||
GATE_AREA_NAME,
|
||||
'${TYPE}' TYPE,
|
||||
GATE_AREA_ID id
|
||||
FROM
|
||||
mk_gate_area
|
||||
WHERE
|
||||
isdelete = 0 and GATE_AREA_TYPE = #{GATE_AREA_TYPE}
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||
and CORPINFO_ID=#{CORPINFO_ID}
|
||||
</if>
|
||||
</select>
|
||||
<update id="edit">
|
||||
update
|
||||
<include refid="table"></include>
|
||||
set
|
||||
GATE_AREA_NAME = #{GATE_AREA_NAME},
|
||||
GATE_AREA_TYPE = #{GATE_AREA_TYPE},
|
||||
LONGITUDE = #{LONGITUDE},
|
||||
LATITUDE = #{LATITUDE},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATTIME = #{OPERATTIME}
|
||||
where
|
||||
GATE_AREA_ID = #{GATE_AREA_ID}
|
||||
</update>
|
||||
<update id="removeByIds">
|
||||
update mk_gate_area
|
||||
set ISDELETE = 1
|
||||
where GATE_AREA_ID in
|
||||
<foreach collection="list" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,248 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.gatemachine.CzksGateCarIOMapper">
|
||||
<insert id="saveMineral">
|
||||
INSERT INTO `qa-czks-prevention`.`work_mineral_io_record`
|
||||
(MINERAL_RECORD_ID,
|
||||
TRUCK_NO,
|
||||
CAR_TEAM_NAME,
|
||||
LRSJ,
|
||||
JGSJ,
|
||||
CGSJ,
|
||||
LX,
|
||||
GATE_MACHINE_ID,
|
||||
PASS_TYPE,
|
||||
ISDELETE,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME)
|
||||
VALUES (#{MINERAL_RECORD_ID},
|
||||
#{TRUCK_NO},
|
||||
#{CAR_TEAM_NAME},
|
||||
#{LRSJ},
|
||||
#{JGSJ},
|
||||
#{CGSJ},
|
||||
#{LX},
|
||||
#{GATE_MACHINE_ID},
|
||||
#{PASS_TYPE},
|
||||
0,
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME})
|
||||
</insert>
|
||||
<insert id="saveGrocery">
|
||||
INSERT INTO `qa-czks-prevention`.`work_grocery_io_record`
|
||||
(GROCERY_RECORD_ID,
|
||||
TRUCK_NO,
|
||||
CAR_TEAM_NAME,
|
||||
LRSJ,
|
||||
JGSJ,
|
||||
CGSJ,
|
||||
LX,
|
||||
GATE_MACHINE_ID,
|
||||
PASS_TYPE,
|
||||
ISDELETE,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME)
|
||||
VALUES (#{GROCERY_RECORD_ID},
|
||||
#{TRUCK_NO},
|
||||
#{CAR_TEAM_NAME},
|
||||
#{LRSJ},
|
||||
#{JGSJ},
|
||||
#{CGSJ},
|
||||
#{LX},
|
||||
#{GATE_MACHINE_ID},
|
||||
#{PASS_TYPE},
|
||||
0,
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME})
|
||||
</insert>
|
||||
<select id="getGroceryIORecords" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
||||
select * from
|
||||
`qa-czks-prevention`.`work_grocery_io_record` f
|
||||
where 1=1
|
||||
<if test="pd.JGSJ != null and pd.JGSJ != ''">
|
||||
and f.JGSJ = #{JGSJ}
|
||||
</if>
|
||||
<if test="pd.LX != null and pd.LX != ''">
|
||||
and f.LX = #{LX}
|
||||
</if>
|
||||
<if test="pd.TRUCK_NO != null and pd.TRUCK_NO != ''">
|
||||
and f.TRUCK_NO like CONCAT(CONCAT('%', #{TRUCK_NO}),'%')
|
||||
</if>
|
||||
order by f.OPERATTIME desc
|
||||
</select>
|
||||
<select id="getMineralIORecords" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
||||
select * from
|
||||
`qa-czks-prevention`.`work_mineral_io_record` f
|
||||
where 1=1
|
||||
<if test="pd.JGSJ != null and pd.JGSJ != ''">
|
||||
and f.JGSJ = #{JGSJ}
|
||||
</if>
|
||||
<if test="pd.LX != null and pd.LX != ''">
|
||||
and f.LX = #{LX}
|
||||
</if>
|
||||
<if test="pd.TRUCK_NO != null and pd.TRUCK_NO != ''">
|
||||
and f.TRUCK_NO like CONCAT(CONCAT('%', #{TRUCK_NO}),'%')
|
||||
</if>
|
||||
order by f.OPERATTIME desc
|
||||
</select>
|
||||
<update id="editGrocery" parameterType="com.zcloud.entity.PageData">
|
||||
update
|
||||
`qa-czks-prevention`.`work_grocery_io_record`
|
||||
set TRUCK_NO=#{TRUCK_NO},
|
||||
CAR_TEAM_NAME=#{CAR_TEAM_NAME},
|
||||
LRSJ=#{LRSJ},
|
||||
JGSJ=#{JGSJ},
|
||||
CGSJ=#{CGSJ},
|
||||
LX=#{LX},
|
||||
PASS_TYPE=#{PASS_TYPE},
|
||||
CREATOR=#{CREATOR},
|
||||
CREATTIME=#{CREATTIME},
|
||||
OPERATOR=#{OPERATOR},
|
||||
OPERATTIME=#{OPERATTIME}
|
||||
where 1 = 1
|
||||
and GROCERY_RECORD_ID = #{GROCERY_RECORD_ID ,jdbcType=VARCHAR}
|
||||
</update>
|
||||
<update id="editMineral" parameterType="com.zcloud.entity.PageData">
|
||||
update
|
||||
`qa-czks-prevention`.`work_mineral_io_record`
|
||||
set TRUCK_NO=#{TRUCK_NO},
|
||||
CAR_TEAM_NAME=#{CAR_TEAM_NAME},
|
||||
LRSJ=#{LRSJ},
|
||||
JGSJ=#{JGSJ},
|
||||
CGSJ=#{CGSJ},
|
||||
LX=#{LX},
|
||||
PASS_TYPE=#{PASS_TYPE},
|
||||
CREATOR=#{CREATOR},
|
||||
CREATTIME=#{CREATTIME},
|
||||
OPERATOR=#{OPERATOR},
|
||||
OPERATTIME=#{OPERATTIME}
|
||||
where 1 = 1
|
||||
and MINERAL_RECORD_ID = #{MINERAL_RECORD_ID ,jdbcType=VARCHAR}
|
||||
</update>
|
||||
<update id="removeGroceryRecordByIds" parameterType="com.zcloud.entity.PageData">
|
||||
update
|
||||
`qa-czks-prevention`.`work_grocery_io_record`
|
||||
set ISDELETE = #{ISDELETE ,jdbcType=INTEGER}
|
||||
where 1 = 1
|
||||
and GROCERY_RECORD_ID = #{GROCERY_RECORD_ID ,jdbcType=VARCHAR}
|
||||
</update>
|
||||
|
||||
<update id="removeMineralRecordByIds" parameterType="com.zcloud.entity.PageData">
|
||||
update
|
||||
`qa-czks-prevention`.`work_mineral_io_record`
|
||||
set ISDELETE = #{ISDELETE ,jdbcType=INTEGER}
|
||||
where 1 = 1
|
||||
and MINERAL_RECORD_ID = #{MINERAL_RECORD_ID ,jdbcType=VARCHAR}
|
||||
</update>
|
||||
<select id="countGroceryEnterAndQuit" resultType="pd" parameterType="pd">
|
||||
select
|
||||
count(case when g.PASS_TYPE = '0' then 0 end) as `entered`,
|
||||
count(case when g.PASS_TYPE = '1' then 1 end) as `quited`
|
||||
from
|
||||
`qa-czks-prevention`.`work_grocery_io_record` g
|
||||
where
|
||||
g.ISDELETE = 0
|
||||
and day(g.CREATTIME) = day(NOW())
|
||||
</select>
|
||||
<select id="countMineralEnterAndQuit" resultType="pd" parameterType="pd">
|
||||
select
|
||||
count(case when m.PASS_TYPE = '0' then 0 end) as `entered`,
|
||||
count(case when m.PASS_TYPE = '1' then 1 end) as `quited`
|
||||
from
|
||||
`qa-czks-prevention`.`work_mineral_io_record` m
|
||||
where
|
||||
m.ISDELETE = 0
|
||||
and day(m.CREATTIME) = day(NOW())
|
||||
</select>
|
||||
<select id="countGroceryEnterAndQuitAll" resultType="pd" parameterType="pd">
|
||||
select
|
||||
count(case when g.PASS_TYPE = '0' then 0 end) as `entered`,
|
||||
count(case when g.PASS_TYPE = '1' then 1 end) as `quited`
|
||||
from
|
||||
`qa-czks-prevention`.`work_grocery_io_record` g
|
||||
where
|
||||
g.ISDELETE = 0
|
||||
</select>
|
||||
<select id="countMineralEnterAndQuitAll" resultType="pd" parameterType="pd">
|
||||
select
|
||||
count(case when m.PASS_TYPE = '0' then 0 end) as `entered`,
|
||||
count(case when m.PASS_TYPE = '1' then 1 end) as `quited`
|
||||
from
|
||||
`qa-czks-prevention`.`work_mineral_io_record` m
|
||||
where
|
||||
m.ISDELETE = 0
|
||||
</select>
|
||||
|
||||
<select id="getMineralDatalistPage" resultType="pd" parameterType="com.zcloud.entity.Page">
|
||||
select *
|
||||
from `qa-czks-prevention`.`work_mineral_io_record` f
|
||||
where f.ISDELETE = 0
|
||||
<if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' ">
|
||||
and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
|
||||
<if test="pd.startTime!=null and pd.startTime!='' and pd.endTime!=null and pd.endTime!=''">
|
||||
<if test="pd.IO!=null and pd.IO!=''">
|
||||
<if test="pd.IO==0">
|
||||
and f.PASS_TYPE=0 and f.JGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
|
||||
#{pd.endTime ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="pd.IO==1">
|
||||
and f.PASS_TYPE=1 and f.CGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
|
||||
#{pd.endTime ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
</if>
|
||||
<if test="pd.IO==null or pd.IO=='' ">
|
||||
and f.CREATTIME between #{pd.startTime ,jdbcType=VARCHAR} and #{pd.endTime ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
</if>
|
||||
|
||||
<if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' ">
|
||||
and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%')
|
||||
</if>
|
||||
<if test="pd.CAR_TEAM_NAME!=null and pd.CAR_TEAM_NAME!='' ">
|
||||
and f.CAR_TEAM_NAME like CONCAT(CONCAT('%',#{pd.CAR_TEAM_NAME}),'%')
|
||||
</if>
|
||||
order by f.OPERATTIME desc
|
||||
</select>
|
||||
<select id="getGroceryDatalistPage" resultType="pd" parameterType="com.zcloud.entity.Page">
|
||||
select *
|
||||
from `qa-czks-prevention`.`work_grocery_io_record` f
|
||||
where f.ISDELETE = 0
|
||||
<if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' ">
|
||||
and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
|
||||
<if test="pd.startTime!=null and pd.startTime!='' and pd.endTime!=null and pd.endTime!=''">
|
||||
<if test="pd.IO!=null and pd.IO!=''">
|
||||
<if test="pd.IO==0">
|
||||
and f.PASS_TYPE=0 and f.JGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
|
||||
#{pd.endTime ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="pd.IO==1">
|
||||
and f.PASS_TYPE=1 and f.CGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
|
||||
#{pd.endTime ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
</if>
|
||||
<if test="pd.IO==null or pd.IO=='' ">
|
||||
and f.CREATTIME between #{pd.startTime ,jdbcType=VARCHAR} and #{pd.endTime ,jdbcType=VARCHAR}
|
||||
</if>
|
||||
</if>
|
||||
|
||||
<if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' ">
|
||||
and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%')
|
||||
</if>
|
||||
<if test="pd.CAR_TEAM_NAME!=null and pd.CAR_TEAM_NAME!='' ">
|
||||
and f.CAR_TEAM_NAME like CONCAT(CONCAT('%',#{pd.CAR_TEAM_NAME}),'%')
|
||||
</if>
|
||||
order by f.OPERATTIME desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,333 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.gatemachine.CzksGateMachineMapper">
|
||||
<sql id="table"> mk_gate_machine </sql>
|
||||
|
||||
<sql id="filed">
|
||||
f
|
||||
.
|
||||
GATE_MACHINE_ID
|
||||
,
|
||||
f.GATE_MACHINE_TYPE,
|
||||
f.EQUIPMENTID,
|
||||
f.GATE_MACHINE_MODEL,
|
||||
f.GATE_MACHINE_NAME,
|
||||
f.STATE,
|
||||
f.DESCR,
|
||||
f.LATITUDE,
|
||||
f.LONGITUDE,
|
||||
f.CORPINFO_ID,
|
||||
f.CREATOR,
|
||||
f.CREATTIME,
|
||||
f.OPERATOR,
|
||||
f.OPERATTIME,
|
||||
f.REMAKE
|
||||
</sql>
|
||||
<insert id="save">
|
||||
INSERT INTO mk_gate_machine
|
||||
(
|
||||
GATE_MACHINE_ID,
|
||||
GATE_AREA_ID,
|
||||
GATE_MACHINE_NAME,
|
||||
GATE_MACHINE_TYPE,
|
||||
EQUIPMENTID,
|
||||
GATE_MACHINE_MODEL,
|
||||
STATE,
|
||||
DESCR,
|
||||
LONGITUDE,
|
||||
LATITUDE,
|
||||
CORPINFO_ID,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME)
|
||||
VALUES (#{GATE_MACHINE_ID},
|
||||
#{GATE_AREA_ID},
|
||||
#{GATE_MACHINE_NAME},
|
||||
#{GATE_MACHINE_TYPE},
|
||||
#{EQUIPMENTID},
|
||||
#{GATE_MACHINE_MODEL},
|
||||
#{STATE},
|
||||
#{DESCR},
|
||||
#{LONGITUDE},
|
||||
#{LATITUDE},
|
||||
#{CORPINFO_ID},
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME})
|
||||
</insert>
|
||||
<select id="getDatalistPage" resultType="com.zcloud.entity.PageData">
|
||||
select <include refid="filed"></include>, CONCAT_WS('--', f.LATITUDE,f.LONGITUDE) LONGTITUDEANDLATITUDE
|
||||
from
|
||||
mk_gate_machine f where ISDELETE = 0
|
||||
<if test="pd.GATE_MACHINE_NAME != null and pd.GATE_MACHINE_NAME != ''">
|
||||
and f.GATE_MACHINE_NAME like CONCAT(CONCAT('%', #{pd.GATE_MACHINE_NAME}),'%')
|
||||
</if>
|
||||
<if test="pd.GATE_AREA_ID != null and pd.GATE_AREA_ID != ''">
|
||||
and f.GATE_AREA_ID = #{pd.GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="pd.GATE_MACHINE_TYPE != null and pd.GATE_MACHINE_TYPE != ''">
|
||||
and f.GATE_MACHINE_TYPE = #{pd.GATE_MACHINE_TYPE}
|
||||
</if>
|
||||
<if test="pd.GATE_MACHINE_MODEL != null and pd.GATE_MACHINE_MODEL != ''">
|
||||
and f.GATE_MACHINE_MODEL like CONCAT(CONCAT('%', #{pd.GATE_MACHINE_MODEL}),'%')
|
||||
</if>
|
||||
</select>
|
||||
<select id="getOnlineGateMachine" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
'PERSON_OUT' TYPE,
|
||||
COUNT( 1 ) COUNT
|
||||
FROM
|
||||
`bus_carduser` f
|
||||
WHERE
|
||||
f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
AND STATE = 1
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'PERSON_IN' TYPE,
|
||||
COUNT( 1 ) count
|
||||
FROM
|
||||
`bus_carduser` f
|
||||
WHERE
|
||||
f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
AND STATE = 0
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'CAR_IN' TYPE,
|
||||
IFNULL( COUNT( 1 ), 0 ) COUNT
|
||||
FROM
|
||||
bus_foreigncar c
|
||||
WHERE
|
||||
c.ISDELETE = 0 and
|
||||
c.TIME_IN BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'CAR_OUT' TYPE,
|
||||
IFNULL( COUNT( 1 ), 0 ) COUNT
|
||||
FROM
|
||||
bus_foreigncar c
|
||||
WHERE
|
||||
c.ISDELETE = 0 and
|
||||
c.TIME_OUT BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'CAMERA' TYPE,
|
||||
IFNULL( COUNT( 1 ), 0 ) COUNT
|
||||
FROM
|
||||
bus_gatevideo v
|
||||
LEFT JOIN mk_gate_area o on v.GATE_AREA_ID = o.GATE_AREA_ID
|
||||
WHERE
|
||||
v.isdelete = 0
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and o.CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and o.CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
|
||||
</select>
|
||||
<select id="getTodayInOutCount" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
f.EQUIPMENTID,
|
||||
COUNT( 1 ) COUNT,
|
||||
m.GATE_MACHINE_NAME
|
||||
FROM
|
||||
bus_carduser f
|
||||
LEFT JOIN mk_gate_machine m ON f.EQUIPMENTID = m.EQUIPMENTID
|
||||
WHERE
|
||||
f.TIME > CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and m.CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and m.CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||
and m.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
|
||||
GROUP BY
|
||||
f.EQUIPMENTID
|
||||
ORDER BY
|
||||
GATE_MACHINE_NAME DESC
|
||||
</select>
|
||||
<select id="getGatePosition" resultType="com.zcloud.entity.PageData">
|
||||
select LONGITUDE,
|
||||
LATITUDE,
|
||||
GATE_MACHINE_NAME,
|
||||
'${TYPE}' TYPE,
|
||||
GATE_MACHINE_ID id
|
||||
FROM
|
||||
mk_gate_machine
|
||||
WHERE
|
||||
isdelete = 0
|
||||
and GATE_MACHINE_TYPE = #{GATE_MACHINE_TYPE}
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
</select>
|
||||
<select id="getGateMachineInfoById" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
r.GATE_AREA_NAME,
|
||||
GROUP_CONCAT( f.GATE_MACHINE_NAME ) GATE_MACHINE_NAME,
|
||||
GROUP_CONCAT( DISTINCT f.GATE_MACHINE_MODEL ) GATE_MACHINE_MODEL,
|
||||
GROUP_CONCAT( DISTINCT r.CORPINFO_ID ) CORPINFO_ID,
|
||||
GROUP_CONCAT( f.EQUIPMENTID ) EQUIPMENTID
|
||||
FROM
|
||||
mk_gate_machine f
|
||||
LEFT JOIN mk_gate_area r ON r.GATE_AREA_ID = f.GATE_AREA_ID
|
||||
|
||||
left join bus_gatevideo v on v.GATE_AREA_ID = f.GATE_AREA_ID
|
||||
WHERE
|
||||
f.ISDELETE = 0
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''" >
|
||||
and f.GATE_AREA_ID = #{GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="GATEVIDEO_ID != null and GATEVIDEO_ID != ''" >
|
||||
AND v.GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</if>
|
||||
|
||||
GROUP BY
|
||||
f.GATE_AREA_ID
|
||||
</select>
|
||||
<select id="getPersonRecordCountByEId" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
CASE
|
||||
STATE
|
||||
WHEN 0 THEN
|
||||
'PERSON_IN' ELSE 'PERSON_OUT'
|
||||
END TYPE
|
||||
FROM
|
||||
bus_carduser
|
||||
WHERE
|
||||
EQUIPMENTID in <foreach collection="array" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
GROUP BY
|
||||
STATE
|
||||
</select>
|
||||
<select id="getCarRecordCountByEId" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_IN' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
EQUIPMENTID in
|
||||
<foreach collection="array" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND TIME_IN BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' ) UNION ALL
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_OUT' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
EQUIPMENTID in
|
||||
<foreach collection="array" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND TIME_OUT BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
</select>
|
||||
<select id="getCarRecordCountByCorpId" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_IN' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
and CORPINFO_ID = #{CORPINFO_ID}
|
||||
AND TIME_IN BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' ) UNION ALL
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_OUT' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
and CORPINFO_ID = #{CORPINFO_ID}
|
||||
AND TIME_OUT BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
</select>
|
||||
|
||||
<update id="edit">
|
||||
update
|
||||
<include refid="table"></include>
|
||||
set
|
||||
GATE_MACHINE_TYPE = #{GATE_MACHINE_TYPE},
|
||||
GATE_MACHINE_MODEL = #{GATE_MACHINE_MODEL},
|
||||
GATE_MACHINE_NAME = #{GATE_MACHINE_NAME},
|
||||
STATE = #{STATE},
|
||||
DESCR = #{DESCR},
|
||||
LONGITUDE = #{LONGITUDE},
|
||||
LATITUDE = #{LATITUDE},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
REMAKE = #{REMAKE}
|
||||
where
|
||||
GATE_MACHINE_ID = #{GATE_MACHINE_ID}
|
||||
</update>
|
||||
|
||||
<update id="removeByIds">
|
||||
update mk_gate_machine
|
||||
set ISDELETE = 1
|
||||
where GATE_MACHINE_ID in
|
||||
<foreach collection="list" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
|
||||
<select id="getPersonRecordListAllByIdlistPage" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
f.*
|
||||
from bus_carduser f
|
||||
WHERE
|
||||
1=1
|
||||
and f.EQUIPMENTID in (select EQUIPMENTID from mk_gate_machine where GATE_AREA_ID = #{pd.GATE_AREA_ID})
|
||||
AND f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
order by f.time desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,265 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.gatemachine.CzksGateVideoMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_GATEVIDEO
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.GATE_AREA_ID,
|
||||
f.VIDEONAME,
|
||||
f.OPDATE,
|
||||
f.OPUSER,
|
||||
f.ISDELETE,
|
||||
f.CODE,
|
||||
f.PLATFORMVIDEOMANAGEMENT_ID,
|
||||
f.GATEVIDEO_ID,
|
||||
f.LATITUDE,
|
||||
f.LONGITUDE
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
GATE_AREA_ID,
|
||||
VIDEONAME,
|
||||
OPDATE,
|
||||
OPUSER,
|
||||
ISDELETE,
|
||||
CODE,
|
||||
PLATFORMVIDEOMANAGEMENT_ID,
|
||||
GATEVIDEO_ID,
|
||||
LATITUDE,
|
||||
CORPINFO_ID,
|
||||
LONGITUDE
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{GATE_AREA_ID},
|
||||
#{VIDEONAME},
|
||||
#{OPDATE},
|
||||
#{OPUSER},
|
||||
#{ISDELETE},
|
||||
#{CODE},
|
||||
#{PLATFORMVIDEOMANAGEMENT_ID},
|
||||
#{GATEVIDEO_ID},
|
||||
#{LATITUDE},
|
||||
#{CORPINFO_ID},
|
||||
#{LONGITUDE}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
GATE_AREA_ID = #{GATE_AREA_ID},
|
||||
</if>
|
||||
<if test="VIDEONAME != null and VIDEONAME != ''"><!-- 关键词检索 -->
|
||||
VIDEONAME = #{VIDEONAME},
|
||||
</if>
|
||||
<if test="PLATFORMVIDEOMANAGEMENT_ID != null and PLATFORMVIDEOMANAGEMENT_ID != ''"><!-- 关键词检索 -->
|
||||
PLATFORMVIDEOMANAGEMENT_ID = #{PLATFORMVIDEOMANAGEMENT_ID},
|
||||
</if>
|
||||
<if test="CODE != null and CODE != ''"><!-- 关键词检索 -->
|
||||
CODE = #{CODE},
|
||||
</if>
|
||||
GATEVIDEO_ID = GATEVIDEO_ID
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</update>
|
||||
|
||||
<!-- 定位 -->
|
||||
<update id="savePosition" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
LATITUDE = #{LATITUDE},
|
||||
LONGITUDE = #{LONGITUDE}
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</update>
|
||||
|
||||
<update id="editIsShowBycorpinfoid" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set CODE= #{CODE}
|
||||
where
|
||||
GATE_AREA_ID = #{GATE_AREA_ID}
|
||||
</update>
|
||||
<update id="editIsShow" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set CODE= #{CODE}
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</update>
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.ISDELETE = '0'
|
||||
<if test="GATEVIDEO_ID != null and GATEVIDEO_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATEVIDEO_ID=#{GATEVIDEO_ID}
|
||||
</if>
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATE_AREA_ID=#{GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="CODE != null and CODE != ''"><!-- 关键词检索 -->
|
||||
and f.CODE=#{CODE}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 通过CODE获取数据 -->
|
||||
<select id="findByCode" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.CODE=#{CODE}
|
||||
</select>
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
pv.INDEXCODE
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join `qa-czks-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.GATE_AREA_ID != null and pd.GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATE_AREA_ID=#{pd.GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and
|
||||
(
|
||||
f.VIDEONAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATE_AREA_ID=#{GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="CODE != null and CODE != ''"><!-- 关键词检索 -->
|
||||
and f.CODE=#{CODE}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listBo" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.VIDEONAME,
|
||||
f.OPDATE,
|
||||
f.OPUSER,
|
||||
f.ISDELETE,
|
||||
f.GATEVIDEO_ID,
|
||||
pv.INDEXCODE
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join `qa-czks-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
|
||||
and f.CORPINFO_ID=#{CORPINFO_ID}
|
||||
</if>
|
||||
<if test="ArrayDATA_IDS != null and ArrayDATA_IDS != ''"><!-- 关键词检索 -->
|
||||
and GATEVIDEO_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
|
||||
</select>
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
GATEVIDEO_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAllForMap" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0' and f.LATITUDE is not null and f.LONGITUDE is not null
|
||||
</select>
|
||||
|
||||
<!-- 消防点位已定位 -->
|
||||
<select id="getPointsInfo" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0' and f.LATITUDE is not null and f.LONGITUDE is not null
|
||||
</select>
|
||||
<select id="getCameraPosition" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
GATEVIDEO_ID AS id,
|
||||
VIDEONAME AS `NAME`,
|
||||
v.LATITUDE,
|
||||
v.LONGITUDE
|
||||
FROM
|
||||
bus_gatevideo v
|
||||
LEFT JOIN mk_gate_machine o on v.GATE_AREA_ID = o.GATE_AREA_ID
|
||||
WHERE
|
||||
v.ISDELETE = 0
|
||||
and v.LATITUDE is not null and v.LONGITUDE is not null
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and o.CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||
and o.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
GROUP BY v.GATEVIDEO_ID
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.map.GateAreaMapper">
|
||||
<sql id="table"> mk_gate_area </sql>
|
||||
|
||||
<sql id="filed">
|
||||
f.GATE_AREA_ID,
|
||||
f.GATE_AREA_NAME,
|
||||
f.GATE_AREA_TYPE,
|
||||
f.LATITUDE,
|
||||
f.LONGITUDE,
|
||||
f.CORPINFO_ID,
|
||||
f.ISDELETE,
|
||||
f.CREATOR,
|
||||
f.CREATTIME,
|
||||
f.OPERATOR,
|
||||
f.OPERATTIME
|
||||
</sql>
|
||||
<insert id="save">
|
||||
INSERT INTO <include refid="table"></include>
|
||||
(
|
||||
GATE_AREA_ID,
|
||||
GATE_AREA_NAME,
|
||||
GATE_AREA_TYPE,
|
||||
LATITUDE,
|
||||
LONGITUDE,
|
||||
CORPINFO_ID,
|
||||
ISDELETE,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME
|
||||
)
|
||||
VALUES (
|
||||
#{GATE_AREA_ID},
|
||||
#{GATE_AREA_NAME},
|
||||
#{GATE_AREA_TYPE},
|
||||
#{LATITUDE},
|
||||
#{LONGITUDE},
|
||||
#{CORPINFO_ID},
|
||||
#{ISDELETE},
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME}
|
||||
)
|
||||
</insert>
|
||||
<select id="getDatalistPage" resultType="com.zcloud.entity.PageData">
|
||||
select <include refid="filed"></include>, CONCAT_WS('--', f.LATITUDE,f.LONGITUDE) LONGTITUDEANDLATITUDE,
|
||||
(select count(1) from BUS_GATEVIDEO v where v.GATE_AREA_ID = f.GATE_AREA_ID and v.ISDELETE = '0') as VIDEO_COUNT,
|
||||
(select count(1) from mk_gate_machine m where m.GATE_AREA_ID = f.GATE_AREA_ID and m.ISDELETE = '0') as GATE_COUNT
|
||||
from
|
||||
<include refid="table"></include> f where f.ISDELETE = 0
|
||||
<if test="pd.GATE_AREA_NAME != null and pd.GATE_AREA_NAME != ''">
|
||||
and f.GATE_AREA_NAME like CONCAT(CONCAT('%', #{pd.GATE_AREA_NAME}),'%')
|
||||
</if>
|
||||
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
|
||||
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
</if>
|
||||
<if test="pd.GATE_AREA_TYPE != null and pd.GATE_AREA_TYPE != ''">
|
||||
and f.GATE_AREA_TYPE = #{pd.GATE_AREA_TYPE}
|
||||
</if>
|
||||
order by f.OPERATTIME desc
|
||||
</select>
|
||||
<select id="getGatePosition" resultType="com.zcloud.entity.PageData">
|
||||
select LONGITUDE,
|
||||
LATITUDE,
|
||||
GATE_AREA_NAME,
|
||||
'${TYPE}' TYPE,
|
||||
GATE_AREA_ID id
|
||||
FROM
|
||||
mk_gate_area
|
||||
WHERE
|
||||
isdelete = 0 and GATE_AREA_TYPE = #{GATE_AREA_TYPE}
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
</select>
|
||||
<update id="edit">
|
||||
update
|
||||
<include refid="table"></include>
|
||||
set
|
||||
GATE_AREA_NAME = #{GATE_AREA_NAME},
|
||||
GATE_AREA_TYPE = #{GATE_AREA_TYPE},
|
||||
LONGITUDE = #{LONGITUDE},
|
||||
LATITUDE = #{LATITUDE},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATTIME = #{OPERATTIME}
|
||||
where
|
||||
GATE_AREA_ID = #{GATE_AREA_ID}
|
||||
</update>
|
||||
<update id="removeByIds">
|
||||
update mk_gate_area
|
||||
set ISDELETE = 1
|
||||
where GATE_AREA_ID in
|
||||
<foreach collection="list" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,333 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.map.GateMachineMapper">
|
||||
<sql id="table"> mk_gate_machine </sql>
|
||||
|
||||
<sql id="filed">
|
||||
f
|
||||
.
|
||||
GATE_MACHINE_ID
|
||||
,
|
||||
f.GATE_MACHINE_TYPE,
|
||||
f.EQUIPMENTID,
|
||||
f.GATE_MACHINE_MODEL,
|
||||
f.GATE_MACHINE_NAME,
|
||||
f.STATE,
|
||||
f.DESCR,
|
||||
f.LATITUDE,
|
||||
f.LONGITUDE,
|
||||
f.CORPINFO_ID,
|
||||
f.CREATOR,
|
||||
f.CREATTIME,
|
||||
f.OPERATOR,
|
||||
f.OPERATTIME,
|
||||
f.REMAKE
|
||||
</sql>
|
||||
<insert id="save">
|
||||
INSERT INTO mk_gate_machine
|
||||
(
|
||||
GATE_MACHINE_ID,
|
||||
GATE_AREA_ID,
|
||||
GATE_MACHINE_NAME,
|
||||
GATE_MACHINE_TYPE,
|
||||
EQUIPMENTID,
|
||||
GATE_MACHINE_MODEL,
|
||||
STATE,
|
||||
DESCR,
|
||||
LONGITUDE,
|
||||
LATITUDE,
|
||||
CORPINFO_ID,
|
||||
CREATOR,
|
||||
CREATTIME,
|
||||
OPERATOR,
|
||||
OPERATTIME)
|
||||
VALUES (#{GATE_MACHINE_ID},
|
||||
#{GATE_AREA_ID},
|
||||
#{GATE_MACHINE_NAME},
|
||||
#{GATE_MACHINE_TYPE},
|
||||
#{EQUIPMENTID},
|
||||
#{GATE_MACHINE_MODEL},
|
||||
#{STATE},
|
||||
#{DESCR},
|
||||
#{LONGITUDE},
|
||||
#{LATITUDE},
|
||||
#{CORPINFO_ID},
|
||||
#{CREATOR},
|
||||
#{CREATTIME},
|
||||
#{OPERATOR},
|
||||
#{OPERATTIME})
|
||||
</insert>
|
||||
<select id="getDatalistPage" resultType="com.zcloud.entity.PageData">
|
||||
select <include refid="filed"></include>, CONCAT_WS('--', f.LATITUDE,f.LONGITUDE) LONGTITUDEANDLATITUDE
|
||||
from
|
||||
mk_gate_machine f where ISDELETE = 0
|
||||
<if test="pd.GATE_MACHINE_NAME != null and pd.GATE_MACHINE_NAME != ''">
|
||||
and f.GATE_MACHINE_NAME like CONCAT(CONCAT('%', #{pd.GATE_MACHINE_NAME}),'%')
|
||||
</if>
|
||||
<if test="pd.GATE_AREA_ID != null and pd.GATE_AREA_ID != ''">
|
||||
and f.GATE_AREA_ID = #{pd.GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="pd.GATE_MACHINE_TYPE != null and pd.GATE_MACHINE_TYPE != ''">
|
||||
and f.GATE_MACHINE_TYPE = #{pd.GATE_MACHINE_TYPE}
|
||||
</if>
|
||||
<if test="pd.GATE_MACHINE_MODEL != null and pd.GATE_MACHINE_MODEL != ''">
|
||||
and f.GATE_MACHINE_MODEL like CONCAT(CONCAT('%', #{pd.GATE_MACHINE_MODEL}),'%')
|
||||
</if>
|
||||
</select>
|
||||
<select id="getOnlineGateMachine" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
'PERSON_OUT' TYPE,
|
||||
COUNT( 1 ) COUNT
|
||||
FROM
|
||||
`bus_carduser` f
|
||||
WHERE
|
||||
f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
AND STATE = 1
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'PERSON_IN' TYPE,
|
||||
COUNT( 1 ) count
|
||||
FROM
|
||||
`bus_carduser` f
|
||||
WHERE
|
||||
f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
AND STATE = 0
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'CAR_IN' TYPE,
|
||||
IFNULL( COUNT( 1 ), 0 ) COUNT
|
||||
FROM
|
||||
bus_foreigncar c
|
||||
WHERE
|
||||
c.ISDELETE = 0 and
|
||||
c.TIME_IN BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'CAR_OUT' TYPE,
|
||||
IFNULL( COUNT( 1 ), 0 ) COUNT
|
||||
FROM
|
||||
bus_foreigncar c
|
||||
WHERE
|
||||
c.ISDELETE = 0 and
|
||||
c.TIME_OUT BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
UNION ALL
|
||||
SELECT
|
||||
'CAMERA' TYPE,
|
||||
IFNULL( COUNT( 1 ), 0 ) COUNT
|
||||
FROM
|
||||
bus_gatevideo v
|
||||
LEFT JOIN mk_gate_area o on v.GATE_AREA_ID = o.GATE_AREA_ID
|
||||
WHERE
|
||||
v.isdelete = 0
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and o.CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and o.CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
|
||||
</select>
|
||||
<select id="getTodayInOutCount" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
f.EQUIPMENTID,
|
||||
COUNT( 1 ) COUNT,
|
||||
m.GATE_MACHINE_NAME
|
||||
FROM
|
||||
bus_carduser f
|
||||
LEFT JOIN mk_gate_machine m ON f.EQUIPMENTID = m.EQUIPMENTID
|
||||
WHERE
|
||||
f.TIME > CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and m.CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and m.CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||
and m.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
|
||||
GROUP BY
|
||||
f.EQUIPMENTID
|
||||
ORDER BY
|
||||
GATE_MACHINE_NAME DESC
|
||||
</select>
|
||||
<select id="getGatePosition" resultType="com.zcloud.entity.PageData">
|
||||
select LONGITUDE,
|
||||
LATITUDE,
|
||||
GATE_MACHINE_NAME,
|
||||
'${TYPE}' TYPE,
|
||||
GATE_MACHINE_ID id
|
||||
FROM
|
||||
mk_gate_machine
|
||||
WHERE
|
||||
isdelete = 0
|
||||
and GATE_MACHINE_TYPE = #{GATE_MACHINE_TYPE}
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORP_INFO_ID != null and CORP_INFO_ID != ''">
|
||||
and CORPINFO_ID = #{CORP_INFO_ID}
|
||||
</if>
|
||||
</select>
|
||||
<select id="getGateMachineInfoById" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
r.GATE_AREA_NAME,
|
||||
GROUP_CONCAT( f.GATE_MACHINE_NAME ) GATE_MACHINE_NAME,
|
||||
GROUP_CONCAT( DISTINCT f.GATE_MACHINE_MODEL ) GATE_MACHINE_MODEL,
|
||||
GROUP_CONCAT( DISTINCT r.CORPINFO_ID ) CORPINFO_ID,
|
||||
GROUP_CONCAT( f.EQUIPMENTID ) EQUIPMENTID
|
||||
FROM
|
||||
mk_gate_machine f
|
||||
LEFT JOIN mk_gate_area r ON r.GATE_AREA_ID = f.GATE_AREA_ID
|
||||
|
||||
left join bus_gatevideo v on v.GATE_AREA_ID = f.GATE_AREA_ID
|
||||
WHERE
|
||||
f.ISDELETE = 0
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''" >
|
||||
and f.GATE_AREA_ID = #{GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="GATEVIDEO_ID != null and GATEVIDEO_ID != ''" >
|
||||
AND v.GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</if>
|
||||
|
||||
GROUP BY
|
||||
f.GATE_AREA_ID
|
||||
</select>
|
||||
<select id="getPersonRecordCountByEId" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
CASE
|
||||
STATE
|
||||
WHEN 0 THEN
|
||||
'PERSON_IN' ELSE 'PERSON_OUT'
|
||||
END TYPE
|
||||
FROM
|
||||
bus_carduser
|
||||
WHERE
|
||||
EQUIPMENTID in <foreach collection="array" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
GROUP BY
|
||||
STATE
|
||||
</select>
|
||||
<select id="getCarRecordCountByEId" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_IN' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
EQUIPMENTID in
|
||||
<foreach collection="array" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND TIME_IN BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' ) UNION ALL
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_OUT' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
EQUIPMENTID in
|
||||
<foreach collection="array" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND TIME_OUT BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
</select>
|
||||
<select id="getCarRecordCountByCorpId" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_IN' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
and CORPINFO_ID = #{CORPINFO_ID}
|
||||
AND TIME_IN BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' ) UNION ALL
|
||||
SELECT
|
||||
COUNT( 1 ) COUNT,
|
||||
'CAR_OUT' TYPE
|
||||
FROM
|
||||
bus_foreigncar
|
||||
WHERE
|
||||
ISDELETE = 0
|
||||
and CORPINFO_ID = #{CORPINFO_ID}
|
||||
AND TIME_OUT BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
</select>
|
||||
|
||||
<update id="edit">
|
||||
update
|
||||
<include refid="table"></include>
|
||||
set
|
||||
GATE_MACHINE_TYPE = #{GATE_MACHINE_TYPE},
|
||||
GATE_MACHINE_MODEL = #{GATE_MACHINE_MODEL},
|
||||
GATE_MACHINE_NAME = #{GATE_MACHINE_NAME},
|
||||
STATE = #{STATE},
|
||||
DESCR = #{DESCR},
|
||||
LONGITUDE = #{LONGITUDE},
|
||||
LATITUDE = #{LATITUDE},
|
||||
CORPINFO_ID = #{CORPINFO_ID},
|
||||
OPERATOR = #{OPERATOR},
|
||||
OPERATTIME = #{OPERATTIME},
|
||||
REMAKE = #{REMAKE}
|
||||
where
|
||||
GATE_MACHINE_ID = #{GATE_MACHINE_ID}
|
||||
</update>
|
||||
|
||||
<update id="removeByIds">
|
||||
update mk_gate_machine
|
||||
set ISDELETE = 1
|
||||
where GATE_MACHINE_ID in
|
||||
<foreach collection="list" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
|
||||
<select id="getPersonRecordListAllByIdlistPage" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
f.*
|
||||
from bus_carduser f
|
||||
WHERE
|
||||
1=1
|
||||
and f.EQUIPMENTID in (select EQUIPMENTID from mk_gate_machine where GATE_AREA_ID = #{pd.GATE_AREA_ID})
|
||||
AND f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' )
|
||||
AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' )
|
||||
order by f.time desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,263 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.map.GateVideoMapper">
|
||||
|
||||
<!--表名 -->
|
||||
<sql id="tableName">
|
||||
BUS_GATEVIDEO
|
||||
</sql>
|
||||
|
||||
<!--数据字典表名 -->
|
||||
<sql id="dicTableName">
|
||||
SYS_DICTIONARIES
|
||||
</sql>
|
||||
|
||||
<!-- 字段 -->
|
||||
<sql id="Field">
|
||||
f.GATE_AREA_ID,
|
||||
f.VIDEONAME,
|
||||
f.OPDATE,
|
||||
f.OPUSER,
|
||||
f.ISDELETE,
|
||||
f.CODE,
|
||||
f.PLATFORMVIDEOMANAGEMENT_ID,
|
||||
f.GATEVIDEO_ID,
|
||||
f.LATITUDE,
|
||||
f.LONGITUDE
|
||||
</sql>
|
||||
|
||||
<!-- 字段用于新增 -->
|
||||
<sql id="Field2">
|
||||
GATE_AREA_ID,
|
||||
VIDEONAME,
|
||||
OPDATE,
|
||||
OPUSER,
|
||||
ISDELETE,
|
||||
CODE,
|
||||
PLATFORMVIDEOMANAGEMENT_ID,
|
||||
GATEVIDEO_ID,
|
||||
LATITUDE,
|
||||
LONGITUDE
|
||||
</sql>
|
||||
|
||||
<!-- 字段值 -->
|
||||
<sql id="FieldValue">
|
||||
#{GATE_AREA_ID},
|
||||
#{VIDEONAME},
|
||||
#{OPDATE},
|
||||
#{OPUSER},
|
||||
#{ISDELETE},
|
||||
#{CODE},
|
||||
#{PLATFORMVIDEOMANAGEMENT_ID},
|
||||
#{GATEVIDEO_ID},
|
||||
#{LATITUDE},
|
||||
#{LONGITUDE}
|
||||
</sql>
|
||||
|
||||
<!-- 新增-->
|
||||
<insert id="save" parameterType="pd">
|
||||
insert into
|
||||
<include refid="tableName"></include>
|
||||
(
|
||||
<include refid="Field2"></include>
|
||||
) values (
|
||||
<include refid="FieldValue"></include>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 删除-->
|
||||
<delete id="delete" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</delete>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="edit" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
GATE_AREA_ID = #{GATE_AREA_ID},
|
||||
</if>
|
||||
<if test="VIDEONAME != null and VIDEONAME != ''"><!-- 关键词检索 -->
|
||||
VIDEONAME = #{VIDEONAME},
|
||||
</if>
|
||||
<if test="PLATFORMVIDEOMANAGEMENT_ID != null and PLATFORMVIDEOMANAGEMENT_ID != ''"><!-- 关键词检索 -->
|
||||
PLATFORMVIDEOMANAGEMENT_ID = #{PLATFORMVIDEOMANAGEMENT_ID},
|
||||
</if>
|
||||
<if test="CODE != null and CODE != ''"><!-- 关键词检索 -->
|
||||
CODE = #{CODE},
|
||||
</if>
|
||||
GATEVIDEO_ID = GATEVIDEO_ID
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</update>
|
||||
|
||||
<!-- 定位 -->
|
||||
<update id="savePosition" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
LATITUDE = #{LATITUDE},
|
||||
LONGITUDE = #{LONGITUDE}
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</update>
|
||||
|
||||
<update id="editIsShowBycorpinfoid" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set CODE= #{CODE}
|
||||
where
|
||||
GATE_AREA_ID = #{GATE_AREA_ID}
|
||||
</update>
|
||||
<update id="editIsShow" parameterType="pd">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set CODE= #{CODE}
|
||||
where
|
||||
GATEVIDEO_ID = #{GATEVIDEO_ID}
|
||||
</update>
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="findById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.ISDELETE = '0'
|
||||
<if test="GATEVIDEO_ID != null and GATEVIDEO_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATEVIDEO_ID=#{GATEVIDEO_ID}
|
||||
</if>
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATE_AREA_ID=#{GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="CODE != null and CODE != ''"><!-- 关键词检索 -->
|
||||
and f.CODE=#{CODE}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 通过CODE获取数据 -->
|
||||
<select id="findByCode" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where
|
||||
f.CODE=#{CODE}
|
||||
</select>
|
||||
<!-- 列表 -->
|
||||
<select id="datalistPage" parameterType="page" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>,
|
||||
pv.INDEXCODE
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join `qa-czks-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.GATE_AREA_ID != null and pd.GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATE_AREA_ID=#{pd.GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
|
||||
and
|
||||
(
|
||||
f.VIDEONAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||
)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAll" parameterType="pd" resultType="pd">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0'
|
||||
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 关键词检索 -->
|
||||
and f.GATE_AREA_ID=#{GATE_AREA_ID}
|
||||
</if>
|
||||
<if test="CODE != null and CODE != ''"><!-- 关键词检索 -->
|
||||
and f.CODE=#{CODE}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listBo" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.VIDEONAME,
|
||||
f.OPDATE,
|
||||
f.OPUSER,
|
||||
f.ISDELETE,
|
||||
f.GATEVIDEO_ID,
|
||||
pv.INDEXCODE
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join `qa-czks-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
|
||||
where f.ISDELETE = '0'
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
|
||||
and f.CORPINFO_ID=#{CORPINFO_ID}
|
||||
</if>
|
||||
<if test="ArrayDATA_IDS != null and ArrayDATA_IDS != ''"><!-- 关键词检索 -->
|
||||
and GATEVIDEO_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
|
||||
</select>
|
||||
<!-- 批量删除 -->
|
||||
<delete id="deleteAll" parameterType="String">
|
||||
update
|
||||
<include refid="tableName"></include>
|
||||
set
|
||||
ISDELETE = '1'
|
||||
where
|
||||
GATEVIDEO_ID in
|
||||
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<!-- 列表(全部) -->
|
||||
<select id="listAllForMap" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0' and f.LATITUDE is not null and f.LONGITUDE is not null
|
||||
</select>
|
||||
|
||||
<!-- 消防点位已定位 -->
|
||||
<select id="getPointsInfo" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.*
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
where f.ISDELETE = '0' and f.LATITUDE is not null and f.LONGITUDE is not null
|
||||
</select>
|
||||
<select id="getCameraPosition" resultType="com.zcloud.entity.PageData">
|
||||
SELECT
|
||||
GATEVIDEO_ID AS id,
|
||||
VIDEONAME AS `NAME`,
|
||||
'CAMERA' AS TYPE,
|
||||
v.LATITUDE,
|
||||
v.LONGITUDE
|
||||
FROM
|
||||
bus_gatevideo v
|
||||
LEFT JOIN mk_gate_machine o on v.GATE_AREA_ID = o.GATE_AREA_ID
|
||||
WHERE
|
||||
v.ISDELETE = 0
|
||||
and v.LATITUDE is not null and v.LONGITUDE is not null
|
||||
<if test="AREA != null and AREA != ''">
|
||||
and o.CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
|
||||
</if>
|
||||
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
|
||||
and o.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,177 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zcloud.mapper.datasource.map.MapKeyProjectMapper">
|
||||
|
||||
|
||||
<select id="findFormCount" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
SUM( STATE_COUNT ) STATE_COUNT,
|
||||
SUM( VIDEOKG_COUNT ) VIDEO_COUNT,
|
||||
SUM( CHECK_COUNT ) CHECK_COUNT,
|
||||
SUM( HIDDEN_COUNT ) HIDDEN_COUNT,
|
||||
SUM( PUNISH_COUNT ) PUNISH_COUNT,
|
||||
SUM( AMOUT_SUM ) AMOUT_SUM
|
||||
FROM
|
||||
`qa-czks-regulatory`.vi_keyproj_count
|
||||
where 1=1
|
||||
<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
|
||||
and CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
<if test="ids!= null and ids.size()>0">
|
||||
AND CORPINFO_ID IN
|
||||
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="datalistPage" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
v.OUTSOURCED_COUNT,
|
||||
v.CHECK_COUNT,
|
||||
v.HIDDEN_COUNT,
|
||||
c.CORP_NAME
|
||||
FROM
|
||||
`qa-czks-regulatory`.vi_keyproj_count v
|
||||
LEFT JOIN `qa-czks-prevention`.bus_corp_info c on v.CORPINFO_ID=c.CORPINFO_ID
|
||||
where 1=1
|
||||
<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
|
||||
and v.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
</if>
|
||||
<if test="pd.ids!= null and pd.ids.size()>0">
|
||||
AND v.CORPINFO_ID IN
|
||||
<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
|
||||
#{pd.ids[${index}]}
|
||||
</foreach>
|
||||
</if>
|
||||
order by v.CHECK_COUNT desc
|
||||
</select>
|
||||
|
||||
<select id="getProjectLocation" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
'PROJECT' TYPE,
|
||||
o.OUTSOURCED_ID id,
|
||||
o.WORK_LONGITUDE LONGITUDE,
|
||||
o.WORK_LATITUDE LATITUDE,
|
||||
u.CORPINFO_ID,
|
||||
o.OUTSOURCED_NAME as MAP_POINT_NAME
|
||||
FROM
|
||||
`qa-czks-regulatory`.bus_outsourced o
|
||||
LEFT JOIN `qa-czks-prevention`.vi_user_all u on o.CREATOR = u.USER_ID
|
||||
WHERE
|
||||
o.ISDELETE = '0'
|
||||
AND o.STATE = '1'
|
||||
AND o.WORK_LONGITUDE IS NOT NULL
|
||||
AND o.WORK_LONGITUDE != ''
|
||||
AND o.WORK_LATITUDE IS NOT NULL
|
||||
AND o.WORK_LATITUDE != ''
|
||||
<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
|
||||
and u.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
<if test="ids!= null and ids.size()>0">
|
||||
AND u.CORPINFO_ID IN
|
||||
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getVideoLocation" parameterType="pd" resultType="pd">
|
||||
SELECT
|
||||
'camera' TYPE,
|
||||
v.VIDEOMANAGER_ID id,
|
||||
v.LONGITUDE,
|
||||
v.LATITUDE,
|
||||
u.CORPINFO_ID,
|
||||
v.VIDEONAME as MAP_POINT_NAME
|
||||
FROM
|
||||
`qa-czks-regulatory`.bus_videomanager v
|
||||
LEFT JOIN `qa-czks-regulatory`.bus_outsourced o on v.OUTSOURCED_ID = o.OUTSOURCED_ID
|
||||
LEFT JOIN `qa-czks-prevention`.vi_user_all u on o.CREATOR = u.USER_ID
|
||||
WHERE
|
||||
v.ISDELETE = '0'
|
||||
AND o.STATE = '1'
|
||||
AND o.ISDELETE = '0'
|
||||
AND v.LONGITUDE IS NOT NULL
|
||||
AND v.LONGITUDE != ''
|
||||
AND v.LATITUDE IS NOT NULL
|
||||
AND v.LATITUDE != ''
|
||||
<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
|
||||
and u.CORPINFO_ID = #{CORPINFO_ID}
|
||||
</if>
|
||||
<if test="ids!= null and ids.size()>0">
|
||||
AND u.CORPINFO_ID IN
|
||||
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="getProjectById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.*,
|
||||
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
|
||||
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
|
||||
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
|
||||
(select GROUP_CONCAT(t.NAME) from (
|
||||
SELECT
|
||||
CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID
|
||||
FROM
|
||||
`qa-czks-prevention`.OA_DEPARTMENT t
|
||||
LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
|
||||
) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
|
||||
(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
|
||||
-- isd.NAME DEPARTMENT_NAME,
|
||||
isdd.NAME MANAGER_DEPARTMENT_NAME,
|
||||
isu.NAME USER_NAME,
|
||||
pci.NAME Q_COMPETENT_DEPT_NAME,
|
||||
pcij.NAME Q_DEPARTMENT_NAME,
|
||||
pcijd.NAME Q_INVOLVING_CORPS_DEPART_NAME,
|
||||
b.UNITS_NAME as UNITS_ID,
|
||||
b.UNITS_NAME as UNITS_NAME,
|
||||
p.`NAME` as UNITS_PIC_NAME
|
||||
from
|
||||
`qa-czks-regulatory`.bus_outsourced f
|
||||
-- LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
|
||||
LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
|
||||
LEFT JOIN `qa-czks-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
|
||||
LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
|
||||
LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
|
||||
LEFT JOIN `qa-czks-prevention`.oa_department pcijd ON pcijd.DEPARTMENT_ID = f.INVOLVING_CORPS_DEPART_ID
|
||||
left join `qa-czks-regulatory`.bus_units b using (UNITS_ID)
|
||||
left join `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
|
||||
where
|
||||
f.OUTSOURCED_ID = #{id}
|
||||
</select>
|
||||
|
||||
<!-- 通过ID获取数据 -->
|
||||
<select id="getVideoById" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.OUTSOURCED_ID,
|
||||
f.VIDEONAME,
|
||||
f.VIDEOURL,
|
||||
f.OPDATE,
|
||||
f.OPUSER,
|
||||
f.ISDELETE,
|
||||
f.CODE,
|
||||
f.VIDEO_RESOURCES_ID,
|
||||
f.PLATFORMVIDEOMANAGEMENT_ID,
|
||||
f.VIDEOMANAGER_ID,
|
||||
f.LATITUDE,
|
||||
f.LONGITUDE,
|
||||
o.OUTSOURCED_NAME,
|
||||
c.CORP_NAME,
|
||||
pv.INDEXCODE
|
||||
from
|
||||
`qa-czks-regulatory`.BUS_VIDEOMANAGER f
|
||||
LEFT JOIN `qa-czks-regulatory`.bus_outsourced o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
|
||||
LEFT JOIN `qa-czks-prevention`.vi_user_all u on o.CREATOR = u.USER_ID
|
||||
LEFT JOIN `qa-czks-prevention`.bus_corp_info c on u.CORPINFO_ID=c.CORPINFO_ID
|
||||
left join `qa-czks-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
|
||||
where
|
||||
f.VIDEOMANAGER_ID = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -411,6 +411,9 @@
|
|||
AND fcs.ISDELETE = 0
|
||||
|
||||
where frd.FIRE_RECORD_ID = #{FIRE_RECORD_ID} and fp.FIRE_POINT_ID = #{FIRE_POINT_ID}
|
||||
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
|
||||
and d.CORPINFO_ID = #{pd.CORPINFO_ID}
|
||||
</if>
|
||||
GROUP BY
|
||||
frd.FIRE_RECORD_ID,
|
||||
fd.FIRE_DEVICE_ID
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.util.HttpRequestUtil;
|
||||
import com.zcloud.util.Tools;
|
||||
|
||||
public class Test {
|
||||
private static String username = "qinan";
|
||||
private static String password = "ZBo7pZ6UKDGLXq/xc87WB/J84jk0B7jpujsQZFcGbG4NrNN0CuWSiImfNln0nloVYC0BOp+9bnCq7MEFpzJXy11z2iYnlOA8B7MM5YDi2dpI+bHO0+lfL57eH6IXP7rrSjiKWCBDjNPgYGETkSgXNRVb8L9LnwX6qbHDri4ARTI=";
|
||||
private static String userName = "n3Q3nVlzQ/8wVC0CObso2H+i8Y3g8q7k0DGZrZY4ofqnAv1wgfFst7AnlTYu7Rw1aJv36cPD/nrWARmNqP+UghX17K5iutwmKLVwC4EZaVmVABQGLjYdCekj2ePHpGjDFyHYaGQrIVJ651WxFZfKtdBexSL7b9sm7FRbpievNmA=";
|
||||
private static String source = "API";
|
||||
private static String code = "1";
|
||||
private static String perLocToken = "4b13428cadd8bafbf9ae7ae2544";
|
||||
private static String perLocUrl = "http://172.16.130.86/gateway-service";
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
getToken();
|
||||
}
|
||||
|
||||
public static String goToLogin() {
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("username", username);
|
||||
request.put("password", password);
|
||||
request.put("userName", userName);
|
||||
request.put("source", source);
|
||||
request.put("code", code);
|
||||
String loginResStr = HttpRequestUtil.doPost("http://172.16.130.86/gateway-service" + "/auth/encryptLogin", request.toJSONString());
|
||||
JSONObject loginResponse = JSONObject.parseObject(loginResStr);
|
||||
if(Tools.notEmpty(loginResStr) && loginResponse != null
|
||||
&& loginResponse.get("code") != null && loginResponse.getInteger("code") == 200
|
||||
&& loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("token") != null){
|
||||
return loginResponse.getJSONObject("data").getString("token");
|
||||
} else { // 登录失败
|
||||
throw new RuntimeException("人员定位第三方登录失败");
|
||||
}
|
||||
}
|
||||
|
||||
public static String getToken() throws Exception {
|
||||
// token 不为空。验证token是否失效
|
||||
if (Tools.notEmpty(perLocToken)) {
|
||||
JSONObject request = new JSONObject();
|
||||
request.put("pageNum", 1);
|
||||
request.put("pageSize", 10);
|
||||
String httpResponseStr = HttpRequestUtil.doPost(perLocToken, perLocUrl + "/system/menu/menuTree",request.toJSONString());
|
||||
JSONObject httpResponse = JSONObject.parseObject(httpResponseStr);
|
||||
// token 有效
|
||||
if (Tools.notEmpty(httpResponseStr) && httpResponse != null && httpResponse.get("code") != null && httpResponse.getInteger("code") == 200) {
|
||||
return perLocToken;
|
||||
} else { // token 失效 或者报错
|
||||
perLocToken = goToLogin();
|
||||
}
|
||||
} else {
|
||||
perLocToken = goToLogin();
|
||||
}
|
||||
return perLocToken;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
升级内容： 企业端PC： 1、新增-三人以上风险分布图菜单-分公司进行上传维护 2、新增-人员聚集分布图菜单-分公司进行上传维护 3、新增-人员培训申请-分公司进行申请培训 4、新增-相关方人员撤场申请审批-分公司审批相关方人员撤回申请 监管端PC： 1、新增-三人以上风险分布图菜单，查看分公司数据 2、新增-人员聚集分布图菜单，查看分公司数据 3、优化-重点工程菜单-搜索条件可以手动输入,主管部门和监管部门可以选择全部企业 4、优化-入场告知培训管理-优化审核流程 相关方PC： 1、新增-人员推送申请-相关方对分公司推送人员 2、新增-人员撤回申请-相关方对分公司申请撤回人员 企业端APP： 1、优化-动火作业-监火改为选择部门 2、新增-查看重点工程监控视频 3、新增-重点工程创建人审核开工申请和结束申请 监管端APP： 1、新增-查看重点工程监控视频 2、新增-重点工程创建人审核开工申请和结束申请 一公司app： 1、新增-原来动火作业改为国标新动火作业审批流程
|
||||
Loading…
Reference in New Issue