Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
slm-bi
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
林锐标
slm-bi
Commits
8bb40134
Commit
8bb40134
authored
Jun 01, 2021
by
梁光意
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化配置类
parent
eebd96b3
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
87 additions
and
53 deletions
+87
-53
DataCenterConfig.java
src/main/java/com/syc/slm/slmbi/config/DataCenterConfig.java
+24
-20
BaseRestController.java
...java/com/syc/slm/slmbi/controller/BaseRestController.java
+5
-1
DeptController.java
...ain/java/com/syc/slm/slmbi/controller/DeptController.java
+3
-12
TokenController.java
...in/java/com/syc/slm/slmbi/controller/TokenController.java
+5
-1
BusinessConfigServiceImpl.java
...syc/slm/slmbi/service/impl/BusinessConfigServiceImpl.java
+8
-3
CompanyServiceImpl.java
...va/com/syc/slm/slmbi/service/impl/CompanyServiceImpl.java
+4
-1
DeptServiceImpl.java
.../java/com/syc/slm/slmbi/service/impl/DeptServiceImpl.java
+4
-1
InstrumentPanelTreeServiceImpl.java
...lm/slmbi/service/impl/InstrumentPanelTreeServiceImpl.java
+5
-1
PermissionServiceImpl.java
...com/syc/slm/slmbi/service/impl/PermissionServiceImpl.java
+4
-1
PositionServiceImpl.java
...a/com/syc/slm/slmbi/service/impl/PositionServiceImpl.java
+5
-1
UserServiceImpl.java
.../java/com/syc/slm/slmbi/service/impl/UserServiceImpl.java
+5
-1
VariableServiceImpl.java
...a/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java
+15
-10
No files found.
src/main/java/com/syc/slm/slmbi/config/DataCenterConfig.java
View file @
8bb40134
package
com
.
syc
.
slm
.
slmbi
.
config
;
import
lombok.Data
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Configuration
;
/**
* @author: guangyi-liang
* @date: 2021/5/7
*/
public
final
class
DataCenterConfig
{
@Configuration
@Data
public
class
DataCenterConfig
{
@Value
(
"${dc_client.host}"
)
p
ublic
static
String
dcClientHost
;
p
rivate
String
dcClientHost
;
@Value
(
"${dc_client.interfaces.permissionCodeUrl}"
)
p
ublic
static
String
permissionCodeUrl
;
p
rivate
String
permissionCodeUrl
;
@Value
(
"${dc_client.interfaces.companyAppId}"
)
p
ublic
static
String
companyAppId
;
p
rivate
String
companyAppId
;
@Value
(
"${dc_client.interfaces.positionListUrl}"
)
p
ublic
static
String
positionListUrl
;
p
rivate
String
positionListUrl
;
@Value
(
"${dc_client.interfaces.deptListUrl}"
)
p
ublic
static
String
deptListUrl
;
p
rivate
String
deptListUrl
;
@Value
(
"${dc_client.interfaces.userTree}"
)
p
ublic
static
String
userTree
;
p
rivate
String
userTree
;
@Value
(
"${dc_client.interfaces.variableList}"
)
p
ublic
static
String
variableList
;
p
rivate
String
variableList
;
@Value
(
"${dc_client.interfaces.deviceList}"
)
p
ublic
static
String
deviceList
;
p
rivate
String
deviceList
;
@Value
(
"${dc_client.interfaces.deptsRoles}"
)
p
ublic
static
String
deptsRoles
;
p
rivate
String
deptsRoles
;
@Value
(
"${dc_client.interfaces.businessFiledData}"
)
p
ublic
static
String
businessFiledData
;
p
rivate
String
businessFiledData
;
@Value
(
"${dc_client.interfaces.businessDataFieldStatistics}"
)
p
ublic
static
String
businessDataFieldStatistics
;
p
rivate
String
businessDataFieldStatistics
;
@Value
(
"${dc_client.interfaces.variableCodeHistoryList}"
)
p
ublic
static
String
variableHistoryDataList
;
p
rivate
String
variableHistoryDataList
;
@Value
(
"${dc_client.interfaces.variableAllDataList}"
)
p
ublic
static
String
variableRealTimeDataList
;
p
rivate
String
variableRealTimeDataList
;
@Value
(
"${dc_client.interfaces.filedValue}"
)
p
ublic
static
String
filedValue
;
p
rivate
String
filedValue
;
@Value
(
"${dc_client.interfaces.send}"
)
p
ublic
static
String
send
;
p
rivate
String
send
;
@Value
(
"${dc_client.interfaces.variableStatus}"
)
p
ublic
static
String
variableStatus
;
p
rivate
String
variableStatus
;
@Value
(
"${dc_client.interfaces.variableHistoryStatus}"
)
p
ublic
static
String
variableHistoryStatus
;
p
rivate
String
variableHistoryStatus
;
@Value
(
"${dc_client.interfaces.realTimeVariableDataList}"
)
p
ublic
static
String
realTimeVariableDataList
;
p
rivate
String
realTimeVariableDataList
;
@Value
(
"${dc_client.interfaces.variableStatusRealTimeDataList}"
)
p
ublic
static
String
variableStatusRealTimeDataList
;
p
rivate
String
variableStatusRealTimeDataList
;
}
src/main/java/com/syc/slm/slmbi/controller/BaseRestController.java
View file @
8bb40134
...
...
@@ -12,6 +12,7 @@ import com.syc.slm.slmbi.exception.SysException;
import
com.syc.slm.slmbi.function.Action0
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.context.request.NativeWebRequest
;
import
org.springframework.web.context.request.RequestAttributes
;
...
...
@@ -33,6 +34,9 @@ import java.util.function.Supplier;
@Slf4j
public
class
BaseRestController
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@ModelAttribute
public
void
onInit
(
HttpServletRequest
request
)
{
String
uri
=
request
.
getRequestURI
();
...
...
@@ -59,7 +63,7 @@ public class BaseRestController {
Map
<
String
,
String
>
map
=
(
Map
<
String
,
String
>)
webRequest
.
getAttribute
(
HandlerMapping
.
URI_TEMPLATE_VARIABLES_ATTRIBUTE
,
RequestAttributes
.
SCOPE_REQUEST
);
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
map
.
get
(
"appId"
)+
""
);
String
getUrl
=
DataCenterConfig
.
dcClientHost
+
"/{appId}/users/user-info"
;
String
getUrl
=
dataCenterConfig
.
getDcClientHost
()
+
"/{appId}/users/user-info"
;
R
<
CurrentUser
>
result
=
RestTemplateUtils
.
get
(
getUrl
,
new
TypeToken
<
R
<
CurrentUser
>>()
{
}.
getType
(),
uriVariables
);
request
.
setAttribute
(
token
,
SlmConstants
.
gson
.
toJson
(
result
.
detach
()));
...
...
src/main/java/com/syc/slm/slmbi/controller/DeptController.java
View file @
8bb40134
...
...
@@ -34,6 +34,9 @@ public class DeptController extends BaseRestController{
@Autowired
private
DeptService
deptService
;
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@GetMapping
@ApiOperation
(
"部门查询"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"deptName"
,
value
=
"部门名称"
,
dataTypeClass
=
String
.
class
),
...
...
@@ -45,16 +48,4 @@ public class DeptController extends BaseRestController{
return
deptService
.
selectPositionList
(
currentUser
.
getToken
(),
appId
,
deptName
);
});
}
@GetMapping
(
"/base"
)
@ApiOperation
(
"部门查询"
)
public
R
<
List
<
DeptVo
>>
base
(
HttpServletRequest
request
,
@PathVariable
String
appId
)
{
return
call
(()
->
{
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
appId
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
"/{appId}/base"
;
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
List
<
DeptVo
>>>()
{}.
getType
(),
uriVariables
);
return
null
;
});
}
}
src/main/java/com/syc/slm/slmbi/controller/TokenController.java
View file @
8bb40134
...
...
@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -27,6 +28,9 @@ import java.util.Map;
@RequestMapping
(
"/tokens"
)
@Api
(
value
=
"获取token"
,
tags
=
"获取token"
)
public
class
TokenController
extends
BaseRestController
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@PostMapping
@ApiOperation
(
"获取token"
)
@ApiImplicitParams
({
...
...
@@ -37,7 +41,7 @@ public class TokenController extends BaseRestController{
public
R
<
Map
<
String
,
Object
>>
token
(
String
account
,
String
password
,
Integer
origin
){
return
call
(()->{
Map
<
String
,
Object
>
maps
=
Maps
.
newHashMap
();
String
uri
=
DataCenterConfig
.
dcClientHost
+
"/user/token?account="
+
account
+
"&password="
+
password
+
"&origin="
+
origin
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
"/user/token?account="
+
account
+
"&password="
+
password
+
"&origin="
+
origin
;
ResponseEntity
<
Map
>
post
=
RestTemplateUtils
.
post
(
uri
,
Map
.
class
);
if
(
ObjectUtils
.
isNotEmpty
(
post
)){
Integer
code
=
(
int
)
post
.
getBody
().
get
(
"code"
);
...
...
src/main/java/com/syc/slm/slmbi/service/impl/BusinessConfigServiceImpl.java
View file @
8bb40134
...
...
@@ -25,6 +25,7 @@ import com.syc.slm.slmbi.enums.Condition;
import
com.syc.slm.slmbi.exception.SysException
;
import
com.syc.slm.slmbi.service.BusinessConfigService
;
import
com.syc.slm.slmbi.vo.BusinessConfigVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -43,6 +44,10 @@ import java.util.stream.Collectors;
**/
@Service
public
class
BusinessConfigServiceImpl
extends
ServiceImpl
<
BusinessConfigMapper
,
BusinessConfig
>
implements
BusinessConfigService
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
@Transactional
(
readOnly
=
true
)
public
List
<
BusinessConfigVo
>
selectConfigList
()
{
...
...
@@ -125,7 +130,7 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
dto
.
setWhere
(
this
.
filterWhereNoLimit
(
dto
.
getWhere
()));
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
businessFiledData
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getBusinessFiledData
()
;
R
<
Map
<
String
,
List
<
Object
>>>
result
=
RestTemplateUtils
.
post
(
uri
,
null
,
dto
,
new
TypeToken
<
R
<
Map
<
String
,
List
<
Object
>>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
@@ -166,7 +171,7 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
dto
.
setWhere
(
this
.
filterWhereNoLimit
(
dto
.
getWhere
()));
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
businessDataFieldStatistics
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getBusinessDataFieldStatistics
()
;
R
<
Map
<
String
,
Object
>>
result
=
RestTemplateUtils
.
post
(
uri
,
null
,
dto
,
new
TypeToken
<
R
<
Map
<
String
,
Object
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
@@ -188,7 +193,7 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
uriVariables
.
put
(
"size"
,
size
);
uriVariables
.
put
(
"name"
,
name
);
IPage
<
String
>
page
=
new
Page
<>(
current
,
size
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
filedValue
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getFiledValue
()
;
R
<
Map
<
String
,
Object
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
Map
<
String
,
Object
>>>()
{}.
getType
(),
uriVariables
);
Map
<
String
,
Object
>
resultMaps
=
result
.
detach
();
if
(
CollectionUtils
.
isNotEmpty
(
resultMaps
)){
...
...
src/main/java/com/syc/slm/slmbi/service/impl/CompanyServiceImpl.java
View file @
8bb40134
...
...
@@ -35,6 +35,9 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private
InstrumentPanelTreeInitMapper
treeInitMapper
;
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
public
Set
<
String
>
findAll
(
String
appId
)
{
return
this
.
findAllAppId
(
appId
);
...
...
@@ -62,7 +65,7 @@ public class CompanyServiceImpl implements CompanyService {
private
Set
<
String
>
findAllAppId
(
String
appId
){
Map
<
String
,
String
>
map
=
Maps
.
newHashMap
();
map
.
put
(
"appId"
,
appId
);
R
<
Set
<
String
>>
result
=
RestTemplateUtils
.
get
(
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
companyAppId
,
new
TypeToken
<
R
<
Set
<
String
>>>()
{}.
getType
(),
map
);
R
<
Set
<
String
>>
result
=
RestTemplateUtils
.
get
(
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getCompanyAppId
()
,
new
TypeToken
<
R
<
Set
<
String
>>>()
{}.
getType
(),
map
);
return
result
.
detach
();
}
...
...
src/main/java/com/syc/slm/slmbi/service/impl/DeptServiceImpl.java
View file @
8bb40134
...
...
@@ -8,6 +8,7 @@ import com.syc.slm.slmbi.config.DataCenterConfig;
import
com.syc.slm.slmbi.service.DeptService
;
import
com.syc.slm.slmbi.vo.DeptVo
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
...
...
@@ -24,6 +25,8 @@ import java.util.Map;
@Slf4j
public
class
DeptServiceImpl
implements
DeptService
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
public
List
<
DeptVo
>
selectPositionList
(
String
token
,
String
appId
,
String
deptName
)
{
...
...
@@ -32,7 +35,7 @@ public class DeptServiceImpl implements DeptService {
uriVariables
.
put
(
"deptName"
,
deptName
);
uriVariables
.
put
(
"appId"
,
appId
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
deptListUrl
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getDeptListUrl
()
;
R
<
List
<
DeptVo
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
List
<
DeptVo
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelTreeServiceImpl.java
View file @
8bb40134
...
...
@@ -52,6 +52,10 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
@Autowired
private
InstrumentPanelService
panelService
;
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
public
void
batchUpdateTreeByIds
(
Set
<
String
>
treeIds
,
Integer
recordStatus
)
{
if
(
CollectionUtils
.
isNotEmpty
(
treeIds
))
{
...
...
@@ -424,7 +428,7 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
private
R
<
Map
<
String
,
String
>>
setDeptAndRole
(
CurrentUser
user
){
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
deptsRoles
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getDeptsRoles
()
;
return
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
Map
<
String
,
String
>>>()
{}.
getType
(),
uriVariables
);
}
...
...
src/main/java/com/syc/slm/slmbi/service/impl/PermissionServiceImpl.java
View file @
8bb40134
...
...
@@ -7,6 +7,7 @@ import com.syc.slm.common.core.util.RestTemplateUtils;
import
com.syc.slm.slmbi.config.DataCenterConfig
;
import
com.syc.slm.slmbi.service.PermissionService
;
import
com.syc.slm.slmbi.vo.PermissionCodeVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
...
...
@@ -19,12 +20,14 @@ import java.util.Map;
@Service
public
class
PermissionServiceImpl
implements
PermissionService
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
public
List
<
PermissionCodeVo
>
findAllPermissionCode
(
String
appId
,
String
token
)
{
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
appId
);
R
<
List
<
PermissionCodeVo
>>
result
=
RestTemplateUtils
.
get
(
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
permissionCodeUrl
,
new
TypeToken
<
R
<
List
<
PermissionCodeVo
>>>()
{}.
getType
(),
uriVariables
);
R
<
List
<
PermissionCodeVo
>>
result
=
RestTemplateUtils
.
get
(
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getPermissionCodeUrl
()
,
new
TypeToken
<
R
<
List
<
PermissionCodeVo
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
}
src/main/java/com/syc/slm/slmbi/service/impl/PositionServiceImpl.java
View file @
8bb40134
...
...
@@ -7,6 +7,7 @@ import com.syc.slm.common.core.util.RestTemplateUtils;
import
com.syc.slm.slmbi.config.DataCenterConfig
;
import
com.syc.slm.slmbi.service.PositionService
;
import
com.syc.slm.slmbi.vo.PositionVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
...
...
@@ -22,13 +23,16 @@ import java.util.Map;
@Service
public
class
PositionServiceImpl
implements
PositionService
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
public
List
<
PositionVo
>
selectPositionList
(
String
token
,
String
appId
,
String
name
)
{
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"positionName"
,
name
);
uriVariables
.
put
(
"appId"
,
appId
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
positionListUrl
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getPositionListUrl
()
;
R
<
List
<
PositionVo
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
List
<
PositionVo
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
src/main/java/com/syc/slm/slmbi/service/impl/UserServiceImpl.java
View file @
8bb40134
...
...
@@ -7,6 +7,7 @@ import com.syc.slm.common.core.util.RestTemplateUtils;
import
com.syc.slm.slmbi.config.DataCenterConfig
;
import
com.syc.slm.slmbi.service.UserService
;
import
com.syc.slm.slmbi.vo.UserTreeVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
...
...
@@ -21,12 +22,15 @@ import java.util.Map;
**/
@Service
public
class
UserServiceImpl
implements
UserService
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
public
List
<
UserTreeVo
>
selectUserList
(
String
appId
,
String
token
,
String
userName
)
{
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"userName"
,
userName
);
uriVariables
.
put
(
"appId"
,
appId
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
userTree
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getUserTree
()
;
R
<
List
<
UserTreeVo
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
List
<
UserTreeVo
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
src/main/java/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java
View file @
8bb40134
...
...
@@ -21,6 +21,7 @@ import com.syc.slm.slmbi.service.VariableService;
import
com.syc.slm.slmbi.vo.VariableDeviceVo
;
import
com.syc.slm.slmbi.vo.VariableSourceVo
;
import
com.syc.slm.slmbi.vo.VariableVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -38,6 +39,10 @@ import java.util.stream.Collectors;
**/
@Service
public
class
VariableServiceImpl
implements
VariableService
{
@Autowired
private
DataCenterConfig
dataCenterConfig
;
@Override
public
IPage
<
VariableVo
>
getVariableList
(
VariableDTO
variableDTO
,
String
appId
,
String
token
)
{
IPage
<
VariableVo
>
page
=
new
Page
<>(
variableDTO
.
getCurrent
(),
variableDTO
.
getSize
());
...
...
@@ -57,7 +62,7 @@ public class VariableServiceImpl implements VariableService {
p
.
put
(
"current"
,
variableDTO
.
getCurrent
()+
""
);
p
.
put
(
"size"
,
variableDTO
.
getSize
()+
""
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
variableList
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getVariableList
()
;
R
<
Map
<
String
,
Object
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
Map
<
String
,
Object
>>>()
{
}.
getType
(),
p
);
Map
<
String
,
Object
>
detach
=
result
.
detach
();
...
...
@@ -106,7 +111,7 @@ public class VariableServiceImpl implements VariableService {
p
.
put
(
"warranty_status"
,
null
);
p
.
put
(
"page_num"
,
queryPageDTO
.
getCurrent
()
+
""
);
p
.
put
(
"page_size"
,
queryPageDTO
.
getSize
()
+
""
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
deviceList
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getDeviceList
()
;
R
<
Map
<
String
,
Object
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
Map
<
String
,
Object
>>>()
{
}.
getType
(),
p
);
Map
<
String
,
Object
>
detach
=
result
.
detach
();
...
...
@@ -147,7 +152,7 @@ public class VariableServiceImpl implements VariableService {
// Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType());
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
variableRealTimeDataList
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getVariableRealTimeDataList
()
;
R
<
Map
<
String
,
List
<
Object
>>>
result
=
RestTemplateUtils
.
post
(
uri
,
variableDTO
,
new
TypeToken
<
R
<
Map
<
String
,
List
<
Object
>>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
@@ -194,7 +199,7 @@ public class VariableServiceImpl implements VariableService {
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
variableHistoryDataList
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getVariableHistoryDataList
()
;
R
<
Map
<
String
,
Object
>>
result
=
RestTemplateUtils
.
post
(
uri
,
variableDTO
,
new
TypeToken
<
R
<
Map
<
String
,
Object
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
@@ -231,7 +236,7 @@ public class VariableServiceImpl implements VariableService {
}
if
(
CollectionUtils
.
isNotEmpty
(
departments
)
||
CollectionUtils
.
isNotEmpty
(
positions
))
{
R
<
Map
<
String
,
String
>>
result
=
setDeptAndRole
(
currentUser
,
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
deptsRoles
);
R
<
Map
<
String
,
String
>>
result
=
setDeptAndRole
(
currentUser
,
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getDeptsRoles
()
);
Map
<
String
,
String
>
detach
=
result
.
detach
();
String
officeIds
=
detach
.
get
(
"deptIds"
);
String
roleIds
=
detach
.
get
(
"roleIds"
);
...
...
@@ -274,7 +279,7 @@ public class VariableServiceImpl implements VariableService {
dto
.
setAppId
(
currentUser
.
getAppId
());
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
currentUser
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
send
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getSend
()
;
R
<
Object
>
result
=
RestTemplateUtils
.
post
(
uri
,
null
,
dto
,
new
TypeToken
<
R
<
Object
>>()
{}.
getType
(),
uriVariables
);
result
.
detach
();
...
...
@@ -294,7 +299,7 @@ public class VariableServiceImpl implements VariableService {
uriVariables
.
put
(
"deviceId"
,
deviceId
);
uriVariables
.
put
(
"variableId"
,
variableId
);
uriVariables
.
put
(
"variableCode"
,
variableCode
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
variableStatus
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()
+
dataCenterConfig
.
getVariableStatus
()
;
R
<
Map
<
String
,
Object
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
Map
<
String
,
Object
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
@@ -328,7 +333,7 @@ public class VariableServiceImpl implements VariableService {
uriVariables
.
put
(
"variableCode"
,
variableCode
);
uriVariables
.
put
(
"startTime"
,
startTime
);
uriVariables
.
put
(
"endTime"
,
endTime
);
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
variableHistoryStatus
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getVariableHistoryStatus
()
;
R
<
Map
<
String
,
Object
>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
Map
<
String
,
Object
>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
@@ -338,7 +343,7 @@ public class VariableServiceImpl implements VariableService {
this
.
judgeSearchList
(
variableDTO
.
getVariableSearchList
());
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
realTimeVariableDataList
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getRealTimeVariableDataList
()
;
R
<
Map
<
String
,
List
<
Object
>>>
result
=
RestTemplateUtils
.
post
(
uri
,
variableDTO
,
new
TypeToken
<
R
<
Map
<
String
,
List
<
Object
>>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
@@ -360,7 +365,7 @@ public class VariableServiceImpl implements VariableService {
}
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
String
uri
=
DataCenterConfig
.
dcClientHost
+
DataCenterConfig
.
variableStatusRealTimeDataList
;
String
uri
=
dataCenterConfig
.
getDcClientHost
()+
dataCenterConfig
.
getVariableStatusRealTimeDataList
()
;
R
<
Map
<
String
,
Map
<
String
,
Object
>>>
result
=
RestTemplateUtils
.
post
(
uri
,
statusRealTimeDataList
,
new
TypeToken
<
R
<
Map
<
String
,
Map
<
String
,
Object
>>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
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