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
92c27d8d
Commit
92c27d8d
authored
Jan 17, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:取消设备文件前缀地址,fileserver_domain
parent
1ce21c8e
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
26 additions
and
96 deletions
+26
-96
CarController.java
...ava/com/yeejoin/equipmanage/controller/CarController.java
+3
-5
ManufacturerInfoController.java
...in/equipmanage/controller/ManufacturerInfoController.java
+0
-12
CarServiceImpl.java
.../com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
+6
-10
EquipmentDetailServiceImpl.java
.../equipmanage/service/impl/EquipmentDetailServiceImpl.java
+2
-7
EquipmentManageServiceImpl.java
.../equipmanage/service/impl/EquipmentManageServiceImpl.java
+1
-8
EquipmentServiceImpl.java
...eejoin/equipmanage/service/impl/EquipmentServiceImpl.java
+3
-7
EquipmentSpecificAlarmServiceImpl.java
...anage/service/impl/EquipmentSpecificAlarmServiceImpl.java
+1
-4
EquipmentSpecificSerivceImpl.java
...quipmanage/service/impl/EquipmentSpecificSerivceImpl.java
+1
-6
QREquipmentDefServiceImpl.java
...n/equipmanage/service/impl/QREquipmentDefServiceImpl.java
+1
-3
QREquipmentKnowledgeServiceImpl.java
...pmanage/service/impl/QREquipmentKnowledgeServiceImpl.java
+1
-4
ScrapDetailServiceImpl.java
...join/equipmanage/service/impl/ScrapDetailServiceImpl.java
+2
-5
ScrapServiceImpl.java
...om/yeejoin/equipmanage/service/impl/ScrapServiceImpl.java
+1
-4
StockDetailServiceImpl.java
...join/equipmanage/service/impl/StockDetailServiceImpl.java
+2
-5
application-dev.properties
...ystem-equip/src/main/resources/application-dev.properties
+2
-5
application-docker.properties
...em-equip/src/main/resources/application-docker.properties
+0
-3
application-jcs.properties
...ystem-equip/src/main/resources/application-jcs.properties
+0
-2
application-qa.properties
...system-equip/src/main/resources/application-qa.properties
+0
-3
application-test.properties
...stem-equip/src/main/resources/application-test.properties
+0
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
View file @
92c27d8d
...
@@ -180,8 +180,6 @@ public class CarController extends AbstractBaseController {
...
@@ -180,8 +180,6 @@ public class CarController extends AbstractBaseController {
private
String
appKeyApp
;
private
String
appKeyApp
;
@Value
(
"${iot.vehicle.track}"
)
@Value
(
"${iot.vehicle.track}"
)
private
String
iotServerName
;
private
String
iotServerName
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Value
(
"${systemctl.sync.switch}"
)
@Value
(
"${systemctl.sync.switch}"
)
private
Boolean
syncSwitch
;
private
Boolean
syncSwitch
;
...
@@ -572,7 +570,7 @@ public class CarController extends AbstractBaseController {
...
@@ -572,7 +570,7 @@ public class CarController extends AbstractBaseController {
for
(
Map
<
String
,
Object
>
map
:
list
)
{
for
(
Map
<
String
,
Object
>
map
:
list
)
{
String
img
=
(
String
)
map
.
get
(
"img"
);
String
img
=
(
String
)
map
.
get
(
"img"
);
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
map
.
put
(
"img"
,
fileServer
+
img
);
map
.
put
(
"img"
,
img
);
}
}
}
}
}
}
...
@@ -828,7 +826,7 @@ public class CarController extends AbstractBaseController {
...
@@ -828,7 +826,7 @@ public class CarController extends AbstractBaseController {
mape
.
put
(
"brand"
,
brand
);
mape
.
put
(
"brand"
,
brand
);
listdate
=
equipmentCategoryMapper
.
getEquipmentCount
(
mape
);
listdate
=
equipmentCategoryMapper
.
getEquipmentCount
(
mape
);
for
(
Map
<
String
,
Object
>
map
:
listdate
)
{
for
(
Map
<
String
,
Object
>
map
:
listdate
)
{
map
.
put
(
"img"
,
fileServer
+
map
.
get
(
"img"
));
map
.
put
(
"img"
,
map
.
get
(
"img"
));
Object
amount
=
map
.
get
(
"amount"
);
Object
amount
=
map
.
get
(
"amount"
);
String
unit
=
map
.
get
(
"unit"
).
toString
();
String
unit
=
map
.
get
(
"unit"
).
toString
();
if
(
ercode
.
substring
(
0
,
1
).
equals
(
"4"
))
{
if
(
ercode
.
substring
(
0
,
1
).
equals
(
"4"
))
{
...
@@ -872,7 +870,7 @@ public class CarController extends AbstractBaseController {
...
@@ -872,7 +870,7 @@ public class CarController extends AbstractBaseController {
amount
=
amount
+
utname
;
amount
=
amount
+
utname
;
}
}
map
.
put
(
"amount"
,
amount
);
map
.
put
(
"amount"
,
amount
);
map
.
put
(
"img"
,
fileServer
+
map
.
get
(
"img"
));
map
.
put
(
"img"
,
map
.
get
(
"img"
));
}
}
return
listdate
;
return
listdate
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ManufacturerInfoController.java
View file @
92c27d8d
...
@@ -53,9 +53,6 @@ public class ManufacturerInfoController {
...
@@ -53,9 +53,6 @@ public class ManufacturerInfoController {
@Autowired
@Autowired
ISystemDicService
iSystemDicService
;
ISystemDicService
iSystemDicService
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
/**
/**
* 新增
* 新增
*
*
...
@@ -66,9 +63,6 @@ public class ManufacturerInfoController {
...
@@ -66,9 +63,6 @@ public class ManufacturerInfoController {
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
public
ManufacturerInfo
saveManufacturerInfo
(
HttpServletRequest
request
,
public
ManufacturerInfo
saveManufacturerInfo
(
HttpServletRequest
request
,
@RequestBody
ManufacturerInfo
manufacturerInfo
)
{
@RequestBody
ManufacturerInfo
manufacturerInfo
)
{
if
(!
ObjectUtils
.
isEmpty
(
manufacturerInfo
.
getImg
())
&&
manufacturerInfo
.
getImg
().
contains
(
fileServer
))
{
manufacturerInfo
.
setImg
(
manufacturerInfo
.
getImg
().
replace
(
fileServer
,
""
));
}
if
(!
ObjectUtils
.
isEmpty
(
manufacturerInfo
.
getCountryId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
manufacturerInfo
.
getCountryId
()))
{
SystemDic
byId
=
iSystemDicService
.
getByIdforAll
(
manufacturerInfo
.
getCountryId
());
SystemDic
byId
=
iSystemDicService
.
getByIdforAll
(
manufacturerInfo
.
getCountryId
());
manufacturerInfo
.
setCountry
(
byId
.
getName
());
manufacturerInfo
.
setCountry
(
byId
.
getName
());
...
@@ -113,9 +107,6 @@ public class ManufacturerInfoController {
...
@@ -113,9 +107,6 @@ public class ManufacturerInfoController {
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"修改"
,
notes
=
"修改"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"修改"
,
notes
=
"修改"
)
public
boolean
updateByIdManufacturerInfo
(
HttpServletRequest
request
,
public
boolean
updateByIdManufacturerInfo
(
HttpServletRequest
request
,
@RequestBody
ManufacturerInfo
manufacturerInfo
)
{
@RequestBody
ManufacturerInfo
manufacturerInfo
)
{
if
(!
ObjectUtils
.
isEmpty
(
manufacturerInfo
.
getImg
())
&&
manufacturerInfo
.
getImg
().
contains
(
fileServer
))
{
manufacturerInfo
.
setImg
(
manufacturerInfo
.
getImg
().
replace
(
fileServer
,
""
));
}
if
(!
ObjectUtils
.
isEmpty
(
manufacturerInfo
.
getCountryId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
manufacturerInfo
.
getCountryId
()))
{
SystemDic
byId
=
iSystemDicService
.
getByIdforAll
(
manufacturerInfo
.
getCountryId
());
SystemDic
byId
=
iSystemDicService
.
getByIdforAll
(
manufacturerInfo
.
getCountryId
());
manufacturerInfo
.
setCountryId
(
manufacturerInfo
.
getCountryId
());
manufacturerInfo
.
setCountryId
(
manufacturerInfo
.
getCountryId
());
...
@@ -150,9 +141,6 @@ public class ManufacturerInfoController {
...
@@ -150,9 +141,6 @@ public class ManufacturerInfoController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据id查询"
,
notes
=
"根据id查询"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据id查询"
,
notes
=
"根据id查询"
)
public
ManufacturerInfo
selectById
(
HttpServletRequest
request
,
@PathVariable
Long
id
)
{
public
ManufacturerInfo
selectById
(
HttpServletRequest
request
,
@PathVariable
Long
id
)
{
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
id
);
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
id
);
if
(!
ObjectUtils
.
isEmpty
(
manufacturerInfo
.
getImg
()))
{
manufacturerInfo
.
setImg
(
fileServer
+
manufacturerInfo
.
getImg
());
}
return
manufacturerInfo
;
return
manufacturerInfo
;
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @
92c27d8d
...
@@ -188,8 +188,6 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
...
@@ -188,8 +188,6 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Autowired
@Autowired
@Lazy
@Lazy
private
IEquipmentIndexService
equipmentIndexService
;
private
IEquipmentIndexService
equipmentIndexService
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Autowired
@Autowired
private
IManufacturerInfoService
iManufacturerInfoService
;
private
IManufacturerInfoService
iManufacturerInfoService
;
@Autowired
@Autowired
...
@@ -1147,7 +1145,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
...
@@ -1147,7 +1145,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
Equipment
equipment
=
iEquipmentService
.
getById
(
carOne
.
getEquipmentId
());
Equipment
equipment
=
iEquipmentService
.
getById
(
carOne
.
getEquipmentId
());
String
utilName
=
carMapper
.
getUtilName
(
equipment
.
getUnitId
());
String
utilName
=
carMapper
.
getUtilName
(
equipment
.
getUnitId
());
carOne
.
setUnitName
(
utilName
);
carOne
.
setUnitName
(
utilName
);
equipment
.
setImg
(
fileServer
+
equipment
.
getImg
());
equipment
.
setImg
(
equipment
.
getImg
());
carOne
.
setEquipment
(
equipment
);
carOne
.
setEquipment
(
equipment
);
carOne
.
setCarState
(
CarStatusEnum
.
getEnum
(
carOne
.
getCarState
().
toString
()).
getName
());
carOne
.
setCarState
(
CarStatusEnum
.
getEnum
(
carOne
.
getCarState
().
toString
()).
getName
());
}
}
...
@@ -1285,9 +1283,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
...
@@ -1285,9 +1283,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
return
new
ArrayList
<
UploadFile
>();
return
new
ArrayList
<
UploadFile
>();
}
}
list
.
forEach
(
item
->
{
list
.
forEach
(
item
->
{
if
(
item
.
getUrl
().
contains
(
fileServer
))
{
item
.
setUrl
(
item
.
getUrl
());
item
.
setUrl
(
item
.
getUrl
().
replace
(
fileServer
,
""
));
}
item
.
setFileType
(
type
);
item
.
setFileType
(
type
);
item
.
setObjectType
(
BillContentEnum
.
CL
.
getKey
());
item
.
setObjectType
(
BillContentEnum
.
CL
.
getKey
());
item
.
setObjectId
(
id
);
item
.
setObjectId
(
id
);
...
@@ -1388,7 +1384,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
...
@@ -1388,7 +1384,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
car
.
setCarPropertyList
(
carPropertyList
);
car
.
setCarPropertyList
(
carPropertyList
);
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
car
.
getManufacturerId
());
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
car
.
getManufacturerId
());
manufacturerInfo
.
setImg
(
fileServer
+
manufacturerInfo
.
getImg
());
manufacturerInfo
.
setImg
(
manufacturerInfo
.
getImg
());
car
.
setManufacturerInfo
(
manufacturerInfo
);
car
.
setManufacturerInfo
(
manufacturerInfo
);
car
.
setImg
(
getCarFileList
(
id
,
FileTypeEnum
.
image
.
toString
()));
car
.
setImg
(
getCarFileList
(
id
,
FileTypeEnum
.
image
.
toString
()));
car
.
setVideo
(
getCarFileList
(
id
,
FileTypeEnum
.
video
.
toString
()));
car
.
setVideo
(
getCarFileList
(
id
,
FileTypeEnum
.
video
.
toString
()));
...
@@ -1417,7 +1413,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
...
@@ -1417,7 +1413,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
Map
<
String
,
List
<
CarIndexVo
>>
map
=
carVoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
vo
->
vo
.
getName
()));
Map
<
String
,
List
<
CarIndexVo
>>
map
=
carVoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
vo
->
vo
.
getName
()));
car
.
setExt
(
JSONObject
.
toJSONString
(
map
));
car
.
setExt
(
JSONObject
.
toJSONString
(
map
));
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
car
.
getManufacturerId
());
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
car
.
getManufacturerId
());
manufacturerInfo
.
setImg
(
fileServer
+
manufacturerInfo
.
getImg
());
manufacturerInfo
.
setImg
(
manufacturerInfo
.
getImg
());
car
.
setManufacturerInfo
(
manufacturerInfo
);
car
.
setManufacturerInfo
(
manufacturerInfo
);
car
.
setImg
(
getCarFileList
(
id
,
FileTypeEnum
.
image
.
toString
()));
car
.
setImg
(
getCarFileList
(
id
,
FileTypeEnum
.
image
.
toString
()));
Equipment
equipment
=
iEquipmentService
.
getById
(
car
.
getEquipmentId
());
Equipment
equipment
=
iEquipmentService
.
getById
(
car
.
getEquipmentId
());
...
@@ -1444,7 +1440,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
...
@@ -1444,7 +1440,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
Map
<
String
,
List
<
CarIndexVo
>>
map
=
carVoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
vo
->
vo
.
getName
()));
Map
<
String
,
List
<
CarIndexVo
>>
map
=
carVoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
vo
->
vo
.
getName
()));
car
.
setExt
(
JSONObject
.
toJSONString
(
map
));
car
.
setExt
(
JSONObject
.
toJSONString
(
map
));
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
car
.
getManufacturerId
());
ManufacturerInfo
manufacturerInfo
=
iManufacturerInfoService
.
getById
(
car
.
getManufacturerId
());
manufacturerInfo
.
setImg
(
fileServer
+
manufacturerInfo
.
getImg
());
manufacturerInfo
.
setImg
(
manufacturerInfo
.
getImg
());
car
.
setManufacturerInfo
(
manufacturerInfo
);
car
.
setManufacturerInfo
(
manufacturerInfo
);
car
.
setImg
(
getCarFileList
(
car
.
getId
(),
FileTypeEnum
.
image
.
toString
()));
car
.
setImg
(
getCarFileList
(
car
.
getId
(),
FileTypeEnum
.
image
.
toString
()));
Equipment
equipment
=
iEquipmentService
.
getById
(
car
.
getEquipmentId
());
Equipment
equipment
=
iEquipmentService
.
getById
(
car
.
getEquipmentId
());
...
@@ -1463,7 +1459,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
...
@@ -1463,7 +1459,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
List
<
UploadFile
>
list
=
iUploadFileService
.
list
(
new
QueryWrapper
<
UploadFile
>().
eq
(
"object_id"
,
id
)
List
<
UploadFile
>
list
=
iUploadFileService
.
list
(
new
QueryWrapper
<
UploadFile
>().
eq
(
"object_id"
,
id
)
.
eq
(
"object_type"
,
BillContentEnum
.
CL
.
getKey
()).
eq
(
"file_type"
,
type
));
.
eq
(
"object_type"
,
BillContentEnum
.
CL
.
getKey
()).
eq
(
"file_type"
,
type
));
list
.
forEach
(
item
->
{
list
.
forEach
(
item
->
{
item
.
setUrl
(
fileServer
+
item
.
getUrl
());
item
.
setUrl
(
item
.
getUrl
());
});
});
return
list
;
return
list
;
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @
92c27d8d
...
@@ -64,9 +64,6 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
...
@@ -64,9 +64,6 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Autowired
@Autowired
private
IEquipmentSpecificIndexSerivce
equipmentSpecificIndexSerivce
;
private
IEquipmentSpecificIndexSerivce
equipmentSpecificIndexSerivce
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Autowired
@Autowired
private
ISystemDicService
iSystemDicService
;
private
ISystemDicService
iSystemDicService
;
...
@@ -84,9 +81,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
...
@@ -84,9 +81,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
return
new
ArrayList
<
UploadFile
>();
return
new
ArrayList
<
UploadFile
>();
}
}
list
.
forEach
(
item
->
{
list
.
forEach
(
item
->
{
if
(
item
.
getUrl
().
contains
(
fileServer
))
{
item
.
setUrl
(
item
.
getUrl
());
item
.
setUrl
(
item
.
getUrl
().
replace
(
fileServer
,
""
));
}
item
.
setFileType
(
type
);
item
.
setFileType
(
type
);
item
.
setObjectType
(
BillContentEnum
.
ZB
.
getKey
());
item
.
setObjectType
(
BillContentEnum
.
ZB
.
getKey
());
item
.
setObjectId
(
id
);
item
.
setObjectId
(
id
);
...
@@ -137,7 +132,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
...
@@ -137,7 +132,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
List
<
UploadFile
>
list
=
iUploadFileService
.
list
(
new
QueryWrapper
<
UploadFile
>().
eq
(
"object_id"
,
id
)
List
<
UploadFile
>
list
=
iUploadFileService
.
list
(
new
QueryWrapper
<
UploadFile
>().
eq
(
"object_id"
,
id
)
.
eq
(
"object_type"
,
BillContentEnum
.
ZB
.
getKey
()).
eq
(
"file_type"
,
type
));
.
eq
(
"object_type"
,
BillContentEnum
.
ZB
.
getKey
()).
eq
(
"file_type"
,
type
));
list
.
forEach
(
item
->
{
list
.
forEach
(
item
->
{
item
.
setUrl
(
fileServer
+
item
.
getUrl
());
item
.
setUrl
(
item
.
getUrl
());
});
});
return
list
;
return
list
;
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
View file @
92c27d8d
...
@@ -46,13 +46,6 @@ import java.util.zip.ZipOutputStream;
...
@@ -46,13 +46,6 @@ import java.util.zip.ZipOutputStream;
@Service
@Service
public
class
EquipmentManageServiceImpl
extends
ServiceImpl
<
EquipmentManageMapper
,
EquipmentManageEntity
>
implements
EquipmentManageService
{
public
class
EquipmentManageServiceImpl
extends
ServiceImpl
<
EquipmentManageMapper
,
EquipmentManageEntity
>
implements
EquipmentManageService
{
/**
* 文件服务器地址
*/
@Value
(
"${fileserver_domain}"
)
private
String
ipUrl
;
@Autowired
@Autowired
EquipmentManageMapper
equipmentManageMapper
;
EquipmentManageMapper
equipmentManageMapper
;
...
@@ -281,7 +274,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
...
@@ -281,7 +274,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
response
.
setHeader
(
"Access-Control-Allow-Origin"
,
"*"
);
response
.
setHeader
(
"Access-Control-Allow-Origin"
,
"*"
);
response
.
setContentType
(
"multipart/form-data"
);
response
.
setContentType
(
"multipart/form-data"
);
try
{
try
{
InputStream
inputStream
=
getInputStreamFromURL
(
ipUrl
+
vo
.
getUrl
());
InputStream
inputStream
=
getInputStreamFromURL
(
vo
.
getUrl
());
//3.通过response获取ServletOutputStream对象(out)
//3.通过response获取ServletOutputStream对象(out)
out
=
response
.
getOutputStream
();
out
=
response
.
getOutputStream
();
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentServiceImpl.java
View file @
92c27d8d
...
@@ -57,13 +57,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
...
@@ -57,13 +57,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
private
PatrolFeign
patrolFeign
;
private
PatrolFeign
patrolFeign
;
@Autowired
@Autowired
private
RemoteSecurityService
remoteSecurityService
;
private
RemoteSecurityService
remoteSecurityService
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Autowired
@Autowired
private
IEquipmentDetailService
iEquipmentDetailService
;
private
IEquipmentDetailService
iEquipmentDetailService
;
@Value
(
"${fileserver_domain}"
)
private
String
fileUrl
;
// 装备分类code长度
// 装备分类code长度
private
static
final
int
CATECODELEN
=
8
;
private
static
final
int
CATECODELEN
=
8
;
private
String
proviceCode
=
"44"
;
private
String
proviceCode
=
"44"
;
...
@@ -339,7 +335,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
...
@@ -339,7 +335,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
imgQueryWrapper
.
eq
(
"file_type"
,
"image"
);
imgQueryWrapper
.
eq
(
"file_type"
,
"image"
);
List
<
UploadFile
>
uploadFiles
=
uploadFileMapper
.
selectList
(
imgQueryWrapper
);
List
<
UploadFile
>
uploadFiles
=
uploadFileMapper
.
selectList
(
imgQueryWrapper
);
for
(
UploadFile
s
:
uploadFiles
)
{
for
(
UploadFile
s
:
uploadFiles
)
{
s
.
setUrl
(
fileServer
+
s
.
getUrl
());
s
.
setUrl
(
s
.
getUrl
());
}
}
equipmentBaseApp
.
setImg
(
uploadFiles
);
equipmentBaseApp
.
setImg
(
uploadFiles
);
equipmentApp
.
setEquipmentBase
(
equipmentBaseApp
);
equipmentApp
.
setEquipmentBase
(
equipmentBaseApp
);
...
@@ -349,7 +345,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
...
@@ -349,7 +345,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
excelQueryWrapper
.
eq
(
"file_type"
,
"instruction"
);
excelQueryWrapper
.
eq
(
"file_type"
,
"instruction"
);
List
<
UploadFile
>
uploadFiles1
=
uploadFileMapper
.
selectList
(
excelQueryWrapper
);
List
<
UploadFile
>
uploadFiles1
=
uploadFileMapper
.
selectList
(
excelQueryWrapper
);
for
(
UploadFile
s
:
uploadFiles1
)
{
for
(
UploadFile
s
:
uploadFiles1
)
{
s
.
setUrl
(
fileServer
+
s
.
getUrl
());
s
.
setUrl
(
s
.
getUrl
());
}
}
equipmentApp
.
setExcel
(
uploadFiles1
);
equipmentApp
.
setExcel
(
uploadFiles1
);
//性能指标,带指标值
//性能指标,带指标值
...
@@ -424,7 +420,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
...
@@ -424,7 +420,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
images
.
forEach
(
a
->
{
images
.
forEach
(
a
->
{
String
picture
=
a
.
getPicture
();
String
picture
=
a
.
getPicture
();
if
(
StringUtils
.
isNotEmpty
(
picture
))
{
if
(
StringUtils
.
isNotEmpty
(
picture
))
{
a
.
setPicture
(
fileUrl
+
picture
);
a
.
setPicture
(
picture
);
}
}
});
});
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java
View file @
92c27d8d
...
@@ -89,9 +89,6 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
...
@@ -89,9 +89,6 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
@Autowired
@Autowired
private
IVideoService
videoService
;
private
IVideoService
videoService
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Override
@Override
public
void
handleExport
(
HttpServletResponse
response
,
List
<
Long
>
ids
,
String
alarmType
)
{
public
void
handleExport
(
HttpServletResponse
response
,
List
<
Long
>
ids
,
String
alarmType
)
{
CommonPageInfoParam
param
=
new
CommonPageInfoParam
();
CommonPageInfoParam
param
=
new
CommonPageInfoParam
();
...
@@ -469,7 +466,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
...
@@ -469,7 +466,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
alarmDataVO5
.
setKey
(
EquipmentDataEnum
.
XT
.
getName
());
alarmDataVO5
.
setKey
(
EquipmentDataEnum
.
XT
.
getName
());
alarmDataVO5
.
setValue
(
StringUtil
.
isNotEmpty
(
sourceData
.
get
(
"systemName"
))
?
sourceData
.
get
(
"systemName"
).
toString
()
:
null
);
alarmDataVO5
.
setValue
(
StringUtil
.
isNotEmpty
(
sourceData
.
get
(
"systemName"
))
?
sourceData
.
get
(
"systemName"
).
toString
()
:
null
);
lists
.
add
(
alarmDataVO5
);
lists
.
add
(
alarmDataVO5
);
alarmEquipMockDataVO
.
setPic
(
StringUtil
.
isNotEmpty
(
sourceData
.
get
(
"imgUrl"
))
?
fileServer
+
sourceData
.
get
(
"imgUrl"
)
:
null
);
alarmEquipMockDataVO
.
setPic
(
StringUtil
.
isNotEmpty
(
sourceData
.
get
(
"imgUrl"
))
?
sourceData
.
get
(
"imgUrl"
).
toString
(
)
:
null
);
alarmEquipMockDataVO
.
setAlarmCount
(
count
);
alarmEquipMockDataVO
.
setAlarmCount
(
count
);
alarmEquipMockDataVO
.
setQrcode
(
StringUtil
.
isNotEmpty
(
sourceData
.
get
(
"qrCode"
))
?
sourceData
.
get
(
"qrCode"
).
toString
()
:
null
);
alarmEquipMockDataVO
.
setQrcode
(
StringUtil
.
isNotEmpty
(
sourceData
.
get
(
"qrCode"
))
?
sourceData
.
get
(
"qrCode"
).
toString
()
:
null
);
alarmEquipMockDataVO
.
setDetailUrl
(
null
);
alarmEquipMockDataVO
.
setDetailUrl
(
null
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @
92c27d8d
...
@@ -117,9 +117,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
...
@@ -117,9 +117,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Value
(
"${systemctl.dict.iot-core-param}"
)
@Value
(
"${systemctl.dict.iot-core-param}"
)
private
String
iotCoreParam
;
private
String
iotCoreParam
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Value
(
"${equipment.filter.code}"
)
@Value
(
"${equipment.filter.code}"
)
private
String
codes
;
private
String
codes
;
...
@@ -380,9 +377,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
...
@@ -380,9 +377,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
return
new
ArrayList
<
UploadFile
>();
return
new
ArrayList
<
UploadFile
>();
}
}
list
.
forEach
(
item
->
{
list
.
forEach
(
item
->
{
if
(
item
.
getUrl
().
contains
(
fileServer
))
{
item
.
setUrl
(
item
.
getUrl
());
item
.
setUrl
(
item
.
getUrl
().
replace
(
fileServer
,
""
));
}
item
.
setId
(
sequence
.
nextId
());
item
.
setId
(
sequence
.
nextId
());
item
.
setFileType
(
type
);
item
.
setFileType
(
type
);
item
.
setObjectType
(
BillContentEnum
.
ZB
.
getKey
());
item
.
setObjectType
(
BillContentEnum
.
ZB
.
getKey
());
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/QREquipmentDefServiceImpl.java
View file @
92c27d8d
...
@@ -94,8 +94,6 @@ public class QREquipmentDefServiceImpl implements IQRCodeService<ScanResult<QREq
...
@@ -94,8 +94,6 @@ public class QREquipmentDefServiceImpl implements IQRCodeService<ScanResult<QREq
private
IStockDetailService
stockDetailService
;
private
IStockDetailService
stockDetailService
;
@Autowired
@Autowired
private
UploadFileMapper
uploadFileMapper
;
private
UploadFileMapper
uploadFileMapper
;
@Value
(
"${fileserver_domain}"
)
private
String
fileUrl
;
@Autowired
@Autowired
IEquipmentService
iEquipmentService
;
IEquipmentService
iEquipmentService
;
...
@@ -269,7 +267,7 @@ public class QREquipmentDefServiceImpl implements IQRCodeService<ScanResult<QREq
...
@@ -269,7 +267,7 @@ public class QREquipmentDefServiceImpl implements IQRCodeService<ScanResult<QREq
ParsePropertyUtil
.
setting
(
info:
:
setCarNum
,
car:
:
getCarNum
);
ParsePropertyUtil
.
setting
(
info:
:
setCarNum
,
car:
:
getCarNum
);
ParsePropertyUtil
.
setting
(
info:
:
setEquipmentId
,
car:
:
getEquipmentId
);
ParsePropertyUtil
.
setting
(
info:
:
setEquipmentId
,
car:
:
getEquipmentId
);
ParsePropertyUtil
.
setting
(
info:
:
setEquipName
,
equipment:
:
getName
);
ParsePropertyUtil
.
setting
(
info:
:
setEquipName
,
equipment:
:
getName
);
info
.
setImg
(
fileUrl
+
img
);
info
.
setImg
(
img
);
// ParsePropertyUtil.setting(info::setImg, () -> {
// ParsePropertyUtil.setting(info::setImg, () -> {
// if(car.getImg().size()>0){
// if(car.getImg().size()>0){
// if (StringUtil.isNotEmpty(car.getImg().get(0).getUrl())) {
// if (StringUtil.isNotEmpty(car.getImg().get(0).getUrl())) {
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/QREquipmentKnowledgeServiceImpl.java
View file @
92c27d8d
...
@@ -126,9 +126,6 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
...
@@ -126,9 +126,6 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
private
IEquipmentSpecificSerivce
equipmentSpecificSerivce
;
private
IEquipmentSpecificSerivce
equipmentSpecificSerivce
;
@Autowired
@Autowired
private
IStockDetailService
iStockDetailService
;
private
IStockDetailService
iStockDetailService
;
@Value
(
"${fileserver_domain}"
)
private
String
fileUrl
;
public
ScanResult
<
QREquipResponse
>
scan
(
QRCodeRequest
request
)
throws
RuntimeException
{
public
ScanResult
<
QREquipResponse
>
scan
(
QRCodeRequest
request
)
throws
RuntimeException
{
try
{
try
{
...
@@ -377,7 +374,7 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
...
@@ -377,7 +374,7 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
}
}
});
});
String
img
=
iEquipmentService
.
getById
(
equipmentDetail
.
getEquipmentId
()).
getImg
();
String
img
=
iEquipmentService
.
getById
(
equipmentDetail
.
getEquipmentId
()).
getImg
();
info
.
setImg
(
fileUrl
+
img
);
info
.
setImg
(
img
);
// ParsePropertyUtil.setting(info::setImg, () -> {
// ParsePropertyUtil.setting(info::setImg, () -> {
// if(equipmentDetail.getVideo()!=null && equipmentDetail.getVideo().size() != 0){
// if(equipmentDetail.getVideo()!=null && equipmentDetail.getVideo().size() != 0){
// if (null != equipmentDetail.getImg().get(0).getUrl()) {
// if (null != equipmentDetail.getImg().get(0).getUrl()) {
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ScrapDetailServiceImpl.java
View file @
92c27d8d
...
@@ -43,9 +43,6 @@ public class ScrapDetailServiceImpl extends ServiceImpl<ScrapDetailMapper, Scrap
...
@@ -43,9 +43,6 @@ public class ScrapDetailServiceImpl extends ServiceImpl<ScrapDetailMapper, Scrap
@Autowired
@Autowired
private
ScrapMapper
scrapMapper
;
private
ScrapMapper
scrapMapper
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Override
@Override
public
ScrapDetail
getOneById
(
Long
id
)
{
public
ScrapDetail
getOneById
(
Long
id
)
{
ScrapDetail
scrapDetail
=
getById
(
id
);
ScrapDetail
scrapDetail
=
getById
(
id
);
...
@@ -68,14 +65,14 @@ public class ScrapDetailServiceImpl extends ServiceImpl<ScrapDetailMapper, Scrap
...
@@ -68,14 +65,14 @@ public class ScrapDetailServiceImpl extends ServiceImpl<ScrapDetailMapper, Scrap
scrapDetail
.
setStockDetail
(
stockDetail
);
scrapDetail
.
setStockDetail
(
stockDetail
);
String
img
=
equipmentDetail
.
getEquipment
().
getImg
();
String
img
=
equipmentDetail
.
getEquipment
().
getImg
();
if
(
img
!=
null
&&
!
""
.
equals
(
img
)){
if
(
img
!=
null
&&
!
""
.
equals
(
img
)){
scrapDetail
.
setImg
(
fileServer
+
img
);
scrapDetail
.
setImg
(
img
);
}
}
}
else
if
(
scrapDetail
.
getCarId
()
!=
null
)
{
}
else
if
(
scrapDetail
.
getCarId
()
!=
null
)
{
Car
car
=
iCarService
.
getById
(
scrapDetail
.
getCarId
());
Car
car
=
iCarService
.
getById
(
scrapDetail
.
getCarId
());
scrapDetail
.
setCar
(
car
);
scrapDetail
.
setCar
(
car
);
String
img
=
scrapMapper
.
getImgById
(
scrapDetail
.
getScrapId
(),
"2"
);
String
img
=
scrapMapper
.
getImgById
(
scrapDetail
.
getScrapId
(),
"2"
);
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
scrapDetail
.
setImg
(
fileServer
+
img
);
scrapDetail
.
setImg
(
img
);
}
}
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ScrapServiceImpl.java
View file @
92c27d8d
...
@@ -61,9 +61,6 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
...
@@ -61,9 +61,6 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
@Autowired
@Autowired
private
EquipmentOnCarMapper
equipmentOnCarMapper
;
private
EquipmentOnCarMapper
equipmentOnCarMapper
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Override
@Override
public
Scrap
create
(
List
<
ScrapDetail
>
list
,
String
type
,
AgencyUserModel
agencyUserModel
)
{
public
Scrap
create
(
List
<
ScrapDetail
>
list
,
String
type
,
AgencyUserModel
agencyUserModel
)
{
this
.
scrapCheck
(
type
,
list
);
this
.
scrapCheck
(
type
,
list
);
...
@@ -267,7 +264,7 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
...
@@ -267,7 +264,7 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
String
type
=
scrap
.
getBillType
();
String
type
=
scrap
.
getBillType
();
String
img
=
scrapMapper
.
getImgById
(
scrap
.
getId
(),
type
);
String
img
=
scrapMapper
.
getImgById
(
scrap
.
getId
(),
type
);
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
scrap
.
setImg
(
fileServer
+
img
);
scrap
.
setImg
(
img
);
}
}
List
<
Map
<
String
,
Object
>>
list
=
scrapDetailService
.
geteqTypeAndAmount
(
scrap
.
getId
());
List
<
Map
<
String
,
Object
>>
list
=
scrapDetailService
.
geteqTypeAndAmount
(
scrap
.
getId
());
if
(
0
<
list
().
size
())
{
if
(
0
<
list
().
size
())
{
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockDetailServiceImpl.java
View file @
92c27d8d
...
@@ -51,9 +51,6 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
...
@@ -51,9 +51,6 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
@Autowired
@Autowired
private
StockDetailMapper
stockDetailMapper
;
private
StockDetailMapper
stockDetailMapper
;
@Value
(
"${fileserver_domain}"
)
private
String
fileServer
;
@Override
@Override
public
Page
<
StockDetail
>
pageCategoryStock
(
Page
<
EquipmentDetail
>
pageBean
,
String
category
,
public
Page
<
StockDetail
>
pageCategoryStock
(
Page
<
EquipmentDetail
>
pageBean
,
String
category
,
Long
warehouseStructureId
)
{
Long
warehouseStructureId
)
{
...
@@ -73,7 +70,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
...
@@ -73,7 +70,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
stockDetail
.
setEquipmentDetail
(
equipmentDetail
);
stockDetail
.
setEquipmentDetail
(
equipmentDetail
);
String
img
=
equipmentDetail
.
getEquipment
().
getImg
();
String
img
=
equipmentDetail
.
getEquipment
().
getImg
();
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
stockDetail
.
setImg
(
fileServer
+
img
);
stockDetail
.
setImg
(
img
);
}
}
stockDetailList
.
add
(
stockDetail
);
stockDetailList
.
add
(
stockDetail
);
}
}
...
@@ -122,7 +119,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
...
@@ -122,7 +119,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
stockDetail
.
setEquipmentDetail
(
equipmentDetail
);
stockDetail
.
setEquipmentDetail
(
equipmentDetail
);
String
img
=
equipmentDetail
.
getEquipment
().
getImg
();
String
img
=
equipmentDetail
.
getEquipment
().
getImg
();
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
if
(
img
!=
null
&&
!
""
.
equals
(
img
))
{
stockDetail
.
setImg
(
fileServer
+
img
);
stockDetail
.
setImg
(
img
);
}
}
}
}
return
page
;
return
page
;
...
...
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @
92c27d8d
spring.datasource.driver-class-name
=
com.mysql.cj.jdbc.Driver
spring.datasource.driver-class-name
=
com.mysql.cj.jdbc.Driver
spring.datasource.url
=
jdbc:mysql://172.16.
10.85:3306/autosys_business_v3.0.0.2
?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.url
=
jdbc:mysql://172.16.
3.20:3307/autosys_business_v3.0.1.3
?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username
=
root
spring.datasource.username
=
root
spring.datasource.password
=
Amos2019Mysql8
spring.datasource.password
=
123456
spring.datasource.type
=
com.zaxxer.hikari.HikariDataSource
spring.datasource.type
=
com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name
=
DatebookHikariCP
spring.datasource.hikari.pool-name
=
DatebookHikariCP
spring.datasource.hikari.minimum-idle
=
3
spring.datasource.hikari.minimum-idle
=
3
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout
=
60000
spring.datasource.hikari.connection-timeout
=
60000
spring.datasource.hikari.connection-test-query
=
SELECT 1
spring.datasource.hikari.connection-test-query
=
SELECT 1
# \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740
fileserver_domain
=
http://39.98.246.31:8888/
eureka.instance.hostname
=
172.16.11.20
eureka.instance.hostname
=
172.16.11.20
eureka.instance.prefer-ip-address
=
true
eureka.instance.prefer-ip-address
=
true
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
...
...
amos-boot-system-equip/src/main/resources/application-docker.properties
View file @
92c27d8d
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout
=
30000
spring.datasource.hikari.connection-timeout
=
30000
spring.datasource.hikari.connection-test-query
=
SELECT 1
spring.datasource.hikari.connection-test-query
=
SELECT 1
# 文件服务器地址
fileserver_domain
=
http://39.98.246.31:8888/
eureka.instance.hostname
=
172.16.11.20
eureka.instance.hostname
=
172.16.11.20
eureka.instance.prefer-ip-address
=
true
eureka.instance.prefer-ip-address
=
true
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
...
...
amos-boot-system-equip/src/main/resources/application-jcs.properties
View file @
92c27d8d
...
@@ -17,8 +17,6 @@ fdfs.connect-timeout=601
...
@@ -17,8 +17,6 @@ fdfs.connect-timeout=601
fdfs.thumb-image.height
=
200
fdfs.thumb-image.height
=
200
fdfs.thumb-image.width
=
200
fdfs.thumb-image.width
=
200
fdfs.tracker-list[0]=
39.98.246.31
:
22122
fdfs.tracker-list[0]=
39.98.246.31
:
22122
# 文件服务器地址
fileserver_domain
=
http://39.98.246.31:8888/
eureka.instance.hostname
=
172.16.10.72
eureka.instance.hostname
=
172.16.10.72
eureka.instance.prefer-ip-address
=
true
eureka.instance.prefer-ip-address
=
true
...
...
amos-boot-system-equip/src/main/resources/application-qa.properties
View file @
92c27d8d
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout
=
30000
spring.datasource.hikari.connection-timeout
=
30000
spring.datasource.hikari.connection-test-query
=
SELECT 1
spring.datasource.hikari.connection-test-query
=
SELECT 1
# 文件服务器地址
fileserver_domain
=
http://39.98.246.31:8888/
eureka.instance.hostname
=
172.16.11.20
eureka.instance.hostname
=
172.16.11.20
eureka.instance.prefer-ip-address
=
true
eureka.instance.prefer-ip-address
=
true
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
...
...
amos-boot-system-equip/src/main/resources/application-test.properties
View file @
92c27d8d
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
...
@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout
=
30000
spring.datasource.hikari.connection-timeout
=
30000
spring.datasource.hikari.connection-test-query
=
SELECT 1
spring.datasource.hikari.connection-test-query
=
SELECT 1
# 文件服务器地址
fileserver_domain
=
http://39.98.246.31:8888/
eureka.instance.hostname
=
172.16.11.20
eureka.instance.hostname
=
172.16.11.20
eureka.instance.prefer-ip-address
=
true
eureka.instance.prefer-ip-address
=
true
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
eureka.client.serviceUrl.defaultZone
:
http://${eureka.instance.hostname}:10001/eureka/
...
...
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