Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
64b53c35
Commit
64b53c35
authored
Jul 18, 2022
by
任刚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
限制分系统下拉树只能选择第三级进行添加
parent
01bf8593
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
15 deletions
+28
-15
EquipmentCategoryServiceImpl.java
...quipmanage/service/impl/EquipmentCategoryServiceImpl.java
+13
-0
application-dev.properties
...ystem-equip/src/main/resources/application-dev.properties
+15
-15
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentCategoryServiceImpl.java
View file @
64b53c35
...
...
@@ -477,19 +477,32 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
Map
<
String
,
List
<
EquipmentCategory
>>
tmpMap
=
new
HashMap
<
String
,
List
<
EquipmentCategory
>>();
equipmentCategories
.
forEach
(
action
->
{
if
(
action
.
getParentId
()
==
null
)
{
action
.
setLevel
(
"0"
);
list
.
add
(
action
);
}
else
{
if
(
tmpMap
.
get
(
action
.
getParentId
().
toString
())
==
null
)
{
ArrayList
<
EquipmentCategory
>
tmplist
=
new
ArrayList
<
EquipmentCategory
>();
action
.
setLevel
(
"2"
);
tmplist
.
add
(
action
);
tmpMap
.
put
(
action
.
getParentId
().
toString
(),
tmplist
);
}
else
{
if
(!
tmpMap
.
get
(
action
.
getParentId
().
toString
()).
contains
(
action
))
{
action
.
setLevel
(
"2"
);
tmpMap
.
get
(
action
.
getParentId
().
toString
()).
add
(
action
);
}
}
}
});
for
(
EquipmentCategory
type:
list
){
Long
category
=
type
.
getId
();
List
<
EquipmentCategory
>
equipment
=
tmpMap
.
get
(
category
.
toString
());
if
(
equipment
!=
null
){
for
(
EquipmentCategory
a:
equipment
){
a
.
setLevel
(
"1"
);
}
}
}
getChildrenList
(
list
,
tmpMap
);
return
list
;
}
...
...
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @
64b53c35
spring.datasource.driver-class-name
=
com.mysql.cj.jdbc.Driver
spring.datasource.url
=
jdbc:mysql://172.16.
11.201:3306/dl_business_v3.0.1.3
?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.url
=
jdbc:mysql://172.16.
3.18:3306/business_v3.0.0.2
?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username
=
root
spring.datasource.password
=
Yeejoin@2020
spring.datasource.type
=
com.zaxxer.hikari.HikariDataSource
...
...
@@ -12,7 +12,7 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout
=
60000
spring.datasource.hikari.connection-test-query
=
SELECT 1
eureka.instance.hostname
=
172.16.
11.201
eureka.instance.hostname
=
172.16.
3.18
eureka.instance.prefer-ip-address
=
true
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
...
...
@@ -25,9 +25,9 @@ security.appKeyApp=studio_normalapp_3056965
#redis
spring.redis.database
=
1
spring.redis.host
=
172.16.
11.201
spring.redis.host
=
172.16.
3.18
spring.redis.port
=
6379
spring.redis.password
=
123456
0
spring.redis.password
=
yeejoin@202
0
spring.redis.lettuce.pool.max-active
=
200
spring.redis.lettuce.pool.max-wait
=
-1
spring.redis.lettuce.pool.max-idle
=
10
...
...
@@ -45,35 +45,35 @@ mqtt.client.product.id=mqtt
mqtt.topic
=
topic_mqtt
spring.mqtt.completionTimeout
=
3000
#
数据同步开关
#
\u6570\u636E\u540C\u6B65\u5F00\u5173
systemctl.sync.switch
=
false
#
数据JCS开关
#
\u6570\u636EJCS\u5F00\u5173
systemctl.jcs.switch
=
false
#
平台数据开关
#
\u5E73\u53F0\u6570\u636E\u5F00\u5173
systemctl.amos.switch
=
false
isSendApp
=
false
#
报表数据地址
#
\u62A5\u8868\u6570\u636E\u5730\u5740
equip.report.url
=
/fire-fighting-system/ureport/preview?_u=file:
#
数字化南瑞平台接口
#
\u6570\u5B57\u5316\u5357\u745E\u5E73\u53F0\u63A5\u53E3
dcs.url.token
=
http://198.87.103.158:8001/auth-service/oauth/token
dcs.url.sendalarm
=
http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
#
系统上线时间
#
\u7CFB\u7EDF\u4E0A\u7EBF\u65F6\u95F4
param.system.online.date
=
2019-02-12
#
视频转码服务开关 hls(关)/flv(开),默认关闭,数字换流站使用时开启
#
\u89C6\u9891\u8F6C\u7801\u670D\u52A1\u5F00\u5173 hls(\u5173)/flv(\u5F00),\u9ED8\u8BA4\u5173\u95ED\uFF0C\u6570\u5B57\u6362\u6D41\u7AD9\u4F7F\u7528\u65F6\u5F00\u542F
window.vedioFormat
=
hls
#
航天视频服务地址
#
\u822A\u5929\u89C6\u9891\u670D\u52A1\u5730\u5740
param.htvideo.url
=
http://192.168.4.174:9001;
#
南瑞视频转码服务地址
#
\u5357\u745E\u89C6\u9891\u8F6C\u7801\u670D\u52A1\u5730\u5740
param.nrvideo.url
=
http://198.87.103.158:8001;
#
南瑞视频平台通过视频id获取flv格式视频播放地址
#
\u5357\u745E\u89C6\u9891\u5E73\u53F0\u901A\u8FC7\u89C6\u9891id\u83B7\u53D6flv\u683C\u5F0F\u89C6\u9891\u64AD\u653E\u5730\u5740
param.nrflvbyvoideoid.url
=
http://192.168.4.159:10010/api/media/live
#
预案消防炮、消防泵设备维度类型
#
\u9884\u6848\u6D88\u9632\u70AE\u3001\u6D88\u9632\u6CF5\u8BBE\u5907\u7EF4\u5EA6\u7C7B\u578B
equipment.plan.monitor
=
92030200,92032200
equipment.plan.pump
=
92010600,92030600,92130400,92140200,92150300
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment