Compare commits
649 Commits
da70a913a9
...
prod
Author | SHA1 | Date | |
---|---|---|---|
86116cbf5c | |||
e98890cd79 | |||
287672d28b | |||
06bf8220d8 | |||
ddf00d23d6 | |||
a02864c003 | |||
ecc1dadb4f | |||
863366de7e | |||
bb4ac2bcb8 | |||
![]() |
046e9d925a | ||
![]() |
0d83a93a7b | ||
![]() |
d29c901352 | ||
4890e9c8e3 | |||
f9544ad4e1 | |||
b1f0ce3d3c | |||
28f44a1c5f | |||
85a943a697 | |||
10033dd646 | |||
![]() |
fe8c5a76f3 | ||
![]() |
3c6595e591 | ||
97a3c106cb | |||
14b8370f44 | |||
0b22169649 | |||
826684ed66 | |||
e2fbd251b3 | |||
2200ef4880 | |||
ff2bc3cf93 | |||
659f3089e4 | |||
ce0c4b201c | |||
bad3ffdf4c | |||
0e0646f4b8 | |||
fbc07ac629 | |||
d8f5713a3d | |||
8afc12f3b6 | |||
710379c1a4 | |||
ac5cff7cc6 | |||
![]() |
6d2741a8a5 | ||
![]() |
0233dad442 | ||
![]() |
feb16fc4b7 | ||
c773aed9c7 | |||
db29ef77fa | |||
![]() |
fecaa7921d | ||
![]() |
92cb1fcd63 | ||
fbcc6ec713 | |||
f3591e7ff1 | |||
6d25db8c59 | |||
![]() |
57e9ac1079 | ||
d6623bb9da | |||
efeafd5e13 | |||
130e3aeb04 | |||
cfff5df7d0 | |||
1b138ab299 | |||
b7e9dfa148 | |||
76c0aa74f1 | |||
![]() |
825e1ed183 | ||
c2f0b64e6f | |||
e61b56b05e | |||
eb1b2084b5 | |||
4d76a4df45 | |||
0330b023a3 | |||
1eb95bf6f6 | |||
df9adf700c | |||
368eea91e8 | |||
19e259a15e | |||
816b90e9e1 | |||
6133d7761d | |||
318da3f0ee | |||
3c8eb59165 | |||
3c480d92f0 | |||
78d97e14ee | |||
c2c1818ba6 | |||
3ebc58f5e3 | |||
07b9e8b722 | |||
b20828a800 | |||
9c0b0bad03 | |||
c4495d2cf2 | |||
a16c333759 | |||
6e84a1c646 | |||
a6b0277ff6 | |||
ef0976c621 | |||
e949122b37 | |||
638a98a4c6 | |||
360f87ea0d | |||
555de9f5aa | |||
da131cda5c | |||
c86f887d3e | |||
2c127576a0 | |||
15a0f3f884 | |||
0d4754eef9 | |||
dad6666107 | |||
87b77b26d1 | |||
0584a44601 | |||
![]() |
18bd1724c4 | ||
![]() |
c8475f818d | ||
d3a1d16b8f | |||
5ec2a67049 | |||
9eeca6f32e | |||
8966b52cc5 | |||
b022d3a68c | |||
63e5abc003 | |||
1d8b948a13 | |||
953a545ba6 | |||
a8dc8d99df | |||
fb7e5c7e19 | |||
1b5204e6ed | |||
8340f5cf6a | |||
9897bb8db7 | |||
4a62ad17c3 | |||
1e39769309 | |||
df9e3b77ff | |||
42b5c78658 | |||
49401d42ba | |||
1aa576a9ae | |||
d0ccd668fa | |||
3c144d00e5 | |||
359a380937 | |||
a36667e599 | |||
1d8ad14ebc | |||
73e47e5127 | |||
2e314b2901 | |||
2103be1de5 | |||
2a143bb147 | |||
37966e73c1 | |||
f01d28b21e | |||
db9b1e1cd3 | |||
0385bef3f4 | |||
eba9e78695 | |||
![]() |
be3992c1dc | ||
5c9672dc18 | |||
5fb396575d | |||
f23b02fe51 | |||
63c95ecda8 | |||
62d9a21627 | |||
5c7a76b855 | |||
![]() |
d5d8b80f49 | ||
![]() |
9e346ba882 | ||
6e83b36987 | |||
2ec65fe29f | |||
d392021952 | |||
3a44280abe | |||
a056feae53 | |||
eecf869640 | |||
f7d1f81940 | |||
4f62b3bea3 | |||
9034f0ef7a | |||
c1c3950b2d | |||
0ee671fbcf | |||
7376a7a9be | |||
e450c66385 | |||
6397085fe9 | |||
6d3849fa64 | |||
23cab413c2 | |||
c8179e164d | |||
38e75e6b6b | |||
06ab323f21 | |||
50ddc1e954 | |||
187763e0e5 | |||
8849b1d889 | |||
fea2972dd0 | |||
be5d00040d | |||
![]() |
e0abf1bd13 | ||
![]() |
5e164ae2ac | ||
c5f6744623 | |||
2e0695c1c0 | |||
![]() |
a0927b1e6e | ||
![]() |
2716324734 | ||
785f903e2a | |||
5a9cc74405 | |||
e383f112d2 | |||
e66f29c665 | |||
ae8a1f095b | |||
247ad09a58 | |||
333fadf6df | |||
80a44540d8 | |||
44beda8f34 | |||
77bfdd2823 | |||
da70fcc869 | |||
e3e070e411 | |||
f05fbc967d | |||
d9cf6ef530 | |||
d13f58cb95 | |||
9110c152aa | |||
42b926bf75 | |||
f488acf9cc | |||
6075704524 | |||
63ee355745 | |||
fc4d7a2bdf | |||
9a4be9e609 | |||
2becd3e7ce | |||
be52875780 | |||
9d12fc7fdd | |||
d235ac8e81 | |||
44e6a1b556 | |||
db30232834 | |||
515d473da0 | |||
78a33f408f | |||
1179cbd77a | |||
c1ee3a3328 | |||
93af6976da | |||
81d60e3832 | |||
7c8ddfcda5 | |||
72b431f1a9 | |||
1e35f72bd9 | |||
c5ab0b0217 | |||
0db34e94fd | |||
9d0e22e9e6 | |||
78cba4532d | |||
64538d32e9 | |||
0a25ddc8ef | |||
46735c04ba | |||
6ceea97200 | |||
4b3ed9dbaf | |||
bdaa8f2c99 | |||
c7e81a892c | |||
b75b799432 | |||
86ba03167b | |||
563aacd2b0 | |||
007c40b9e6 | |||
67b3ae8d17 | |||
6a7a0a344f | |||
11087e3f33 | |||
61883eff21 | |||
ee0664c23b | |||
a8b21eeaa3 | |||
d9264b65ab | |||
8b9e053517 | |||
6410e15b88 | |||
8bbe92db4e | |||
9bf0fb3568 | |||
87b641138d | |||
9abb69888b | |||
cfd7a4de87 | |||
20c27a8f7f | |||
2cc45acc37 | |||
74e5323934 | |||
2556be5019 | |||
52cb5277f1 | |||
92adf7e010 | |||
7e36a04fae | |||
6533f6720f | |||
f5b011a869 | |||
0d6a1b268d | |||
0fa3b43853 | |||
e41835c95e | |||
b9b0a04099 | |||
f807f37395 | |||
8c32e29571 | |||
de44deae2e | |||
5e3fd9355d | |||
ef3c144fe6 | |||
a6b586836d | |||
cef84284bb | |||
edf514b25d | |||
afc0e69319 | |||
269c105282 | |||
573bd4cb8c | |||
e52ee15f0f | |||
51c6dd2cc1 | |||
cf473bcbc8 | |||
8bbf5f0eca | |||
d7c4b2ba54 | |||
43f07b7396 | |||
33ea126b95 | |||
7bbf011dcf | |||
22dadcfdd9 | |||
f2d66263af | |||
507c2e4d8d | |||
d0f825e4c9 | |||
4341c88b1c | |||
03fc2de13b | |||
dcda333d43 | |||
86939591f5 | |||
284d7a938c | |||
c6e482b498 | |||
aa94f476b6 | |||
abc1fdbc7a | |||
cf60740347 | |||
b09ba939ae | |||
4130a863de | |||
26c292ea96 | |||
fb80f4bba6 | |||
ae4969dad8 | |||
018714f352 | |||
d971fa0b92 | |||
727e984726 | |||
6c4a404799 | |||
e41944c908 | |||
f4706ad097 | |||
005dbc1110 | |||
b43c3b25e0 | |||
65586d21a3 | |||
d005fec88c | |||
2ffeb25d82 | |||
89041e783b | |||
9dbccf93a8 | |||
e73d6abf62 | |||
7b74451547 | |||
54c423b8cb | |||
627f2a1a11 | |||
f79c5bf59b | |||
1b64c97626 | |||
a13d4ab51a | |||
59dc46f019 | |||
a7db0253e8 | |||
4861c89c57 | |||
d1473886f6 | |||
32b3768789 | |||
69e652b224 | |||
af22185111 | |||
b378470f06 | |||
![]() |
0dd0336724 | ||
![]() |
cc6d89c588 | ||
631d1f0ffb | |||
ed35a45142 | |||
![]() |
8a6e499368 | ||
5d078e8c8c | |||
054a8590ea | |||
99758c1a60 | |||
e47a13c214 | |||
ec301ac993 | |||
d5e46d88df | |||
48984a494d | |||
![]() |
15531ae029 | ||
![]() |
4b4e67682b | ||
989421e244 | |||
e3867b7a12 | |||
6444a9330b | |||
4893a04d39 | |||
e89bd1df04 | |||
1a2a9a1035 | |||
1c23320f5a | |||
9aa58d2027 | |||
6023f35674 | |||
2deb9b96f9 | |||
20faf13328 | |||
3d6fa49e8f | |||
2a6f258ae5 | |||
29ba1ab5c6 | |||
66721b34cd | |||
f0a7f2147f | |||
2b19146c70 | |||
c78d90a316 | |||
fedc381713 | |||
70fe6d713a | |||
17d041e51d | |||
5a92f9032e | |||
0a18e0c1a6 | |||
3fa1beca78 | |||
4acfdb6b35 | |||
00ad9a1330 | |||
a4e40f5123 | |||
db58a91252 | |||
f619c65261 | |||
a12ee50d08 | |||
b91201cf7f | |||
86c28e95dd | |||
1288d27125 | |||
b7a4e512f0 | |||
cb84447450 | |||
bbe911119c | |||
82740b7d62 | |||
eb03629e84 | |||
c488f666d2 | |||
6d9266ee21 | |||
2a36ddf688 | |||
5d81537bdb | |||
bbd895f116 | |||
8093e1cfd7 | |||
290780379d | |||
![]() |
59f8e0fc2f | ||
![]() |
6b1519a5b6 | ||
4316a25f6e | |||
7b37ed293f | |||
7c52b9b851 | |||
0db07e6d53 | |||
0cb299d383 | |||
26b609ea81 | |||
58971070e9 | |||
0c34fedc8d | |||
15f97ac503 | |||
f1625b6e5f | |||
291f9e7ffa | |||
80a42d32ea | |||
1f4e168b56 | |||
00be7b4c47 | |||
1fcfa11608 | |||
cf5757c48f | |||
1d474d735e | |||
7f76de6073 | |||
4f58aa9c1e | |||
063b424b2b | |||
f7db092af8 | |||
c104a71f76 | |||
f9fe218f7a | |||
c66c81b434 | |||
6ede822c35 | |||
bd742b9f16 | |||
5028649266 | |||
c8e199e68e | |||
8c463bfa66 | |||
131adee296 | |||
6e1c2e612b | |||
f7cdf4bc09 | |||
c366a30488 | |||
389ba82659 | |||
6c57942886 | |||
dc3b6ab197 | |||
e016e6d44c | |||
9afeed3108 | |||
7af0cee8e9 | |||
79f98b5387 | |||
14b6077ea7 | |||
e69093390c | |||
8f71f5f261 | |||
95dfc5ef9b | |||
40a9cb65b8 | |||
6965b78db0 | |||
17f342ed76 | |||
f0beb7be5e | |||
6938640419 | |||
7ef6d2ab47 | |||
ef7ca1fa5a | |||
1b3fd18873 | |||
ec23e32ed6 | |||
b7fa3cd788 | |||
21985e48e7 | |||
9602ef96f7 | |||
d42e2c627f | |||
28143d17e7 | |||
b303ab6faa | |||
da0ba9aa0a | |||
bff00b7b4a | |||
64c3355e05 | |||
00b85990f4 | |||
4a73dd53ee | |||
e3e26f46c1 | |||
0efbb1051e | |||
ad567ec13a | |||
887b23e5ca | |||
95b3be486a | |||
fe7620fac4 | |||
5274fb8d64 | |||
cd9227be31 | |||
bee90b70d1 | |||
f92ef72238 | |||
15b25144f0 | |||
23e3100146 | |||
b857a2121b | |||
b3813dfe75 | |||
ae44ccb565 | |||
56dcc609d1 | |||
4458432b5d | |||
041db8c435 | |||
1a900ad3db | |||
7bdd9ff072 | |||
eb7d29640b | |||
dd733fe5e2 | |||
ff7bf241cb | |||
a043e18ba6 | |||
751e65774f | |||
2150602335 | |||
f5159ab5f7 | |||
cd2703080d | |||
ca4d366d74 | |||
5ad0f652fe | |||
f4dbcba15f | |||
47f389c560 | |||
127336af6d | |||
ba0c495c42 | |||
d070a52487 | |||
3b7635bf1d | |||
99336196e0 | |||
d43b600e51 | |||
d3517de7b6 | |||
b1fb876181 | |||
84e79b0414 | |||
819105a470 | |||
c0d43c01c6 | |||
6cc04a9cac | |||
2786cd9a7f | |||
2a2df4e501 | |||
f2aafe220f | |||
a1942c34cb | |||
399f48f1b4 | |||
eaef24b3b7 | |||
c49bc001bb | |||
81ebb3e8c1 | |||
31291b4413 | |||
a24c9dce47 | |||
2631febd2a | |||
8ae12277d8 | |||
1124b832ac | |||
919d0937cd | |||
1388e918c3 | |||
5da0665092 | |||
e026c73627 | |||
99c15c311f | |||
2c8d32f945 | |||
d540a37543 | |||
5d2aa88690 | |||
350b8f511c | |||
359e73fa97 | |||
9ac415d6fc | |||
67bf690c8a | |||
ab9fc43996 | |||
c289a25829 | |||
1c64023502 | |||
b95f99532f | |||
77b345e017 | |||
c9c6f229bd | |||
2d1b6d8ff7 | |||
![]() |
9fc7fb0fde | ||
![]() |
ed091501d7 | ||
1e9efc77ed | |||
0b90663d3d | |||
4010cc7dfa | |||
f3973d2595 | |||
34d7b40645 | |||
![]() |
800a2de30f | ||
![]() |
365ca2d7bc | ||
7511227e51 | |||
a198e0c720 | |||
0e5e73be26 | |||
f45442e954 | |||
63b96a79d6 | |||
e6c3c7d88a | |||
426717e9cc | |||
498209cb87 | |||
f24df2e494 | |||
0c0ecf8f93 | |||
8c4748c9a3 | |||
e4c21c831b | |||
073e235179 | |||
98fb035a97 | |||
eb5efd9a6c | |||
5a88e94c23 | |||
b4228c0425 | |||
49ec73df49 | |||
![]() |
adafd52d0f | ||
aa5b0b9478 | |||
6163532f39 | |||
b7d225c107 | |||
305705abc0 | |||
625be80cf2 | |||
5d042a2151 | |||
75292374fa | |||
72b3e40124 | |||
d8dfde621e | |||
9c0591dfaa | |||
9f2c4658a0 | |||
e07f690002 | |||
ec2d00ac72 | |||
894cb912f0 | |||
f35a15fc23 | |||
e1f716c70b | |||
3f97caad42 | |||
177bbe5a8f | |||
![]() |
f866e2ffc6 | ||
7928aa16f8 | |||
43933c83c5 | |||
f16a9e0897 | |||
63dd804ced | |||
dbf9346953 | |||
8dbb2aab9d | |||
c2c0d1ffb4 | |||
3511a0b8c1 | |||
ed97e7cefb | |||
365ec14925 | |||
978c1f6f9e | |||
2c794447d8 | |||
![]() |
bbb80f3a63 | ||
![]() |
9c5cd99a54 | ||
![]() |
fa28f2d351 | ||
47c35c603c | |||
fdc70aec0a | |||
94b0156479 | |||
bd484cf106 | |||
a04a6b5571 | |||
172ede3eb3 | |||
e473d9b905 | |||
54655ae6d6 | |||
8b340c9e95 | |||
f53dee48ca | |||
9305db7f7a | |||
c1bcdd367a | |||
71814b3b5b | |||
83cc3a4f84 | |||
2d14253d5c | |||
eb8665c872 | |||
7440f1bc9a | |||
0cf20a8408 | |||
250d308a7f | |||
30f70fd08d | |||
25ffc7adc7 | |||
43171c2cac | |||
3e81ca335f | |||
5ad50d96b9 | |||
6246f897cb | |||
767551cb34 | |||
f11f199f51 | |||
34dc9d652b | |||
421bc821eb | |||
13eee82adc | |||
493c0e641f | |||
7c9f400cfd | |||
1beae8d9af | |||
8c6e6507df | |||
0fe62c735c | |||
![]() |
be7002153c | ||
6a7095ec58 | |||
7db6d2adac | |||
d70d99fb9a | |||
2347d46a9b | |||
815fe53f1a | |||
6127223a78 | |||
f9ea62db04 | |||
4e60d1f3d1 | |||
cf920532dd | |||
f319a320ce | |||
![]() |
f98e94ecd1 | ||
8ad79b4369 | |||
2eab7e5242 | |||
ca962395f6 | |||
302c4be55c | |||
c7ff295d76 | |||
7ccce852e9 | |||
52cffa205c | |||
8233524b2b | |||
74c7a809d9 | |||
a8b1254b96 | |||
eb1ec10c86 | |||
21c149bf0c | |||
e3e4e38f91 | |||
a5dae3530d | |||
f69326343e | |||
c49bb4cdb3 | |||
bb98a34fa6 | |||
ba9202e6ca | |||
7dc0a87a23 | |||
1ca5352a9d | |||
a349719de9 | |||
7b40b084c1 | |||
9a34602030 | |||
73b4581836 | |||
322a9944e8 | |||
487480c0e1 | |||
398e19f2f7 | |||
4a20ec11db | |||
147c67b5ad |
@@ -1,53 +0,0 @@
|
||||
name: Gitea Actions Demo
|
||||
run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
|
||||
on: [push]
|
||||
jobs:
|
||||
Explore-Gitea-Actions:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
||||
- name: Checkout code
|
||||
uses: http://47.109.37.87:3000/bichangxiong/checkout@v4 # 使用 Gitea 镜像
|
||||
with:
|
||||
fetch-depth: 1 # 只拉取最新一次提交
|
||||
# - name: Checkout code
|
||||
# uses: actions/checkout@v4 # 拉取代码到工作目录
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
cache: maven
|
||||
- name: Set up Maven
|
||||
uses: stCarolas/setup-maven@v5
|
||||
with:
|
||||
maven-version: 3.8.2
|
||||
|
||||
- name: List files in the repository
|
||||
run: |
|
||||
ls ${{ gitea.workspace }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: mvn clean package -DskipTests
|
||||
- name: copy file via ssh password
|
||||
uses: appleboy/scp-action@v0.1.7
|
||||
with:
|
||||
host: 192.168.1.3
|
||||
username: root
|
||||
password: by@2025!
|
||||
port: 22
|
||||
source: "ruoyi-modules/Property/target/Property.jar,ruoyi-modules/Property/docker-compose.yml,ruoyi-modules/Property/Dockerfile"
|
||||
target: "/project/runner/plus/"
|
||||
- name: Deploy to server via SSH
|
||||
uses: appleboy/ssh-action@v0.1.7
|
||||
with:
|
||||
host: 192.168.1.3
|
||||
username: root
|
||||
password: by@2025!
|
||||
port: 22
|
||||
script: |
|
||||
cd /project/runner/plus/ruoyi-modules/Property
|
||||
docker-compose up -d --force-recreate
|
||||
|
||||
|
||||
- run: echo "🍏 This job's status is ${{ job.status }}."
|
94
.gitea/workflows/master.yml
Normal file
94
.gitea/workflows/master.yml
Normal file
@@ -0,0 +1,94 @@
|
||||
name: Build and Push to Target Registry
|
||||
|
||||
# 监听master分支的推送事件
|
||||
on:
|
||||
push:
|
||||
branches: [ prod ]
|
||||
|
||||
jobs:
|
||||
build-and-deploy:
|
||||
name: 构建并推送镜像到目标仓库
|
||||
runs-on: ubuntu
|
||||
timeout-minutes: 30
|
||||
|
||||
steps:
|
||||
- name: 拉取代码
|
||||
uses: http://git.missmoc.top/mocheng/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: 使用Maven构建项目
|
||||
run: |
|
||||
echo "===== 开始Maven构建 ====="
|
||||
/maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
|
||||
|
||||
echo "===== Maven构建完成 ====="
|
||||
|
||||
- name: 构建并推送Docker镜像
|
||||
env:
|
||||
# 替换为你的Docker Registry地址(例如:localhost:5000 或 192.168.1.100:5000)
|
||||
TARGET_REGISTRY: 127.0.0.1:5000
|
||||
# 目标仓库中的项目名称
|
||||
TARGET_PROJECT: smartparks
|
||||
run: |
|
||||
echo "===== 环境信息 ====="
|
||||
echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
|
||||
|
||||
# 【删除登录步骤】因为仓库无认证,无需登录
|
||||
|
||||
echo "===== 查找项目中的Dockerfile ====="
|
||||
dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
|
||||
if [ -z "$dockerfiles" ]; then
|
||||
echo "警告:未找到任何Dockerfile"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# 处理每个Dockerfile(后续构建、推送逻辑与之前类似,保持不变)
|
||||
echo "$dockerfiles" | while read -r dockerfile; do
|
||||
echo "===== 处理Dockerfile: $dockerfile ====="
|
||||
|
||||
docker_context=$(dirname "$dockerfile")
|
||||
image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9_-]//g')
|
||||
full_image_name="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-${{ github.sha }}"
|
||||
echo "镜像名称: $full_image_name"
|
||||
|
||||
# 检查JAR包是否存在
|
||||
echo "===== 检查JAR包 ====="
|
||||
jar_files=$(find "$docker_context" -name "*.jar" -type f)
|
||||
if [ -z "$jar_files" ]; then
|
||||
echo "警告:在 $docker_context 目录中未找到JAR包"
|
||||
continue
|
||||
fi
|
||||
echo "找到JAR包:"
|
||||
echo "$jar_files"
|
||||
|
||||
echo "===== 构建镜像 ====="
|
||||
if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
|
||||
echo "错误:构建镜像失败"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "===== 推送镜像到仓库 ====="
|
||||
if ! docker push "$full_image_name"; then
|
||||
echo "错误:推送镜像失败,请检查仓库是否可访问"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 推送latest标签(逻辑保持不变)
|
||||
latest_image="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-latest"
|
||||
echo "===== 推送最新标签: $latest_image ====="
|
||||
docker tag "$full_image_name" "$latest_image"
|
||||
if ! docker push "$latest_image"; then
|
||||
echo "错误:推送latest标签失败"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "===== 清理操作 ====="
|
||||
docker system prune -f
|
||||
echo "===== 所有操作完成 ===="
|
||||
|
||||
- name: 重启服务
|
||||
run: |
|
||||
kubectl rollout restart deployment sis -n smartparks
|
||||
kubectl rollout restart deployment property -n smartparks
|
BIN
lib/hik/jna-4.5.2_1.jar
Normal file
BIN
lib/hik/jna-4.5.2_1.jar
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libAudioIntercom.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libAudioIntercom.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCAlarm.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCAlarm.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCCoreDevCfg.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCCoreDevCfg.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCDisplay.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCDisplay.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCGeneralCfgMgr.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCGeneralCfgMgr.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCIndustry.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCIndustry.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCPlayBack.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCPlayBack.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCPreview.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCPreview.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libHCVoiceTalk.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libHCVoiceTalk.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libStreamTransClient.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libStreamTransClient.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libSystemTransform.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libSystemTransform.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libanalyzedata.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libanalyzedata.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/HCNetSDKCom/libiconv2.so
Normal file
BIN
lib/hik/linux64/HCNetSDKCom/libiconv2.so
Normal file
Binary file not shown.
12
lib/hik/linux64/HCNetSDK_Log_Switch.xml
Normal file
12
lib/hik/linux64/HCNetSDK_Log_Switch.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="GB2312"?>
|
||||
<SdkLocal>
|
||||
<SdkLog>
|
||||
<logLevel>3</logLevel><!--req, 1-ERROR, 2-DEBUG, 3-INFO-->
|
||||
<logDirectory>./SDKLOG/</logDirectory><!--the end of the string must be '/'-->
|
||||
<autoDelete>true</autoDelete><!--true: There are less than 10 files in the directory, it will be auto deleted by sdk when the files are more than 10; false: No upper limit to the number of log files-->
|
||||
</SdkLog>
|
||||
<HeartbeatCfg>
|
||||
<Interval>120</Interval> <!-- <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>룬<EFBFBD><EBA3AC><EFBFBD><EFBFBD>0<EFBFBD><30>ʹ<EFBFBD><CAB9>Ĭ<EFBFBD><C4AC>ֵ120s<30><73>ȡֵ<C8A1><D6B5>ΧΪ[30, 120] С<><D0A1>30s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ30s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>120s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ120s-->
|
||||
<Count>1</Count> <!-- <20><><EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD>ص<EFBFBD><D8B5><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>ʹ<EFBFBD><CAB9>Ĭ<EFBFBD><C4AC>ֵ1<D6B5><31>-->
|
||||
</HeartbeatCfg>
|
||||
</SdkLocal>
|
BIN
lib/hik/linux64/libAudioRender.so
Normal file
BIN
lib/hik/linux64/libAudioRender.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libHCCore.so
Normal file
BIN
lib/hik/linux64/libHCCore.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libNPQos.so
Normal file
BIN
lib/hik/linux64/libNPQos.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libPlayCtrl.so
Normal file
BIN
lib/hik/linux64/libPlayCtrl.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libSuperRender.so
Normal file
BIN
lib/hik/linux64/libSuperRender.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libcrypto.so.1.1
Normal file
BIN
lib/hik/linux64/libcrypto.so.1.1
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libhcnetsdk.so
Normal file
BIN
lib/hik/linux64/libhcnetsdk.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libhpr.so
Normal file
BIN
lib/hik/linux64/libhpr.so
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libopenal.so.1
Normal file
BIN
lib/hik/linux64/libopenal.so.1
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libssl.so.1.1
Normal file
BIN
lib/hik/linux64/libssl.so.1.1
Normal file
Binary file not shown.
BIN
lib/hik/linux64/libz.so
Normal file
BIN
lib/hik/linux64/libz.so
Normal file
Binary file not shown.
BIN
lib/hik/win64/AudioRender.dll
Normal file
BIN
lib/hik/win64/AudioRender.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/ClientDemo.exe
Normal file
BIN
lib/hik/win64/ClientDemo.exe
Normal file
Binary file not shown.
1
lib/hik/win64/ClientDemoDll/ReadMe.txt
Normal file
1
lib/hik/win64/ClientDemoDll/ReadMe.txt
Normal file
@@ -0,0 +1 @@
|
||||
The dll in this directory<72><79>iconv.dll,libxml2.dll,zlib1.dll,calib.dll<6C><6C>only used in ClientDemo.
|
BIN
lib/hik/win64/ClientDemoDll/calib.dll
Normal file
BIN
lib/hik/win64/ClientDemoDll/calib.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/ClientDemoDll/iconv.dll
Normal file
BIN
lib/hik/win64/ClientDemoDll/iconv.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/ClientDemoDll/libcrypto-1_1-x64.dll
Normal file
BIN
lib/hik/win64/ClientDemoDll/libcrypto-1_1-x64.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/ClientDemoDll/libssl-1_1-x64.dll
Normal file
BIN
lib/hik/win64/ClientDemoDll/libssl-1_1-x64.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/ClientDemoDll/libxml2.dll
Normal file
BIN
lib/hik/win64/ClientDemoDll/libxml2.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/ClientDemoDll/zlib1.dll
Normal file
BIN
lib/hik/win64/ClientDemoDll/zlib1.dll
Normal file
Binary file not shown.
0
lib/hik/win64/DemoLocalCfg.json
Normal file
0
lib/hik/win64/DemoLocalCfg.json
Normal file
25
lib/hik/win64/DeviceCfg.json
Normal file
25
lib/hik/win64/DeviceCfg.json
Normal file
@@ -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": []
|
||||
}]
|
||||
}
|
BIN
lib/hik/win64/GdiPlus.dll
Normal file
BIN
lib/hik/win64/GdiPlus.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/GdiPlus.lib
Normal file
BIN
lib/hik/win64/GdiPlus.lib
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCCore.dll
Normal file
BIN
lib/hik/win64/HCCore.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCCore.lib
Normal file
BIN
lib/hik/win64/HCCore.lib
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDK.dll
Normal file
BIN
lib/hik/win64/HCNetSDK.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDK.lib
Normal file
BIN
lib/hik/win64/HCNetSDK.lib
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/AnalyzeData.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/AnalyzeData.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/AudioIntercom.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/AudioIntercom.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/AudioRender.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/AudioRender.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCAlarm.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCAlarm.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCAlarm.lib
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCAlarm.lib
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCCoreDevCfg.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCCoreDevCfg.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCDisplay.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCDisplay.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.lib
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.lib
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCIndustry.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCIndustry.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCPlayBack.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCPlayBack.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCPreview.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCPreview.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCPreview.lib
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCPreview.lib
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/HCVoiceTalk.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/HCVoiceTalk.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/OpenAL32.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/OpenAL32.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/StreamTransClient.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/StreamTransClient.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/SystemTransform.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/SystemTransform.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HCNetSDKCom/libiconv2.dll
Normal file
BIN
lib/hik/win64/HCNetSDKCom/libiconv2.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HXVA.dll
Normal file
BIN
lib/hik/win64/HXVA.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/HmMerge.dll
Normal file
BIN
lib/hik/win64/HmMerge.dll
Normal file
Binary file not shown.
0
lib/hik/win64/LocalSensorAdd.dat
Normal file
0
lib/hik/win64/LocalSensorAdd.dat
Normal file
BIN
lib/hik/win64/LocalXml.zip
Normal file
BIN
lib/hik/win64/LocalXml.zip
Normal file
Binary file not shown.
BIN
lib/hik/win64/MP_Render.dll
Normal file
BIN
lib/hik/win64/MP_Render.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/NPQos.dll
Normal file
BIN
lib/hik/win64/NPQos.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/OpenAL32.dll
Normal file
BIN
lib/hik/win64/OpenAL32.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/PlayCtrl.dll
Normal file
BIN
lib/hik/win64/PlayCtrl.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/PlayCtrl.lib
Normal file
BIN
lib/hik/win64/PlayCtrl.lib
Normal file
Binary file not shown.
BIN
lib/hik/win64/SuperRender.dll
Normal file
BIN
lib/hik/win64/SuperRender.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/YUVProcess.dll
Normal file
BIN
lib/hik/win64/YUVProcess.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/hlog.dll
Normal file
BIN
lib/hik/win64/hlog.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/hpr.dll
Normal file
BIN
lib/hik/win64/hpr.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/libcrypto-1_1-x64.dll
Normal file
BIN
lib/hik/win64/libcrypto-1_1-x64.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/libmmd.dll
Normal file
BIN
lib/hik/win64/libmmd.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/libssl-1_1-x64.dll
Normal file
BIN
lib/hik/win64/libssl-1_1-x64.dll
Normal file
Binary file not shown.
BIN
lib/hik/win64/zlib1.dll
Normal file
BIN
lib/hik/win64/zlib1.dll
Normal file
Binary file not shown.
48
pom.xml
48
pom.xml
@@ -58,7 +58,8 @@
|
||||
<warm-flow.version>1.7.3</warm-flow.version>
|
||||
<!-- mq配置 -->
|
||||
<rocketmq.version>2.3.0</rocketmq.version>
|
||||
|
||||
<!-- hik sdk 配置 -->
|
||||
<hik-sdk.version>1.0</hik-sdk.version>
|
||||
<!-- 插件版本 -->
|
||||
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
|
||||
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
|
||||
@@ -73,10 +74,8 @@
|
||||
<properties>
|
||||
<!-- 环境标识,需要与配置文件的名称相对应 -->
|
||||
<profiles.active>dev</profiles.active>
|
||||
<!-- <nacos.server>127.0.0.1:8848</nacos.server>-->
|
||||
<!-- <logstash.address>127.0.0.1:4560</logstash.address>-->
|
||||
<nacos.server>47.109.37.87:8848</nacos.server>
|
||||
<logstash.address>47.109.37.87:4560</logstash.address>
|
||||
<nacos.server>10.20.1.65:8848</nacos.server>
|
||||
<logstash.address>10.20.1.65:4560</logstash.address>
|
||||
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
|
||||
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
|
||||
<nacos.username>nacos</nacos.username>
|
||||
@@ -92,30 +91,39 @@
|
||||
<properties>
|
||||
<!-- 环境标识,需要与配置文件的名称相对应 -->
|
||||
<profiles.active>dev</profiles.active>
|
||||
<!-- <nacos.server>127.0.0.1:8848</nacos.server>-->
|
||||
<!-- <logstash.address>127.0.0.1:4560</logstash.address>-->
|
||||
<nacos.server>47.109.37.87:8848</nacos.server>
|
||||
<logstash.address>47.109.37.87:4560</logstash.address>
|
||||
<nacos.server>113.249.101.254:8848</nacos.server>
|
||||
<logstash.address>113.249.101.254:4560</logstash.address>
|
||||
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
|
||||
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
|
||||
<nacos.username>nacos</nacos.username>
|
||||
<nacos.password>by@2025??</nacos.password>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>test</id>
|
||||
<properties>
|
||||
<!-- 环境标识,需要与配置文件的名称相对应 -->
|
||||
<profiles.active>test</profiles.active>
|
||||
<nacos.server>192.168.24.101:8848</nacos.server>
|
||||
<logstash.address>192.168.24.101:4560</logstash.address>
|
||||
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
|
||||
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
|
||||
<nacos.username>nacos</nacos.username>
|
||||
<nacos.password>nacos</nacos.password>
|
||||
<!-- <logstash.address>127.0.0.1:4560</logstash.address>-->
|
||||
</properties>
|
||||
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>prod</id>
|
||||
<properties>
|
||||
<profiles.active>prod</profiles.active>
|
||||
<nacos.server>127.0.0.1:8848</nacos.server>
|
||||
<logstash.address>127.0.0.1:4560</logstash.address>
|
||||
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
|
||||
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
|
||||
<nacos.username>nacos</nacos.username>
|
||||
<nacos.password>nacos</nacos.password>
|
||||
<logstash.address>127.0.0.1:4560</logstash.address>
|
||||
|
||||
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
@@ -373,6 +381,18 @@
|
||||
<version>${mapstruct-plus.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.hik</groupId>
|
||||
<artifactId>examples</artifactId>
|
||||
<version>${hik-sdk.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.hik</groupId>
|
||||
<artifactId>jna</artifactId>
|
||||
<version>${hik-sdk.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!--消息队列-->
|
||||
<dependency>
|
||||
<groupId>org.apache.rocketmq</groupId>
|
||||
|
@@ -14,6 +14,7 @@
|
||||
<module>ruoyi-api-resource</module>
|
||||
<module>ruoyi-api-workflow</module>
|
||||
<module>property-api</module>
|
||||
<module>sis-api</module>
|
||||
</modules>
|
||||
|
||||
<artifactId>ruoyi-api</artifactId>
|
||||
|
@@ -23,6 +23,11 @@
|
||||
<artifactId>ruoyi-common-core</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.dromara</groupId>
|
||||
<artifactId>ruoyi-common-dubbo</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
|
@@ -0,0 +1,32 @@
|
||||
package org.dromara.property.api;
|
||||
|
||||
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 排班远程服务调用
|
||||
*
|
||||
* @author lxj
|
||||
*/
|
||||
public interface RemoteAttendanceService {
|
||||
|
||||
/**
|
||||
* 查询指定天数的排班信息
|
||||
*
|
||||
* @param date 查询时间
|
||||
* @return 返回排班人员信息
|
||||
*/
|
||||
List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date);
|
||||
|
||||
/**
|
||||
* 根据时间和设备ip查询当前设备所处区域的排班人员信息
|
||||
*
|
||||
* @param date 查询时间
|
||||
* @param deviceIp 设备ip
|
||||
* @return 返回排班人员信息
|
||||
*/
|
||||
List<RemoteAttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp);
|
||||
|
||||
}
|
@@ -0,0 +1,13 @@
|
||||
package org.dromara.property.api;
|
||||
|
||||
import org.dromara.property.api.domain.vo.RemoteBuildingVo;
|
||||
|
||||
/**
|
||||
* 物业楼层远程服务
|
||||
* @author lxj
|
||||
*/
|
||||
public interface RemoteBuildingService {
|
||||
|
||||
RemoteBuildingVo queryBuildingById(Long id);
|
||||
|
||||
}
|
@@ -20,5 +20,11 @@ public interface RemoteFloorService {
|
||||
*/
|
||||
List<TreeNode<Long>> queryTreeList();
|
||||
|
||||
|
||||
/**
|
||||
* 根据楼层id查询楼层
|
||||
*
|
||||
* @param buildingId 单元ID
|
||||
* @return 楼层
|
||||
*/
|
||||
List<RemoteFloorVo> queryByBuildingId(Long buildingId);
|
||||
}
|
||||
|
@@ -0,0 +1,19 @@
|
||||
package org.dromara.property.api;
|
||||
|
||||
import org.dromara.property.api.domain.vo.RemoteResidentPersonVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author lsm
|
||||
* @apiNote RemoteResidentPersonService
|
||||
* @since 2025/7/26
|
||||
*/
|
||||
public interface RemoteResidentPersonService {
|
||||
|
||||
// 查询已上传图片,未授权人员
|
||||
List<RemoteResidentPersonVo> queryUnAuthPerson();
|
||||
|
||||
// 更新E8平台id
|
||||
Boolean updateE8Id(Long personId, Long e8Id);
|
||||
}
|
@@ -0,0 +1,5 @@
|
||||
package org.dromara.property.api;
|
||||
|
||||
public interface RemoteVisitoreGetCodeInfoService {
|
||||
String getCodeInfo(String code);
|
||||
}
|
@@ -0,0 +1,52 @@
|
||||
package org.dromara.property.api.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* 排班人员信息
|
||||
*
|
||||
* @author lxj
|
||||
* @since 2025-08-17
|
||||
*/
|
||||
@Data
|
||||
public class RemoteAttendanceUserGroupVo implements Serializable {
|
||||
|
||||
/**
|
||||
* 排班ID
|
||||
*/
|
||||
private Long scheduleId;
|
||||
|
||||
/**
|
||||
* 员工ID
|
||||
*/
|
||||
private Long employeeId;
|
||||
|
||||
/**
|
||||
* 员工姓名
|
||||
*/
|
||||
private String employeeName;
|
||||
|
||||
/**
|
||||
* 部门ID
|
||||
*/
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
private String deptName;
|
||||
|
||||
/**
|
||||
* 开始日期
|
||||
*/
|
||||
private LocalDate startDate;
|
||||
|
||||
/**
|
||||
* 结束日期(仅date_type=3时有效)
|
||||
*/
|
||||
private LocalDate endDate;
|
||||
|
||||
}
|
@@ -0,0 +1,39 @@
|
||||
package org.dromara.property.api.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 单元信息
|
||||
*
|
||||
* @author lxj
|
||||
*/
|
||||
@Data
|
||||
public class RemoteBuildingVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -11L;
|
||||
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 园区id
|
||||
*/
|
||||
private Long communityId;
|
||||
|
||||
/**
|
||||
* 建筑名称
|
||||
*/
|
||||
private String buildingName;
|
||||
|
||||
/**
|
||||
* 总层数
|
||||
*/
|
||||
private Long floorCount;
|
||||
|
||||
}
|
@@ -0,0 +1,39 @@
|
||||
package org.dromara.property.api.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author lsm
|
||||
* @apiNote RemoteResidentPersonVo
|
||||
* @since 2025/7/26
|
||||
*/
|
||||
@Data
|
||||
public class RemoteResidentPersonVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id;
|
||||
|
||||
private String ossId;
|
||||
|
||||
private String name;
|
||||
|
||||
private Long gender;
|
||||
|
||||
private String phone;
|
||||
|
||||
private String idCard;
|
||||
|
||||
private Long authGroupId;
|
||||
|
||||
private Date authBegDate;
|
||||
|
||||
private Date authEndDate;
|
||||
|
||||
private Integer rosterType;
|
||||
}
|
@@ -1,6 +1,5 @@
|
||||
package org.dromara.resource.api;
|
||||
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.resource.api.domain.RemoteFile;
|
||||
|
||||
@@ -22,6 +21,14 @@ public interface RemoteFileService {
|
||||
*/
|
||||
RemoteFile upload(String name, String originalFilename, String contentType, byte[] file) throws ServiceException;
|
||||
|
||||
/**
|
||||
* 文件上传
|
||||
* @param file 文件信息
|
||||
* @return 结果
|
||||
* @throws ServiceException
|
||||
*/
|
||||
RemoteFile uploadImg(byte[] file) throws ServiceException;
|
||||
|
||||
/**
|
||||
* 通过ossId查询对应的url
|
||||
*
|
||||
@@ -41,7 +48,7 @@ public interface RemoteFileService {
|
||||
/**
|
||||
* 文件下载方法,支持一次性下载完整文件
|
||||
*
|
||||
* @param ossId OSS对象ID
|
||||
* @param ossId OSS对象ID
|
||||
* @return byte[] 返回下载的字节数组
|
||||
*/
|
||||
byte[] downloadToByteArray(Long ossId) throws IOException;
|
||||
|
@@ -2,6 +2,7 @@ package org.dromara.resource.api;
|
||||
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.resource.api.domain.RemoteFile;
|
||||
|
||||
@@ -28,6 +29,18 @@ public class RemoteFileServiceMock implements RemoteFileService {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 文件上传
|
||||
*
|
||||
* @param file 文件信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public RemoteFile uploadImg(byte[] file) {
|
||||
log.warn("服务调用异常 -> 降级处理");
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过ossId查询对应的url
|
||||
*
|
||||
@@ -55,7 +68,7 @@ public class RemoteFileServiceMock implements RemoteFileService {
|
||||
/**
|
||||
* 文件下载方法,支持一次性下载完整文件
|
||||
*
|
||||
* @param ossId OSS对象ID
|
||||
* @param ossId OSS对象ID
|
||||
* @return byte[] 返回下载的字节数组
|
||||
*/
|
||||
public byte[] downloadToByteArray(Long ossId) throws IOException {
|
||||
|
@@ -14,4 +14,5 @@ public interface RemoteConfigService {
|
||||
*/
|
||||
boolean selectRegisterEnabled(String tenantId);
|
||||
|
||||
String selectQrTimeOut();
|
||||
}
|
||||
|
@@ -34,4 +34,10 @@ public interface RemoteDeptService {
|
||||
*/
|
||||
List<RemoteDeptVo> selectDeptsByList();
|
||||
|
||||
/**
|
||||
* 根据部门id查询部门信息
|
||||
* @param deptId 部门id
|
||||
* @return 返回部门信息
|
||||
*/
|
||||
RemoteDeptVo selectDeptVoById(Long deptId);
|
||||
}
|
||||
|
@@ -26,6 +26,14 @@ public interface RemoteUserService {
|
||||
*/
|
||||
LoginUser getUserInfo(String username, String tenantId) throws UserException;
|
||||
|
||||
/**
|
||||
* 通过用户id查询用户信息
|
||||
*
|
||||
* @param userId 用户id
|
||||
* @return 结果
|
||||
*/
|
||||
RemoteUserVo getUserInfoById(Long userId) throws UserException;
|
||||
|
||||
/**
|
||||
* 通过用户id查询用户信息
|
||||
*
|
||||
@@ -189,4 +197,10 @@ public interface RemoteUserService {
|
||||
*/
|
||||
Map<Long, String> selectPostNamesByIds(List<Long> postIds);
|
||||
|
||||
Map<String, Integer> seelectOrgcount();
|
||||
|
||||
/**
|
||||
* 查询用户列表
|
||||
*/
|
||||
List<RemoteUserVo> selectUserList(List<Long> userIds);
|
||||
}
|
||||
|
@@ -25,6 +25,11 @@ public class RemoteUserVo implements Serializable {
|
||||
*/
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
private String tenantId;
|
||||
|
||||
/**
|
||||
* 部门ID
|
||||
*/
|
||||
|
29
ruoyi-api/sis-api/pom.xml
Normal file
29
ruoyi-api/sis-api/pom.xml
Normal file
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>org.dromara</groupId>
|
||||
<artifactId>ruoyi-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>sis-api</artifactId>
|
||||
|
||||
<description>
|
||||
安防api模块
|
||||
</description>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- RuoYi Common Core-->
|
||||
<dependency>
|
||||
<groupId>org.dromara</groupId>
|
||||
<artifactId>ruoyi-common-core</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
@@ -0,0 +1,72 @@
|
||||
package org.dromara.sis.api;
|
||||
|
||||
import org.dromara.sis.api.domain.RemoteSdkChannel;
|
||||
import org.dromara.sis.api.domain.RemoteSisDeviceChannel;
|
||||
import org.dromara.sis.api.domain.RemoteSisDeviceManage;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface RemoteDeviceService {
|
||||
|
||||
|
||||
/**
|
||||
* 查询所有的海康设备信息
|
||||
*
|
||||
* @return 返回海康设备列表
|
||||
*/
|
||||
List<RemoteSisDeviceManage> queryHikDevices();
|
||||
|
||||
|
||||
/**
|
||||
* 更新设备在线状态
|
||||
*
|
||||
* @param item 设备信息
|
||||
* @return 返回是否操作成功
|
||||
*/
|
||||
Boolean updateDeviceState(RemoteSisDeviceManage item);
|
||||
|
||||
/**
|
||||
* 根据id查询的设备信息
|
||||
*
|
||||
*/
|
||||
RemoteSisDeviceManage queryDeviceById(Long id);
|
||||
|
||||
/**
|
||||
* 查询设备通道信息
|
||||
*
|
||||
* @param deviceIp 设备ip
|
||||
* @return 返回通道列表
|
||||
*/
|
||||
List<RemoteSisDeviceChannel> queryDeviceChannels(String deviceIp);
|
||||
|
||||
/**
|
||||
* 更新设备通道在线状态
|
||||
*
|
||||
* @param deviceIp 设备ip
|
||||
* @return 返回是否成功
|
||||
*/
|
||||
Boolean updateDeviceChannelState(String deviceIp, Integer onLineState);
|
||||
|
||||
/**
|
||||
* 根据ip列表删除设备通道
|
||||
*
|
||||
* @param list ip列表
|
||||
* @return 返回删除条数
|
||||
*/
|
||||
Integer deleteByChannelIps(List<String> list);
|
||||
|
||||
/**
|
||||
* 批量写入设备通道
|
||||
*
|
||||
* @param insertData 写入数据
|
||||
* @return 返回写入条数
|
||||
*/
|
||||
Boolean insertChannel(List<RemoteSdkChannel> insertData);
|
||||
|
||||
/**
|
||||
* 更新设备通道信息
|
||||
* @param updateData 更新数据
|
||||
* @return 返回更新成功数量
|
||||
*/
|
||||
Integer updateChannelInfo(List<RemoteSisDeviceChannel> updateData);
|
||||
}
|
@@ -0,0 +1,25 @@
|
||||
package org.dromara.sis.api;
|
||||
|
||||
import org.dromara.sis.api.domain.RemoteSdkChannel;
|
||||
import org.dromara.sis.api.domain.RemoteSisDeviceManage;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface RemoteHikSdkService {
|
||||
|
||||
/**
|
||||
* 海康sdk 登录操作
|
||||
*
|
||||
* @param item 登录参数
|
||||
* @return 是否登录成功
|
||||
*/
|
||||
Boolean deviceLogin(RemoteSisDeviceManage item);
|
||||
|
||||
/**
|
||||
* 获取nvr设备通道信息
|
||||
*
|
||||
* @param deviceIp 设备ip
|
||||
* @return 返回通道信息
|
||||
*/
|
||||
List<RemoteSdkChannel> getDeviceChannel(String deviceIp);
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user