diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 1add414..c0b66ec 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -1,6 +1,8 @@ name: Gitea Actions Demo run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 -on: [push] +on: + push: + branches: [ master ] # 当main分支有推送时触发 jobs: Explore-Gitea-Actions: runs-on: ubuntu-latest @@ -13,7 +15,7 @@ jobs: # - name: Checkout code # uses: actions/checkout@v4 # 拉取代码到工作目录 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: http://47.109.37.87:3000/bichangxiong/setup-java@v3 with: java-version: '17' distribution: 'temurin' @@ -23,12 +25,8 @@ jobs: with: maven-version: 3.8.2 - - name: List files in the repository - run: | - ls ${{ gitea.workspace }} - - name: Install dependencies - run: mvn clean package -DskipTests + run: mvn clean package -DskipTests -Dmaven.repo.local=/home/runner/maven-repo - name: copy file via ssh password uses: appleboy/scp-action@v0.1.7 with: diff --git a/lib/hik/linux64/HCNetSDKCom/libAudioIntercom.so b/lib/hik/linux64/HCNetSDKCom/libAudioIntercom.so new file mode 100644 index 0000000..49685d9 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libAudioIntercom.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCAlarm.so b/lib/hik/linux64/HCNetSDKCom/libHCAlarm.so new file mode 100644 index 0000000..a54dee3 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCAlarm.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCCoreDevCfg.so b/lib/hik/linux64/HCNetSDKCom/libHCCoreDevCfg.so new file mode 100644 index 0000000..5ada40f Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCCoreDevCfg.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCDisplay.so b/lib/hik/linux64/HCNetSDKCom/libHCDisplay.so new file mode 100644 index 0000000..9871c9e Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCDisplay.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCGeneralCfgMgr.so b/lib/hik/linux64/HCNetSDKCom/libHCGeneralCfgMgr.so new file mode 100644 index 0000000..7666233 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCGeneralCfgMgr.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCIndustry.so b/lib/hik/linux64/HCNetSDKCom/libHCIndustry.so new file mode 100644 index 0000000..4b11107 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCIndustry.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCPlayBack.so b/lib/hik/linux64/HCNetSDKCom/libHCPlayBack.so new file mode 100644 index 0000000..6137552 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCPlayBack.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCPreview.so b/lib/hik/linux64/HCNetSDKCom/libHCPreview.so new file mode 100644 index 0000000..035cd3d Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCPreview.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libHCVoiceTalk.so b/lib/hik/linux64/HCNetSDKCom/libHCVoiceTalk.so new file mode 100644 index 0000000..6a2ab90 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libHCVoiceTalk.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libStreamTransClient.so b/lib/hik/linux64/HCNetSDKCom/libStreamTransClient.so new file mode 100644 index 0000000..6b16337 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libStreamTransClient.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libSystemTransform.so b/lib/hik/linux64/HCNetSDKCom/libSystemTransform.so new file mode 100644 index 0000000..086c631 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libSystemTransform.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libanalyzedata.so b/lib/hik/linux64/HCNetSDKCom/libanalyzedata.so new file mode 100644 index 0000000..fa416e9 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libanalyzedata.so differ diff --git a/lib/hik/linux64/HCNetSDKCom/libiconv2.so b/lib/hik/linux64/HCNetSDKCom/libiconv2.so new file mode 100644 index 0000000..d17b0a8 Binary files /dev/null and b/lib/hik/linux64/HCNetSDKCom/libiconv2.so differ diff --git a/lib/hik/linux64/HCNetSDK_Log_Switch.xml b/lib/hik/linux64/HCNetSDK_Log_Switch.xml new file mode 100644 index 0000000..8b7e236 --- /dev/null +++ b/lib/hik/linux64/HCNetSDK_Log_Switch.xml @@ -0,0 +1,12 @@ + + + + 3 + ./SDKLOG/ + true + + + 120 + 1 + + \ No newline at end of file diff --git a/lib/hik/linux64/libAudioRender.so b/lib/hik/linux64/libAudioRender.so new file mode 100644 index 0000000..f39a4a1 Binary files /dev/null and b/lib/hik/linux64/libAudioRender.so differ diff --git a/lib/hik/linux64/libHCCore.so b/lib/hik/linux64/libHCCore.so new file mode 100644 index 0000000..7846902 Binary files /dev/null and b/lib/hik/linux64/libHCCore.so differ diff --git a/lib/hik/linux64/libNPQos.so b/lib/hik/linux64/libNPQos.so new file mode 100644 index 0000000..4972715 Binary files /dev/null and b/lib/hik/linux64/libNPQos.so differ diff --git a/lib/hik/linux64/libPlayCtrl.so b/lib/hik/linux64/libPlayCtrl.so new file mode 100644 index 0000000..e255c22 Binary files /dev/null and b/lib/hik/linux64/libPlayCtrl.so differ diff --git a/lib/hik/linux64/libSuperRender.so b/lib/hik/linux64/libSuperRender.so new file mode 100644 index 0000000..3f36846 Binary files /dev/null and b/lib/hik/linux64/libSuperRender.so differ diff --git a/lib/hik/linux64/libcrypto.so.1.1 b/lib/hik/linux64/libcrypto.so.1.1 new file mode 100644 index 0000000..88c3746 Binary files /dev/null and b/lib/hik/linux64/libcrypto.so.1.1 differ diff --git a/lib/hik/linux64/libhcnetsdk.so b/lib/hik/linux64/libhcnetsdk.so new file mode 100644 index 0000000..2607cee Binary files /dev/null and b/lib/hik/linux64/libhcnetsdk.so differ diff --git a/lib/hik/linux64/libhpr.so b/lib/hik/linux64/libhpr.so new file mode 100644 index 0000000..8efcabb Binary files /dev/null and b/lib/hik/linux64/libhpr.so differ diff --git a/lib/hik/linux64/libopenal.so.1 b/lib/hik/linux64/libopenal.so.1 new file mode 100644 index 0000000..a9dcb82 Binary files /dev/null and b/lib/hik/linux64/libopenal.so.1 differ diff --git a/lib/hik/linux64/libssl.so.1.1 b/lib/hik/linux64/libssl.so.1.1 new file mode 100644 index 0000000..f3e4481 Binary files /dev/null and b/lib/hik/linux64/libssl.so.1.1 differ diff --git a/lib/hik/linux64/libz.so b/lib/hik/linux64/libz.so new file mode 100644 index 0000000..13b4ed9 Binary files /dev/null and b/lib/hik/linux64/libz.so differ diff --git a/lib/hik/win64/AudioRender.dll b/lib/hik/win64/AudioRender.dll new file mode 100644 index 0000000..4935684 Binary files /dev/null and b/lib/hik/win64/AudioRender.dll differ diff --git a/lib/hik/win64/ClientDemo.exe b/lib/hik/win64/ClientDemo.exe new file mode 100644 index 0000000..75aedfa Binary files /dev/null and b/lib/hik/win64/ClientDemo.exe differ diff --git a/lib/hik/win64/ClientDemoDll/ReadMe.txt b/lib/hik/win64/ClientDemoDll/ReadMe.txt new file mode 100644 index 0000000..8006f36 --- /dev/null +++ b/lib/hik/win64/ClientDemoDll/ReadMe.txt @@ -0,0 +1 @@ +The dll in this directoryiconv.dll,libxml2.dll,zlib1.dll,calib.dllonly used in ClientDemo. \ No newline at end of file diff --git a/lib/hik/win64/ClientDemoDll/calib.dll b/lib/hik/win64/ClientDemoDll/calib.dll new file mode 100644 index 0000000..328c63e Binary files /dev/null and b/lib/hik/win64/ClientDemoDll/calib.dll differ diff --git a/lib/hik/win64/ClientDemoDll/iconv.dll b/lib/hik/win64/ClientDemoDll/iconv.dll new file mode 100644 index 0000000..df71882 Binary files /dev/null and b/lib/hik/win64/ClientDemoDll/iconv.dll differ diff --git a/lib/hik/win64/ClientDemoDll/libcrypto-1_1-x64.dll b/lib/hik/win64/ClientDemoDll/libcrypto-1_1-x64.dll new file mode 100644 index 0000000..f2f96d7 Binary files /dev/null and b/lib/hik/win64/ClientDemoDll/libcrypto-1_1-x64.dll differ diff --git a/lib/hik/win64/ClientDemoDll/libssl-1_1-x64.dll b/lib/hik/win64/ClientDemoDll/libssl-1_1-x64.dll new file mode 100644 index 0000000..8034d79 Binary files /dev/null and b/lib/hik/win64/ClientDemoDll/libssl-1_1-x64.dll differ diff --git a/lib/hik/win64/ClientDemoDll/libxml2.dll b/lib/hik/win64/ClientDemoDll/libxml2.dll new file mode 100644 index 0000000..c8d57f3 Binary files /dev/null and b/lib/hik/win64/ClientDemoDll/libxml2.dll differ diff --git a/lib/hik/win64/ClientDemoDll/zlib1.dll b/lib/hik/win64/ClientDemoDll/zlib1.dll new file mode 100644 index 0000000..82913fb Binary files /dev/null and b/lib/hik/win64/ClientDemoDll/zlib1.dll differ diff --git a/lib/hik/win64/DemoLocalCfg.json b/lib/hik/win64/DemoLocalCfg.json new file mode 100644 index 0000000..e69de29 diff --git a/lib/hik/win64/DeviceCfg.json b/lib/hik/win64/DeviceCfg.json new file mode 100644 index 0000000..c176150 --- /dev/null +++ b/lib/hik/win64/DeviceCfg.json @@ -0,0 +1,25 @@ +{ + "Devices": [{ + "ID": 0, + "SerialNumber": "DS-K221020240130V010006CHGB5685986", + "ChannelNumber": 0, + "StartChannel": 1, + "AlarmInNum": 0, + "AlarmOutNum": 2, + "IPChanNum": 0, + "MirrorChanNum": 0, + "StartMirrorChanNo": 0, + "LocalNodeName": "192.168.110.196", + "DeviceType": 864, + "DiskNum": 0, + "LoginUserName": "admin", + "LoginUserPwd": "qweasd123", + "DeviceIP": "192.168.110.196", + "DeviceMultiIP": "0.0.0.0", + "DevicePort": 8000, + "DeviceName": "", + "LoginMode": 0, + "Https": 0, + "Channels": [] + }] +} \ No newline at end of file diff --git a/lib/hik/win64/GdiPlus.dll b/lib/hik/win64/GdiPlus.dll new file mode 100644 index 0000000..b759ed6 Binary files /dev/null and b/lib/hik/win64/GdiPlus.dll differ diff --git a/lib/hik/win64/GdiPlus.lib b/lib/hik/win64/GdiPlus.lib new file mode 100644 index 0000000..6fb1bb6 Binary files /dev/null and b/lib/hik/win64/GdiPlus.lib differ diff --git a/lib/hik/win64/HCCore.dll b/lib/hik/win64/HCCore.dll new file mode 100644 index 0000000..48f8411 Binary files /dev/null and b/lib/hik/win64/HCCore.dll differ diff --git a/lib/hik/win64/HCCore.lib b/lib/hik/win64/HCCore.lib new file mode 100644 index 0000000..495c74a Binary files /dev/null and b/lib/hik/win64/HCCore.lib differ diff --git a/lib/hik/win64/HCNetSDK.dll b/lib/hik/win64/HCNetSDK.dll new file mode 100644 index 0000000..2ed412e Binary files /dev/null and b/lib/hik/win64/HCNetSDK.dll differ diff --git a/lib/hik/win64/HCNetSDK.lib b/lib/hik/win64/HCNetSDK.lib new file mode 100644 index 0000000..ff8e9e2 Binary files /dev/null and b/lib/hik/win64/HCNetSDK.lib differ diff --git a/lib/hik/win64/HCNetSDKCom/AnalyzeData.dll b/lib/hik/win64/HCNetSDKCom/AnalyzeData.dll new file mode 100644 index 0000000..2317b39 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/AnalyzeData.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/AudioIntercom.dll b/lib/hik/win64/HCNetSDKCom/AudioIntercom.dll new file mode 100644 index 0000000..071a5e2 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/AudioIntercom.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/AudioRender.dll b/lib/hik/win64/HCNetSDKCom/AudioRender.dll new file mode 100644 index 0000000..4935684 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/AudioRender.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCAlarm.dll b/lib/hik/win64/HCNetSDKCom/HCAlarm.dll new file mode 100644 index 0000000..bdb8406 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCAlarm.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCAlarm.lib b/lib/hik/win64/HCNetSDKCom/HCAlarm.lib new file mode 100644 index 0000000..0aa0d4c Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCAlarm.lib differ diff --git a/lib/hik/win64/HCNetSDKCom/HCCoreDevCfg.dll b/lib/hik/win64/HCNetSDKCom/HCCoreDevCfg.dll new file mode 100644 index 0000000..7cd924e Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCCoreDevCfg.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCDisplay.dll b/lib/hik/win64/HCNetSDKCom/HCDisplay.dll new file mode 100644 index 0000000..f0a2b7c Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCDisplay.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.dll b/lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.dll new file mode 100644 index 0000000..3719694 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.lib b/lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.lib new file mode 100644 index 0000000..7091c25 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.lib differ diff --git a/lib/hik/win64/HCNetSDKCom/HCIndustry.dll b/lib/hik/win64/HCNetSDKCom/HCIndustry.dll new file mode 100644 index 0000000..9af77a1 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCIndustry.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCPlayBack.dll b/lib/hik/win64/HCNetSDKCom/HCPlayBack.dll new file mode 100644 index 0000000..8d8e8a7 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCPlayBack.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCPreview.dll b/lib/hik/win64/HCNetSDKCom/HCPreview.dll new file mode 100644 index 0000000..005656d Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCPreview.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/HCPreview.lib b/lib/hik/win64/HCNetSDKCom/HCPreview.lib new file mode 100644 index 0000000..18d4d63 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCPreview.lib differ diff --git a/lib/hik/win64/HCNetSDKCom/HCVoiceTalk.dll b/lib/hik/win64/HCNetSDKCom/HCVoiceTalk.dll new file mode 100644 index 0000000..eb04a1e Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/HCVoiceTalk.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/OpenAL32.dll b/lib/hik/win64/HCNetSDKCom/OpenAL32.dll new file mode 100644 index 0000000..4b35df4 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/OpenAL32.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/StreamTransClient.dll b/lib/hik/win64/HCNetSDKCom/StreamTransClient.dll new file mode 100644 index 0000000..a69e9bf Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/StreamTransClient.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/SystemTransform.dll b/lib/hik/win64/HCNetSDKCom/SystemTransform.dll new file mode 100644 index 0000000..f704e49 Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/SystemTransform.dll differ diff --git a/lib/hik/win64/HCNetSDKCom/libiconv2.dll b/lib/hik/win64/HCNetSDKCom/libiconv2.dll new file mode 100644 index 0000000..978e2fa Binary files /dev/null and b/lib/hik/win64/HCNetSDKCom/libiconv2.dll differ diff --git a/lib/hik/win64/HXVA.dll b/lib/hik/win64/HXVA.dll new file mode 100644 index 0000000..b7ebfcc Binary files /dev/null and b/lib/hik/win64/HXVA.dll differ diff --git a/lib/hik/win64/HmMerge.dll b/lib/hik/win64/HmMerge.dll new file mode 100644 index 0000000..d46a6ac Binary files /dev/null and b/lib/hik/win64/HmMerge.dll differ diff --git a/lib/hik/win64/LocalSensorAdd.dat b/lib/hik/win64/LocalSensorAdd.dat new file mode 100644 index 0000000..e69de29 diff --git a/lib/hik/win64/LocalXml.zip b/lib/hik/win64/LocalXml.zip new file mode 100644 index 0000000..3620e68 Binary files /dev/null and b/lib/hik/win64/LocalXml.zip differ diff --git a/lib/hik/win64/MP_Render.dll b/lib/hik/win64/MP_Render.dll new file mode 100644 index 0000000..e5cde63 Binary files /dev/null and b/lib/hik/win64/MP_Render.dll differ diff --git a/lib/hik/win64/NPQos.dll b/lib/hik/win64/NPQos.dll new file mode 100644 index 0000000..c709f56 Binary files /dev/null and b/lib/hik/win64/NPQos.dll differ diff --git a/lib/hik/win64/OpenAL32.dll b/lib/hik/win64/OpenAL32.dll new file mode 100644 index 0000000..4b35df4 Binary files /dev/null and b/lib/hik/win64/OpenAL32.dll differ diff --git a/lib/hik/win64/PlayCtrl.dll b/lib/hik/win64/PlayCtrl.dll new file mode 100644 index 0000000..2a5eb97 Binary files /dev/null and b/lib/hik/win64/PlayCtrl.dll differ diff --git a/lib/hik/win64/PlayCtrl.lib b/lib/hik/win64/PlayCtrl.lib new file mode 100644 index 0000000..ddcf2f4 Binary files /dev/null and b/lib/hik/win64/PlayCtrl.lib differ diff --git a/lib/hik/win64/SuperRender.dll b/lib/hik/win64/SuperRender.dll new file mode 100644 index 0000000..b00c0c2 Binary files /dev/null and b/lib/hik/win64/SuperRender.dll differ diff --git a/lib/hik/win64/YUVProcess.dll b/lib/hik/win64/YUVProcess.dll new file mode 100644 index 0000000..d86ec3f Binary files /dev/null and b/lib/hik/win64/YUVProcess.dll differ diff --git a/lib/hik/win64/hlog.dll b/lib/hik/win64/hlog.dll new file mode 100644 index 0000000..fe2298a Binary files /dev/null and b/lib/hik/win64/hlog.dll differ diff --git a/lib/hik/win64/hpr.dll b/lib/hik/win64/hpr.dll new file mode 100644 index 0000000..eef0d55 Binary files /dev/null and b/lib/hik/win64/hpr.dll differ diff --git a/lib/hik/win64/libcrypto-1_1-x64.dll b/lib/hik/win64/libcrypto-1_1-x64.dll new file mode 100644 index 0000000..6731338 Binary files /dev/null and b/lib/hik/win64/libcrypto-1_1-x64.dll differ diff --git a/lib/hik/win64/libmmd.dll b/lib/hik/win64/libmmd.dll new file mode 100644 index 0000000..8becb5e Binary files /dev/null and b/lib/hik/win64/libmmd.dll differ diff --git a/lib/hik/win64/libssl-1_1-x64.dll b/lib/hik/win64/libssl-1_1-x64.dll new file mode 100644 index 0000000..ac5e8fd Binary files /dev/null and b/lib/hik/win64/libssl-1_1-x64.dll differ diff --git a/lib/hik/win64/zlib1.dll b/lib/hik/win64/zlib1.dll new file mode 100644 index 0000000..9c37a84 Binary files /dev/null and b/lib/hik/win64/zlib1.dll differ diff --git a/pom.xml b/pom.xml index 5e5f0ca..12792e2 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,8 @@ 1.7.3 2.3.0 - + + 1.0 3.11.0 3.1.2 @@ -73,10 +74,8 @@ dev - - - 47.109.37.87:8848 - 47.109.37.87:4560 + 127.0.0.1:8848 + 127.0.0.1:4560 DEFAULT_GROUP DEFAULT_GROUP nacos @@ -92,8 +91,8 @@ dev - - + + 47.109.37.87:8848 47.109.37.87:4560 DEFAULT_GROUP @@ -108,15 +107,15 @@ prod prod - - + + 47.109.37.87:8848 47.109.37.87:4560 DEFAULT_GROUP DEFAULT_GROUP nacos nacos - + @@ -376,6 +375,18 @@ ${mapstruct-plus.version} + + com.hik + examples + ${hik-sdk.version} + + + + com.hik + jna + ${hik-sdk.version} + + org.apache.rocketmq diff --git a/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteUnitService.java b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteUnitService.java new file mode 100644 index 0000000..175b9b0 --- /dev/null +++ b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteUnitService.java @@ -0,0 +1,13 @@ +package org.dromara.property.api; + +import org.dromara.property.api.domain.vo.RemoteUnitVo; + +/** + * 物业楼层远程服务 + * @author lxj + */ +public interface RemoteUnitService { + + RemoteUnitVo queryUnitById(Long id); + +} diff --git a/ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteUnitVo.java b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteUnitVo.java new file mode 100644 index 0000000..97b6e0b --- /dev/null +++ b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteUnitVo.java @@ -0,0 +1,51 @@ +package org.dromara.property.api.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 单元信息 + * + * @author lxj + */ +@Data +public class RemoteUnitVo implements Serializable { + + @Serial + private static final long serialVersionUID = -11L; + + /** + * 主键id + */ + private Long id; + + private Long communityId; + + /** + * 建筑名称 + */ + private Long buildingId; + + /** + * 单元名称 + */ + private String unitName; + + /** + * 单元层数 + */ + private Integer floorCount; + + /** + * 单元户数 + */ + private Integer householdCount; + + /** + * 楼梯数量 + */ + private Integer stairCount; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java index 5588b19..7d1e158 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java @@ -15,4 +15,8 @@ public interface CodePrefixConstants { * 人像编码前缀 */ String PERSON_LIB_IMAGE_CODE_PREFIX = "102"; + + String ELEVATOR_CONTROL_CODE_PREFIX = "E01"; + + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersController.java index b41ba4b..72906e5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersController.java @@ -16,6 +16,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.property.domain.bo.ServiceWorkOrdersBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersInfoVo; import org.dromara.property.domain.vo.ServiceWorkOrdersVo; import org.dromara.property.service.IServiceWorkOrdersService; import org.springframework.validation.annotation.Validated; @@ -41,40 +42,40 @@ public class ServiceWorkOrdersController extends BaseController { /** * 查询【工单处理】列表 */ - @SaCheckPermission("system:workOrders:list") + //@SaCheckPermission("system:workOrders:list") @GetMapping("/list") public TableDataInfo list(ServiceWorkOrdersBo bo, PageQuery pageQuery) { return serviceWorkOrdersService.queryPageList(bo, pageQuery); } /** - * 导出【请填写功能名称】列表 + * 导出【工单处理】列表 */ - @SaCheckPermission("system:workOrders:export") - @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + // @SaCheckPermission("system:workOrders:export") + @Log(title = "【工单处理】", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ServiceWorkOrdersBo bo, HttpServletResponse response) { List list = serviceWorkOrdersService.queryList(bo); - ExcelUtil.exportExcel(list, "【请填写功能名称】", ServiceWorkOrdersVo.class, response); + ExcelUtil.exportExcel(list, "【工单处理】", ServiceWorkOrdersVo.class, response); } /** - * 获取【请填写功能名称】详细信息 + * 获取【工单处理】详细信息 * * @param id 主键 */ - @SaCheckPermission("system:workOrders:query") + // @SaCheckPermission("system:workOrders:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(serviceWorkOrdersService.queryById(id)); } /** - * 新增【请填写功能名称】 + * 新增【工单处理】 */ - @SaCheckPermission("system:workOrders:add") - @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + // @SaCheckPermission("system:workOrders:add") + @Log(title = "【工单处理】", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody ServiceWorkOrdersBo bo) { @@ -82,10 +83,10 @@ public class ServiceWorkOrdersController extends BaseController { } /** - * 修改【请填写功能名称】 + * 修改【工单处理】 */ - @SaCheckPermission("system:workOrders:edit") - @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + //@SaCheckPermission("system:workOrders:edit") + @Log(title = "【工单处理】", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) { @@ -93,12 +94,12 @@ public class ServiceWorkOrdersController extends BaseController { } /** - * 删除【请填写功能名称】 + * 删除【工单处理】 * * @param ids 主键串 */ - @SaCheckPermission("system:workOrders:remove") - @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + // @SaCheckPermission("system:workOrders:remove") + @Log(title = "【工单处理】", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java new file mode 100644 index 0000000..90c08a0 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java @@ -0,0 +1,106 @@ +package org.dromara.property.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; +import org.dromara.property.service.IServiceWorkOrdersTypeService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【工单类型】 + * 前端访问路由地址为:/system/workOrdersType + * + * @author mocheng + * @date 2025-07-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workOrdersType") +public class ServiceWorkOrdersTypeController extends BaseController { + + private final IServiceWorkOrdersTypeService serviceWorkOrdersTypeService; + + /** + * 查询【工单类型】列表 + */ + @SaCheckPermission("system:workOrdersType:list") + @GetMapping("/list") + public TableDataInfo list(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) { + return serviceWorkOrdersTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出【工单类型】列表 + */ + @SaCheckPermission("system:workOrdersType:export") + @Log(title = "【导出工单类型】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ServiceWorkOrdersTypeBo bo, HttpServletResponse response) { + List list = serviceWorkOrdersTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "【工单类型】", ServiceWorkOrdersTypeVo.class, response); + } + + /** + * 获取【工单类型】详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:workOrdersType:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(serviceWorkOrdersTypeService.queryById(id)); + } + + /** + * 新增【工单类型】 + */ + @SaCheckPermission("system:workOrdersType:add") + @Log(title = "【新增工单类型】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) { + return toAjax(serviceWorkOrdersTypeService.insertByBo(bo)); + } + + /** + * 修改【工单类型】 + */ + @SaCheckPermission("system:workOrdersType:edit") + @Log(title = "【工单类型】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) { + return toAjax(serviceWorkOrdersTypeService.updateByBo(bo)); + } + + /** + * 删除【工单类型】 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:workOrdersType:remove") + @Log(title = "【工单类型】", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(serviceWorkOrdersTypeService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServerBooking.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServerBooking.java index 8283dc0..4ac2587 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServerBooking.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServerBooking.java @@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -37,7 +39,7 @@ public class ServerBooking extends TenantEntity { /** * 预约数量 */ - private Long serverNum; + private Integer serverNum; /** * 预约类型 @@ -67,17 +69,17 @@ public class ServerBooking extends TenantEntity { /** * 预约价格 */ - private Long bookingPrice; + private BigDecimal bookingPrice; /** * 实付价格 */ - private Long payPrice; + private BigDecimal payPrice; /** * 支付方式 */ - private Long payType; + private Integer payType; /** * 备注 @@ -87,7 +89,7 @@ public class ServerBooking extends TenantEntity { /** * 状态 */ - private Long state; + private Integer state; /** * 创建人id diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java index d81b717..ed5a881 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java @@ -42,12 +42,12 @@ public class ServiceWorkOrders extends TenantEntity { /** * 工单类型 */ - private Long type; + private Long type; /** * 状态 */ - private Long status; + private Integer status; /** * 派单时间 @@ -59,10 +59,6 @@ public class ServiceWorkOrders extends TenantEntity { */ private String initiatorName; - /** - * 发起人手机号 - */ - private String initiatorPhone; /** * 处理人姓名 @@ -87,12 +83,12 @@ public class ServiceWorkOrders extends TenantEntity { /** * 评价 */ - private String serviceEvalua; + private Integer serviceEvalua; /** * 是否超时 */ - private Long isTimeOut; + private Integer isTimeOut; /** * 创建人id @@ -104,10 +100,5 @@ public class ServiceWorkOrders extends TenantEntity { */ private Long updateById; - /** - * 搜索值 - */ - private String searchValue; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java new file mode 100644 index 0000000..ea18036 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java @@ -0,0 +1,75 @@ +package org.dromara.property.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【工单类型】对象 service_work_orders_type + * + * @author mocheng + * @date 2025-07-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("service_work_orders_type") +public class ServiceWorkOrdersType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 工单类型编号 + */ + private String orderTypeNo; + + /** + * 工单类型名称 + */ + private String orderTypeName; + + /** + * 运作模式 + */ + private String operationMode; + + /** + * 排序值 + */ + private Integer sort; + + /** + * 累计工单数量 + */ + private Integer completionNumber; + + /** + * 是否支持转单(0支持,1不支持) + */ + private Integer isTransfers; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java index 389f540..65e0198 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java @@ -46,7 +46,7 @@ public class MeetBo extends BaseEntity { * 容纳人数 */ @NotBlank(message = "容纳人数不能为空") - private Long personNumber; + private Integer personNumber; /** * 基础服务 @@ -61,11 +61,12 @@ public class MeetBo extends BaseEntity { /** * 增值服务是否启用 */ - private Long attach; + private Integer attach; /** * 负责人 */ + @NotBlank(message = "负责人不能为空") private String principals; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java index 37fe972..9e1f749 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java @@ -39,11 +39,6 @@ public class MeetBookingBo extends BaseEntity { */ private Long meetId; - /** - * 会议室地址 - */ - private String meetLocation; - /** * 所属单位 */ @@ -54,10 +49,6 @@ public class MeetBookingBo extends BaseEntity { */ private String person; - /** - * 联系方式 - */ - private String phone; /** * 预定开始时间 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java index 29f7db8..4fbf80c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java @@ -12,7 +12,7 @@ import org.dromara.property.domain.ServiceWorkOrders; import java.util.Date; /** - * 【请填写功能名称】业务对象 service_work_orders + * 【工单处理】业务对象 service_work_orders * * @author mocheng * @date 2025-07-07 @@ -41,12 +41,12 @@ public class ServiceWorkOrdersBo extends BaseEntity { /** * 工单类型 */ - private Long type; + private Long type; /** * 状态 */ - private Long status; + private Integer status; /** * 派单时间 @@ -58,10 +58,6 @@ public class ServiceWorkOrdersBo extends BaseEntity { */ private String initiatorName; - /** - * 发起人手机号 - */ - private String initiatorPhone; /** * 处理人姓名 @@ -86,12 +82,12 @@ public class ServiceWorkOrdersBo extends BaseEntity { /** * 评价 */ - private String serviceEvalua; + private Integer serviceEvalua; /** * 是否超时 */ - private Long isTimeOut; + private Integer isTimeOut; /** * 创建人id @@ -103,10 +99,6 @@ public class ServiceWorkOrdersBo extends BaseEntity { */ private Long updateById; - /** - * 搜索值 - */ - private String searchValue; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java new file mode 100644 index 0000000..d02facd --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java @@ -0,0 +1,78 @@ +package org.dromara.property.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.property.domain.ServiceWorkOrdersType; + +/** + * 【工单类型】业务对象 service_work_orders_type + * + * @author mocheng + * @date 2025-07-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ServiceWorkOrdersType.class, reverseConvertGenerate = false) +public class ServiceWorkOrdersTypeBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 工单类型编号 + */ + private String orderTypeNo; + + /** + * 工单类型名称 + */ + @NotNull(message = "工单类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderTypeName; + + /** + * 运作模式 + */ + @NotNull(message = "运作模式不能为空", groups = { AddGroup.class, EditGroup.class }) + private String operationMode; + + /** + * 排序值 + */ + @NotNull(message = "排序值不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer sort; + + /** + * 完成时效 + */ + @NotNull(message = "完成时效不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer completionNumber; + + /** + * 是否支持转单(0支持,1不支持) + */ + private Integer isTransfers; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingAppointmentVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingAppointmentVo.java index 3499f82..eb570cf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingAppointmentVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingAppointmentVo.java @@ -59,6 +59,12 @@ public class MeetBookingAppointmentVo implements Serializable { */ @ExcelProperty(value = "预定人名称") private String personName; + /** + * 联系方式 + */ + @ExcelProperty(value = "联系方式") + private String phone; + /** * 会议室主题 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingVo.java index 27893a1..adaa33a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetBookingVo.java @@ -64,11 +64,21 @@ public class MeetBookingVo implements Serializable { @ExcelProperty(value = "所属单位") private String unit; + /** + * 所属单位名称 + */ + @ExcelProperty(value = "所属单位名称") + private String unitName; /** * 预定人 */ @ExcelProperty(value = "预定人") private String person; + /** + * 预定人名称 + */ + @ExcelProperty(value = "预定人名称") + private String personName; /** * 联系方式 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersInfoVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersInfoVo.java new file mode 100644 index 0000000..72ebaad --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersInfoVo.java @@ -0,0 +1,134 @@ +package org.dromara.property.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.property.domain.ServiceWorkOrders; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * @Author:yuyongle + * @Date:2025/7/9 17:25 + * @Description:工单处理详情 + **/ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ServiceWorkOrders.class) +public class ServiceWorkOrdersInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 工单编号 + */ + @ExcelProperty(value = "工单编号") + private String orderNo; + + /** + * 工单名称 + */ + @ExcelProperty(value = "工单名称") + private String orderName; + + /** + * 工单类型 + */ + @ExcelProperty(value = "工单类型") + private Long type; + + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private Integer status; + + /** + * 派单时间 + */ + @ExcelProperty(value = "派单时间") + private Date dispatchTime; + + /** + * 发起人姓名 + */ + @ExcelProperty(value = "发起人姓名") + private String initiatorName; + /** + * 发起人姓名文本 + */ + @ExcelProperty(value = "发起人姓名文本") + private String initiatorNameText; + + /** + * 发起人手机号 + */ + @ExcelProperty(value = "发起人手机号") + private String initiatorPhone; + + /** + * 处理人姓名 + */ + @ExcelProperty(value = "处理人姓名") + private String handler; + /** + * 处理人姓名文本 + */ + @ExcelProperty(value = "处理人姓名文本") + private String handlerText; + + /** + * 处理人姓名电话 + */ + @ExcelProperty(value = "处理人电话") + private String handlerPhone; + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String location; + + /** + * 计划完成时间 + */ + @ExcelProperty(value = "计划完成时间") + private Date planCompleTime; + + /** + * 完成时间 + */ + @ExcelProperty(value = "完成时间") + private Date compleTime; + + /** + * 评价 + */ + @ExcelProperty(value = "评价") + private String serviceEvalua; + + /** + * 是否超时 + */ + @ExcelProperty(value = "是否超时") + private Integer isTimeOut; + /** + * 类型名称 + */ + @ExcelProperty(value = "类型名称") + private String typeName; + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java new file mode 100644 index 0000000..a590211 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java @@ -0,0 +1,89 @@ +package org.dromara.property.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.property.domain.ServiceWorkOrdersType; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 【工单类型】视图对象 service_work_orders_type + * + * @author mocheng + * @date 2025-07-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ServiceWorkOrdersType.class) +public class ServiceWorkOrdersTypeVo implements Serializable { + + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 工单类型编号 + */ + @ExcelProperty(value = "工单类型编号") + private String orderTypeNo; + + /** + * 工单类型名称 + */ + @ExcelProperty(value = "工单类型名称") + private String orderTypeName; + + /** + * 运作模式 + */ + @ExcelProperty(value = "运作模式") + private String operationMode; + + /** + * 排序值 + */ + @ExcelProperty(value = "排序值") + private Integer sort; + + /** + * 完成时效 + */ + @ExcelProperty(value = "完成时效") + private Integer completionNumber; + + /** + * 是否支持转单(0支持,1不支持) + */ + @ExcelProperty(value = "是否支持转单(0支持,1不支持)") + private Integer isTransfers; + + /** + * 创建人id + */ + @ExcelProperty(value = "创建人id") + private Long createById; + + /** + * 更新人id + */ + @ExcelProperty(value = "更新人id") + private Long updateById; + + /** + * 搜索值 + */ + @ExcelProperty(value = "搜索值") + private String searchValue; + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java index 6032f45..163becd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java @@ -13,7 +13,7 @@ import java.util.Date; /** - * 【请填写功能名称】视图对象 service_work_orders + * 【工单处理】视图对象 service_work_orders * * @author mocheng * @date 2025-07-07 @@ -49,12 +49,17 @@ public class ServiceWorkOrdersVo implements Serializable { */ @ExcelProperty(value = "工单类型") private Long type; + /** + * 工单类型名称 + */ + @ExcelProperty(value = "工单类型名称") + private String typeName; /** * 状态 */ @ExcelProperty(value = "状态") - private Long status; + private int status; /** * 派单时间 @@ -67,6 +72,11 @@ public class ServiceWorkOrdersVo implements Serializable { */ @ExcelProperty(value = "发起人姓名") private String initiatorName; + /** + * 发起人姓名文本 + */ + @ExcelProperty(value = "发起人姓名文本") + private String initiatorNameText; /** * 发起人手机号 @@ -79,6 +89,12 @@ public class ServiceWorkOrdersVo implements Serializable { */ @ExcelProperty(value = "处理人姓名") private String handler; + /** + * 处理人姓名文本 + */ + @ExcelProperty(value = "处理人姓名文本") + private String handlerText; + /** * 地址 @@ -102,13 +118,13 @@ public class ServiceWorkOrdersVo implements Serializable { * 评价 */ @ExcelProperty(value = "评价") - private String serviceEvalua; + private Integer serviceEvalua; /** * 是否超时 */ @ExcelProperty(value = "是否超时") - private Long isTimeOut; + private int isTimeOut; /** * 创建人id @@ -128,5 +144,9 @@ public class ServiceWorkOrdersVo implements Serializable { @ExcelProperty(value = "搜索值") private String searchValue; - + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java index 69802b6..b4735df 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java @@ -26,7 +26,7 @@ import java.util.Date; public class TbFloorVo implements Serializable { @Serial - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -1L; /** * diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteUnitServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteUnitServiceImpl.java new file mode 100644 index 0000000..7016393 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteUnitServiceImpl.java @@ -0,0 +1,39 @@ +package org.dromara.property.dubbo; + +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.property.api.RemoteUnitService; +import org.dromara.property.api.domain.vo.RemoteUnitVo; +import org.dromara.property.domain.vo.TbUnitVo; +import org.dromara.property.service.ITbUnitService; + +/** + * 对外提供的远程服务调用 + * + * @author lxj + */ +@DubboService +@RequiredArgsConstructor +public class RemoteUnitServiceImpl implements RemoteUnitService { + + private final ITbUnitService tbUnitService; + + + @Override + public RemoteUnitVo queryUnitById(Long id) { + TbUnitVo tbUnitVo = tbUnitService.queryById(id); + if(tbUnitVo == null) { + return null; + } + RemoteUnitVo remoteUnitVo = new RemoteUnitVo(); + remoteUnitVo.setId(tbUnitVo.getId()); + remoteUnitVo.setCommunityId(tbUnitVo.getCommunityId()); + remoteUnitVo.setBuildingId(tbUnitVo.getBuildingId()); + remoteUnitVo.setUnitName(tbUnitVo.getUnitName()); + remoteUnitVo.setFloorCount(tbUnitVo.getFloorCount()); + remoteUnitVo.setHouseholdCount(tbUnitVo.getHouseholdCount()); + remoteUnitVo.setStairCount(tbUnitVo.getStairCount()); + return remoteUnitVo; + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ApplicationMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ApplicationMapper.java index d8797ac..550bc5b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ApplicationMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ApplicationMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Application; import org.dromara.property.domain.vo.ApplicationVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface ApplicationMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetMapper.java index 2d231d7..acd1404 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Asset; import org.dromara.property.domain.vo.AssetVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface AssetMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java index a22c469..7e2ba86 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.AssetType; import org.dromara.property.domain.vo.AssetTypeVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-23 */ +@Mapper public interface AssetTypeMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java index 4ffe3a2..80170b5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.dromara.property.domain.Clean; import org.dromara.property.domain.vo.CleanVo; @@ -13,6 +14,7 @@ import java.util.List; * @author mocheng * @date 2025-06-19 */ +@Mapper public interface CleanMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java index bed303d..37a26dd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java @@ -2,6 +2,7 @@ package org.dromara.property.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.CleanOrder; import org.dromara.property.domain.vo.CleanOrderVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -12,6 +13,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-19 */ +@Mapper public interface CleanOrderMapper extends BaseMapperPlus { Page selectForPage(Page build, LambdaQueryWrapper lqw); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java index 97d549a..8e8b1fe 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java @@ -1,6 +1,7 @@ package org.dromara.property.mapper; import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.property.domain.CleanRelation; import org.dromara.property.domain.vo.CleanRelationVo; @@ -11,6 +12,7 @@ import org.dromara.property.domain.vo.CleanRelationVo; * @author mocheng * @date 2025-07-01 */ +@Mapper public interface CleanRelationMapper extends BaseMapperPlus { @Insert("insert into clean_relation(id,clean_id, areas, sum_price) values(#{id},#{cleanId}, #{areas}, #{sumPrice})") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java index 5bdb2d5..143b791 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.CleanserverOrder; import org.dromara.property.domain.vo.CleanserverOrderVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-23 */ +@Mapper public interface CleanserverOrderMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ConteactMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ConteactMapper.java index d1c8cc0..7413432 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ConteactMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ConteactMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Conteact; import org.dromara.property.domain.vo.ConteactVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface ConteactMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotLogMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotLogMapper.java index 191d262..62d319c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotLogMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotLogMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.DepotLog; import org.dromara.property.domain.vo.DepotLogVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author LionLi * @date 2025-06-21 */ +@Mapper public interface DepotLogMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotMapper.java index d6d8496..215488c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Depot; import org.dromara.property.domain.vo.DepotVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface DepotMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachMapper.java index 15b0318..8cb7146 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.MeetAttach; import org.dromara.property.domain.vo.MeetAttachVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface MeetAttachMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachOrderMapper.java index e7845ca..c6ad55f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachOrderMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachOrderMapper.java @@ -1,4 +1,5 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.property.domain.MeetAttachOrder; import org.dromara.property.domain.vo.MeetAttachOrderVo; @@ -9,6 +10,7 @@ import org.dromara.property.domain.vo.MeetAttachOrderVo; * @author mocheng * @date 2025-07-08 */ +@Mapper public interface MeetAttachOrderMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetBookingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetBookingMapper.java index 958bac2..0b4661b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetBookingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetBookingMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.MeetBooking; import org.dromara.property.domain.vo.MeetBookingVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface MeetBookingMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetMapper.java index 1f16cd9..d1e5a34 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Meet; import org.dromara.property.domain.vo.MeetVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface MeetMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderChargeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderChargeMapper.java index ea6c22e..28703d3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderChargeMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderChargeMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.PlantsOrderCharge; import org.dromara.property.domain.vo.PlantsOrderChargeVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-30 */ +@Mapper public interface PlantsOrderChargeMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderMaintainMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderMaintainMapper.java index d6ad8dc..9d7e412 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderMaintainMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderMaintainMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.dromara.property.domain.PlantsOrderMaintain; import org.dromara.property.domain.vo.PlantsOrderMaintainVo; @@ -14,6 +15,7 @@ import java.util.Map; * @author mocheng * @date 2025-06-30 */ +@Mapper public interface PlantsOrderMaintainMapper extends BaseMapperPlus { @Select("SELECT " + diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsPlanProductMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsPlanProductMapper.java index 4f39099..44f2a5b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsPlanProductMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsPlanProductMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.PlantsPlanProduct; import org.dromara.property.domain.vo.PlantsPlanProductVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -12,6 +13,7 @@ import java.util.List; * @author mocheng * @date 2025-06-25 */ +@Mapper public interface PlantsPlanProductMapper extends BaseMapperPlus { void deleteByPlanId(Long planId); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsProductMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsProductMapper.java index 986c712..af4cbb3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsProductMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsProductMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.PlantsProduct; import org.dromara.property.domain.vo.PlantsProductVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-25 */ +@Mapper public interface PlantsProductMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalOrderMapper.java index 1409804..3d332ef 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalOrderMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalOrderMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.dromara.property.domain.PlantsRentalOrder; import org.dromara.property.domain.vo.PlantsRentalOrderVo; @@ -14,6 +15,7 @@ import java.util.Map; * @author mocheng * @date 2025-06-30 */ +@Mapper public interface PlantsRentalOrderMapper extends BaseMapperPlus { @Select("SELECT HOUR(create_time) AS hour, COUNT(*) AS count " + diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalPlanMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalPlanMapper.java index dd9e4b9..af73bf1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalPlanMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalPlanMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.PlantsRentalPlan; import org.dromara.property.domain.vo.PlantsRentalPlanVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-25 */ +@Mapper public interface PlantsRentalPlanMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentPersonMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentPersonMapper.java index b29e28a..76f77fb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentPersonMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentPersonMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.ResidentPerson; import org.dromara.property.domain.vo.ResidentPersonVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-19 */ +@Mapper public interface ResidentPersonMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentUnitMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentUnitMapper.java index 2469f42..2d679d1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentUnitMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentUnitMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.ResidentUnit; import org.dromara.property.domain.vo.ResidentUnitVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-19 */ +@Mapper public interface ResidentUnitMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerBookingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerBookingMapper.java index d44893d..f07b166 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerBookingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerBookingMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.ServerBooking; import org.dromara.property.domain.vo.ServerBookingVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface ServerBookingMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerMapper.java index 65dcfbb..99fe57b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Server; import org.dromara.property.domain.vo.ServerVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface ServerMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWarningMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWarningMapper.java index ffb15c7..a59a93f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWarningMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWarningMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.property.domain.ServiceWarning; import org.dromara.property.domain.vo.ServiceWarningVo; @@ -11,6 +12,7 @@ Mapper接口 * @author mocheng * @date 2025-07-08 */ +@Mapper public interface ServiceWarningMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java index 35a5e40..7c81441 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java @@ -1,15 +1,17 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.property.domain.ServiceWorkOrders; import org.dromara.property.domain.vo.ServiceWorkOrdersVo; /** - * 【请填写功能名称】Mapper接口 + * 【工单处理】Mapper接口 * * @author mocheng * @date 2025-07-07 */ +@Mapper public interface ServiceWorkOrdersMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersTypeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersTypeMapper.java new file mode 100644 index 0000000..ab4f88d --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersTypeMapper.java @@ -0,0 +1,17 @@ +package org.dromara.property.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.property.domain.ServiceWorkOrdersType; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; + +/** + * 【工单类型】Mapper接口 + * + * @author mocheng + * @date 2025-07-09 + */ +@Mapper +public interface ServiceWorkOrdersTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SuppliersMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SuppliersMapper.java index 971c495..f59fbef 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SuppliersMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SuppliersMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Suppliers; import org.dromara.property.domain.vo.SuppliersVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface SuppliersMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SysCityAreaMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SysCityAreaMapper.java index 786b181..70be67f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SysCityAreaMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SysCityAreaMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.property.domain.SysCityArea; @@ -15,6 +16,7 @@ import java.util.List; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface SysCityAreaMapper extends BaseMapperPlus { @Select("select * from sys_city_area") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAreaGroupMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAreaGroupMapper.java index 64aa3a1..cbdf386 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAreaGroupMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAreaGroupMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbAreaGroup; import org.dromara.property.domain.vo.TbAreaGroupVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author dy * @date 2025-06-25 */ +@Mapper public interface TbAreaGroupMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java index f9b84c1..abf20f2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbBuilding; import org.dromara.property.domain.vo.TbBuildingVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-26 */ +@Mapper public interface TbBuildingMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java index 638b80f..785e2a6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbCeremonialServe; import org.dromara.property.domain.vo.TbCeremonialServeVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TbCeremonialServeMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java index 0e7140e..e9566ac 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbCeremonialserveRoombooking; import org.dromara.property.domain.vo.TbCeremonialserveRoombookingVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TbCeremonialserveRoombookingMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java index 0e400b4..e7d600b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbCommunity; import org.dromara.property.domain.vo.TbCommunityVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-26 */ +@Mapper public interface TbCommunityMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java index bc4d57b..62aee55 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbConference; import org.dromara.property.domain.vo.TbConferenceVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TbConferenceMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java index 02d21b9..a51f2c5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbE8Config; import org.dromara.property.domain.vo.TbE8ConfigVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TbE8ConfigMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java index 92bc925..c126461 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbFloor; import org.dromara.property.domain.vo.TbFloorVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-26 */ +@Mapper public interface TbFloorMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java index 6307a36..cd9ff46 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbRoomBooking; import org.dromara.property.domain.vo.TbRoomBookingVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TbRoomBookingMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomMapper.java index bef70dc..bcb15a5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbRoom; import org.dromara.property.domain.vo.TbRoomVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -13,6 +14,7 @@ import java.util.Map; * @author mocheng * @date 2025-06-26 */ +@Mapper public interface TbRoomMapper extends BaseMapperPlus { //查询房间名称 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbServiceClassificationMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbServiceClassificationMapper.java index 55e5c1c..271e3ce 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbServiceClassificationMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbServiceClassificationMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbServiceClassification; import org.dromara.property.domain.vo.TbServiceClassificationVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-17 */ +@Mapper public interface TbServiceClassificationMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUnitMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUnitMapper.java index bf3d08b..172de72 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUnitMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUnitMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbUnit; import org.dromara.property.domain.vo.TbUnitVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-26 */ +@Mapper public interface TbUnitMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java index 67dafe0..f03c820 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbUserGroup; import org.dromara.property.domain.vo.TbUserGroupVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author dy * @date 2025-06-25 */ +@Mapper public interface TbUserGroupMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java index 624ca33..7721baf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbVisitorManagement; import org.dromara.property.domain.vo.TbVisitorManagementVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-19 */ +@Mapper public interface TbVisitorManagementMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java index 36b0731..e8efd80 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TdDeviceType; import org.dromara.property.domain.vo.TdDeviceTypeVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TdDeviceTypeMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java index 6f83856..0f85b76 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TdFactory; import org.dromara.property.domain.vo.TdFactoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TdFactoryMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java index de73a3d..64bbb8c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TsConfig; import org.dromara.property.domain.vo.TsConfigVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TsConfigMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java index f307a53..cb8eb42 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TsOperationLog; import org.dromara.property.domain.vo.TsOperationLogVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-18 */ +@Mapper public interface TsOperationLogMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/VerificationMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/VerificationMapper.java index 8c4b80e..c85faf7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/VerificationMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/VerificationMapper.java @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.Verification; import org.dromara.property.domain.vo.VerificationVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author mocheng * @date 2025-06-21 */ +@Mapper public interface VerificationMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java index 16163d8..08d66ae 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java @@ -3,13 +3,14 @@ package org.dromara.property.service; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.property.domain.bo.ServiceWorkOrdersBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersInfoVo; import org.dromara.property.domain.vo.ServiceWorkOrdersVo; import java.util.Collection; import java.util.List; /** - * 【请填写功能名称】Service接口 + * 【工单处理】Service接口 * * @author mocheng * @date 2025-07-07 @@ -17,48 +18,48 @@ import java.util.List; public interface IServiceWorkOrdersService { /** - * 查询【请填写功能名称】 + * 查询【工单处理】 * * @param id 主键 - * @return 【请填写功能名称】 + * @return 【工单处理】 */ - ServiceWorkOrdersVo queryById(Long id); + ServiceWorkOrdersInfoVo queryById(Long id); /** - * 分页查询【请填写功能名称】列表 + * 分页查询【工单处理】列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 【请填写功能名称】分页列表 + * @return 【工单处理】分页列表 */ TableDataInfo queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery); /** - * 查询符合条件的【请填写功能名称】列表 + * 查询符合条件的【工单处理】列表 * * @param bo 查询条件 - * @return 【请填写功能名称】列表 + * @return 【工单处理】列表 */ List queryList(ServiceWorkOrdersBo bo); /** - * 新增【请填写功能名称】 + * 新增【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否新增成功 */ Boolean insertByBo(ServiceWorkOrdersBo bo); /** - * 修改【请填写功能名称】 + * 修改【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否修改成功 */ Boolean updateByBo(ServiceWorkOrdersBo bo); /** - * 校验并批量删除【请填写功能名称】信息 + * 校验并批量删除【工单处理】信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersTypeService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersTypeService.java new file mode 100644 index 0000000..a838a21 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersTypeService.java @@ -0,0 +1,68 @@ +package org.dromara.property.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【工单类型】Service接口 + * + * @author mocheng + * @date 2025-07-09 + */ +public interface IServiceWorkOrdersTypeService { + + /** + * 查询【工单类型】 + * + * @param id 主键 + * @return 【工单类型】 + */ + ServiceWorkOrdersTypeVo queryById(Long id); + + /** + * 分页查询【工单类型】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【工单类型】分页列表 + */ + TableDataInfo queryPageList(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【工单类型】列表 + * + * @param bo 查询条件 + * @return 【工单类型】列表 + */ + List queryList(ServiceWorkOrdersTypeBo bo); + + /** + * 新增【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否新增成功 + */ + Boolean insertByBo(ServiceWorkOrdersTypeBo bo); + + /** + * 修改【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否修改成功 + */ + Boolean updateByBo(ServiceWorkOrdersTypeBo bo); + + /** + * 校验并批量删除【工单类型】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java index 63113cf..bbae6f1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java @@ -17,6 +17,7 @@ import org.dromara.property.domain.vo.MeetAttachVo; import org.dromara.property.domain.MeetAttach; import org.dromara.property.mapper.MeetAttachMapper; import org.dromara.property.service.IMeetAttachService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -93,6 +94,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService { * @return 是否新增成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(MeetAttachBo bo) { MeetAttach add = MapstructUtils.convert(bo, MeetAttach.class); validEntityBeforeSave(add); @@ -110,6 +112,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService { * @return 是否修改成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(MeetAttachBo bo) { MeetAttach update = MapstructUtils.convert(bo, MeetAttach.class); validEntityBeforeSave(update); @@ -131,6 +134,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService { * @return 是否删除成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index b73ce1a..d07069f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -1,12 +1,17 @@ package org.dromara.property.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.rabbitmq.client.Return; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.exception.base.BaseException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -42,6 +47,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { private final MeetAttachOrderMapper meetAttachOrderMapper; private final ResidentPersonMapper residentPersonMapper; private final TbRoomMapper roomMapper; + private final MeetMapper meetMapper; private final ResidentUnitMapper residentUnitMapper; /** @@ -54,12 +60,13 @@ public class MeetBookingServiceImpl implements IMeetBookingService { public MeetBookingDetailVo queryById(Long id) { MeetBookingVo meetBookingVo = baseMapper.selectVoById(id); MeetBookingDetailVo meetBookingDetailVo = BeanUtil.copyProperties(meetBookingVo, MeetBookingDetailVo.class); - String locationName = roomMapper.queryRoomName(Long.valueOf(meetBookingDetailVo.getMeetLocation())); + MeetVo meetVo = meetMapper.selectVoById(meetBookingDetailVo.getMeetId()); + String locationName = roomMapper.queryRoomName(Long.valueOf(meetVo.getLocation())); meetBookingDetailVo.setLocationName(locationName); - ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetBookingDetailVo.getPerson()); + ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(Long.valueOf(meetBookingVo.getPerson())); meetBookingDetailVo.setPersonName(residentPersonVo.getUserName()); - meetBookingDetailVo.setPerson(residentPersonVo.getPhone()); - ResidentUnitVo residentUnitVo = residentUnitMapper.selectVoById(meetBookingDetailVo.getUnit()); + meetBookingDetailVo.setPhone(residentPersonVo.getPhone()); + ResidentUnitVo residentUnitVo = residentUnitMapper.selectVoById(Long.valueOf(meetBookingVo.getUnit())); meetBookingDetailVo.setUnitName(residentUnitVo.getName()); return meetBookingDetailVo; } @@ -75,7 +82,30 @@ public class MeetBookingServiceImpl implements IMeetBookingService { public TableDataInfo queryPageList(MeetBookingBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + + List units = result.getRecords().stream() + .map(vo -> vo.getUnit()) + .distinct() + .collect(Collectors.toList()); + List persons = result.getRecords().stream() + .map(vo -> vo.getPerson()) + .distinct() + .collect(Collectors.toList()); + List residentUnitVolist = residentUnitMapper.selectVoByIds(units); + List residentPersonsVolist = residentPersonMapper.selectVoByIds(persons); + + List meetBookingVoList = new ArrayList<>(); + result.getRecords().stream().forEach(s -> { + ResidentUnitVo residentUnitVo = residentUnitVolist.stream() + .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getUnit())).findFirst().orElse(null); + s.setUnitName(residentUnitVo.getName()); + ResidentPersonVo residentPersonVo = residentPersonsVolist.stream() + .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null); + s.setPersonName(residentPersonVo.getUserName()); + s.setPhone(residentPersonVo.getPhone()); + meetBookingVoList.add(s); + }); + return TableDataInfo.build(new Page().setRecords(meetBookingVoList)); } /** @@ -93,6 +123,9 @@ public class MeetBookingServiceImpl implements IMeetBookingService { .le(MeetBooking::getScheduledStarttime, endOfDay) .ge(MeetBooking::getScheduledEndtime, startOfDay); List meetBookings = baseMapper.selectList(meetBookingLambdaQueryWrapper); + if (CollectionUtil.isEmpty(meetBookings)) { + return new ArrayList<>(); + } List meetBookingAppointmentVoList = BeanUtil.copyToList(meetBookings, MeetBookingAppointmentVo.class); SimpleDateFormat df = new SimpleDateFormat("HH"); List units = meetBookingAppointmentVoList.stream() @@ -113,24 +146,10 @@ public class MeetBookingServiceImpl implements IMeetBookingService { ResidentPersonVo residentPersonVo = residentPersonsVolist.stream() .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null); s.setPersonName(residentPersonVo.getUserName()); + s.setPhone(residentPersonVo.getPhone()); String str = df.format(s.getScheduledStarttime()); int a = Integer.parseInt(str); - if (a >= 0 && a <= 6) { - s.setSlots("凌晨"); - } - if (a > 6 && a <= 12) { - s.setSlots("上午"); - } - if (a > 12 && a <= 13) { - s.setSlots("中午"); - } - if (a > 13 && a <= 18) { - s.setSlots("下午"); - } - if (a > 18 && a <= 24) { - s.setSlots("晚上"); - } - + s.setSlots(a <= 12 ? "上午" : "下午"); } ); return meetBookingAppointmentVoList; @@ -165,6 +184,9 @@ public class MeetBookingServiceImpl implements IMeetBookingService { .ge(MeetBooking::getScheduledStarttime, startOfWeek) .le(MeetBooking::getScheduledEndtime, endOfWeek); List meetBookingVoList = baseMapper.selectVoList(bookingLambdaQueryWrapper); + if (CollectionUtil.isEmpty(meetBookingVoList)) { + return new ArrayList<>(); + } List meetBookingWeekVoList = BeanUtil.copyToList(meetBookingVoList, MeetBookingWeekVo.class); String[] weekStr = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; List meetBookingWeekList = new ArrayList<>(); @@ -193,21 +215,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { s.setWeek(weekStr[firstDayOfWeek - 1]); String str = df.format(s.getScheduledStarttime()); int a = Integer.parseInt(str); - if (a >= 0 && a <= 6) { - s.setSlots("凌晨"); - } - if (a > 6 && a <= 12) { - s.setSlots("上午"); - } - if (a > 12 && a <= 13) { - s.setSlots("中午"); - } - if (a > 13 && a <= 18) { - s.setSlots("下午"); - } - if (a > 18 && a <= 24) { - s.setSlots("晚上"); - } + s.setSlots(a <= 12 ? "上午" : "下午"); meetBookingWeekList.add(s); }); return meetBookingWeekList; @@ -218,17 +226,6 @@ public class MeetBookingServiceImpl implements IMeetBookingService { lqw.orderByAsc(MeetBooking::getId); lqw.like(StringUtils.isNotBlank(bo.getName()), MeetBooking::getName, bo.getName()); lqw.eq(bo.getMeetId() != null, MeetBooking::getMeetId, bo.getMeetId()); - lqw.eq(StringUtils.isNotBlank(bo.getMeetLocation()), MeetBooking::getMeetLocation, bo.getMeetLocation()); - lqw.eq(StringUtils.isNotBlank(bo.getUnit()), MeetBooking::getUnit, bo.getUnit()); - lqw.eq(StringUtils.isNotBlank(bo.getPerson()), MeetBooking::getPerson, bo.getPerson()); - lqw.eq(StringUtils.isNotBlank(bo.getPhone()), MeetBooking::getPhone, bo.getPhone()); - lqw.eq(bo.getScheduledStarttime() != null, MeetBooking::getScheduledStarttime, bo.getScheduledStarttime()); - lqw.eq(bo.getScheduledEndtime() != null, MeetBooking::getScheduledEndtime, bo.getScheduledEndtime()); - // lqw.eq(ObjectUtil.isNotEmpty(bo.getPersonSum()), MeetBooking::getPersonSum, bo.getPersonSum()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getPrice()), MeetBooking::getPrice, bo.getPrice()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getAttach()), MeetBooking::getAttach, bo.getAttach()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getPayState()), MeetBooking::getPayState, bo.getPayState()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getState()), MeetBooking::getState, bo.getState()); return lqw; } @@ -281,6 +278,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { */ private void validEntityBeforeSave(MeetBooking entity) { //TODO 做一些数据校验,如唯一约束 + } /** @@ -291,6 +289,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { * @return 是否删除成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java index 6302c19..5cafdb2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java @@ -57,8 +57,10 @@ public class MeetServiceImpl implements IMeetService { public MeetVo queryById(Long id){ MeetVo meetVo= baseMapper.selectVoById(id); ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetVo.getPrincipals()); - meetVo.setPrincipalsName(residentPersonVo.getUserName()); - meetVo.setPhoneNo(residentPersonVo.getPhone()); + if(ObjectUtil.isNotEmpty(residentPersonVo)){ + meetVo.setPrincipalsName(residentPersonVo.getUserName()); + meetVo.setPhoneNo(residentPersonVo.getPhone()); + } String locationName = roomMapper.queryRoomName(Long.valueOf(meetVo.getLocation())); meetVo.setLocationName(locationName); return meetVo; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java index 1c51aa3..c56d9da 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java @@ -1,5 +1,8 @@ package org.dromara.property.service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,18 +13,21 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.property.domain.ServiceWorkOrders; +import org.dromara.property.domain.ServiceWorkOrdersType; import org.dromara.property.domain.bo.ServiceWorkOrdersBo; -import org.dromara.property.domain.vo.ServiceWorkOrdersVo; +import org.dromara.property.domain.vo.*; +import org.dromara.property.mapper.ResidentPersonMapper; import org.dromara.property.mapper.ServiceWorkOrdersMapper; +import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper; import org.dromara.property.service.IServiceWorkOrdersService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** - * 【请填写功能名称】Service业务层处理 + * 【工单处理】Service业务层处理 * * @author mocheng * @date 2025-07-07 @@ -32,37 +38,70 @@ import java.util.Map; public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { private final ServiceWorkOrdersMapper baseMapper; + private final ServiceWorkOrdersTypeMapper typesMapper; + private final ResidentPersonMapper residentPersonMapper; /** - * 查询【请填写功能名称】 + * 查询【工单处理】 * * @param id 主键 - * @return 【请填写功能名称】 + * @return 【工单处理】 */ @Override - public ServiceWorkOrdersVo queryById(Long id){ - return baseMapper.selectVoById(id); + public ServiceWorkOrdersInfoVo queryById(Long id) { + ServiceWorkOrdersVo serviceWorkOrdersVo = baseMapper.selectVoById(id); + ServiceWorkOrdersInfoVo serviceWorkOrdersInfoVo = BeanUtil.copyProperties(serviceWorkOrdersVo, ServiceWorkOrdersInfoVo.class); + ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = typesMapper.selectVoById(serviceWorkOrdersVo.getType()); + if (Objects.nonNull(serviceWorkOrdersTypeVo)) { + serviceWorkOrdersInfoVo.setTypeName(serviceWorkOrdersTypeVo.getOrderTypeName()); + } + ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(Long.valueOf(serviceWorkOrdersVo.getInitiatorName())); + if (Objects.nonNull(residentPersonVo)) { + serviceWorkOrdersInfoVo.setInitiatorNameText(residentPersonVo.getUserName()); + serviceWorkOrdersInfoVo.setInitiatorPhone(residentPersonVo.getPhone()); + } + ResidentPersonVo residentPersonHandler = residentPersonMapper.selectVoById(Long.valueOf(serviceWorkOrdersVo.getHandler())); + if (Objects.nonNull(residentPersonHandler)) { + serviceWorkOrdersInfoVo.setHandlerText(residentPersonHandler.getUserName()); + serviceWorkOrdersInfoVo.setHandlerPhone(residentPersonHandler.getPhone()); + } + return serviceWorkOrdersInfoVo; } /** - * 分页查询【请填写功能名称】列表 + * 分页查询【工单处理】列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 【请填写功能名称】分页列表 + * @return 【工单处理】分页列表 */ @Override public TableDataInfo queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + if (ObjectUtil.isEmpty(result.getRecords())) { + return TableDataInfo.build(result); + } + List typeList = result.getRecords().stream() + .map(vo -> vo.getType()) + .distinct() + .collect(Collectors.toList()); + List serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList); + List serviceWorkOrdersVoList = new ArrayList<>(); + result.getRecords().stream().forEach(s -> { + ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream() + .filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null); + s.setTypeName(serviceWorkOrdersTypeVo.getOrderTypeName()); + serviceWorkOrdersVoList.add(s); + }); + return TableDataInfo.build(new Page().setRecords(serviceWorkOrdersVoList)); } /** - * 查询符合条件的【请填写功能名称】列表 + * 查询符合条件的【工单处理】列表 * * @param bo 查询条件 - * @return 【请填写功能名称】列表 + * @return 【工单处理】列表 */ @Override public List queryList(ServiceWorkOrdersBo bo) { @@ -76,32 +115,29 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { lqw.orderByAsc(ServiceWorkOrders::getId); lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ServiceWorkOrders::getOrderNo, bo.getOrderNo()); lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName()); - lqw.eq(bo.getType() != null, ServiceWorkOrders::getType, bo.getType()); - lqw.eq(bo.getStatus() != null, ServiceWorkOrders::getStatus, bo.getStatus()); lqw.eq(bo.getDispatchTime() != null, ServiceWorkOrders::getDispatchTime, bo.getDispatchTime()); lqw.like(StringUtils.isNotBlank(bo.getInitiatorName()), ServiceWorkOrders::getInitiatorName, bo.getInitiatorName()); - lqw.eq(StringUtils.isNotBlank(bo.getInitiatorPhone()), ServiceWorkOrders::getInitiatorPhone, bo.getInitiatorPhone()); lqw.eq(StringUtils.isNotBlank(bo.getHandler()), ServiceWorkOrders::getHandler, bo.getHandler()); lqw.eq(StringUtils.isNotBlank(bo.getLocation()), ServiceWorkOrders::getLocation, bo.getLocation()); lqw.eq(bo.getPlanCompleTime() != null, ServiceWorkOrders::getPlanCompleTime, bo.getPlanCompleTime()); lqw.eq(bo.getCompleTime() != null, ServiceWorkOrders::getCompleTime, bo.getCompleTime()); - lqw.eq(StringUtils.isNotBlank(bo.getServiceEvalua()), ServiceWorkOrders::getServiceEvalua, bo.getServiceEvalua()); - lqw.eq(bo.getIsTimeOut() != null, ServiceWorkOrders::getIsTimeOut, bo.getIsTimeOut()); - lqw.eq(bo.getCreateById() != null, ServiceWorkOrders::getCreateById, bo.getCreateById()); - lqw.eq(bo.getUpdateById() != null, ServiceWorkOrders::getUpdateById, bo.getUpdateById()); + lqw.eq(Objects.nonNull(bo.getServiceEvalua()), ServiceWorkOrders::getServiceEvalua, bo.getServiceEvalua()); + lqw.eq(Objects.nonNull(bo.getType()), ServiceWorkOrders::getType, bo.getType()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrders::getSearchValue, bo.getSearchValue()); return lqw; } /** - * 新增【请填写功能名称】 + * 新增【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否新增成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(ServiceWorkOrdersBo bo) { ServiceWorkOrders add = MapstructUtils.convert(bo, ServiceWorkOrders.class); + validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -111,12 +147,13 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { } /** - * 修改【请填写功能名称】 + * 修改【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否修改成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(ServiceWorkOrdersBo bo) { ServiceWorkOrders update = MapstructUtils.convert(bo, ServiceWorkOrders.class); validEntityBeforeSave(update); @@ -126,20 +163,22 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(ServiceWorkOrders entity){ + private void validEntityBeforeSave(ServiceWorkOrders entity) { //TODO 做一些数据校验,如唯一约束 + entity.setOrderNo("GD" + IdUtil.getSnowflakeNextIdStr()); } /** - * 校验并批量删除【请填写功能名称】信息 + * 校验并批量删除【工单处理】信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 * @return 是否删除成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java new file mode 100644 index 0000000..e7a9269 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.property.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.ServiceWorkOrdersType; +import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; +import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper; +import org.dromara.property.service.IServiceWorkOrdersTypeService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【工单类型】Service业务层处理 + * + * @author mocheng + * @date 2025-07-09 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeService { + + private final ServiceWorkOrdersTypeMapper baseMapper; + + /** + * 查询【工单类型】 + * + * @param id 主键 + * @return 【工单类型】 + */ + @Override + public ServiceWorkOrdersTypeVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询【工单类型】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【工单类型】分页列表 + */ + @Override + public TableDataInfo queryPageList(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【工单类型】列表 + * + * @param bo 查询条件 + * @return 【工单类型】列表 + */ + @Override + public List queryList(ServiceWorkOrdersTypeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ServiceWorkOrdersTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(ServiceWorkOrdersType::getId); + lqw.eq(StringUtils.isNotBlank(bo.getOrderTypeNo()), ServiceWorkOrdersType::getOrderTypeNo, bo.getOrderTypeNo()); + lqw.like(StringUtils.isNotBlank(bo.getOrderTypeName()), ServiceWorkOrdersType::getOrderTypeName, bo.getOrderTypeName()); + lqw.eq(StringUtils.isNotBlank(bo.getOperationMode()), ServiceWorkOrdersType::getOperationMode, bo.getOperationMode()); + lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrdersType::getSearchValue, bo.getSearchValue()); + return lqw; + } + + /** + * 新增【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(ServiceWorkOrdersTypeBo bo) { + ServiceWorkOrdersType add = MapstructUtils.convert(bo, ServiceWorkOrdersType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否修改成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(ServiceWorkOrdersTypeBo bo) { + ServiceWorkOrdersType update = MapstructUtils.convert(bo, ServiceWorkOrdersType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ServiceWorkOrdersType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【工单类型】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/ServiceWorkOrdersTypeMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/ServiceWorkOrdersTypeMapper.xml new file mode 100644 index 0000000..3b75daf --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/ServiceWorkOrdersTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/TbRoomMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/TbRoomMapper.xml index fd50b64..bdc04ce 100644 --- a/ruoyi-modules/Property/src/main/resources/mapper/Property/TbRoomMapper.xml +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/TbRoomMapper.xml @@ -5,25 +5,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"